From cf9cee7929f43c60e23045f078be656daa9feb20 Mon Sep 17 00:00:00 2001
From: Furior <68264134+Furrior@users.noreply.github.com>
Date: Sun, 17 Sep 2023 04:54:07 +0700
Subject: [PATCH] Tweak: para wishgranter (#195)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Что этот PR делает
## Почему это хорошо для игры
## Изображения изменений
## Тестирование
## Changelog
:cl:
tweak: Поменял вишгрантер имбы на обычный в гейте
/:cl:
---
_maps/map_files220/RandomZLevels/wildwest.dmm | 204 +++++++++---------
.../{_maps220 => maps220}/_maps220.dm | 0
.../{_maps220 => maps220}/_maps220.dme | 5 +-
.../{_maps220 => maps220}/code/Areas/away.dm | 0
.../code/Areas/gateway.dm | 0
.../code/Areas/station.dm | 0
.../code/RandomRuins/lavaland_ruins.dm | 0
.../code/RandomRuins/space_ruins.dm | 0
.../code/Station/cyberiad.dm | 0
.../code/Station/delta.dm | 0
.../{_maps220 => maps220}/code/corpses.dm | 0
.../{_maps220 => maps220}/code/helpers.dm | 2 +-
modular_ss220/maps220/code/misc.dm | 105 +++++++++
.../{_maps220 => maps220}/code/mobs.dm | 2 +-
.../{_maps220 => maps220}/code/spawners.dm | 4 +-
.../{_maps220 => maps220}/code/walls.dm | 0
.../icons/mapping_helpers.dmi | Bin
.../icons/simple_human.dmi | Bin
.../icons/spawner_icons.dmi | Bin
modular_ss220/modular_ss220.dme | 3 +-
20 files changed, 215 insertions(+), 110 deletions(-)
rename modular_ss220/{_maps220 => maps220}/_maps220.dm (100%)
rename modular_ss220/{_maps220 => maps220}/_maps220.dme (94%)
rename modular_ss220/{_maps220 => maps220}/code/Areas/away.dm (100%)
rename modular_ss220/{_maps220 => maps220}/code/Areas/gateway.dm (100%)
rename modular_ss220/{_maps220 => maps220}/code/Areas/station.dm (100%)
rename modular_ss220/{_maps220 => maps220}/code/RandomRuins/lavaland_ruins.dm (100%)
rename modular_ss220/{_maps220 => maps220}/code/RandomRuins/space_ruins.dm (100%)
rename modular_ss220/{_maps220 => maps220}/code/Station/cyberiad.dm (100%)
rename modular_ss220/{_maps220 => maps220}/code/Station/delta.dm (100%)
rename modular_ss220/{_maps220 => maps220}/code/corpses.dm (100%)
rename modular_ss220/{_maps220 => maps220}/code/helpers.dm (98%)
create mode 100644 modular_ss220/maps220/code/misc.dm
rename modular_ss220/{_maps220 => maps220}/code/mobs.dm (98%)
rename modular_ss220/{_maps220 => maps220}/code/spawners.dm (95%)
rename modular_ss220/{_maps220 => maps220}/code/walls.dm (100%)
rename modular_ss220/{_maps220 => maps220}/icons/mapping_helpers.dmi (100%)
rename modular_ss220/{_maps220 => maps220}/icons/simple_human.dmi (100%)
rename modular_ss220/{_maps220 => maps220}/icons/spawner_icons.dmi (100%)
diff --git a/_maps/map_files220/RandomZLevels/wildwest.dmm b/_maps/map_files220/RandomZLevels/wildwest.dmm
index df56ee2f305c..5186bf2b7bde 100644
--- a/_maps/map_files220/RandomZLevels/wildwest.dmm
+++ b/_maps/map_files220/RandomZLevels/wildwest.dmm
@@ -217,9 +217,9 @@
/area/awaymission/wildwest/wildwest_mines)
"cq" = (
/obj/effect/step_trigger/sound_effect{
+ happens_once = 1;
sound = "modular_ss220/aesthetics_sounds/sound/creepy/many_whisper2.ogg";
- triggerer_only = 1;
- happens_once = 1
+ triggerer_only = 1
},
/turf/simulated/floor{
icon_state = "cult"
@@ -347,8 +347,8 @@
/area/awaymission/wildwest/wildwest_mines)
"dI" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 4
+ dir = 4;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/carpet,
/area/awaymission/wildwest/wildwest_mines)
@@ -365,8 +365,8 @@
/obj/structure/table/holotable/wood,
/obj/item/book/random,
/obj/item/clothing/glasses/regular{
- pixel_y = 9;
- pixel_x = 8
+ pixel_x = 8;
+ pixel_y = 9
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/carpet/red,
@@ -396,8 +396,8 @@
pixel_y = 14
},
/obj/machinery/door_control{
- pixel_x = -9;
- id = "ww_window"
+ id = "ww_window";
+ pixel_x = -9
},
/turf/simulated/floor/plasteel{
dir = 10;
@@ -429,8 +429,8 @@
/area/awaymission/wildwest/wildwest_mines)
"en" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 8
+ dir = 8;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/carpet/purple,
/area/awaymission/wildwest/wildwest_mines)
@@ -499,9 +499,9 @@
message = "Ancient walls, monstrous petroglyphs and sweet smell of putrefaction... It's worth turning back before this cursed call takes over your mind completely!"
},
/obj/effect/step_trigger/sound_effect{
+ happens_once = 1;
sound = "modular_ss220/aesthetics_sounds/sound/creepy/many_whisper2.ogg";
- triggerer_only = 1;
- happens_once = 1
+ triggerer_only = 1
},
/turf/simulated/floor/plating/ironsand,
/area/awaymission/wildwest/wildwest_mines)
@@ -661,8 +661,8 @@
/area/awaymission/wildwest/wildwest_refine)
"gq" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 8
+ dir = 8;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/plating/asteroid,
/area/awaymission/wildwest/wildwest_mines)
@@ -877,8 +877,8 @@
/area/awaymission/wildwest/wildwest_refine)
"iy" = (
/obj/machinery/door_control{
- pixel_y = 30;
- id = "ww_door_ext"
+ id = "ww_door_ext";
+ pixel_y = 30
},
/turf/simulated/floor,
/area/awaymission/wildwest/wildwest_refine)
@@ -946,9 +946,9 @@
message = "You catch a glimpse of how you begin to move chaotically to the beat of the call!"
},
/obj/effect/step_trigger/sound_effect{
+ happens_once = 1;
sound = "modular_ss220/aesthetics_sounds/sound/creepy/many_whisper2.ogg";
- triggerer_only = 1;
- happens_once = 1
+ triggerer_only = 1
},
/turf/simulated/floor/plating/ironsand,
/area/awaymission/wildwest/wildwest_mines)
@@ -1113,8 +1113,8 @@
/area/awaymission/wildwest/wildwest_mines)
"kx" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 4
+ dir = 4;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/carpet/orange,
/area/awaymission/wildwest/wildwest_mines)
@@ -1215,8 +1215,8 @@
/area/awaymission/wildwest/wildwest_mines)
"ln" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 4
+ dir = 4;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/wood,
/area/awaymission/wildwest/wildwest_mines)
@@ -1513,8 +1513,8 @@
"oe" = (
/obj/machinery/hydroponics/soil,
/obj/structure/flora/corn_stalk{
- pixel_y = 15;
- anchored = 1
+ anchored = 1;
+ pixel_y = 15
},
/turf/simulated/floor/plating/asteroid,
/area/awaymission/wildwest/wildwest_mines)
@@ -1580,8 +1580,8 @@
pixel_y = 6
},
/obj/machinery/door_control{
- pixel_x = 7;
id = "ww_pod";
+ pixel_x = 7;
pixel_y = 8
},
/turf/simulated/floor/plasteel{
@@ -1591,8 +1591,8 @@
/area/awaymission/wildwest/wildwest_refine)
"oF" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 1
+ dir = 1;
+ icon_state = "bulb-broken"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -1601,9 +1601,9 @@
/area/awaymission/wildwest/wildwest_mines)
"oH" = (
/obj/effect/step_trigger/sound_effect{
+ happens_once = 1;
sound = "sound/hallucinations/i_see_you1.ogg";
- triggerer_only = 1;
- happens_once = 1
+ triggerer_only = 1
},
/turf/simulated/floor{
icon_state = "cult"
@@ -1703,16 +1703,16 @@
dir = 8
},
/obj/machinery/door_control{
- pixel_y = -27;
- id = "ww_hang1"
+ id = "ww_hang1";
+ pixel_y = -27
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood,
/area/awaymission/wildwest/wildwest_mines)
"pL" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 8
+ dir = 8;
+ icon_state = "bulb-broken"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/carpet,
@@ -1863,9 +1863,9 @@
/area/awaymission/wildwest/wildwest_mines)
"ri" = (
/obj/effect/step_trigger/sound_effect{
+ happens_once = 1;
sound = "sound/hallucinations/behind_you1.ogg";
- triggerer_only = 1;
- happens_once = 1
+ triggerer_only = 1
},
/turf/simulated/floor{
icon_state = "cult"
@@ -2063,8 +2063,8 @@
"th" = (
/obj/effect/step_trigger/sound_effect{
happens_once = 1;
- triggerer_only = 1;
- sound = "sound/hallucinations/over_here1.ogg"
+ sound = "sound/hallucinations/over_here1.ogg";
+ triggerer_only = 1
},
/turf/simulated/floor{
icon_state = "cult"
@@ -2104,8 +2104,8 @@
"tB" = (
/obj/machinery/economy/vending/snack/free,
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 4
+ dir = 4;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/wood,
/area/awaymission/wildwest/wildwest_mines)
@@ -2140,8 +2140,8 @@
/area/awaymission/wildwest/wildwest_mines)
"tX" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 4
+ dir = 4;
+ icon_state = "bulb-broken"
},
/mob/living/simple_animal/hostile/syndicate/melee,
/turf/simulated/floor/carpet/green,
@@ -2162,8 +2162,8 @@
/obj/structure/table/wood/fancy/red,
/obj/item/clothing/suit/hooded/cultrobes,
/obj/item/trash/candle{
- pixel_y = 1;
- pixel_x = 9
+ pixel_x = 9;
+ pixel_y = 1
},
/obj/item/clothing/suit/hooded/cultrobes/cult_shield,
/turf/simulated/floor{
@@ -2344,8 +2344,8 @@
/area/awaymission/wildwest/wildwest_mines)
"vJ" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 8
+ dir = 8;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/carpet/orange,
/area/awaymission/wildwest/wildwest_mines)
@@ -2359,8 +2359,8 @@
/obj/machinery/atmospherics/portable/canister/oxygen,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 8
+ dir = 8;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/wood,
/area/awaymission/wildwest/wildwest_mines)
@@ -2678,9 +2678,9 @@
/area/awaymission/wildwest/wildwest_mines)
"zL" = (
/obj/effect/step_trigger/sound_effect{
+ happens_once = 1;
sound = "modular_ss220/aesthetics_sounds/sound/creepy/many_whisper1.ogg";
- triggerer_only = 1;
- happens_once = 1
+ triggerer_only = 1
},
/turf/simulated/floor{
icon_state = "cult"
@@ -2818,9 +2818,9 @@
/area/awaymission/wildwest/wildwest_mines)
"AU" = (
/obj/effect/step_trigger/sound_effect{
+ happens_once = 1;
sound = "sound/hallucinations/turn_around1.ogg";
- triggerer_only = 1;
- happens_once = 1
+ triggerer_only = 1
},
/turf/simulated/floor{
icon_state = "cult"
@@ -2828,9 +2828,9 @@
/area/awaymission/wildwest/wildwest_vault)
"AV" = (
/obj/effect/step_trigger/sound_effect{
+ happens_once = 1;
sound = "modular_ss220/aesthetics_sounds/sound/creepy/scary_whisper1.ogg";
- triggerer_only = 1;
- happens_once = 1
+ triggerer_only = 1
},
/obj/effect/step_trigger/message{
message = "Has this rock always been here?"
@@ -2960,9 +2960,9 @@
/area/awaymission/wildwest/wildwest_mines)
"Cm" = (
/obj/effect/step_trigger/sound_effect{
+ happens_once = 1;
sound = "modular_ss220/aesthetics_sounds/sound/creepy/many_whisper2.ogg";
- triggerer_only = 1;
- happens_once = 1
+ triggerer_only = 1
},
/turf/simulated/floor{
icon_state = "cultdamage"
@@ -3058,8 +3058,8 @@
dir = 4
},
/obj/machinery/door_control{
- pixel_y = 28;
- id = "ww_hang1"
+ id = "ww_hang1";
+ pixel_y = 28
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -3111,8 +3111,8 @@
/area/awaymission/wildwest/wildwest_mines)
"DF" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 8
+ dir = 8;
+ icon_state = "bulb-broken"
},
/obj/effect/decal/cleanable/cobweb,
/obj/structure/closet/crate/trashcart,
@@ -3211,8 +3211,8 @@
dir = 4
},
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 8
+ dir = 8;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/wood,
/area/awaymission/wildwest/wildwest_mines)
@@ -3398,8 +3398,8 @@
/area/awaymission/wildwest/wildwest_mines)
"Gb" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 1
+ dir = 1;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/plating/asteroid,
/area/awaymission/wildwest/wildwest_mines)
@@ -3492,8 +3492,8 @@
/area/awaymission/wildwest/wildwest_mines)
"GS" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 4
+ dir = 4;
+ icon_state = "bulb-broken"
},
/obj/effect/mine/dnascramble,
/obj/effect/decal/cleanable/dirt,
@@ -3574,8 +3574,8 @@
/area/awaymission/wildwest/wildwest_mines)
"HJ" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 4
+ dir = 4;
+ icon_state = "bulb-broken"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood,
@@ -3770,8 +3770,8 @@
/area/space)
"JV" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 8
+ dir = 8;
+ icon_state = "bulb-broken"
},
/mob/living/simple_animal/hostile/syndicate/ranged,
/turf/simulated/floor/carpet/purple,
@@ -3798,8 +3798,8 @@
/area/awaymission/wildwest/wildwest_mines)
"Ku" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 4
+ dir = 4;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/plating/asteroid,
/area/awaymission/wildwest/wildwest_mines)
@@ -3821,8 +3821,8 @@
"KK" = (
/obj/structure/barricade/sandbags,
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 1
+ dir = 1;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/plating/asteroid,
/area/awaymission/wildwest/wildwest_mines)
@@ -3903,8 +3903,8 @@
pixel_y = 18
},
/obj/item/trash/raisins{
- pixel_y = 11;
- pixel_x = -17
+ pixel_x = -17;
+ pixel_y = 11
},
/obj/effect/decal/cleanable/ash,
/obj/effect/decal/cleanable/blood/old,
@@ -4075,7 +4075,7 @@
},
/area/awaymission/wildwest/wildwest_vault)
"Ni" = (
-/obj/machinery/wish_granter,
+/obj/machinery/wish_granter_dark,
/turf/simulated/floor{
icon_state = "necro3"
},
@@ -4095,8 +4095,8 @@
/area/awaymission/wildwest/wildwest_refine)
"Nl" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 8
+ dir = 8;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/wood,
/area/awaymission/wildwest/wildwest_mines)
@@ -4194,8 +4194,8 @@
"Os" = (
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 1
+ dir = 1;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/plating/asteroid,
/area/awaymission/wildwest/wildwest_mines)
@@ -4325,8 +4325,8 @@
/area/awaymission/wildwest/wildwest_mines)
"PL" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 8
+ dir = 8;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor,
/area/awaymission/wildwest/wildwest_refine)
@@ -4458,8 +4458,8 @@
"QQ" = (
/obj/effect/landmark/damageturf,
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 8
+ dir = 8;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor,
/area/awaymission/wildwest/wildwest_refine)
@@ -4587,9 +4587,9 @@
/area/awaymission/wildwest/wildwest_mines)
"SO" = (
/obj/effect/step_trigger/sound_effect{
+ happens_once = 1;
sound = "sound/hallucinations/im_here1.ogg";
- triggerer_only = 1;
- happens_once = 1
+ triggerer_only = 1
},
/turf/simulated/floor{
icon_state = "cult"
@@ -4707,16 +4707,16 @@
"TQ" = (
/obj/effect/decal/warning_stripes/north,
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 1
+ dir = 1;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor,
/area/awaymission/wildwest/wildwest_refine)
"TS" = (
/obj/machinery/mineral/ore_redemption,
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 4
+ dir = 4;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -4777,8 +4777,8 @@
"Uq" = (
/obj/item/shard{
icon_state = "medium";
- pixel_y = -10;
- pixel_x = 16
+ pixel_x = 16;
+ pixel_y = -10
},
/turf/simulated/floor/plating/asteroid,
/area/awaymission/wildwest/wildwest_mines)
@@ -4853,8 +4853,8 @@
/area/awaymission/wildwest/wildwest_mines)
"Vj" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 8
+ dir = 8;
+ icon_state = "bulb-broken"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/carpet/red,
@@ -4907,8 +4907,8 @@
"VV" = (
/obj/structure/reagent_dispensers/beerkeg,
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 1
+ dir = 1;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/wood,
/area/awaymission/wildwest/wildwest_mines)
@@ -4957,8 +4957,8 @@
/obj/structure/bed,
/obj/item/bedsheet/medical,
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 4
+ dir = 4;
+ icon_state = "bulb-broken"
},
/turf/simulated/floor/wood,
/area/awaymission/wildwest/wildwest_mines)
@@ -5127,8 +5127,8 @@
/area/awaymission/wildwest/wildwest_mines)
"YJ" = (
/obj/machinery/light/small{
- icon_state = "bulb-broken";
- dir = 8
+ dir = 8;
+ icon_state = "bulb-broken"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/carpet/green,
@@ -5155,8 +5155,8 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/shard{
icon_state = "medium";
- pixel_y = -10;
- pixel_x = 16
+ pixel_x = 16;
+ pixel_y = -10
},
/obj/item/shard,
/turf/simulated/floor/plasteel{
diff --git a/modular_ss220/_maps220/_maps220.dm b/modular_ss220/maps220/_maps220.dm
similarity index 100%
rename from modular_ss220/_maps220/_maps220.dm
rename to modular_ss220/maps220/_maps220.dm
diff --git a/modular_ss220/_maps220/_maps220.dme b/modular_ss220/maps220/_maps220.dme
similarity index 94%
rename from modular_ss220/_maps220/_maps220.dme
rename to modular_ss220/maps220/_maps220.dme
index ac6e81840662..2ca1c8702986 100644
--- a/modular_ss220/_maps220/_maps220.dme
+++ b/modular_ss220/maps220/_maps220.dme
@@ -7,8 +7,9 @@
#include "code/RandomRuins/space_ruins.dm"
#include "code/Station/cyberiad.dm"
#include "code/Station/delta.dm"
-#include "code/mobs.dm"
#include "code/corpses.dm"
-#include "code/spawners.dm"
#include "code/helpers.dm"
+#include "code/misc.dm"
+#include "code/mobs.dm"
+#include "code/spawners.dm"
#include "code/walls.dm"
diff --git a/modular_ss220/_maps220/code/Areas/away.dm b/modular_ss220/maps220/code/Areas/away.dm
similarity index 100%
rename from modular_ss220/_maps220/code/Areas/away.dm
rename to modular_ss220/maps220/code/Areas/away.dm
diff --git a/modular_ss220/_maps220/code/Areas/gateway.dm b/modular_ss220/maps220/code/Areas/gateway.dm
similarity index 100%
rename from modular_ss220/_maps220/code/Areas/gateway.dm
rename to modular_ss220/maps220/code/Areas/gateway.dm
diff --git a/modular_ss220/_maps220/code/Areas/station.dm b/modular_ss220/maps220/code/Areas/station.dm
similarity index 100%
rename from modular_ss220/_maps220/code/Areas/station.dm
rename to modular_ss220/maps220/code/Areas/station.dm
diff --git a/modular_ss220/_maps220/code/RandomRuins/lavaland_ruins.dm b/modular_ss220/maps220/code/RandomRuins/lavaland_ruins.dm
similarity index 100%
rename from modular_ss220/_maps220/code/RandomRuins/lavaland_ruins.dm
rename to modular_ss220/maps220/code/RandomRuins/lavaland_ruins.dm
diff --git a/modular_ss220/_maps220/code/RandomRuins/space_ruins.dm b/modular_ss220/maps220/code/RandomRuins/space_ruins.dm
similarity index 100%
rename from modular_ss220/_maps220/code/RandomRuins/space_ruins.dm
rename to modular_ss220/maps220/code/RandomRuins/space_ruins.dm
diff --git a/modular_ss220/_maps220/code/Station/cyberiad.dm b/modular_ss220/maps220/code/Station/cyberiad.dm
similarity index 100%
rename from modular_ss220/_maps220/code/Station/cyberiad.dm
rename to modular_ss220/maps220/code/Station/cyberiad.dm
diff --git a/modular_ss220/_maps220/code/Station/delta.dm b/modular_ss220/maps220/code/Station/delta.dm
similarity index 100%
rename from modular_ss220/_maps220/code/Station/delta.dm
rename to modular_ss220/maps220/code/Station/delta.dm
diff --git a/modular_ss220/_maps220/code/corpses.dm b/modular_ss220/maps220/code/corpses.dm
similarity index 100%
rename from modular_ss220/_maps220/code/corpses.dm
rename to modular_ss220/maps220/code/corpses.dm
diff --git a/modular_ss220/_maps220/code/helpers.dm b/modular_ss220/maps220/code/helpers.dm
similarity index 98%
rename from modular_ss220/_maps220/code/helpers.dm
rename to modular_ss220/maps220/code/helpers.dm
index 18a118f24dd8..9eb2566efdb2 100644
--- a/modular_ss220/_maps220/code/helpers.dm
+++ b/modular_ss220/maps220/code/helpers.dm
@@ -1,5 +1,5 @@
/obj/effect/mapping_helpers
- icon = 'modular_ss220/_maps220/icons/mapping_helpers.dmi'
+ icon = 'modular_ss220/maps220/icons/mapping_helpers.dmi'
/obj/effect/mapping_helpers/light
icon_state = "sunlight_helper"
diff --git a/modular_ss220/maps220/code/misc.dm b/modular_ss220/maps220/code/misc.dm
new file mode 100644
index 000000000000..e0f4dc3ca429
--- /dev/null
+++ b/modular_ss220/maps220/code/misc.dm
@@ -0,0 +1,105 @@
+/obj/machinery/wish_granter_dark
+ name = "Исполнитель Желаний"
+ desc = "Вы уже не уверены в этом..."
+ icon = 'icons/obj/device.dmi'
+ icon_state = "syndbeacon"
+
+ anchored = TRUE
+ density = TRUE
+ power_state = NO_POWER_USE
+
+ var/power_mutations
+ var/charges = 1
+ var/insisting = FALSE
+
+/obj/machinery/wish_granter_dark/Initialize(mapload)
+ . = ..()
+ power_mutations = list(/datum/mutation/meson_vision, /datum/mutation/night_vision, /datum/mutation/cold_resist, /datum/mutation/grant_spell/cryo)
+
+/obj/machinery/wish_granter_dark/attack_hand(mob/living/carbon/human/user as mob)
+ usr.set_machine(src)
+
+ if(!charges)
+ to_chat(user, "[name] никак не реагирует.")
+ return
+
+ else if(!ishuman(user))
+ to_chat(user, "Вы чувствуете темное движение внутри [name], которого опасаются ваши инстинкты.")
+ return
+
+ else if(is_special_character(user))
+ to_chat(user, "Что-то инстинктивно заставляет вас отстраниться.")
+ return
+
+ else if(!insisting)
+ to_chat(user, "Ваше первое прикосновение заставляет [name] зашевелиться, прислушиваясь к вам. Вы действительно уверены, что хотите это сделать?")
+ insisting = TRUE
+ return
+
+ insisting = FALSE
+ var/wish = input("Вы хотите...","Желание") as null|anything in list("Сила", "Богатство", "Бессмертие", "Покой")
+ if(!wish)
+ return
+ charges--
+
+ var/mob/living/carbon/human/human = user
+ var/become_shadow = TRUE
+ var/list/output = list()
+ switch(wish)
+ if("Сила")
+ for(var/mutation_type in power_mutations)
+ var/datum/mutation/mutation = GLOB.dna_mutations[mutation_type]
+ mutation.activate(human)
+
+ if("Богатство")
+ new /obj/structure/closet/syndicate/resources/everything(loc)
+
+ if("Бессмертие")
+ user.verbs += /mob/living/carbon/human/verb/immortality
+
+ if("Покой")
+ for(var/mob/living/simple_animal/hostile/faithless/F in GLOB.mob_living_list)
+ F.death()
+ become_shadow = FALSE
+
+ if(become_shadow && !isshadowperson(human))
+ output += "Ваше желание исполнено, но какой ценой..."
+ output += "[name] наказывает вас за ваш эгоизм, забирая вашу душу и деформируя ваше тело, чтобы оно соответствовало тьме в вашем сердце."
+ output += span_warning("Ваша плоть темнеет!")
+ output += "Вы теперь Тень, раса живущих во тьме гуманоидов."
+ output += span_warning("Ваше тело бурно реагирует на свет.") + span_notice("Однако естественным образом исцеляется в темноте..")
+ output += "Помимо ваших новых качеств, вы психически не изменились и сохраняете свою прежнюю личность."
+ human.set_species(/datum/species/shadow)
+ user.regenerate_icons()
+ else
+ output += "Вы чувствуете как избежали горькой судьбы..."
+ output += "Каким бы инопланетным разумом ни обладал [name], оно удовлетворяет ваше желание. Наступает тишина..."
+
+ to_chat(user, output.Join("
"))
+
+#define TRAIT_REVIVAL_IN_PROGRESS "revival_in_progress"
+
+/mob/living/carbon/human/verb/immortality()
+ set category = "Бессмертие"
+ set name = "Возрождение"
+
+ if(stat != DEAD)
+ to_chat(src, span_notice("Вы еще живы!"))
+ return
+
+ if(HAS_TRAIT(src, TRAIT_REVIVAL_IN_PROGRESS))
+ to_chat(src, span_notice("Вы уже восстаёте из мертвых!"))
+ return
+
+ ADD_TRAIT(src, TRAIT_REVIVAL_IN_PROGRESS, "Immortality")
+ to_chat(src, span_notice("Смерть - ещё не конец!"))
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/carbon/human, resurrect)), rand(80 SECONDS, 120 SECONDS))
+
+/mob/living/carbon/human/proc/resurrect()
+ // Stolen from ling stasis
+ revive()
+ REMOVE_TRAIT(src, TRAIT_REVIVAL_IN_PROGRESS, "Immortality")
+ to_chat(src, span_notice("Вы вернулись из небытия."))
+ visible_message(span_warning("[name] восстаёт из мертвых, исцелив все свои раны"))
+
+#undef TRAIT_REVIVAL_IN_PROGRESS
diff --git a/modular_ss220/_maps220/code/mobs.dm b/modular_ss220/maps220/code/mobs.dm
similarity index 98%
rename from modular_ss220/_maps220/code/mobs.dm
rename to modular_ss220/maps220/code/mobs.dm
index 9cbaa8da26af..0af1c446771a 100644
--- a/modular_ss220/_maps220/code/mobs.dm
+++ b/modular_ss220/maps220/code/mobs.dm
@@ -2,7 +2,7 @@
/mob/living/simple_animal/hostile/scavengers
name = "Scavenger"
desc = "One of the many random looters or bandits of the frontiers."
- icon = 'modular_ss220/_maps220/icons/simple_human.dmi'
+ icon = 'modular_ss220/maps220/icons/simple_human.dmi'
icon_state = "scav"
icon_living = "scav"
icon_dead = "scavdead"
diff --git a/modular_ss220/_maps220/code/spawners.dm b/modular_ss220/maps220/code/spawners.dm
similarity index 95%
rename from modular_ss220/_maps220/code/spawners.dm
rename to modular_ss220/maps220/code/spawners.dm
index 12d69d60347b..612632e1466d 100644
--- a/modular_ss220/_maps220/code/spawners.dm
+++ b/modular_ss220/maps220/code/spawners.dm
@@ -35,7 +35,7 @@
/* LOOTDROP */
/obj/effect/spawner/lootdrop/maintenance
- icon = 'modular_ss220/_maps220/icons/spawner_icons.dmi'
+ icon = 'modular_ss220/maps220/icons/spawner_icons.dmi'
/obj/effect/spawner/lootdrop/maintenance/three
icon_state = "trippleloot"
@@ -47,7 +47,7 @@
/obj/effect/spawner/lootdrop/trash
name = "trash spawner"
- icon = 'modular_ss220/_maps220/icons/spawner_icons.dmi'
+ icon = 'modular_ss220/maps220/icons/spawner_icons.dmi'
icon_state = "trash"
loot = list(
/obj/item/trash/bowl,
diff --git a/modular_ss220/_maps220/code/walls.dm b/modular_ss220/maps220/code/walls.dm
similarity index 100%
rename from modular_ss220/_maps220/code/walls.dm
rename to modular_ss220/maps220/code/walls.dm
diff --git a/modular_ss220/_maps220/icons/mapping_helpers.dmi b/modular_ss220/maps220/icons/mapping_helpers.dmi
similarity index 100%
rename from modular_ss220/_maps220/icons/mapping_helpers.dmi
rename to modular_ss220/maps220/icons/mapping_helpers.dmi
diff --git a/modular_ss220/_maps220/icons/simple_human.dmi b/modular_ss220/maps220/icons/simple_human.dmi
similarity index 100%
rename from modular_ss220/_maps220/icons/simple_human.dmi
rename to modular_ss220/maps220/icons/simple_human.dmi
diff --git a/modular_ss220/_maps220/icons/spawner_icons.dmi b/modular_ss220/maps220/icons/spawner_icons.dmi
similarity index 100%
rename from modular_ss220/_maps220/icons/spawner_icons.dmi
rename to modular_ss220/maps220/icons/spawner_icons.dmi
diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme
index e4c622eb7203..c0e1b14a3209 100644
--- a/modular_ss220/modular_ss220.dme
+++ b/modular_ss220/modular_ss220.dme
@@ -6,10 +6,9 @@
// --- MAINTENANCE --- //
#include "_defines220/_defines220.dme"
#include "_signals220/_signals220.dme"
-#include "_maps220/_maps220.dme"
#include "_misc/_misc.dme"
#include "_span/_span.dme"
-
+#include "maps220/_maps220.dme"
// --- ICONS --- //
#include "aesthetics/_aesthetics.dme"