From 7ef5246b199d512aed27b353b7e55d7580eca2df Mon Sep 17 00:00:00 2001 From: Detective Google <48196179+Detective-Google@users.noreply.github.com> Date: Fri, 1 May 2020 01:33:14 -0500 Subject: [PATCH] fixes a bunch of mismatch atmos in ruins --- .../IceRuins/icemoon_surface_asteroid.dmm | 787 ++++++++-------- .../IceRuins/icemoon_surface_lust.dmm | 1 + .../IceRuins/icemoon_surface_mining_site.dmm | 4 +- .../icemoon_underground_bathhouse.dmm | 5 +- .../IceRuins/icemoon_underground_lavaland.dmm | 847 +++++++++--------- .../IceRuins/icemoon_underground_library.dmm | 97 +- code/datums/map_config.dm | 2 +- .../ruins/icemoonruin_code/hotsprings.dm | 5 +- 8 files changed, 858 insertions(+), 890 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm index 0b5309b065..acb68d3c80 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm @@ -5,6 +5,9 @@ "b" = ( /turf/closed/mineral/random/snow/no_caves, /area/icemoon/surface/outdoors) +"U" = ( +/turf/closed/mineral/random/no_caves, +/area/icemoon/surface/outdoors/unexplored) (1,1,1) = {" b @@ -94,40 +97,40 @@ b b b b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U b b b @@ -135,90 +138,93 @@ b (4,1,1) = {" b b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U b b "} (5,1,1) = {" b b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U b b "} (6,1,1) = {" b b +U +U +U a a a @@ -249,18 +255,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (7,1,1) = {" b b +U +U +U a a a @@ -291,18 +297,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (8,1,1) = {" b b +U +U +U a a a @@ -333,18 +339,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (9,1,1) = {" b b +U +U +U a a a @@ -375,18 +381,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (10,1,1) = {" b b +U +U +U a a a @@ -417,18 +423,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (11,1,1) = {" b b +U +U +U a a a @@ -459,18 +465,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (12,1,1) = {" b b +U +U +U a a a @@ -501,18 +507,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (13,1,1) = {" b b +U +U +U a a a @@ -543,18 +549,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (14,1,1) = {" b b +U +U +U a a a @@ -585,18 +591,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (15,1,1) = {" b b +U +U +U a a a @@ -627,18 +633,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (16,1,1) = {" b b +U +U +U a a a @@ -669,18 +675,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (17,1,1) = {" b b +U +U +U a a a @@ -711,18 +717,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (18,1,1) = {" b b +U +U +U a a a @@ -753,18 +759,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (19,1,1) = {" b b +U +U +U a a a @@ -795,18 +801,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (20,1,1) = {" b b +U +U +U a a a @@ -837,18 +843,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (21,1,1) = {" b b +U +U +U a a a @@ -879,18 +885,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (22,1,1) = {" b b +U +U +U a a a @@ -921,18 +927,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (23,1,1) = {" b b +U +U +U a a a @@ -963,18 +969,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (24,1,1) = {" b b +U +U +U a a a @@ -1005,18 +1011,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (25,1,1) = {" b b +U +U +U a a a @@ -1047,18 +1053,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (26,1,1) = {" b b +U +U +U a a a @@ -1089,18 +1095,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (27,1,1) = {" b b +U +U +U a a a @@ -1131,18 +1137,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (28,1,1) = {" b b +U +U +U a a a @@ -1173,18 +1179,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (29,1,1) = {" b b +U +U +U a a a @@ -1215,18 +1221,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (30,1,1) = {" b b +U +U +U a a a @@ -1257,18 +1263,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (31,1,1) = {" b b +U +U +U a a a @@ -1299,18 +1305,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (32,1,1) = {" b b +U +U +U a a a @@ -1341,18 +1347,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (33,1,1) = {" b b +U +U +U a a a @@ -1383,18 +1389,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (34,1,1) = {" b b +U +U +U a a a @@ -1425,18 +1431,18 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (35,1,1) = {" b b +U +U +U a a a @@ -1467,96 +1473,93 @@ a a a a -a -a -a -a -a -a +U +U +U b b "} (36,1,1) = {" b b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U b b "} (37,1,1) = {" b b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U b b "} @@ -1564,40 +1567,40 @@ b b b b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U b b b diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm index 7f09c2a84a..5e68de864f 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm @@ -23,6 +23,7 @@ "f" = ( /obj/structure/sign/poster/contraband/lusty_xenomorph, /obj/structure/falsewall/abductor, +/obj/structure/fans/tiny, /turf/open/floor/mineral/diamond, /area/icemoon/surface/outdoors) diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm index 0e9155224a..969acdd871 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm @@ -57,11 +57,11 @@ /area/ruin/unpowered) "m" = ( /obj/structure/barricade/wooden/crude/snow, +/obj/structure/mineral_door/wood, /turf/open/floor/wood, /area/ruin/unpowered) "n" = ( -/obj/structure/mineral_door/wood, -/turf/open/floor/wood, +/turf/closed/mineral/random/snow/no_caves, /area/ruin/unpowered) "o" = ( /obj/item/reagent_containers/food/drinks/beer, diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm index 51103309fc..3672599cff 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm @@ -3,10 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/turf/closed/wall{ - icon = 'icons/turf/shuttleold.dmi'; - icon_state = "block" - }, +/turf/closed/wall/ice, /area/ruin/powered/bathhouse) "c" = ( /obj/machinery/shower{ diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm index e50d98a0b3..a7a97dfec9 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm @@ -12,6 +12,9 @@ }, /turf/open/floor/mineral/gold, /area/icemoon/underground/explored) +"B" = ( +/turf/closed/mineral/random/no_caves, +/area/icemoon/surface/outdoors/unexplored) "P" = ( /turf/open/floor/mineral/silver, /area/icemoon/underground/explored) @@ -110,40 +113,40 @@ b b b b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B b b b @@ -151,90 +154,93 @@ b (4,1,1) = {" b b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B b b "} (5,1,1) = {" b b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B b b "} (6,1,1) = {" b b +B +B +B a a a @@ -264,19 +270,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (7,1,1) = {" b b +B +B +B a a a @@ -306,19 +312,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (8,1,1) = {" b b +B +B +B a a a @@ -348,19 +354,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (9,1,1) = {" b b +B +B +B a a a @@ -390,19 +396,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (10,1,1) = {" b b +B +B +B a a a @@ -432,19 +438,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (11,1,1) = {" b b +B +B +B a a a @@ -474,19 +480,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (12,1,1) = {" b b +B +B +B a a a @@ -516,19 +522,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (13,1,1) = {" b b +B +B +B a a a @@ -558,19 +564,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (14,1,1) = {" b b +B +B +B a a a @@ -600,19 +606,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (15,1,1) = {" b b +B +B +B a a a @@ -642,19 +648,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (16,1,1) = {" b b +B +B +B a a a @@ -684,19 +690,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (17,1,1) = {" b b +B +B +B a a a @@ -726,22 +732,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (18,1,1) = {" b b -a -a -a +B +B +B a a a @@ -771,19 +774,19 @@ a a a a -a -a -a -a +B +B +B +B b b "} (19,1,1) = {" b b -a -a -a +B +B +B a a a @@ -813,19 +816,19 @@ a a a a -a -a -a -a +B +B +B +B b b "} (20,1,1) = {" b b -a -a -a +B +B +B a a a @@ -855,19 +858,19 @@ a a a a -a -a -a -a +B +B +B +B b b "} (21,1,1) = {" b b -a -a -a +B +B +B a a a @@ -897,19 +900,19 @@ a a a a -a -a -a -a +B +B +B +B b b "} (22,1,1) = {" b b -a -a -a +B +B +B a a a @@ -939,19 +942,19 @@ a a a a -a -a -a -a +B +B +B +B b b "} (23,1,1) = {" b b -a -a -a +B +B +B a a a @@ -981,16 +984,19 @@ a a a a -a -a -a -a +B +B +B +B b b "} (24,1,1) = {" b b +B +B +B a a a @@ -1020,19 +1026,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (25,1,1) = {" b b +B +B +B a a a @@ -1062,19 +1068,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (26,1,1) = {" b b +B +B +B a a a @@ -1104,19 +1110,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (27,1,1) = {" b b +B +B +B a a a @@ -1146,19 +1152,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (28,1,1) = {" b b +B +B +B a a a @@ -1188,19 +1194,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (29,1,1) = {" b b +B +B +B a a a @@ -1230,19 +1236,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (30,1,1) = {" b b +B +B +B a a a @@ -1272,19 +1278,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (31,1,1) = {" b b +B +B +B a a a @@ -1314,19 +1320,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (32,1,1) = {" b b +B +B +B a a a @@ -1356,19 +1362,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (33,1,1) = {" b b +B +B +B a a a @@ -1398,19 +1404,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (34,1,1) = {" b b +B +B +B a a a @@ -1440,19 +1446,19 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (35,1,1) = {" b b +B +B +B a a a @@ -1482,97 +1488,94 @@ a a a a -a -a -a -a -a -a -a +B +B +B +B b b "} (36,1,1) = {" b b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B b b "} (37,1,1) = {" b b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B b b "} @@ -1580,40 +1583,40 @@ b b b b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B +B b b b diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm index 106f043813..044f69fd1d 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm @@ -50,9 +50,6 @@ /obj/item/book_of_babel, /turf/open/floor/plasteel/cult, /area/ruin/unpowered/buried_library) -"an" = ( -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/ruin/unpowered/buried_library) "ao" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, @@ -64,7 +61,6 @@ /area/ruin/unpowered/buried_library) "aq" = ( /obj/structure/fluff/paper{ - icon_state = "paper"; dir = 1 }, /turf/open/floor/wood, @@ -75,16 +71,12 @@ "as" = ( /obj/effect/decal/cleanable/dirt, /obj/item/paper/fluff/ruins/oldstation/protosing, -/turf/open/floor/plating/asteroid/snow/icemoon, +/turf/closed/mineral/random/snow/no_caves, /area/ruin/unpowered/buried_library) "at" = ( /obj/structure/fluff/paper, /turf/open/floor/wood, /area/ruin/unpowered/buried_library) -"au" = ( -/obj/structure/fluff/paper/stack, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/ruin/unpowered/buried_library) "av" = ( /obj/structure/bookcase/random, /turf/closed/mineral/random/snow/no_caves, @@ -94,7 +86,7 @@ /area/ruin/unpowered/buried_library) "ax" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/asteroid/snow/icemoon, +/turf/closed/mineral/random/snow/no_caves, /area/ruin/unpowered/buried_library) "ay" = ( /obj/machinery/door/keycard/library, @@ -114,7 +106,7 @@ /area/ruin/unpowered/buried_library) "aC" = ( /obj/item/feather, -/turf/open/floor/plating/asteroid/snow/icemoon, +/turf/closed/mineral/random/snow/no_caves, /area/ruin/unpowered/buried_library) "aD" = ( /turf/open/floor/carpet/black, @@ -127,7 +119,7 @@ "aF" = ( /obj/item/book/manual/random, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/asteroid/snow/icemoon, +/turf/closed/mineral/random/snow/no_caves, /area/ruin/unpowered/buried_library) "aG" = ( /obj/structure/table/bronze, @@ -161,7 +153,7 @@ "aM" = ( /obj/item/stack/sheet/mineral/wood, /obj/item/book/manual/random, -/turf/open/floor/plating/asteroid/snow/icemoon, +/turf/closed/mineral/random/snow/no_caves, /area/ruin/unpowered/buried_library) "aN" = ( /obj/structure/statue/sandstone/venus, @@ -198,10 +190,6 @@ /obj/structure/fluff/paper, /turf/open/floor/wood, /area/ruin/unpowered/buried_library) -"aU" = ( -/obj/item/stack/sheet/mineral/wood, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/ruin/unpowered/buried_library) "aV" = ( /obj/item/stack/sheet/mineral/wood, /obj/structure/fluff/paper/stack, @@ -227,17 +215,12 @@ /area/ruin/unpowered/buried_library) "ba" = ( /obj/structure/barricade/wooden/snowed, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/ruin/unpowered/buried_library) -"bb" = ( -/obj/item/book/manual/random, -/turf/open/floor/plating/asteroid/snow/icemoon, +/turf/closed/mineral/random/snow/no_caves, /area/ruin/unpowered/buried_library) "bc" = ( /obj/item/feather, /obj/structure/fluff/paper, /obj/structure/fluff/paper{ - icon_state = "paper"; dir = 1 }, /turf/open/floor/wood, @@ -245,14 +228,12 @@ "bd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fluff/paper{ - icon_state = "paper"; dir = 1 }, /turf/open/floor/wood, /area/ruin/unpowered/buried_library) "be" = ( /obj/structure/fluff/paper{ - icon_state = "paper"; dir = 5 }, /turf/open/floor/wood, @@ -260,14 +241,13 @@ "bf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fluff/paper{ - icon_state = "paper"; dir = 4 }, /turf/open/floor/wood, /area/ruin/unpowered/buried_library) "bg" = ( /obj/item/paper/fluff/ruins/oldstation/protogun, -/turf/open/floor/plating/asteroid/snow/icemoon, +/turf/closed/mineral/random/snow/no_caves, /area/ruin/unpowered/buried_library) "bh" = ( /obj/effect/decal/cleanable/dirt, @@ -276,7 +256,7 @@ /area/ruin/unpowered/buried_library) "bi" = ( /obj/structure/fluff/paper, -/turf/open/floor/plating/asteroid/snow/icemoon, +/turf/closed/mineral/random/snow/no_caves, /area/ruin/unpowered/buried_library) "bj" = ( /obj/item/book/manual/random, @@ -284,7 +264,6 @@ /area/ruin/unpowered/buried_library) "bk" = ( /obj/structure/fluff/paper{ - icon_state = "paper"; dir = 10 }, /turf/open/floor/wood, @@ -300,7 +279,7 @@ "bn" = ( /obj/item/book/manual/random, /obj/item/stack/sheet/mineral/wood, -/turf/open/floor/plating/asteroid/snow/icemoon, +/turf/closed/mineral/random/snow/no_caves, /area/ruin/unpowered/buried_library) "bo" = ( /obj/item/stack/sheet/mineral/wood, @@ -309,7 +288,7 @@ "bp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fluff/paper, -/turf/open/floor/plating/asteroid/snow/icemoon, +/turf/closed/mineral/random/snow/no_caves, /area/ruin/unpowered/buried_library) "bq" = ( /obj/structure/mineral_door/wood, @@ -320,10 +299,6 @@ /obj/structure/girder, /turf/closed/mineral/random/snow/no_caves, /area/ruin/unpowered/buried_library) -"bs" = ( -/obj/structure/girder, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/ruin/unpowered/buried_library) "bt" = ( /obj/effect/decal/cleanable/dirt, /turf/template_noop, @@ -332,16 +307,9 @@ /obj/item/stack/sheet/mineral/wood, /turf/closed/mineral/random/snow/no_caves, /area/icemoon/underground/explored) -"bv" = ( -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "bw" = ( /turf/open/floor/wood, /area/icemoon/underground/explored) -"bx" = ( -/obj/item/stack/sheet/mineral/wood, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "by" = ( /obj/item/statuebust, /turf/open/floor/carpet/black, @@ -363,7 +331,6 @@ "bC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fluff/paper{ - icon_state = "paper"; dir = 1 }, /mob/living/simple_animal/pet/fox, @@ -432,11 +399,11 @@ ak ak ak ak -aU +bo ak ak -an -au +ak +bm ae af bk @@ -455,10 +422,10 @@ aa ak ak aR -an -an +ak +ak ae -bb +bj av ak ah @@ -478,7 +445,7 @@ aa aa ak ak -an +ak aC ae aQ @@ -502,13 +469,13 @@ aa aa ad ac -an +ak ae -an +ak aM aO ah -au +bm ah aA ah @@ -528,7 +495,7 @@ aa ad ac ak -au +bm ak ao aR @@ -555,19 +522,19 @@ ak ak av aA -an +ak aG aD aX -an +ak ao ae ao ah ae ac -bs -bv +br +ad ad "} (9,1,1) = {" @@ -593,7 +560,7 @@ ao ac ax bw -bv +ad "} (10,1,1) = {" aa @@ -608,7 +575,7 @@ ak aD aD aN -an +ak aw ak ao @@ -617,7 +584,7 @@ aR ae bq ae -bx +bu ad "} (11,1,1) = {" @@ -631,7 +598,7 @@ ae ah aR aD -an +ak aD aD by @@ -642,7 +609,7 @@ ae bm ac ae -bv +ad ad "} (12,1,1) = {" @@ -662,7 +629,7 @@ aY aD ak ae -au +bm ah ag br @@ -704,7 +671,7 @@ aK al at ah -an +ak ah bh aj diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 9c93259c00..2c445b6119 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -22,7 +22,7 @@ var/traits = null var/space_ruin_levels = 2 var/space_empty_levels = 1 - var/station_ruin_budget = -1 + var/station_ruin_budget = -1 // can be set to manually override the station ruins budget on maps that don't support station ruins, stopping the error from being unable to place the ruins. var/minetype = "lavaland" diff --git a/code/modules/ruins/icemoonruin_code/hotsprings.dm b/code/modules/ruins/icemoonruin_code/hotsprings.dm index b9347750cf..8cbd1b1f37 100644 --- a/code/modules/ruins/icemoonruin_code/hotsprings.dm +++ b/code/modules/ruins/icemoonruin_code/hotsprings.dm @@ -1,12 +1,9 @@ GLOBAL_LIST_EMPTY(cursed_minds) /** - * Turns whoever enters into a mob or random person + * Turns whoever enters into a mob * * If mob is chosen, turns the person into a random animal type - * If appearance is chosen, turns the person into a random human with a random species - * This changes name, and changes their DNA as well - * Random species is same as wizard swap event so people don't get killed ex: plasmamen * Once the spring is used, it cannot be used by the same mind ever again * After usage, teleports the user back to a random safe turf (so mobs are not killed by ice moon atmosphere) *