Skip to content

Commit

Permalink
фиксы и прочий мусор
Browse files Browse the repository at this point in the history
  • Loading branch information
AmShegars committed Jan 5, 2025
1 parent bb2dd97 commit ce9399c
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion mods/anomaly/_anomaly.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/singleton/modpack/colony_types
name = "Интерактивные аномалии"
desc = "Добавляет в игру полноценные аномалии, вдохновлённые Ашаном, пикником на обочине и сталкером."
author = "Shegar"
author = "Shegar(Код), HonkByEmo(Спрайты), AK200(Спрайты)"
2 changes: 2 additions & 0 deletions mods/anomaly/code/artefacts/_anomaly_artefacts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@
if(AnomaliesAmmountInTurf(get_turf(src)) == 0)
connected_to_anomaly = FALSE
input_collector.try_insert_artefact(user, src)
SSanom.collected_artefacts_by_player++
else
for(var/obj/anomaly/anomka in src.loc.contents)
if(prob(25 * user.get_skill_value(SKILL_SCIENCE)))
to_chat(user, SPAN_GOOD("Вы аккуратно, при помощи специальных щупов, помещаете обьект в контейнер."))
connected_to_anomaly = FALSE
SSanom.collected_artefacts_by_player++
input_collector.try_insert_artefact(user, src)
else
to_chat(user, SPAN_WARNING("Обьект уплывает из хвата щупов"))
Expand Down
3 changes: 2 additions & 1 deletion mods/anomaly/code/detectors_and_etc/collector.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/obj/item/collector/examine(mob/user, distance, is_adjacent)
. = ..()
to_chat(user, SPAN_GOOD("Click with collector on object to capture."))
to_chat(user, SPAN_GOOD("Кликните коллектором на обьект для захвата."))


/obj/item/collector/attack_hand(mob/user)
Expand Down Expand Up @@ -126,3 +126,4 @@
materials = list(MATERIAL_ALUMINIUM = 1000, MATERIAL_STEEL = 5000, MATERIAL_GLASS = 2500, MATERIAL_PLASTEEL = 2500, MATERIAL_PLASTIC = 1000)
build_path = /obj/item/collector
sort_string = "VAWAB"

Binary file modified mods/anomaly/icons/detection_icon.dmi
Binary file not shown.
Binary file modified mods/anomaly/icons/effects.dmi
Binary file not shown.
3 changes: 2 additions & 1 deletion mods/global_modpacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "utility_items/_utility_items.dme"
#include "mechs_by_shegar/_mechs_by_shegar.dme"
#include "newUI/_newUI.dme"
#include "weather\_weather.dme"
#include "anomaly/_anomaly.dme"
#include "bouquet_by_hakso/_bouquet_by_hakso.dme"
#include "integrated_circuits/_integrated_circuits.dme"
Expand All @@ -47,5 +48,5 @@
#include "simplangs/simplangs.dme"
#include "makeshift_sword_overhaul/makeshift_sword_overhaul.dme"
#include "item_identification/_item_identification.dme"

#include "vehicle\_vehicle.dme"
#include "../packs/sierra-tweaks/_pack.dm"

0 comments on commit ce9399c

Please sign in to comment.