From e0fe033ff140218b93c54d7762d792d44d4da7e8 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 30 Mar 2023 06:52:33 +0200 Subject: [PATCH] [MIRROR] Hermit Ruin Active Turf Fix(?) [MDB IGNORE] (#20184) * Hermit Ruin Active Turf Fix(?) (#74306) * Hermit Ruin Active Turf Fix(?) --------- Co-authored-by: san7890 --- .../IceRuins/icemoon_underground_hermit.dmm | 399 +++++++++--------- code/game/area/areas/ruins/icemoon.dm | 3 + 2 files changed, 204 insertions(+), 198 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm index 02dae10783b..557739642a5 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm @@ -2,114 +2,112 @@ "aM" = ( /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) -"bz" = ( -/obj/item/flashlight/lantern, +"bp" = ( /turf/open/floor/grass/fairy, -/area/ruin/powered/shuttle) -"bW" = ( -/obj/item/reagent_containers/cup/bucket/wooden, -/turf/open/floor/plating, -/area/ruin/powered/shuttle) -"cI" = ( -/turf/open/floor/plating, -/area/ruin/powered/shuttle) -"ec" = ( -/obj/item/clothing/suit/hooded/wintercoat, -/turf/open/floor/wood, -/area/ruin/powered/shuttle) -"ei" = ( -/obj/machinery/hydroponics/soil, -/turf/open/floor/grass/fairy, -/area/ruin/powered/shuttle) -"gr" = ( -/turf/open/floor/grass/fairy, -/area/ruin/powered/shuttle) -"ha" = ( -/obj/machinery/light/directional/west, -/turf/open/floor/wood, -/area/ruin/powered/shuttle) -"hv" = ( -/obj/structure/bonfire/prelit, -/turf/open/floor/wood, -/area/ruin/powered/shuttle) -"hN" = ( -/turf/open/floor/wood, -/area/ruin/powered/shuttle) -"ii" = ( -/obj/effect/mob_spawn/ghost_role/human/hermit, -/turf/open/floor/wood, -/area/ruin/powered/shuttle) -"il" = ( -/obj/structure/barricade/wooden/crude/snow, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) -"mN" = ( -/turf/closed/wall/mineral/wood, -/area/ruin/powered/shuttle) -"oJ" = ( -/obj/structure/sink/directional/south, -/turf/open/floor/plating, -/area/ruin/powered/shuttle) -"pI" = ( -/obj/item/chair/wood/wings, -/turf/open/floor/wood, -/area/ruin/powered/shuttle) -"sC" = ( -/obj/item/gun/ballistic/rifle/boltaction/pipegun/prime, -/obj/structure/table/wood, -/obj/item/flashlight/lantern, -/turf/open/floor/wood, -/area/ruin/powered/shuttle) -"sM" = ( -/obj/structure/chair/comfy/beige, -/obj/machinery/light/directional/west, -/obj/machinery/light/directional/north, -/turf/open/floor/wood, -/area/ruin/powered/shuttle) -"wH" = ( -/obj/item/tank/internals/emergency_oxygen/engi, -/turf/open/floor/grass/fairy, -/area/ruin/powered/shuttle) -"zd" = ( -/obj/item/storage/bag/plants/portaseeder, -/obj/item/storage/medkit/surgery, -/obj/item/storage/bag/ore, -/obj/structure/table/wood, -/turf/open/floor/grass/fairy, -/area/ruin/powered/shuttle) -"CR" = ( -/obj/item/flashlight/lantern, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) -"GU" = ( -/obj/item/storage/toolbox/emergency, -/turf/open/floor/plating, -/area/ruin/powered/shuttle) -"II" = ( -/obj/item/paper/guides/jobs/hydroponics, -/turf/open/floor/plating, -/area/ruin/powered/shuttle) -"JI" = ( +/area/ruin/powered/hermit) +"bM" = ( /obj/machinery/door/airlock/wood{ name = "Frozen Shack" }, /obj/structure/fans/tiny/invisible, /turf/open/floor/wood, -/area/ruin/powered/shuttle) -"Oe" = ( -/obj/item/seeds/plump, -/obj/item/seeds/plump, -/obj/item/seeds/tower, -/obj/item/seeds/reishi, -/obj/structure/table/wood, -/obj/item/food/grown/mushroom/glowshroom, +/area/ruin/powered/hermit) +"cI" = ( +/obj/item/storage/toolbox/emergency, /turf/open/floor/plating, -/area/ruin/powered/shuttle) -"ON" = ( +/area/ruin/powered/hermit) +"dY" = ( +/obj/structure/sink/directional/south, +/turf/open/floor/plating, +/area/ruin/powered/hermit) +"ec" = ( +/obj/structure/chair/comfy/beige, +/obj/machinery/light/directional/west, +/obj/machinery/light/directional/north, +/turf/open/floor/wood, +/area/ruin/powered/hermit) +"gr" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/grass/fairy, +/area/ruin/powered/hermit) +"ha" = ( +/obj/effect/mob_spawn/ghost_role/human/hermit, +/turf/open/floor/wood, +/area/ruin/powered/hermit) +"hN" = ( +/obj/structure/bonfire/prelit, +/turf/open/floor/wood, +/area/ruin/powered/hermit) +"ii" = ( +/obj/item/clothing/suit/hooded/wintercoat, +/turf/open/floor/wood, +/area/ruin/powered/hermit) +"il" = ( +/obj/structure/barricade/wooden/crude/snow, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"io" = ( +/obj/item/storage/bag/plants/portaseeder, +/obj/item/storage/medkit/surgery, +/obj/item/storage/bag/ore, +/obj/structure/table/wood, +/turf/open/floor/grass/fairy, +/area/ruin/powered/hermit) +"jG" = ( +/turf/closed/wall/mineral/wood, +/area/icemoon/underground/explored) +"mN" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/wood, +/area/ruin/powered/hermit) +"oJ" = ( +/obj/structure/glowshroom/single, +/turf/open/floor/plating, +/area/ruin/powered/hermit) +"sj" = ( /obj/machinery/hydroponics/soil, /obj/machinery/light/directional/north, /turf/open/floor/grass/fairy, -/area/ruin/powered/shuttle) +/area/ruin/powered/hermit) +"sC" = ( +/obj/item/chair/wood/wings, +/turf/open/floor/wood, +/area/ruin/powered/hermit) +"uw" = ( +/obj/machinery/hydroponics/soil, +/turf/open/floor/grass/fairy, +/area/ruin/powered/hermit) +"wf" = ( +/obj/item/gun/ballistic/rifle/boltaction/pipegun/prime, +/obj/structure/table/wood, +/obj/item/flashlight/lantern, +/turf/open/floor/wood, +/area/ruin/powered/hermit) +"wH" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/grass/fairy, +/area/ruin/powered/hermit) +"zd" = ( +/obj/item/pickaxe/improvised, +/obj/structure/table/wood, +/obj/item/knife/combat, +/turf/open/floor/grass/fairy, +/area/ruin/powered/hermit) +"CR" = ( +/obj/item/flashlight/lantern, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"GU" = ( +/obj/item/paper/guides/jobs/hydroponics, +/turf/open/floor/plating, +/area/ruin/powered/hermit) +"JI" = ( +/turf/open/floor/wood, +/area/ruin/powered/hermit) +"Lf" = ( +/obj/item/shovel, +/turf/open/floor/plating, +/area/ruin/powered/hermit) "Qr" = ( /obj/structure/barricade/wooden/snowed, /turf/open/misc/asteroid/snow/icemoon, @@ -117,36 +115,41 @@ "QD" = ( /turf/template_noop, /area/template_noop) +"Rd" = ( +/obj/item/flashlight/lantern, +/turf/open/floor/grass/fairy, +/area/ruin/powered/hermit) "Rr" = ( /obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "Si" = ( -/obj/structure/glowshroom/single, -/turf/open/floor/plating, -/area/ruin/powered/shuttle) -"UL" = ( -/obj/item/pickaxe/improvised, -/obj/structure/table/wood, -/obj/item/knife/combat, -/turf/open/floor/grass/fairy, -/area/ruin/powered/shuttle) -"WK" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/grass/fairy, -/area/ruin/powered/shuttle) -"Xh" = ( /obj/structure/flora/tree/jungle/small/style_random, /turf/open/floor/grass/fairy, -/area/ruin/powered/shuttle) -"XI" = ( -/obj/machinery/light/directional/east, +/area/ruin/powered/hermit) +"TL" = ( +/turf/closed/wall/mineral/wood, +/area/ruin/powered/hermit) +"WK" = ( +/obj/item/tank/internals/emergency_oxygen/engi, /turf/open/floor/grass/fairy, -/area/ruin/powered/shuttle) -"Yi" = ( -/obj/item/shovel, +/area/ruin/powered/hermit) +"Xl" = ( /turf/open/floor/plating, -/area/ruin/powered/shuttle) +/area/ruin/powered/hermit) +"Yi" = ( +/obj/item/seeds/plump, +/obj/item/seeds/plump, +/obj/item/seeds/tower, +/obj/item/seeds/reishi, +/obj/structure/table/wood, +/obj/item/food/grown/mushroom/glowshroom, +/turf/open/floor/plating, +/area/ruin/powered/hermit) +"YA" = ( +/obj/item/reagent_containers/cup/bucket/wooden, +/turf/open/floor/plating, +/area/ruin/powered/hermit) "YN" = ( /turf/closed/mineral/snowmountain/icemoon, /area/icemoon/underground/explored) @@ -174,31 +177,31 @@ QD QD QD QD -QD -QD YN -QD -QD -QD -QD -QD +YN +YN +YN +YN +YN +YN +YN +YN aM QD QD -QD "} (3,1,1) = {" QD QD QD -QD YN YN YN YN YN -QD -QD +YN +YN +YN YN YN YN @@ -208,7 +211,6 @@ YN (4,1,1) = {" QD QD -QD YN YN YN @@ -221,11 +223,13 @@ YN YN YN YN -aM +YN +YN "} (5,1,1) = {" QD -QD +YN +YN YN YN YN @@ -235,25 +239,24 @@ YN aM aM il -YN aM aM aM aM "} (6,1,1) = {" -QD YN YN YN -cI -mN -mN -mN -mN -mN -mN -aM +YN +Xl +Xl +TL +TL +TL +TL +TL +TL aM aM Rr @@ -262,34 +265,34 @@ aM (7,1,1) = {" YN YN -ei -Oe +YN +uw Yi -mN -sM +Lf +TL ec ii ha mN +TL aM aM aM il -aM "} (8,1,1) = {" YN -ei -gr -II +YN +uw +bp GU cI -hv -hN -hN +Xl hN JI -aM +JI +JI +bM aM aM Rr @@ -297,79 +300,81 @@ aM "} (9,1,1) = {" YN -ON -gr -Xh +jG +sj +bp Si oJ -hN -hN -pI +dY +JI +JI sC -mN +wf +TL aM aM aM CR -aM "} (10,1,1) = {" YN -ei -bz -gr -bW -cI -cI -cI -mN -mN -mN +YN +uw +Rd +bp +YA +Xl +Xl +Xl +TL +TL +TL Qr aM aM aM -aM "} (11,1,1) = {" YN YN YN -ei -gr -gr -XI +YN +uw +bp +bp wH WK gr +bp YN YN aM aM -aM Rr "} (12,1,1) = {" QD -QD YN YN -UL +YN +YN zd +io +jG YN YN YN YN YN -YN -aM aM aM aM "} (13,1,1) = {" QD -QD +YN +YN +YN YN YN YN @@ -380,42 +385,40 @@ YN YN aM aM -aM -aM -aM +Rr aM "} (14,1,1) = {" QD QD -QD -QD YN YN YN YN YN -aM -aM -aM +YN +YN +YN +YN aM Rr aM -QD +aM +aM "} (15,1,1) = {" QD QD QD QD -QD -QD -QD +YN +YN +YN +YN aM aM aM aM -Rr aM aM aM @@ -432,10 +435,10 @@ QD QD QD QD +QD aM aM QD QD QD -aM "} diff --git a/code/game/area/areas/ruins/icemoon.dm b/code/game/area/areas/ruins/icemoon.dm index d4270232ff1..3f41b75478b 100644 --- a/code/game/area/areas/ruins/icemoon.dm +++ b/code/game/area/areas/ruins/icemoon.dm @@ -56,3 +56,6 @@ sound_environment = SOUND_ENVIRONMENT_DIZZY mood_bonus = -8 mood_message = "I can feel my lifespan shortening with every breath." + +/area/ruin/powered/hermit + name = "\improper Hermit's Cabin"