From 99c978bfcdd6bae96b0e9b6c3b7560f6f39ded02 Mon Sep 17 00:00:00 2001 From: Dennok Date: Mon, 21 Sep 2020 15:00:57 +0300 Subject: [PATCH] Random ruins map templates fixes (#53848) * fix golem ship propulsion dir * vaporwave tweak replace space to noop, anchor statues * spacehotel tweak replace area to noop, place lattice under grille * creahedship tweak replace space to noop, remove asteroid area from space * vaporwave replace to noop * replace turf space to noop * replace space area and turf on shuttles * replace space area and turf on teplates --- .../RandomRuins/AnywhereRuins/golem_ship.dmm | 2 +- _maps/RandomRuins/SpaceRuins/DJstation.dmm | 6 +- _maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 57 +- .../SpaceRuins/abandonedteleporter.dmm | 2 +- _maps/RandomRuins/SpaceRuins/abandonedzoo.dmm | 15 +- _maps/RandomRuins/SpaceRuins/bigderelict1.dmm | 2 +- _maps/RandomRuins/SpaceRuins/crashedship.dmm | 14 +- _maps/RandomRuins/SpaceRuins/derelict1.dmm | 2 +- _maps/RandomRuins/SpaceRuins/derelict2.dmm | 8 +- _maps/RandomRuins/SpaceRuins/derelict3.dmm | 2 +- _maps/RandomRuins/SpaceRuins/derelict6.dmm | 12 +- _maps/RandomRuins/SpaceRuins/emptyshell.dmm | 64 +- .../RandomRuins/SpaceRuins/forgottenship.dmm | 20 +- .../RandomRuins/SpaceRuins/gasthelizards.dmm | 2 +- _maps/RandomRuins/SpaceRuins/hellfactory.dmm | 6 +- _maps/RandomRuins/SpaceRuins/oldAIsat.dmm | 22 +- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 713 +++++++++--------- .../RandomRuins/SpaceRuins/oldteleporter.dmm | 2 +- _maps/RandomRuins/SpaceRuins/onehalf.dmm | 45 +- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 5 +- .../SpaceRuins/turretedoutpost.dmm | 2 +- _maps/RandomRuins/SpaceRuins/vaporwave.dmm | 10 +- .../RandomRuins/SpaceRuins/whiteshipdock.dmm | 8 +- _maps/shuttles/emergency_pod.dmm | 4 +- _maps/shuttles/emergency_supermatter.dmm | 2 +- _maps/shuttles/emergency_zeta.dmm | 2 +- _maps/shuttles/mining_freight.dmm | 2 +- _maps/templates/medium_shuttle1.dmm | 4 +- _maps/templates/medium_shuttle2.dmm | 4 +- _maps/templates/medium_shuttle3.dmm | 8 +- _maps/templates/medium_shuttle4.dmm | 8 +- _maps/templates/small_asteroid_1.dmm | 4 +- _maps/templates/small_shuttle_1.dmm | 24 +- 33 files changed, 528 insertions(+), 555 deletions(-) diff --git a/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm b/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm index 4e1e62f5410..801a698ace6 100644 --- a/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm +++ b/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm @@ -55,7 +55,7 @@ /area/ruin/powered/golem_ship) "i" = ( /obj/structure/shuttle/engine/propulsion{ - dir = 8 + dir = 4 }, /turf/template_noop, /area/ruin/powered/golem_ship) diff --git a/_maps/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/RandomRuins/SpaceRuins/DJstation.dmm index 3a9283c141b..aec68eea3dc 100644 --- a/_maps/RandomRuins/SpaceRuins/DJstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/DJstation.dmm @@ -16,7 +16,7 @@ "ae" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "af" = ( /turf/closed/wall, /area/ruin/space/djstation) @@ -286,7 +286,7 @@ "aZ" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/template_noop) "ba" = ( /turf/open/floor/plasteel/freezer, /area/ruin/space/djstation) @@ -355,7 +355,7 @@ }, /obj/structure/disposaloutlet, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/template_noop) "Co" = ( /obj/machinery/door/airlock/external{ name = "Ruskie DJ Station" diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index a04a3e64ed5..13191e1148e 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -173,7 +173,7 @@ "bd" = ( /obj/structure/grille/broken, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/template_noop) "be" = ( /obj/machinery/light/small, /turf/open/floor/plasteel, @@ -431,7 +431,7 @@ /turf/open/floor/plasteel/airless{ icon_state = "damaged4" }, -/area/space/nearstation) +/area/template_noop) "cd" = ( /obj/machinery/light, /turf/open/floor/plasteel/airless, @@ -673,7 +673,7 @@ "de" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/airless/solarpanel, -/area/space/nearstation) +/area/template_noop) "df" = ( /obj/item/wallframe/apc, /turf/open/floor/plating/airless, @@ -688,7 +688,7 @@ /area/ruin/space/derelict/gravity_generator) "dj" = ( /turf/open/floor/plasteel/airless/solarpanel, -/area/space/nearstation) +/area/template_noop) "dk" = ( /obj/item/stack/cable_coil/cut, /turf/template_noop, @@ -1861,7 +1861,7 @@ }, /obj/structure/grille, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "hR" = ( /obj/structure/table, /obj/structure/window/reinforced{ @@ -1920,11 +1920,11 @@ /turf/open/floor/plasteel/airless{ icon_state = "damaged5" }, -/area/space/nearstation) +/area/template_noop) "ib" = ( /obj/item/stack/cable_coil/cut, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/template_noop) "ic" = ( /obj/structure/table, /obj/structure/window/reinforced{ @@ -2002,7 +2002,7 @@ /turf/open/floor/plasteel/airless{ icon_state = "damaged4" }, -/area/space/nearstation) +/area/template_noop) "ir" = ( /obj/structure/chair{ dir = 1 @@ -2027,7 +2027,7 @@ dir = 6 }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "iv" = ( /obj/structure/table, /obj/structure/window/reinforced{ @@ -2158,7 +2158,7 @@ }, /obj/structure/grille, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "iU" = ( /obj/structure/table, /obj/structure/window/reinforced{ @@ -2598,7 +2598,7 @@ "kL" = ( /obj/structure/window/fulltile, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "kM" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -2691,7 +2691,7 @@ /obj/structure/lattice, /obj/item/stack/cable_coil/cut, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "le" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plasteel/airless, @@ -3589,7 +3589,7 @@ "vf" = ( /obj/structure/grille, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/template_noop) "vo" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/mineral/gold{ @@ -3605,7 +3605,7 @@ dir = 1 }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "wK" = ( /turf/open/floor/plasteel/airless{ icon_state = "damaged3" @@ -3629,7 +3629,7 @@ /turf/open/floor/plasteel/airless{ icon_state = "damaged3" }, -/area/space/nearstation) +/area/template_noop) "CZ" = ( /obj/item/clothing/suit/space/syndicate/black/green, /turf/open/floor/plasteel/airless{ @@ -3664,7 +3664,7 @@ /turf/open/floor/plasteel/airless{ icon_state = "damaged2" }, -/area/space/nearstation) +/area/template_noop) "ES" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, @@ -3674,7 +3674,7 @@ "Gu" = ( /obj/structure/grille, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "GM" = ( /obj/structure/lattice, /turf/template_noop, @@ -3721,7 +3721,7 @@ /turf/open/floor/plasteel/airless{ icon_state = "floorscorched2" }, -/area/space/nearstation) +/area/template_noop) "Kf" = ( /obj/item/paper/fluff/ruins/thederelict/vaultraider, /obj/effect/decal/remains/human{ @@ -3765,7 +3765,7 @@ /area/ruin/space/derelict/bridge/ai_upload) "Lv" = ( /turf/closed/wall, -/area/space/nearstation) +/area/template_noop) "LX" = ( /obj/machinery/power/smes/engineering{ charge = 0 @@ -3836,9 +3836,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plasteel, /area/ruin/space/derelict/gravity_generator) -"Sv" = ( -/turf/closed/wall/r_wall, -/area/space/nearstation) "Tm" = ( /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/primary/port) @@ -3851,7 +3848,7 @@ /area/ruin/space/derelict/medical) "Uz" = ( /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/template_noop) "UG" = ( /obj/structure/cable, /obj/machinery/power/terminal{ @@ -3909,7 +3906,7 @@ "ZB" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ZM" = ( /obj/machinery/drone_dispenser/derelict, /turf/open/floor/plasteel, @@ -7227,7 +7224,7 @@ aa aa aa ZB -Sv +ci ZB dr dr @@ -7339,7 +7336,7 @@ aa aa aa aa -Sv +ci de dr dr @@ -8695,7 +8692,7 @@ aa aa aa aa -Sv +ci dj dr dr @@ -8809,7 +8806,7 @@ aa aa aa ZB -Sv +ci ZB dr dr @@ -9804,7 +9801,7 @@ aa aa aa aa -Sv +ci ax bj bj @@ -10595,7 +10592,7 @@ ZB aa aa ZB -Sv +ci ax bj bj diff --git a/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm b/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm index 1681cf1e552..175b2dab749 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm @@ -8,7 +8,7 @@ "c" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "d" = ( /obj/structure/frame/computer, /turf/open/floor/plating/airless, diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm index 12ed3fe22c6..8be9406f41c 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -171,7 +171,7 @@ dir = 4 }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "aL" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral, @@ -218,7 +218,7 @@ dir = 8 }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "aR" = ( /obj/machinery/light/small{ dir = 4 @@ -528,7 +528,7 @@ "bK" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/template_noop) "bL" = ( /obj/machinery/light/small{ dir = 8 @@ -576,14 +576,14 @@ "bP" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "bR" = ( /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/structure/disposaloutlet, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/template_noop) "bT" = ( /obj/structure/grille, /obj/item/shard{ @@ -677,9 +677,6 @@ /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/abandonedzoo) -"KN" = ( -/turf/template_noop, -/area/space/nearstation) "Ng" = ( /obj/structure/alien/weeds, /obj/structure/alien/weeds/node, @@ -1061,7 +1058,7 @@ ac ac bN bP -KN +aa aa "} (19,1,1) = {" diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index 4471738305d..9ab10156a9a 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -275,7 +275,7 @@ "aY" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "aZ" = ( /turf/closed/wall, /area/ruin/space/has_grav/derelictoutpost) diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index 5a620d04096..13f2cddb206 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -6,7 +6,7 @@ /obj/item/circular_saw, /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ac" = ( /turf/closed/wall/mineral/titanium, /area/awaymission/bmpship/aft) @@ -46,7 +46,7 @@ "am" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "an" = ( /obj/structure/window/reinforced, /obj/effect/spawner/structure/window/hollow/reinforced/middle{ @@ -1897,12 +1897,6 @@ "hE" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/awaymission/bmpship/fore) -"vh" = ( -/turf/template_noop, -/area/space/nearstation) -"wh" = ( -/turf/template_noop, -/area/awaymission/bmpship) "xA" = ( /turf/closed/mineral/random/no_caves, /area/awaymission/bmpship) @@ -2261,7 +2255,7 @@ aa aa aa aa -wh +aa fS fS xA @@ -3406,7 +3400,7 @@ aa aa am aa -vh +aa EQ gt at diff --git a/_maps/RandomRuins/SpaceRuins/derelict1.dmm b/_maps/RandomRuins/SpaceRuins/derelict1.dmm index 9c1a0d97839..d2fe31b72c2 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict1.dmm @@ -5,7 +5,7 @@ "b" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "c" = ( /turf/closed/wall, /area/ruin/unpowered) diff --git a/_maps/RandomRuins/SpaceRuins/derelict2.dmm b/_maps/RandomRuins/SpaceRuins/derelict2.dmm index c57ac798acb..fb5eb4c2a91 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict2.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict2.dmm @@ -7,7 +7,7 @@ dir = 4 }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "c" = ( /obj/machinery/door/airlock/external, /turf/open/floor/plating, @@ -17,7 +17,7 @@ dir = 8 }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "e" = ( /obj/structure/window/reinforced{ dir = 4 @@ -52,7 +52,7 @@ "k" = ( /obj/structure/window/reinforced, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "l" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -92,7 +92,7 @@ dir = 1 }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "q" = ( /obj/machinery/light/small{ dir = 8 diff --git a/_maps/RandomRuins/SpaceRuins/derelict3.dmm b/_maps/RandomRuins/SpaceRuins/derelict3.dmm index c5a0b2c0123..94000c98692 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict3.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict3.dmm @@ -11,7 +11,7 @@ "d" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) (1,1,1) = {" a diff --git a/_maps/RandomRuins/SpaceRuins/derelict6.dmm b/_maps/RandomRuins/SpaceRuins/derelict6.dmm index 98a9692f50b..2c50b3583a8 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict6.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict6.dmm @@ -9,11 +9,11 @@ icon_state = "singular" }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ac" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ad" = ( /obj/structure/girder, /turf/open/floor/plating/airless{ @@ -24,7 +24,7 @@ /obj/item/stack/sheet/metal, /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "af" = ( /obj/structure/fluff/broken_flooring{ dir = 8; @@ -63,7 +63,7 @@ }, /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "am" = ( /obj/item/stack/rods, /turf/open/floor/plating/airless, @@ -293,12 +293,12 @@ /obj/structure/lattice, /obj/item/stack/sheet/metal, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "aZ" = ( /obj/structure/lattice, /obj/item/shard, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ba" = ( /mob/living/simple_animal/hostile/retaliate/ghost, /turf/open/floor/plasteel/airless/cafeteria, diff --git a/_maps/RandomRuins/SpaceRuins/emptyshell.dmm b/_maps/RandomRuins/SpaceRuins/emptyshell.dmm index 7cbaa3a0b64..583151d8ef2 100644 --- a/_maps/RandomRuins/SpaceRuins/emptyshell.dmm +++ b/_maps/RandomRuins/SpaceRuins/emptyshell.dmm @@ -53,10 +53,6 @@ }, /turf/open/floor/plating, /area/ruin/unpowered) -"Q" = ( -/obj/structure/lattice, -/turf/template_noop, -/area/space/nearstation) (1,1,1) = {" a @@ -65,7 +61,7 @@ a a a a -Q +b a a a @@ -80,12 +76,12 @@ a a a a -Q -Q -Q +b +b +b a a -Q +b a a a @@ -96,23 +92,23 @@ a a a a -Q +b a a -Q +b i i -Q +b a a a -Q +b a "} (4,1,1) = {" a -Q -Q +b +b c c c @@ -128,7 +124,7 @@ a "} (5,1,1) = {" a -Q +b c c c @@ -141,7 +137,7 @@ c c c c -Q +b "} (6,1,1) = {" a @@ -158,7 +154,7 @@ l c c c -Q +b "} (7,1,1) = {" a @@ -196,7 +192,7 @@ a "} (9,1,1) = {" a -Q +b c c d @@ -230,7 +226,7 @@ a "} (11,1,1) = {" a -Q +b c c f @@ -281,7 +277,7 @@ a "} (14,1,1) = {" a -Q +b c c c @@ -316,17 +312,17 @@ a (16,1,1) = {" a a -Q +b a -Q -Q -Q +b +b +b a -Q -Q -Q +b +b +b a -Q +b a a "} @@ -336,12 +332,12 @@ a a a a -Q -Q +b +b a -Q -Q -Q +b +b +b a a a diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm index c156cbfc274..a08d505a1bc 100644 --- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm +++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm @@ -1,11 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "ab" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/unpowered/no_grav) "ac" = ( /obj/machinery/porta_turret/syndicate/energy{ @@ -33,7 +33,7 @@ /obj/structure/shuttle/engine/propulsion{ dir = 8 }, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/syndicate_forgotten_ship) "ag" = ( /obj/effect/mob_spawn/human/syndicatespace/captain, @@ -72,7 +72,7 @@ /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/syndicate_forgotten_ship) "ap" = ( -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/syndicate_forgotten_ship) "aq" = ( /obj/structure/sign/poster/contraband/syndicate_recruitment, @@ -92,7 +92,7 @@ /obj/structure/shuttle/engine/huge{ dir = 8 }, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/syndicate_forgotten_ship) "at" = ( /obj/structure/chair/comfy/shuttle, @@ -312,7 +312,7 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/syndicate_forgotten_cargopod) "aY" = ( -/turf/open/space/basic, +/turf/template_noop, /area/ruin/unpowered/no_grav) "aZ" = ( /turf/closed/indestructible/syndicate, @@ -618,8 +618,8 @@ "bN" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, -/turf/open/space/basic, -/area/space/nearstation) +/turf/template_noop, +/area/template_noop) "bO" = ( /obj/structure/bodycontainer/crematorium{ id = "fscremate" @@ -1196,7 +1196,7 @@ /area/ruin/space/has_grav/powered/syndicate_forgotten_vault) "dj" = ( /turf/closed/mineral/random/high_chance, -/area/space) +/area/template_noop) "dk" = ( /obj/structure/closet/crate/secure/gear{ req_one_access_txt = "150" diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm index cebbc1267d2..06227b98201 100644 --- a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm +++ b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm @@ -5,7 +5,7 @@ "b" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "c" = ( /turf/closed/wall, /area/ruin/space/has_grav/gasthelizard) diff --git a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm index fa446b28f11..97daf0808be 100644 --- a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm +++ b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm @@ -956,19 +956,19 @@ /area/ruin/space/has_grav/hellfactory) "cQ" = ( /obj/structure/lattice/catwalk, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/hellfactory) "cR" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon{ icon_state = "markerburgundy-on" }, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/hellfactory) "cS" = ( /obj/structure/lattice/catwalk, /obj/item/keycard/entry, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/hellfactory) "cT" = ( /obj/machinery/light/broken, diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm index 922482ecbf8..669f48c82f4 100644 --- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm @@ -5,7 +5,7 @@ "ab" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ac" = ( /turf/open/floor/plating/airless, /area/tcommsat/oldaisat) @@ -13,16 +13,16 @@ /obj/structure/lattice, /obj/structure/grille/broken, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ae" = ( /obj/structure/lattice, /obj/structure/grille, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "af" = ( /obj/structure/grille, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/template_noop) "ag" = ( /turf/closed/wall/r_wall, /area/tcommsat/oldaisat) @@ -97,7 +97,7 @@ dir = 4 }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "au" = ( /obj/structure/cable, /turf/open/floor/plating/airless, @@ -119,7 +119,7 @@ dir = 8 }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ay" = ( /obj/effect/spawner/lootdrop/crate_spawner, /turf/open/floor/plasteel/airless, @@ -394,7 +394,7 @@ }, /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "bs" = ( /obj/structure/window/reinforced{ dir = 1 @@ -427,7 +427,7 @@ }, /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "bz" = ( /obj/structure/window/reinforced{ dir = 8 @@ -474,7 +474,7 @@ }, /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "bG" = ( /obj/structure/window/reinforced{ dir = 4 @@ -661,7 +661,7 @@ /obj/structure/window/reinforced, /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "cl" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -757,7 +757,7 @@ icon_state = "medium" }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "cB" = ( /obj/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating, diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index a4f8db05f43..fecb8b0e08b 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -401,7 +401,7 @@ /area/ruin/space/has_grav/ancientstation/deltaai) "bf" = ( /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/template_noop) "bg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue{ @@ -1384,7 +1384,7 @@ "dF" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "dG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -2019,7 +2019,7 @@ }, /obj/structure/lattice/catwalk, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "fg" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, @@ -2649,9 +2649,6 @@ /obj/structure/grille, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/ancientstation/atmo) -"gK" = ( -/turf/template_noop, -/area/space/nearstation) "gL" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ dir = 4 @@ -3474,7 +3471,7 @@ dir = 4 }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "iw" = ( /obj/structure/rack, /obj/item/storage/toolbox/mechanical/old, @@ -3690,7 +3687,7 @@ dir = 4 }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "iP" = ( /obj/structure/chair{ dir = 1 @@ -4760,7 +4757,7 @@ "lg" = ( /obj/structure/lattice/catwalk, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "lh" = ( /turf/closed/mineral/plasma, /area/ruin/unpowered) @@ -4932,12 +4929,12 @@ }, /obj/structure/lattice/catwalk, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "lI" = ( /obj/structure/transit_tube, /obj/structure/lattice/catwalk, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "lJ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/clothing/suit/space/nasavoid/old, @@ -5667,7 +5664,7 @@ "nr" = ( /obj/item/stack/rods, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ns" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, @@ -5996,10 +5993,6 @@ /obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/plasteel, /area/ruin/space/has_grav/ancientstation/deltacorridor) -"nZ" = ( -/mob/living/simple_animal/hostile/carp, -/turf/template_noop, -/area/space/nearstation) "oa" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -6384,7 +6377,7 @@ "oR" = ( /obj/item/shard, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "oS" = ( /obj/effect/decal/cleanable/glass, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -6480,7 +6473,7 @@ icon_state = "small" }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "pf" = ( /obj/structure/window/reinforced{ dir = 8 @@ -6680,7 +6673,7 @@ /obj/structure/lattice, /obj/item/stack/rods, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "tn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair, @@ -7497,7 +7490,7 @@ /obj/item/stack/rods, /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "Tk" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ dir = 1 @@ -7741,33 +7734,33 @@ aa aa aa aa -gK -gK -gK -gK -gK -gK -gK -gK +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa aa ac ac -gK -nZ +aa +ab mH mH mH mH mH -nZ +ab kQ mH mH kQ -gK +aa aa aa aa @@ -7788,7 +7781,7 @@ ab ac ac Td -gK +aa dF AK AK @@ -7797,7 +7790,7 @@ bF lV AK AK -gK +aa aa aa ac @@ -7816,7 +7809,7 @@ mH qk GP kQ -gK +aa aa aa aa @@ -7846,7 +7839,7 @@ oA oE nC Ck -gK +aa aa ac ac @@ -7865,7 +7858,7 @@ nB nK EV kQ -gK +aa aa nr aa @@ -7944,11 +7937,11 @@ kb eH nD AK -gK -gK +aa +aa dF -gK -gK +aa +aa ac ac nk @@ -7963,7 +7956,7 @@ le pp mH kQ -gK +aa ac ac aa @@ -8029,7 +8022,7 @@ aa aa aa aa -gK +aa lt me bw @@ -8109,7 +8102,7 @@ Zg pv uT kQ -gK +aa ac ac ac @@ -8193,13 +8186,13 @@ jk oP Cs oR -gK +aa dF -gK +aa dF pe dF -gK +aa kQ Tk Mt @@ -8207,7 +8200,7 @@ qF Tk Mt mH -gK +aa aa aa aa @@ -8227,7 +8220,7 @@ aa aa aa ni -gK +aa ch zJ mS @@ -8241,22 +8234,22 @@ YN nE nG GU -gK +aa aa dF aa dF aa dF -gK +aa dF -gK -gK +aa +aa LY -gK -gK +aa +aa dF -gK +aa aa aa aa @@ -8325,7 +8318,7 @@ aa aa dF aa -gK +aa ch np mV @@ -8339,7 +8332,7 @@ bG GU DF GU -gK +aa aa dF aa @@ -8374,21 +8367,21 @@ aa aa dF aa -gK +aa ch cr dM ch -gK -gK -gK -gK -gK -gK -gK -gK -gK -gK +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa dF aa @@ -8423,12 +8416,12 @@ aa aa dF aa -gK +aa ch Cq dM ch -gK +aa aa aa aa @@ -8467,17 +8460,17 @@ aa aa aa aa -gK +aa nr dF -gK -gK -gK +aa +aa +aa bK mW mV bJ -gK +aa aa aa aa @@ -8516,7 +8509,7 @@ aa aa aa aa -gK +aa ga ga jE @@ -8526,7 +8519,7 @@ jE mW mV bJ -gK +aa aa aa aa @@ -8565,7 +8558,7 @@ aa aa aa aa -gK +aa gb jV mp @@ -8575,7 +8568,7 @@ jE mW mS ch -gK +aa aa aa aa @@ -8611,10 +8604,10 @@ aa aa aa aa -gK -gK -gK -gK +aa +aa +aa +aa iT lk mG @@ -8624,7 +8617,7 @@ ga mX nc mv -gK +aa aa aa aa @@ -8660,7 +8653,7 @@ aa aa aa aa -gK +aa aZ dK dK @@ -8673,7 +8666,7 @@ mF zJ mS mw -gK +aa aa aa aa @@ -8709,7 +8702,7 @@ aa aa aa aa -gK +aa RX fX fX @@ -8722,7 +8715,7 @@ mM gi mZ mw -gK +aa aa aa aa @@ -8758,7 +8751,7 @@ aa aa aa aa -gK +aa aZ dK dK @@ -8771,7 +8764,7 @@ mF zJ mS mw -gK +aa aa aa aa @@ -8807,10 +8800,10 @@ aa aa aa aa -gK -gK -gK -gK +aa +aa +aa +aa iT mD mF @@ -8820,15 +8813,15 @@ jE uR uB mx -gK aa aa aa -gK -gK +aa +aa +aa my -gK -gK +aa +aa aa aa dF @@ -8859,7 +8852,7 @@ aa aa aa aa -gK +aa gL mA mA @@ -8869,15 +8862,15 @@ jE zJ na ch -gK aa aa aa -gK +aa +aa fB vM fB -gK +aa aa aa dF @@ -8908,7 +8901,7 @@ aa aa aa aa -gK +aa jE jE jE @@ -8918,15 +8911,15 @@ ga zJ mS bJ -gK aa aa aa -gK +aa +aa fC XJ fC -gK +aa aa aa dF @@ -8957,29 +8950,29 @@ aa aa aa aa -gK -gK +aa +aa dF -gK -gK -gK +aa +aa +aa bK zJ mV bJ -gK -gK -gK -gK -gK +aa +aa +aa +aa +aa fC XJ fC -gK -gK -gK +aa +aa +aa dF -gK +aa dF aa dF @@ -9011,12 +9004,12 @@ aa dF aa aa -gK +aa ch np mV bJ -gK +aa eI eI eI @@ -9028,7 +9021,7 @@ hk eI eI eI -gK +aa dF aa dF @@ -9060,12 +9053,12 @@ aa dF aa aa -gK +aa ch mW mS bJ -gK +aa eI bv eK @@ -9077,13 +9070,13 @@ hl hO id eI -gK +aa dF -gK +aa dF -gK -gK -gK +aa +aa +aa aa dF aa @@ -9109,7 +9102,7 @@ aa dF aa aa -gK +aa ch mW mS @@ -9132,7 +9125,7 @@ eI eI eI eI -gK +aa aa dF aa @@ -9158,7 +9151,7 @@ aa dF aa aa -gK +aa ch mW mS @@ -9181,7 +9174,7 @@ iU ji gH eI -gK +aa aa dF aa @@ -9207,7 +9200,7 @@ aa dF aa aa -gK +aa ch zJ mY @@ -9230,7 +9223,7 @@ iV XJ pg dl -gK +aa aa dF aa @@ -9252,11 +9245,11 @@ aa aa aa aa -gK +aa dF -gK -gK -gK +aa +aa +aa bJ zJ mY @@ -9279,10 +9272,10 @@ iW jj ie eI -gK -gK +aa +aa dF -gK +aa aa aa aa @@ -9299,9 +9292,9 @@ aa aa aa aa -gK -gK -gK +aa +aa +aa aT aT aG @@ -9331,9 +9324,9 @@ aG aT aT aT -gK -gK -gK +aa +aa +aa aa aa aa @@ -9348,7 +9341,7 @@ aa aa aa aa -gK +aa aT aT bb @@ -9382,7 +9375,7 @@ kC aT aT aT -gK +aa aa aa aa @@ -9396,8 +9389,8 @@ aa aa aa aa -gK -gK +aa +aa aT ed aY @@ -9431,8 +9424,8 @@ aU aU jQ aT -gK -gK +aa +aa aa aa ac @@ -9444,8 +9437,8 @@ aa aa aa aa -gK -gK +aa +aa as as as @@ -9481,8 +9474,8 @@ kM aG aT aT -gK -gK +aa +aa lh ac ac @@ -9493,7 +9486,7 @@ aa aa aa aa -gK +aa as as dW @@ -9531,7 +9524,7 @@ kD mz aT aG -gK +aa lh ac ac @@ -9542,7 +9535,7 @@ aa aa aa aa -gK +aa aS aO bg @@ -9591,7 +9584,7 @@ aa aa aa aa -gK +aa al at bi @@ -9640,7 +9633,7 @@ aa aa aa aa -gK +aa am au aJ @@ -9689,7 +9682,7 @@ aa aa aa aa -gK +aa am av aK @@ -9738,7 +9731,7 @@ aa aa aa aa -gK +aa am aw aL @@ -9787,7 +9780,7 @@ aa aa aa aa -gK +aa an ax aI @@ -9825,7 +9818,7 @@ bN kp pk bL -gK +aa ac aa aa @@ -9836,7 +9829,7 @@ aa aa aa aa -gK +aa aS bP ax @@ -9874,7 +9867,7 @@ bN bN ns aG -gK +aa aa aa aa @@ -9885,7 +9878,7 @@ aa aa aa aa -gK +aa as as fP @@ -9923,7 +9916,7 @@ kF jP aG aG -gK +aa aa aa aa @@ -9934,8 +9927,8 @@ aa aa aa aa -gK -gK +aa +aa as as as @@ -9971,8 +9964,8 @@ aG aT aT aG -gK -gK +aa +aa aa aa aa @@ -9984,8 +9977,8 @@ aa aa aa aa -gK -gK +aa +aa aT NK OC @@ -10019,8 +10012,8 @@ aY aY la aT -gK -gK +aa +aa aa aa aa @@ -10034,7 +10027,7 @@ aa aa aa aa -gK +aa aT fR It @@ -10068,7 +10061,7 @@ jM aT aT aT -gK +aa aa aa aa @@ -10083,7 +10076,7 @@ aa aa aa aa -gK +aa aT aT aT @@ -10115,9 +10108,9 @@ aG aG aT aT -gK -gK -gK +aa +aa +aa aa aa aa @@ -10132,12 +10125,12 @@ aa aa aa aa -gK -gK +aa +aa dF -gK -gK -gK +aa +aa +aa az cK cK @@ -10160,11 +10153,11 @@ cW ia bN aG -gK -gK -gK +aa +aa +aa dF -gK +aa aa aa aa @@ -10209,7 +10202,7 @@ bN ic bN aG -gK +aa aa aa dF @@ -10258,7 +10251,7 @@ bL ij bL aT -gK +aa aa aa dF @@ -10289,7 +10282,7 @@ az az az ff -gK +aa eJ fd ew @@ -10303,11 +10296,11 @@ OV il eJ eJ -gK +aa iv -gK -gK -gK +aa +aa +aa aa aa dF @@ -10338,8 +10331,8 @@ az az bd lg -gK -gK +aa +aa eJ ex eV @@ -10351,8 +10344,8 @@ hB hX im eJ -gK -gK +aa +aa iv aa aa @@ -10388,7 +10381,7 @@ aa aa lH bd -gK +aa eJ eJ eJ @@ -10400,7 +10393,7 @@ dv dv dv eJ -gK +aa aa iv aa @@ -10437,19 +10430,19 @@ bd aa lg aa -gK -gK -gK -gK -gK +aa +aa +aa +aa +aa dF bf dF -gK -gK +aa +aa dF -gK -gK +aa +aa aa iO aa @@ -10579,29 +10572,29 @@ aa aa aa aa -gK -gK -gK +aa +aa +aa ff -gK -gK +aa +aa ac fU ac -gK +aa dF bf dF -gK -gK +aa +aa dF -gK -gK -gK +aa +aa +aa iv -gK -gK -gK +aa +aa +aa aa aa dF @@ -10628,13 +10621,13 @@ aa dF aa aa -gK +aa bE bY cv bY bE -gK +aa ac ac bE @@ -10642,15 +10635,15 @@ bE bY bD bE -gK +aa dF -gK +aa bE bY jp bY bE -gK +aa aa aa dF @@ -10677,29 +10670,29 @@ aa aa aa aa -gK +aa bE bZ cw lq bE -gK +aa ac -gK +aa bD he nR nn bE -gK +aa dF -gK +aa bE pb jq lA bE -gK +aa aa aa dF @@ -10726,29 +10719,29 @@ dF aa aa aa -gK +aa bE Re cx cX bE -gK -gK -gK +aa +aa +aa bD Ve fV dh bE -gK +aa dF -gK +aa bD lB jr lw bE -gK +aa aa aa dF @@ -10775,7 +10768,7 @@ aa aa nr aa -gK +aa bE ct cy @@ -10797,7 +10790,7 @@ cb js cb bD -gK +aa aa aa dF @@ -10824,8 +10817,8 @@ aa aa aa aa -gK -gK +aa +aa bE om cA @@ -10846,7 +10839,7 @@ cD jr jJ bD -gK +aa aa aa dF @@ -10863,18 +10856,18 @@ ab (65,1,1) = {" aa aa -gK -gK -gK -gK -gK -gK -gK -gK -gK -gK -gK -gK +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa bE cA ee @@ -10895,13 +10888,13 @@ qI jw cD bD -gK -gK -gK +aa +aa +aa dF -gK -gK -gK +aa +aa +aa aa aa aa @@ -10911,8 +10904,8 @@ aa "} (66,1,1) = {" aa -gK -gK +aa +aa ad ad ad @@ -10922,8 +10915,8 @@ ad ad ad ad -gK -gK +aa +aa bE dC ei @@ -10950,7 +10943,7 @@ jA jA jA jA -gK +aa aa aa aa @@ -10960,7 +10953,7 @@ aa "} (67,1,1) = {" aa -gK +aa ad ad ag @@ -10972,7 +10965,7 @@ cz cz ad ad -gK +aa bE cD dc @@ -10999,7 +10992,7 @@ jA kR kZ jA -gK +aa aa aa aa @@ -11009,7 +11002,7 @@ aa "} (68,1,1) = {" aa -gK +aa ad af ag @@ -11058,7 +11051,7 @@ aa "} (69,1,1) = {" aa -gK +aa ad ad ad @@ -11107,7 +11100,7 @@ aa "} (70,1,1) = {" aa -gK +aa ad ag aH @@ -11156,7 +11149,7 @@ aa "} (71,1,1) = {" aa -gK +aa ad ag ap @@ -11195,7 +11188,7 @@ lF kS lb li -gK +aa aa aa aa @@ -11205,7 +11198,7 @@ aa "} (72,1,1) = {" aa -gK +aa ad ad ad @@ -11244,7 +11237,7 @@ ki cl cJ lj -gK +aa aa aa aa @@ -11254,7 +11247,7 @@ aa "} (73,1,1) = {" aa -gK +aa ad ah ao @@ -11303,7 +11296,7 @@ aa "} (74,1,1) = {" aa -gK +aa ad ai aq @@ -11315,7 +11308,7 @@ ag de ag ad -gK +aa bE oq fW @@ -11352,7 +11345,7 @@ aa "} (75,1,1) = {" aa -gK +aa ad ag ag @@ -11364,7 +11357,7 @@ ag ag ag ad -gK +aa bE ca dc @@ -11401,7 +11394,7 @@ aa "} (76,1,1) = {" aa -gK +aa ad ag ai @@ -11413,7 +11406,7 @@ ag lm ai ad -gK +aa bE ca dc @@ -11440,7 +11433,7 @@ jA kU lc jA -gK +aa aa aa aa @@ -11450,7 +11443,7 @@ aa "} (77,1,1) = {" aa -gK +aa ad ag ai @@ -11462,7 +11455,7 @@ ai aq ai ad -gK +aa bE dV hJ @@ -11489,7 +11482,7 @@ jA jA jA jA -gK +aa aa aa aa @@ -11499,7 +11492,7 @@ aa "} (78,1,1) = {" aa -gK +aa ad ao ag @@ -11511,7 +11504,7 @@ xP ag dB ad -gK +aa bE ca je @@ -11532,13 +11525,13 @@ nX ob ca bE -gK -gK -gK -gK +aa +aa +aa +aa dF -gK -gK +aa +aa aa aa aa @@ -11548,7 +11541,7 @@ aa "} (79,1,1) = {" aa -gK +aa ad ad ad @@ -11560,7 +11553,7 @@ ad ad ad ad -gK +aa bE ou ca @@ -11581,7 +11574,7 @@ nY Yh od bE -gK +aa aa aa aa @@ -11597,8 +11590,8 @@ aa "} (80,1,1) = {" aa -gK -gK +aa +aa ad ar aE @@ -11608,7 +11601,7 @@ gk Ws vX ad -gK +aa bE bE cI @@ -11630,7 +11623,7 @@ bD cI bE bE -gK +aa aa aa aa @@ -11647,7 +11640,7 @@ aa (81,1,1) = {" aa aa -gK +aa ad ad aF @@ -11657,7 +11650,7 @@ cF cY fy ad -gK +aa bE dh dh @@ -11679,7 +11672,7 @@ Ve dh dh bE -gK +aa aa aa aa @@ -11696,8 +11689,8 @@ aa (82,1,1) = {" aa aa -gK -gK +aa +aa ad ad ad @@ -11705,8 +11698,8 @@ bA ad ad ad -gK -gK +aa +aa bE he os @@ -11746,16 +11739,16 @@ aa aa aa aa -gK -gK -gK +aa +aa +aa ad ad ad -gK -gK -gK -gK +aa +aa +aa +aa bE bE bE @@ -11777,7 +11770,7 @@ bE bE bE bE -gK +aa aa aa aa @@ -11797,21 +11790,21 @@ aa aa aa aa -gK -gK -gK -gK -gK aa aa -gK -gK -gK -gK -gK -gK -gK -gK +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa bE bE bE @@ -11822,11 +11815,11 @@ bE bE bE bE -gK -gK -gK -gK -gK +aa +aa +aa +aa +aa aa aa aa @@ -11860,18 +11853,18 @@ aa aa aa aa -gK -gK -gK -gK -gK -gK -gK -gK -gK -gK -gK -gK +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa diff --git a/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm b/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm index a6c1148d1dd..107b3c55a75 100644 --- a/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm @@ -5,7 +5,7 @@ "b" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "c" = ( /turf/open/floor/plating/airless, /area/ruin/space/oldteleporter) diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm index 3b4aa9abd9a..904f20c0814 100644 --- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm @@ -6,16 +6,16 @@ /obj/structure/lattice/catwalk, /obj/structure/cable, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ad" = ( /obj/structure/lattice/catwalk, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ae" = ( /obj/item/stack/cable_coil/cut, /obj/structure/lattice/catwalk, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ag" = ( /turf/closed/wall, /area/ruin/space/has_grav/onehalf/dorms_med) @@ -244,7 +244,7 @@ /obj/structure/lattice, /obj/item/storage/toolbox/syndicate, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "aT" = ( /obj/structure/cable, /turf/open/floor/plasteel/airless{ @@ -738,7 +738,7 @@ icon_state = "small" }, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ck" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ @@ -799,7 +799,7 @@ }, /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ct" = ( /obj/structure/lattice, /obj/item/shard{ @@ -980,19 +980,19 @@ /obj/item/stack/sheet/plasteel, /obj/structure/lattice/catwalk, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "di" = ( /obj/item/shard{ icon_state = "medium" }, /obj/structure/lattice/catwalk, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "dj" = ( /obj/item/stack/rods, /obj/structure/lattice/catwalk, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "dl" = ( /obj/item/stack/cable_coil/cut, /turf/template_noop, @@ -1008,18 +1008,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/ruin/space/has_grav/onehalf/bridge) -"Ky" = ( -/turf/template_noop, -/area/space/nearstation) "KC" = ( /obj/structure/frame/computer, /obj/structure/cable, /turf/open/floor/plasteel, /area/ruin/space/has_grav/onehalf/bridge) -"Me" = ( -/obj/structure/lattice, -/turf/template_noop, -/area/space/nearstation) "Vh" = ( /obj/structure/cable, /turf/open/floor/plasteel, @@ -1030,10 +1023,10 @@ aa aa aa aa -Me +aw aa aS -Me +aw aa aa aa @@ -1193,7 +1186,7 @@ bO bR aa cs -Me +aw aa aa cr @@ -1219,7 +1212,7 @@ cA cr cN aa -Me +aw aa dl "} @@ -1234,11 +1227,11 @@ ag bi bx bQ -Me +aw bV aa aa -Me +aw cA aa cL @@ -1344,13 +1337,13 @@ aX bo bp bU -Ky +aa cj bU cF bU -Me -Ky +aw +aa bU ad aa @@ -1564,7 +1557,7 @@ ar br ar ar -Me +aw ad ad ad diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 26e901a5b7a..cc04e425490 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -3,13 +3,14 @@ /turf/template_noop, /area/template_noop) "ab" = ( +/obj/structure/lattice, /obj/structure/grille, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ac" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ad" = ( /obj/machinery/power/solar, /obj/structure/cable, diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm index 92d815f8356..ca97060d4c3 100644 --- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm +++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm @@ -5,7 +5,7 @@ "ab" = ( /obj/structure/lattice, /turf/template_noop, -/area/space/nearstation) +/area/template_noop) "ac" = ( /obj/structure/grille, /turf/open/floor/plating/airless, diff --git a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm index a1b2271d960..3e437362f0a 100644 --- a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm +++ b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm @@ -1,11 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/space, -/area/space) +/turf/template_noop, +/area/template_noop) "b" = ( /obj/structure/lattice, -/turf/open/space, -/area/space/nearstation) +/turf/template_noop, +/area/template_noop) "c" = ( /obj/structure/lattice, /turf/open/floor/plating/asteroid/airless, @@ -130,6 +130,7 @@ /area/ruin/unpowered/no_grav) "C" = ( /obj/structure/statue/sandstone/venus{ + anchored = 1; desc = "Ugh, this is merely an ugly amateurish replica of the other statue! The letters RIPGOAT are scribbled onto the base."; dir = 8 }, @@ -150,6 +151,7 @@ /area/ruin/unpowered/no_grav) "F" = ( /obj/structure/statue/sandstone/venus{ + anchored = 1; dir = 4 }, /obj/effect/turf_decal/sand/plating, diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm index ca0a4b55aae..433977ea2b0 100644 --- a/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm +++ b/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm @@ -1,11 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "b" = ( /obj/docking_port/stationary/picked/whiteship, -/turf/open/space, -/area/space) +/turf/template_noop, +/area/template_noop) (1,1,1) = {" a diff --git a/_maps/shuttles/emergency_pod.dmm b/_maps/shuttles/emergency_pod.dmm index ab441793ca8..2e606771e5b 100644 --- a/_maps/shuttles/emergency_pod.dmm +++ b/_maps/shuttles/emergency_pod.dmm @@ -14,8 +14,8 @@ /turf/open/floor/plating, /area/shuttle/escape) "d" = ( -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "e" = ( /obj/machinery/door/airlock/titanium{ name = "Shuttle Airlock" diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency_supermatter.dmm index 69f979a52d3..b485f14c849 100644 --- a/_maps/shuttles/emergency_supermatter.dmm +++ b/_maps/shuttles/emergency_supermatter.dmm @@ -303,7 +303,7 @@ /area/shuttle/escape) "hD" = ( /obj/structure/lattice/catwalk, -/turf/open/space, +/turf/template_noop, /area/shuttle/escape) "pb" = ( /obj/structure/closet/radiation{ diff --git a/_maps/shuttles/emergency_zeta.dmm b/_maps/shuttles/emergency_zeta.dmm index 81d67ddb0ae..b9698152894 100644 --- a/_maps/shuttles/emergency_zeta.dmm +++ b/_maps/shuttles/emergency_zeta.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/template_noop, -/area/space) +/area/template_noop) "b" = ( /turf/closed/wall/mineral/abductor, /area/shuttle/escape) diff --git a/_maps/shuttles/mining_freight.dmm b/_maps/shuttles/mining_freight.dmm index 5849f6f5034..4311feffb0b 100644 --- a/_maps/shuttles/mining_freight.dmm +++ b/_maps/shuttles/mining_freight.dmm @@ -116,7 +116,7 @@ /obj/effect/spawner/structure/window/shuttle, /obj/structure/shuttle/engine/heater, /turf/open/floor/plating, -/area/space) +/area/template_noop) "q" = ( /obj/structure/ore_box, /obj/effect/turf_decal/delivery, diff --git a/_maps/templates/medium_shuttle1.dmm b/_maps/templates/medium_shuttle1.dmm index 962ac0b9b1b..5df1a1642be 100644 --- a/_maps/templates/medium_shuttle1.dmm +++ b/_maps/templates/medium_shuttle1.dmm @@ -6,7 +6,7 @@ /obj/structure/shuttle/engine/propulsion/burst/left{ dir = 8 }, -/turf/open/space, +/turf/template_noop, /area/ruin/powered/shuttle/medium_1) "c" = ( /obj/structure/shuttle/engine/heater{ @@ -145,7 +145,7 @@ /obj/structure/shuttle/engine/propulsion/burst/right{ dir = 8 }, -/turf/open/space, +/turf/template_noop, /area/ruin/powered/shuttle/medium_1) (1,1,1) = {" diff --git a/_maps/templates/medium_shuttle2.dmm b/_maps/templates/medium_shuttle2.dmm index c9f46bd66e2..ed491b6d5b7 100644 --- a/_maps/templates/medium_shuttle2.dmm +++ b/_maps/templates/medium_shuttle2.dmm @@ -6,7 +6,7 @@ /obj/structure/shuttle/engine/propulsion/burst/left{ dir = 8 }, -/turf/open/space, +/turf/template_noop, /area/ruin/powered/shuttle/medium_2) "c" = ( /obj/structure/shuttle/engine/heater{ @@ -24,7 +24,7 @@ /obj/structure/shuttle/engine/propulsion/burst/right{ dir = 8 }, -/turf/open/space, +/turf/template_noop, /area/ruin/powered/shuttle/medium_2) "g" = ( /turf/closed/wall/mineral/titanium, diff --git a/_maps/templates/medium_shuttle3.dmm b/_maps/templates/medium_shuttle3.dmm index 4d538e81387..aab1570f43b 100644 --- a/_maps/templates/medium_shuttle3.dmm +++ b/_maps/templates/medium_shuttle3.dmm @@ -6,7 +6,7 @@ /obj/structure/shuttle/engine/propulsion{ dir = 1 }, -/turf/open/space, +/turf/template_noop, /area/ruin/powered/shuttle/medium_3) "c" = ( /turf/closed/wall/mineral/plastitanium, @@ -38,7 +38,7 @@ /obj/structure/shuttle/engine/propulsion{ dir = 8 }, -/turf/open/space, +/turf/template_noop, /area/ruin/powered/shuttle/medium_3) "o" = ( /obj/structure/shuttle/engine/heater{ @@ -60,7 +60,7 @@ /obj/structure/shuttle/engine/propulsion{ dir = 4 }, -/turf/open/space, +/turf/template_noop, /area/ruin/powered/shuttle/medium_3) "t" = ( /obj/effect/spawner/structure/window/reinforced, @@ -160,7 +160,7 @@ /area/ruin/powered/shuttle/medium_3) "F" = ( /obj/structure/shuttle/engine/propulsion, -/turf/open/space, +/turf/template_noop, /area/ruin/powered/shuttle/medium_3) "G" = ( /turf/closed/wall/mineral/titanium/nodiagonal, diff --git a/_maps/templates/medium_shuttle4.dmm b/_maps/templates/medium_shuttle4.dmm index 60f188c51f7..f413368ed2c 100644 --- a/_maps/templates/medium_shuttle4.dmm +++ b/_maps/templates/medium_shuttle4.dmm @@ -40,7 +40,7 @@ /obj/structure/shuttle/engine/propulsion/burst{ dir = 1 }, -/turf/open/space, +/turf/template_noop, /area/ruin/powered/shuttle/medium_4) "k" = ( /turf/closed/indestructible/oldshuttle{ @@ -63,11 +63,11 @@ /area/ruin/powered/shuttle/medium_4) "t" = ( /obj/structure/shuttle/engine/propulsion/burst/left, -/turf/open/space, +/turf/template_noop, /area/ruin/powered/shuttle/medium_4) "u" = ( /obj/structure/shuttle/engine/propulsion/burst/right, -/turf/open/space, +/turf/template_noop, /area/ruin/powered/shuttle/medium_4) "v" = ( /obj/structure/shuttle/engine/propulsion/burst/right, @@ -75,7 +75,7 @@ /area/ruin/powered/shuttle/medium_4) "w" = ( /obj/structure/shuttle/engine/propulsion/burst, -/turf/open/space, +/turf/template_noop, /area/ruin/powered/shuttle/medium_4) (1,1,1) = {" diff --git a/_maps/templates/small_asteroid_1.dmm b/_maps/templates/small_asteroid_1.dmm index c2205dbc13c..038002e6356 100644 --- a/_maps/templates/small_asteroid_1.dmm +++ b/_maps/templates/small_asteroid_1.dmm @@ -4,10 +4,10 @@ /area/template_noop) "b" = ( /turf/closed/mineral, -/area/space) +/area/template_noop) "c" = ( /turf/closed/mineral/random/low_chance, -/area/space) +/area/template_noop) (1,1,1) = {" a diff --git a/_maps/templates/small_shuttle_1.dmm b/_maps/templates/small_shuttle_1.dmm index 03789ef8473..2fccceb42c3 100644 --- a/_maps/templates/small_shuttle_1.dmm +++ b/_maps/templates/small_shuttle_1.dmm @@ -4,55 +4,55 @@ /area/template_noop) "b" = ( /turf/closed/wall/mineral/titanium/overspace, -/area/space) +/area/template_noop) "c" = ( /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating/airless, -/area/space) +/area/template_noop) "d" = ( /turf/closed/wall/mineral/titanium, -/area/space) +/area/template_noop) "f" = ( /turf/open/floor/mineral/titanium/blue, -/area/space) +/area/template_noop) "g" = ( /obj/structure/chair{ dir = 1 }, /turf/open/floor/mineral/titanium/blue, -/area/space) +/area/template_noop) "j" = ( /obj/machinery/door/unpowered/shuttle, /turf/open/floor/mineral/titanium/blue, -/area/space) +/area/template_noop) "l" = ( /obj/structure/chair{ dir = 4 }, /turf/open/floor/mineral/titanium/blue, -/area/space) +/area/template_noop) "m" = ( /obj/structure/chair{ dir = 8 }, /turf/open/floor/mineral/titanium/blue, -/area/space) +/area/template_noop) "n" = ( /obj/structure/shuttle/engine/heater, /turf/open/floor/plating/airless, -/area/space) +/area/template_noop) "p" = ( /obj/structure/shuttle/engine/propulsion/left, /turf/open/floor/plating/airless, -/area/space) +/area/template_noop) "q" = ( /obj/structure/shuttle/engine/propulsion, /turf/open/floor/plating/airless, -/area/space) +/area/template_noop) "r" = ( /obj/structure/shuttle/engine/propulsion/right, /turf/open/floor/plating/airless, -/area/space) +/area/template_noop) (1,1,1) = {" a