From c9afc3e53db386a963a1915fd5d888b291632499 Mon Sep 17 00:00:00 2001 From: oranges Date: Wed, 17 Jan 2018 09:36:15 +1300 Subject: [PATCH 1/2] Merge pull request #34319 from ShizCalev/travis-maps Fails travis on common mapping mistakes --- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 8 +- .../SpaceRuins/gondolaasteroid.dmm | 4 +- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 616 +++++------------- .../map_files/Deltastation/DeltaStation2.dmm | 3 +- _maps/map_files/OmegaStation/OmegaStation.dmm | 225 ++----- _maps/map_files/PubbyStation/PubbyStation.dmm | 176 ++--- _maps/map_files/generic/CentCom.dmm | 1 - _maps/shuttles/emergency_arena.dmm | 40 +- _maps/shuttles/emergency_meteor.dmm | 52 +- _maps/shuttles/whiteship_delta.dmm | 3 +- _maps/templates/medium_shuttle1.dmm | 96 +-- _maps/templates/medium_shuttle2.dmm | 108 +-- _maps/templates/medium_shuttle3.dmm | 128 +--- _maps/templates/medium_shuttle4.dmm | 44 +- _maps/templates/pirate_ship.dmm | 50 +- code/game/area/Space_Station_13_areas.dm | 16 + code/game/area/areas/ruins/space.dm | 18 + code/game/area/areas/ruins/templates.dm | 12 + code/game/area/areas/shuttles.dm | 8 + code/modules/admin/verbs/debug.dm | 2 +- tgstation.dme | 1 + tools/travis/build_byond.sh | 15 + 22 files changed, 468 insertions(+), 1158 deletions(-) create mode 100644 code/game/area/areas/ruins/templates.dm diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index cceb58a95d..39d6eca041 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -10,14 +10,10 @@ /area/ruin/unpowered/no_grav) "ad" = ( /turf/closed/mineral/random/low_chance, -/area/asteroid/cave{ - name = "Asteroid - Space" - }) +/area/asteroid/cave/space) "ae" = ( /turf/open/floor/plating/asteroid/airless, -/area/asteroid/cave{ - name = "Asteroid - Space" - }) +/area/asteroid/cave/space) "af" = ( /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage/kitchen) diff --git a/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm b/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm index 5b0387bb39..b45f9a7794 100644 --- a/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm +++ b/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm @@ -25,9 +25,7 @@ /area/ruin/space/has_grav) "g" = ( /turf/open/floor/plating/asteroid/airless, -/area/ruin/space/has_grav{ - dynamic_lighting = 1 - }) +/area/ruin/space/has_grav) "h" = ( /mob/living/simple_animal/pet/gondola, /turf/open/floor/plating/asteroid/airless, diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 9ca7c8ea35..b24f14243d 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -83,48 +83,32 @@ /area/ruin/space/has_grav/hotel) "an" = ( /turf/closed/wall, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "ao" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "ap" = ( /turf/closed/wall, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "aq" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "ar" = ( /turf/closed/wall, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "as" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "at" = ( /turf/closed/wall, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "au" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "av" = ( /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, @@ -138,9 +122,7 @@ }, /obj/item/soap, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "ay" = ( /obj/structure/window{ icon_state = "window"; @@ -148,56 +130,40 @@ }, /obj/structure/toilet, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "az" = ( /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "aA" = ( /obj/machinery/door/airlock{ name = "Bathroom" }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "aB" = ( /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "aC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "aD" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02" }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "aE" = ( /obj/structure/dresser, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "aF" = ( /obj/machinery/shower{ dir = 4 }, /obj/item/soap, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "aG" = ( /obj/structure/window{ icon_state = "window"; @@ -205,56 +171,40 @@ }, /obj/structure/toilet, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "aH" = ( /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "aI" = ( /obj/machinery/door/airlock{ name = "Bathroom" }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "aJ" = ( /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "aK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "aL" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-16" }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "aM" = ( /obj/structure/dresser, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "aN" = ( /obj/machinery/shower{ dir = 4 }, /obj/item/soap, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "aO" = ( /obj/structure/window{ icon_state = "window"; @@ -262,56 +212,40 @@ }, /obj/structure/toilet, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "aP" = ( /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "aQ" = ( /obj/machinery/door/airlock{ name = "Bathroom" }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "aR" = ( /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "aS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "aT" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-16" }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "aU" = ( /obj/structure/dresser, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "aV" = ( /obj/machinery/shower{ dir = 4 }, /obj/item/soap, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "aW" = ( /obj/structure/window{ icon_state = "window"; @@ -319,47 +253,33 @@ }, /obj/structure/toilet, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "aX" = ( /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "aY" = ( /obj/machinery/door/airlock{ name = "Bathroom" }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "aZ" = ( /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "ba" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "bb" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18" }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "bc" = ( /obj/structure/dresser, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "bd" = ( /obj/machinery/power/solar, /obj/structure/cable/yellow, @@ -371,176 +291,128 @@ dir = 8 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "bf" = ( /obj/machinery/light/small{ dir = 4 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "bg" = ( /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "bh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "bi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "bj" = ( /obj/structure/bed, /obj/item/bedsheet/red, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "bk" = ( /obj/structure/window{ icon_state = "window"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "bl" = ( /obj/machinery/light/small{ dir = 4 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "bm" = ( /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "bn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "bo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "bp" = ( /obj/structure/bed, /obj/item/bedsheet/blue, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "bq" = ( /obj/structure/window{ icon_state = "window"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "br" = ( /obj/machinery/light/small{ dir = 4 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "bs" = ( /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "bt" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "bu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "bv" = ( /obj/structure/bed, /obj/item/bedsheet/black, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "bw" = ( /obj/structure/window{ icon_state = "window"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "bx" = ( /obj/machinery/light/small{ dir = 4 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "by" = ( /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "bz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "bA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "bB" = ( /obj/structure/bed, /obj/item/bedsheet/purple, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "bC" = ( /obj/item/clothing/head/cone, /turf/open/floor/plating, @@ -551,72 +423,56 @@ }, /obj/structure/table/wood, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "bE" = ( /obj/structure/chair{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "bF" = ( /obj/machinery/light{ dir = 8 }, /obj/structure/table/wood, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "bG" = ( /obj/structure/chair{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "bH" = ( /obj/machinery/light{ dir = 8 }, /obj/structure/table/wood, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "bI" = ( /obj/structure/chair{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "bJ" = ( /obj/machinery/light{ dir = 8 }, /obj/structure/table/wood, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "bK" = ( /obj/structure/chair{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "bL" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -630,9 +486,7 @@ pixel_x = 32 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "bN" = ( /obj/machinery/power/apc/highcap/five_k{ dir = 2; @@ -643,18 +497,14 @@ icon_state = "0-4" }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "bO" = ( /obj/structure/cable{ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "bP" = ( /obj/machinery/button/door{ id = "a3"; @@ -663,24 +513,18 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "bQ" = ( /obj/machinery/light_switch{ pixel_y = -24 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "bR" = ( /obj/structure/table/wood, /obj/item/clothing/head/sombrero, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "bS" = ( /obj/structure/sink{ dir = 4; @@ -690,9 +534,7 @@ pixel_x = 32 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "bT" = ( /obj/machinery/power/apc/highcap/five_k{ dir = 2; @@ -703,18 +545,14 @@ icon_state = "0-4" }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "bU" = ( /obj/structure/cable{ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "bV" = ( /obj/machinery/button/door{ id = "a4"; @@ -723,24 +561,18 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "bW" = ( /obj/machinery/light_switch{ pixel_y = -24 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "bX" = ( /obj/structure/table/wood, /obj/item/lipstick, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "bY" = ( /obj/structure/sink{ dir = 4; @@ -750,9 +582,7 @@ pixel_x = 32 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "bZ" = ( /obj/machinery/power/apc/highcap/five_k{ dir = 2; @@ -763,18 +593,14 @@ icon_state = "0-4" }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "ca" = ( /obj/structure/cable{ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "cb" = ( /obj/machinery/button/door{ id = "a5"; @@ -783,24 +609,18 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "cc" = ( /obj/machinery/light_switch{ pixel_y = -24 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "cd" = ( /obj/structure/table/wood, /obj/item/clothing/head/collectable/kitty, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "ce" = ( /obj/structure/sink{ dir = 4; @@ -810,9 +630,7 @@ pixel_x = 32 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "cf" = ( /obj/machinery/power/apc/highcap/five_k{ dir = 2; @@ -823,18 +641,14 @@ icon_state = "0-4" }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "cg" = ( /obj/structure/cable{ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "ch" = ( /obj/machinery/button/door{ id = "a6"; @@ -843,23 +657,17 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "ci" = ( /obj/machinery/light_switch{ pixel_y = -24 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "cj" = ( /obj/structure/table/wood, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "ck" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -874,15 +682,11 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "cm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 3" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_3) "cn" = ( /obj/machinery/door/airlock{ id_tag = "a4"; @@ -893,15 +697,11 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "co" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 4" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_4) "cp" = ( /obj/machinery/door/airlock{ id_tag = "a5"; @@ -912,15 +712,11 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "cq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 5" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_5) "cr" = ( /obj/machinery/door/airlock{ id_tag = "a6"; @@ -931,15 +727,11 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "cs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 6" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_6) "ct" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -1195,9 +987,7 @@ /area/ruin/space/has_grav/hotel) "cZ" = ( /turf/closed/wall, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "da" = ( /obj/machinery/door/airlock{ id_tag = "a2"; @@ -1208,20 +998,14 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "db" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "dc" = ( /turf/closed/wall, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dd" = ( /obj/machinery/door/airlock{ id_tag = "a1"; @@ -1232,15 +1016,11 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "de" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "df" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, @@ -1276,9 +1056,7 @@ }, /obj/item/soap, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "dl" = ( /obj/structure/window{ icon_state = "window"; @@ -1286,9 +1064,7 @@ }, /obj/structure/toilet, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "dm" = ( /obj/structure/sink{ dir = 4; @@ -1298,9 +1074,7 @@ pixel_x = 32 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "dn" = ( /obj/machinery/power/apc/highcap/five_k{ dir = 1; @@ -1311,18 +1085,14 @@ icon_state = "0-4" }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "do" = ( /obj/structure/cable{ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "dp" = ( /obj/machinery/button/door{ id = "a2"; @@ -1331,32 +1101,24 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "dq" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "dr" = ( /obj/structure/dresser, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "ds" = ( /obj/machinery/shower{ dir = 4 }, /obj/item/soap, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dt" = ( /obj/structure/window{ icon_state = "window"; @@ -1364,9 +1126,7 @@ }, /obj/structure/toilet, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "du" = ( /obj/structure/sink{ dir = 4; @@ -1376,9 +1136,7 @@ pixel_x = 32 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dv" = ( /obj/machinery/power/apc/highcap/five_k{ dir = 1; @@ -1389,18 +1147,14 @@ icon_state = "0-4" }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dw" = ( /obj/structure/cable{ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dx" = ( /obj/machinery/button/door{ id = "a1"; @@ -1409,23 +1163,17 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dy" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-14" }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dz" = ( /obj/structure/dresser, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dA" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -1467,96 +1215,68 @@ /area/ruin/space/has_grav/hotel/workroom) "dH" = ( /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "dI" = ( /obj/structure/window{ icon_state = "window"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "dJ" = ( /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "dK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "dL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "dM" = ( /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "dN" = ( /obj/structure/bed, /obj/item/bedsheet/yellow, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "dO" = ( /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dP" = ( /obj/structure/window{ icon_state = "window"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dQ" = ( /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dT" = ( /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dU" = ( /obj/structure/bed, /obj/item/bedsheet/ian, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "dV" = ( /turf/open/floor/plasteel/white, /area/ruin/space/has_grav/hotel/workroom) @@ -1620,69 +1340,53 @@ dir = 4 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "ef" = ( /obj/machinery/light{ dir = 8 }, /obj/structure/table/wood, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "eg" = ( /obj/structure/chair{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "eh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "ei" = ( /obj/machinery/light/small{ dir = 4 }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "ej" = ( /obj/machinery/light{ dir = 8 }, /obj/structure/table/wood, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "ek" = ( /obj/structure/chair{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "el" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "em" = ( /obj/machinery/light{ dir = 8 @@ -1728,46 +1432,34 @@ name = "Bathroom" }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "et" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "eu" = ( /obj/structure/table/wood, /obj/item/storage/pill_bottle/dice, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 2" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_2) "ev" = ( /obj/machinery/door/airlock{ name = "Bathroom" }, /turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "ew" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "ex" = ( /obj/structure/table/wood, /turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/guestroom{ - name = "Hotel Guest Room 1" - }) +/area/ruin/space/has_grav/hotel/guestroom/room_1) "ey" = ( /obj/structure/closet/wardrobe/mixed, /turf/open/floor/plasteel/white, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 3783935422..5d69faa3b3 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1237,8 +1237,7 @@ /area/shuttle/abandoned) "acD" = ( /obj/structure/urinal{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index bb25481c4c..ff81b52bb8 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -8,14 +8,10 @@ /area/space) "aac" = ( /turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aad" = ( /turf/closed/mineral/random/labormineral, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aae" = ( /obj/structure/lattice, /turf/open/space, @@ -33,9 +29,7 @@ "aah" = ( /obj/structure/sign/securearea, /turf/closed/wall, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aai" = ( /obj/structure/cable/white{ icon_state = "0-4" @@ -466,15 +460,11 @@ "aaV" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating/asteroid, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aaW" = ( /obj/item/ore/iron, /turf/open/floor/plating/asteroid, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aaX" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -626,14 +616,10 @@ "abi" = ( /obj/structure/girder, /turf/open/floor/plating, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "abj" = ( /turf/open/floor/plating/asteroid, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "abk" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -752,9 +738,7 @@ /area/hallway/primary/central) "abu" = ( /turf/open/floor/plating/astplate, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "abv" = ( /turf/closed/wall, /area/security/detectives_office) @@ -942,20 +926,14 @@ "abR" = ( /obj/structure/lattice, /turf/open/space, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "abS" = ( /obj/item/ore/glass, /turf/open/floor/plating/astplate, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "abT" = ( /turf/closed/wall, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "abU" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -1324,23 +1302,17 @@ "acD" = ( /obj/item/pickaxe/emergency, /turf/open/floor/plating/asteroid, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "acE" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating{ broken = 1; icon_state = "platingdmg1" }, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "acF" = ( /turf/open/floor/plating, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "acG" = ( /obj/structure/door_assembly/door_assembly_mhatch, /obj/effect/turf_decal/stripes/line{ @@ -1350,15 +1322,11 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "acH" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "acI" = ( /obj/structure/dresser, /obj/structure/sign/vacuum{ @@ -1760,31 +1728,23 @@ }, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/astplate, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "adw" = ( /turf/open/floor/plating{ burnt = 1; icon_state = "panelscorched" }, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "adx" = ( /obj/item/clothing/suit/space/orange, /obj/item/clothing/head/helmet/space/orange, /obj/effect/landmark/revenantspawn, /turf/open/floor/plating, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "adz" = ( /obj/structure/sign/vacuum, /turf/closed/wall, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "adA" = ( /obj/structure/closet/secure_closet/detective, /turf/open/floor/plasteel/vault{ @@ -2141,17 +2101,13 @@ name = "2maintenance loot spawner" }, /turf/open/floor/plating, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aem" = ( /turf/open/floor/plating{ broken = 1; icon_state = "platingdmg3" }, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aeo" = ( /obj/structure/table, /obj/item/extinguisher/mini, @@ -2161,18 +2117,14 @@ dir = 9 }, /turf/open/floor/plasteel, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aep" = ( /turf/open/floor/plating, /turf/open/floor/plating{ broken = 1; icon_state = "platingdmg2" }, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aeq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/nanotrasen{ @@ -2524,9 +2476,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "afd" = ( /obj/structure/table/wood, /obj/item/device/taperecorder, @@ -2947,22 +2897,16 @@ "afL" = ( /obj/structure/girder/reinforced, /turf/open/floor/plating, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "afM" = ( /obj/item/ore/iron, /obj/structure/barricade/wooden, /turf/open/floor/plating/astplate, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "afN" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating/astplate, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "afP" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -3380,26 +3324,20 @@ /obj/item/ore/silver, /obj/item/ore/iron, /turf/open/floor/plating/astplate, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "agF" = ( /turf/closed/wall/r_wall, /area/security/brig) "agG" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plating, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "agH" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, /turf/open/floor/plasteel, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "agI" = ( /obj/structure/rack, /obj/item/storage/briefcase{ @@ -3868,9 +3806,7 @@ /area/shuttle/supply) "ahu" = ( /turf/closed/wall/r_wall, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "ahv" = ( /obj/machinery/suit_storage_unit/security, /obj/structure/extinguisher_cabinet{ @@ -3930,9 +3866,7 @@ dir = 10 }, /turf/open/floor/plasteel, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "ahA" = ( /obj/structure/rack, /obj/item/clothing/suit/fire/firefighter, @@ -3942,9 +3876,7 @@ dir = 6 }, /turf/open/floor/plasteel, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "ahB" = ( /obj/machinery/photocopier, /obj/machinery/firealarm{ @@ -4256,9 +4188,7 @@ "aik" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating/astplate, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aim" = ( /obj/structure/rack, /obj/item/storage/box/rubbershot, @@ -5158,9 +5088,7 @@ "ajQ" = ( /obj/item/ore/iron, /turf/open/floor/plating/astplate, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "ajR" = ( /obj/structure/rack, /obj/item/gun/energy/e_gun{ @@ -6255,9 +6183,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/landmark/revenantspawn, /turf/open/floor/plating, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "alH" = ( /obj/item/grenade/barrier{ pixel_x = -3; @@ -6761,9 +6687,7 @@ }, /obj/item/device/flashlight, /turf/open/floor/plating, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "amH" = ( /obj/item/storage/box/chemimp{ pixel_x = 6 @@ -24001,43 +23925,33 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aUR" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 }, /obj/structure/lattice, /turf/open/space, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aUS" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, /obj/structure/lattice, /turf/open/space, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aUT" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aUU" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/structure/lattice/catwalk, /turf/open/space, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aUV" = ( /obj/machinery/light{ dir = 8 @@ -24397,18 +24311,14 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aVL" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aVM" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -24773,9 +24683,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/structure/lattice, /turf/open/space, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aWA" = ( /obj/machinery/libraryscanner, /obj/machinery/newscaster{ @@ -25051,9 +24959,7 @@ "aXc" = ( /obj/structure/lattice/catwalk, /turf/open/space, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "aXe" = ( /obj/structure/table/wood, /obj/machinery/computer/libraryconsole/bookmanagement, @@ -32935,9 +32841,7 @@ /area/engine/supermatter) "bvg" = ( /turf/open/floor/plating/airless/astplate, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "bvh" = ( /obj/structure/closet/emcloset{ anchored = 1 @@ -32951,15 +32855,11 @@ "bvo" = ( /obj/structure/girder, /turf/open/floor/plating/airless, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "bvI" = ( /obj/item/pickaxe/emergency, /turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "bvO" = ( /obj/machinery/light{ dir = 1 @@ -33161,9 +33061,7 @@ dir = 4 }, /turf/closed/mineral/random/labormineral, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "bxj" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -33567,9 +33465,7 @@ "swF" = ( /obj/structure/sign/securearea, /turf/closed/wall/rust, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "swG" = ( /turf/closed/wall/rust, /area/security/detectives_office) @@ -33607,17 +33503,13 @@ /area/quartermaster/storage) "swN" = ( /turf/closed/wall/rust, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "swZ" = ( /turf/closed/wall/r_wall/rust, /area/security/brig) "sxc" = ( /turf/closed/wall/r_wall/rust, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "sxC" = ( /turf/closed/wall/r_wall/rust, /area/ai_monitored/turret_protected/ai) @@ -35433,7 +35325,6 @@ /obj/machinery/turretid{ control_area = "/area/ai_monitored/turret_protected/aisat_interior"; name = "AI Satellite turret control"; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/door/airlock/hatch{ @@ -35689,9 +35580,7 @@ "sNT" = ( /obj/item/stack/sheet/metal, /obj/item/stack/sheet/glass{ - amount = 20; - pixel_x = 0; - pixel_y = 0 + amount = 20 }, /obj/item/device/assembly/flash/handheld, /obj/item/device/assembly/flash/handheld, @@ -35847,9 +35736,7 @@ icon_state = "0-8" }, /turf/open/floor/plating/airless/astplate, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/area/asteroid/nearstation) "sOK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index e9ea5f0797..6d98b09344 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -38334,9 +38334,7 @@ "bNs" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "bNt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -38747,9 +38745,7 @@ /area/space/nearstation) "bOw" = ( /turf/open/floor/plating/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "bOx" = ( /obj/structure/cable{ icon_state = "1-2" @@ -39328,24 +39324,18 @@ network = list("SS13","Monastery") }, /turf/open/floor/plating/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "bQd" = ( /obj/structure/flora/ausbushes/leafybush, /obj/structure/flora/ausbushes/reedbush, /turf/open/floor/plating/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "bQe" = ( /obj/item/device/flashlight/lantern{ on = 1 }, /turf/open/floor/plating/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "bQf" = ( /obj/structure/cable{ icon_state = "1-2" @@ -39353,16 +39343,12 @@ /turf/open/floor/plasteel/asteroid{ icon_plating = "asteroid" }, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "bQg" = ( /turf/open/floor/plasteel/asteroid{ icon_plating = "asteroid" }, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "bQh" = ( /obj/machinery/camera{ c_tag = "Monastery Asteroid Dock Staboard"; @@ -39370,9 +39356,7 @@ network = list("SS13","Monastery") }, /turf/open/floor/plating/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "bQi" = ( /obj/structure/window/reinforced{ dir = 8 @@ -40313,9 +40297,7 @@ "bSm" = ( /obj/structure/flora/ausbushes, /turf/open/floor/plating/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "bSn" = ( /obj/structure/window/reinforced{ dir = 8 @@ -41289,9 +41271,7 @@ "bUC" = ( /obj/structure/flora/ausbushes/fernybush, /turf/open/floor/plating/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "bUD" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment{ @@ -42044,9 +42024,7 @@ network = list("SS13","Monastery") }, /turf/open/floor/plating/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "bWj" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating{ @@ -42665,25 +42643,19 @@ cyclelinkeddir = 4 }, /turf/open/floor/plating, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "bXM" = ( /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plating, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "bXN" = ( /obj/machinery/door/airlock/external{ cyclelinkeddir = 8 }, /turf/open/floor/plating, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "bXS" = ( /obj/structure/grille/broken, /obj/machinery/disposal/bin, @@ -44013,9 +43985,7 @@ /area/maintenance/disposal/incinerator) "caS" = ( /turf/closed/wall, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "caT" = ( /obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile, @@ -44538,9 +44508,7 @@ "ccu" = ( /obj/structure/flora/ausbushes/leafybush, /turf/open/floor/plating/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "ccv" = ( /obj/machinery/light/small{ dir = 8 @@ -44583,15 +44551,11 @@ /turf/open/floor/plasteel/asteroid{ icon_plating = "asteroid" }, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "ccM" = ( /obj/structure/chair, /turf/open/floor/plating/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "ccN" = ( /obj/structure/closet/crate/medical, /obj/item/stack/medical/gauze, @@ -44855,9 +44819,7 @@ /obj/item/trash/plate, /obj/item/kitchen/fork, /turf/open/floor/plating/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "cdE" = ( /obj/structure/chair, /obj/item/cigbutt, @@ -45123,9 +45085,7 @@ dir = 1 }, /turf/open/floor/plating/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "cep" = ( /obj/machinery/light{ dir = 1 @@ -45597,9 +45557,7 @@ /area/chapel/main/monastery) "cfK" = ( /turf/open/floor/plasteel/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "cfL" = ( /obj/structure/flora/ausbushes/fernybush, /obj/machinery/camera{ @@ -45608,20 +45566,14 @@ network = list("SS13","Monastery") }, /turf/open/floor/plasteel/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "cfM" = ( /obj/structure/flora/ausbushes, /turf/open/floor/plasteel/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "cfN" = ( /turf/closed/mineral, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "cfO" = ( /obj/structure/transit_tube, /obj/effect/turf_decal/stripes/line{ @@ -46257,9 +46209,7 @@ /obj/structure/flora/ausbushes/leafybush, /obj/structure/flora/ausbushes/fernybush, /turf/open/floor/plating/asteroid, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "chU" = ( /obj/structure/sink{ dir = 4; @@ -46701,14 +46651,10 @@ /area/engine/engineering) "cju" = ( /turf/closed/mineral, -/area/mine/explored{ - name = "Bomb Testing Asteroid" - }) +/area/asteroid/nearstation/bomb_site) "cjv" = ( /turf/closed/wall, -/area/mine/explored{ - name = "Bomb Testing Asteroid" - }) +/area/asteroid/nearstation/bomb_site) "cjw" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'BOMB RANGE"; @@ -46719,14 +46665,10 @@ icon_state = "riveted"; name = "hyper-reinforced wall" }, -/area/mine/explored{ - name = "Bomb Testing Asteroid" - }) +/area/asteroid/nearstation/bomb_site) "cjx" = ( /turf/open/floor/plating/asteroid/airless, -/area/mine/explored{ - name = "Bomb Testing Asteroid" - }) +/area/asteroid/nearstation/bomb_site) "cjy" = ( /obj/structure/chair{ dir = 4 @@ -46852,9 +46794,7 @@ use_power = 0 }, /turf/open/floor/plating/asteroid/airless, -/area/mine/explored{ - name = "Bomb Testing Asteroid" - }) +/area/asteroid/nearstation/bomb_site) "cjW" = ( /obj/structure/window/reinforced{ dir = 8 @@ -47009,9 +46949,7 @@ "ckt" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/asteroid/airless, -/area/mine/explored{ - name = "Bomb Testing Asteroid" - }) +/area/asteroid/nearstation/bomb_site) "cku" = ( /obj/structure/chair/wood/normal, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -47115,16 +47053,12 @@ /area/engine/engineering) "ckK" = ( /turf/closed/mineral/random/low_chance, -/area/mine/explored{ - name = "Bomb Testing Asteroid" - }) +/area/asteroid/nearstation/bomb_site) "ckL" = ( /obj/item/device/radio/beacon, /obj/effect/landmark/revenantspawn, /turf/open/floor/plating/airless, -/area/mine/explored{ - name = "Bomb Testing Asteroid" - }) +/area/asteroid/nearstation/bomb_site) "ckM" = ( /obj/structure/window/reinforced{ dir = 8 @@ -47246,9 +47180,7 @@ on = 1 }, /turf/open/floor/plating/asteroid/airless, -/area/mine/explored{ - name = "Bomb Testing Asteroid" - }) +/area/asteroid/nearstation/bomb_site) "clk" = ( /obj/machinery/light/small{ dir = 8 @@ -47272,9 +47204,7 @@ "cls" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/closed/mineral, -/area/mine/explored{ - name = "Bomb Testing Asteroid" - }) +/area/asteroid/nearstation/bomb_site) "clt" = ( /obj/docking_port/stationary{ dheight = 9; @@ -47299,9 +47229,7 @@ /area/space/nearstation) "clv" = ( /turf/closed/mineral/iron, -/area/mine/explored{ - name = "Bomb Testing Asteroid" - }) +/area/asteroid/nearstation/bomb_site) "clw" = ( /turf/closed/wall/r_wall, /area/tcommsat/computer) @@ -47359,9 +47287,7 @@ "clF" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/closed/mineral/random/low_chance, -/area/mine/explored{ - name = "Bomb Testing Asteroid" - }) +/area/asteroid/nearstation/bomb_site) "clG" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -47930,18 +47856,14 @@ use_power = 0 }, /turf/open/floor/plating/asteroid/airless, -/area/mine/explored{ - name = "Bomb Testing Asteroid" - }) +/area/asteroid/nearstation/bomb_site) "cnq" = ( /turf/closed/indestructible{ desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; icon_state = "riveted"; name = "hyper-reinforced wall" }, -/area/mine/explored{ - name = "Bomb Testing Asteroid" - }) +/area/asteroid/nearstation/bomb_site) "cnr" = ( /obj/structure/table, /obj/item/stock_parts/subspace/amplifier, @@ -48853,9 +48775,7 @@ "cqW" = ( /obj/effect/spawner/structure/window/reinforced, /turf/closed/mineral, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "cqX" = ( /obj/structure/disposalpipe/segment, /obj/structure/lattice, @@ -48907,9 +48827,7 @@ }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "crm" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment, @@ -49089,9 +49007,7 @@ "crV" = ( /obj/structure/flora/ausbushes/pointybush, /turf/closed/mineral, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "crX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/dark, @@ -50556,15 +50472,11 @@ /obj/structure/lattice, /obj/structure/lattice, /turf/closed/mineral, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "cyM" = ( /obj/structure/lattice, /turf/closed/mineral, -/area/chapel/asteroid{ - name = "Monastery Asteroid" - }) +/area/chapel/asteroid/monastery) "cyP" = ( /obj/structure/bookcase/random/nonfiction, /obj/machinery/light/small{ diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 1866665519..77bc87c1d6 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -14348,7 +14348,6 @@ /obj/machinery/button/door{ id = "smindicate"; name = "external door control"; - pixel_x = 0; pixel_y = 26; req_access_txt = "150" }, diff --git a/_maps/shuttles/emergency_arena.dmm b/_maps/shuttles/emergency_arena.dmm index dec36e99b2..037af600f2 100644 --- a/_maps/shuttles/emergency_arena.dmm +++ b/_maps/shuttles/emergency_arena.dmm @@ -21,55 +21,39 @@ /area/template_noop) "g" = ( /turf/closed/indestructible/necropolis, -/area/shuttle/escape{ - noteleport = 1 - }) +/area/shuttle/escape/arena) "h" = ( /turf/open/indestructible{ icon_state = "cult" }, -/area/shuttle/escape{ - noteleport = 1 - }) +/area/shuttle/escape/arena) "i" = ( /obj/structure/closet/crate/necropolis/dragon, /turf/open/indestructible{ icon_state = "cult" }, -/area/shuttle/escape{ - noteleport = 1 - }) +/area/shuttle/escape/arena) "j" = ( /turf/open/indestructible/necropolis/air, -/area/shuttle/escape{ - noteleport = 1 - }) +/area/shuttle/escape/arena) "k" = ( /obj/structure/fluff/drake_statue, /turf/open/indestructible{ icon_state = "cult" }, -/area/shuttle/escape{ - noteleport = 1 - }) +/area/shuttle/escape/arena) "l" = ( /obj/structure/closet/crate/necropolis/tendril, /turf/open/indestructible/necropolis/air, -/area/shuttle/escape{ - noteleport = 1 - }) +/area/shuttle/escape/arena) "m" = ( /obj/structure/fluff/drake_statue, /turf/open/indestructible/necropolis/air, -/area/shuttle/escape{ - noteleport = 1 - }) +/area/shuttle/escape/arena) "n" = ( /obj/effect/forcefield/arena_shuttle_entrance, /turf/open/indestructible/necropolis/air, -/area/shuttle/escape{ - noteleport = 1 - }) +/area/shuttle/escape/arena) "o" = ( /obj/effect/forcefield/arena_shuttle_entrance, /obj/docking_port/mobile/emergency{ @@ -77,15 +61,11 @@ timid = 1 }, /turf/open/indestructible/necropolis/air, -/area/shuttle/escape{ - noteleport = 1 - }) +/area/shuttle/escape/arena) "p" = ( /obj/structure/healingfountain, /turf/open/indestructible/necropolis/air, -/area/shuttle/escape{ - noteleport = 1 - }) +/area/shuttle/escape/arena) (1,1,1) = {" a diff --git a/_maps/shuttles/emergency_meteor.dmm b/_maps/shuttles/emergency_meteor.dmm index b62c6f141c..a4584813c1 100644 --- a/_maps/shuttles/emergency_meteor.dmm +++ b/_maps/shuttles/emergency_meteor.dmm @@ -4,83 +4,59 @@ /area/template_noop) "b" = ( /turf/closed/mineral, -/area/shuttle/escape{ - luminosity = 0 - }) +/area/shuttle/escape/meteor) "c" = ( /obj/structure/window/reinforced{ dir = 1; layer = 2.9 }, /turf/open/floor/plating/asteroid, -/area/shuttle/escape{ - luminosity = 0 - }) +/area/shuttle/escape/meteor) "d" = ( /turf/open/floor/plating/asteroid, -/area/shuttle/escape{ - luminosity = 0 - }) +/area/shuttle/escape/meteor) "e" = ( /obj/machinery/computer/emergency_shuttle{ dir = 4; use_power = 0 }, /turf/open/floor/plating/asteroid, -/area/shuttle/escape{ - luminosity = 0 - }) +/area/shuttle/escape/meteor) "f" = ( /mob/living/simple_animal/hostile/asteroid/goliath, /turf/open/floor/plating/asteroid, -/area/shuttle/escape{ - luminosity = 0 - }) +/area/shuttle/escape/meteor) "g" = ( /obj/structure/mineral_door/iron, /turf/open/floor/plating/asteroid, -/area/shuttle/escape{ - luminosity = 0 - }) +/area/shuttle/escape/meteor) "h" = ( /obj/item/pickaxe, /turf/open/floor/plating/asteroid, -/area/shuttle/escape{ - luminosity = 0 - }) +/area/shuttle/escape/meteor) "i" = ( /obj/effect/station_crash, /turf/open/floor/plating/asteroid, -/area/shuttle/escape{ - luminosity = 0 - }) +/area/shuttle/escape/meteor) "k" = ( /obj/structure/closet/crate, /turf/open/floor/plating/asteroid, -/area/shuttle/escape{ - luminosity = 0 - }) +/area/shuttle/escape/meteor) "l" = ( /obj/machinery/power/smes, /turf/open/floor/plating/asteroid, -/area/shuttle/escape{ - luminosity = 0 - }) +/area/shuttle/escape/meteor) "m" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/shuttle/engine/heater, /turf/open/floor/plating/airless, -/area/shuttle/escape{ - luminosity = 0 - }) +/area/shuttle/escape/meteor) "n" = ( /obj/structure/shuttle/engine/propulsion, /turf/open/floor/plating/airless, -/area/shuttle/escape{ - luminosity = 0 - }) +/area/shuttle/escape/meteor) "L" = ( /obj/docking_port/mobile/emergency{ dwidth = 20; @@ -91,9 +67,7 @@ width = 40 }, /turf/open/floor/plating/asteroid, -/area/shuttle/escape{ - luminosity = 0 - }) +/area/shuttle/escape/meteor) (1,1,1) = {" a diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 659408ffdf..25f6b99ae4 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -701,8 +701,7 @@ /area/shuttle/abandoned) "bp" = ( /obj/structure/urinal{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; diff --git a/_maps/templates/medium_shuttle1.dmm b/_maps/templates/medium_shuttle1.dmm index 4b2df43281..07cad627cb 100644 --- a/_maps/templates/medium_shuttle1.dmm +++ b/_maps/templates/medium_shuttle1.dmm @@ -7,9 +7,7 @@ dir = 8 }, /turf/open/space, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "c" = ( /obj/structure/shuttle/engine/heater{ dir = 8 @@ -18,149 +16,103 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "d" = ( /turf/closed/wall/mineral/plastitanium, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "e" = ( /turf/closed/wall/mineral/plastitanium{ dir = 1; icon_state = "diagonalWall3" }, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "f" = ( /turf/closed/wall/mineral/plastitanium{ dir = 4; icon_state = "diagonalWall3" }, /turf/closed/wall/mineral/titanium, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "g" = ( /turf/closed/wall/mineral/titanium, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "h" = ( /obj/machinery/door/airlock/external/glass, /turf/open/floor/plating, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "i" = ( /turf/closed/wall/mineral/titanium/overspace, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "j" = ( /turf/open/floor/plasteel/dark, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "k" = ( /obj/machinery/door/airlock/public/glass, /turf/open/floor/plasteel/dark, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "l" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/darkblue, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "m" = ( /obj/machinery/sleeper, /turf/open/floor/plasteel/darkblue, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "n" = ( /turf/open/floor/plasteel, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "o" = ( /obj/machinery/door/airlock/public/glass, /turf/open/floor/plasteel, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "p" = ( /turf/open/floor/plasteel/darkblue, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "q" = ( /turf/open/floor/plasteel/darkyellow, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "r" = ( /obj/structure/table/reinforced, /turf/open/floor/plasteel/darkyellow, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "s" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "t" = ( /obj/machinery/power/smes/magical, /turf/open/floor/plasteel, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "u" = ( /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "v" = ( /obj/structure/chair/comfy{ dir = 4 }, /turf/open/floor/plasteel/darkyellow, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "w" = ( /obj/structure/shuttle/engine/propulsion/burst/right{ dir = 8 }, /turf/open/space, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "x" = ( /turf/closed/wall/mineral/plastitanium{ dir = 1; icon_state = "diagonalWall3" }, /turf/closed/wall/mineral/titanium, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) "y" = ( /turf/closed/wall/mineral/plastitanium{ dir = 4; icon_state = "diagonalWall3" }, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_1) (1,1,1) = {" a diff --git a/_maps/templates/medium_shuttle2.dmm b/_maps/templates/medium_shuttle2.dmm index 5039f5174c..537d1db934 100644 --- a/_maps/templates/medium_shuttle2.dmm +++ b/_maps/templates/medium_shuttle2.dmm @@ -7,9 +7,7 @@ dir = 8 }, /turf/open/space, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "c" = ( /obj/structure/shuttle/engine/heater{ dir = 8 @@ -18,172 +16,120 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "d" = ( /turf/closed/wall/mineral/plastitanium, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "e" = ( /turf/closed/wall/mineral/plastitanium{ dir = 1; icon_state = "diagonalWall3" }, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "f" = ( /obj/structure/shuttle/engine/propulsion/burst/right{ dir = 8 }, /turf/open/space, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "g" = ( /turf/closed/wall/mineral/plastitanium{ dir = 4; icon_state = "diagonalWall3" }, /turf/closed/wall/mineral/titanium, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "h" = ( /turf/closed/wall/mineral/titanium, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "i" = ( /turf/closed/wall/mineral/titanium/overspace, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "j" = ( /turf/closed/wall/mineral/plastitanium{ dir = 8; icon_state = "diagonalWall3" }, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "k" = ( /turf/open/floor/plasteel/dark, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "l" = ( /obj/machinery/door/airlock/external/glass, /turf/open/floor/plating, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "m" = ( /turf/open/floor/plasteel, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "n" = ( /obj/machinery/door/airlock/public/glass, /turf/open/floor/plasteel/dark, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "o" = ( /turf/open/floor/plasteel/darkblue, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "p" = ( /turf/open/floor/plasteel/darkyellow, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "q" = ( /turf/closed/wall/mineral/plastitanium{ icon_state = "diagonalWall3" }, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "r" = ( /obj/structure/table, /turf/open/floor/plasteel, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "s" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/darkblue, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "t" = ( /obj/machinery/sleeper{ icon_state = "sleeper"; dir = 1 }, /turf/open/floor/plasteel/darkblue, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "u" = ( /obj/structure/table/reinforced, /turf/open/floor/plasteel/darkyellow, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "v" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "w" = ( /obj/machinery/power/smes/magical, /turf/open/floor/plating, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "x" = ( /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "y" = ( /obj/structure/chair/comfy{ dir = 4 }, /turf/open/floor/plasteel/darkyellow, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "z" = ( /turf/closed/wall/mineral/plastitanium{ dir = 1; icon_state = "diagonalWall3" }, /turf/closed/wall/mineral/titanium, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "A" = ( /turf/closed/wall/mineral/plastitanium{ dir = 4; icon_state = "diagonalWall3" }, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) "B" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_2) (1,1,1) = {" a diff --git a/_maps/templates/medium_shuttle3.dmm b/_maps/templates/medium_shuttle3.dmm index edc267f44a..263c52c416 100644 --- a/_maps/templates/medium_shuttle3.dmm +++ b/_maps/templates/medium_shuttle3.dmm @@ -7,218 +7,154 @@ dir = 1 }, /turf/open/space, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "c" = ( /turf/closed/wall/mineral/plastitanium, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "d" = ( /obj/structure/shuttle/engine/heater{ dir = 1 }, /turf/open/floor/plating/airless, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "e" = ( /turf/closed/wall/mineral/plastitanium{ dir = 8; icon_state = "diagonalWall3" }, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "f" = ( /turf/closed/wall/mineral/plastitanium{ dir = 1; icon_state = "diagonalWall3" }, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "g" = ( /turf/closed/wall/mineral/plastitanium{ dir = 4; icon_state = "diagonalWall3" }, /turf/closed/wall/mineral/titanium, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "h" = ( /turf/closed/wall/mineral/titanium, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "i" = ( /turf/closed/wall/mineral/plastitanium{ icon_state = "diagonalWall3" }, /turf/closed/wall/mineral/titanium, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "j" = ( /obj/machinery/door/airlock/external/glass, /turf/open/floor/plating, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "k" = ( /obj/machinery/power/smes/magical, /turf/open/floor/plasteel, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "l" = ( /turf/open/floor/plasteel, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "m" = ( /turf/open/floor/plating, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "n" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8 }, /turf/open/space, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "o" = ( /obj/structure/shuttle/engine/heater{ dir = 8 }, /turf/open/floor/plating/airless, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "p" = ( /obj/machinery/door/airlock/public/glass, /turf/open/floor/plasteel, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "q" = ( /obj/structure/shuttle/engine/heater{ dir = 4 }, /turf/open/floor/plating/airless, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "r" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4 }, /turf/open/space, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "s" = ( /turf/closed/wall/mineral/plastitanium{ dir = 1; icon_state = "diagonalWall3" }, /turf/closed/wall/mineral/titanium, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "t" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "u" = ( /turf/closed/wall/mineral/plastitanium{ dir = 8; icon_state = "diagonalWall3" }, /turf/closed/wall/mineral/titanium, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "v" = ( /obj/structure/table, /turf/open/floor/plasteel/darkyellow, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "w" = ( /turf/open/floor/plasteel/darkyellow, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "x" = ( /obj/structure/chair/comfy{ dir = 8 }, /turf/open/floor/plasteel/darkyellow, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "y" = ( /turf/closed/wall/mineral/plastitanium{ icon_state = "diagonalWall3" }, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "z" = ( /obj/machinery/sleeper, /turf/open/floor/plasteel/darkblue, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "A" = ( /turf/open/floor/plasteel/dark, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "B" = ( /turf/closed/wall/mineral/plastitanium{ dir = 4; icon_state = "diagonalWall3" }, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "C" = ( /turf/open/floor/plasteel/darkblue, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "D" = ( /obj/structure/table, /obj/item/storage/firstaid, /turf/open/floor/plasteel/darkblue, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "E" = ( /obj/structure/shuttle/engine/heater, /turf/open/floor/plating/airless, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "F" = ( /obj/structure/shuttle/engine/propulsion, /turf/open/space, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) "G" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ruin/powered{ - name = "Shuttle" - }) +/area/ruin/powered/shuttle/medium_3) (1,1,1) = {" a diff --git a/_maps/templates/medium_shuttle4.dmm b/_maps/templates/medium_shuttle4.dmm index bfb7f5d88e..1464f0961d 100644 --- a/_maps/templates/medium_shuttle4.dmm +++ b/_maps/templates/medium_shuttle4.dmm @@ -6,99 +6,99 @@ /turf/closed/indestructible/oldshuttle/corner{ dir = 8 }, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "c" = ( /turf/closed/indestructible/oldshuttle, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "d" = ( /obj/machinery/door/airlock/public/glass, /turf/open/floor/oldshuttle, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "e" = ( /turf/closed/indestructible/oldshuttle/corner, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "f" = ( /turf/closed/indestructible/oldshuttle/corner{ dir = 1 }, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "g" = ( /turf/open/floor/oldshuttle, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "h" = ( /turf/closed/indestructible/oldshuttle/corner{ dir = 4 }, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "i" = ( /obj/structure/closet{ icon_state = "oldcloset" }, /turf/open/floor/oldshuttle, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "j" = ( /obj/structure/shuttle/engine/propulsion/burst{ dir = 1 }, /turf/open/space, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "k" = ( /turf/closed/indestructible/oldshuttle{ icon_state = "orange" }, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "l" = ( /obj/structure/chair/old{ icon_state = "chairold"; dir = 1 }, /turf/open/floor/oldshuttle, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "m" = ( /turf/closed/indestructible/oldshuttle/corner{ dir = 8 }, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "n" = ( /turf/closed/indestructible/oldshuttle/corner, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "o" = ( /turf/closed/indestructible/oldshuttle/corner{ dir = 1 }, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "p" = ( /turf/closed/indestructible/oldshuttle/corner{ dir = 4 }, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "q" = ( /turf/closed/indestructible/oldshuttle/corner, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "r" = ( /obj/machinery/power/generator, /turf/open/floor/oldshuttle, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "s" = ( /obj/machinery/power/smes, /turf/open/floor/oldshuttle, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "t" = ( /obj/structure/shuttle/engine/propulsion/burst/left, /turf/open/space, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "u" = ( /obj/structure/shuttle/engine/propulsion/burst/right, /turf/open/space, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "v" = ( /obj/structure/shuttle/engine/propulsion/burst/right, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) "w" = ( /obj/structure/shuttle/engine/propulsion/burst, /turf/open/space, -/area/ruin/powered) +/area/ruin/powered/shuttle/medium_4) (1,1,1) = {" a diff --git a/_maps/templates/pirate_ship.dmm b/_maps/templates/pirate_ship.dmm index 02da197578..a97be6e9bd 100644 --- a/_maps/templates/pirate_ship.dmm +++ b/_maps/templates/pirate_ship.dmm @@ -26,7 +26,6 @@ /obj/machinery/button/door{ id = "piratebridge"; name = "Bridge Shutters Control"; - pixel_x = 0; pixel_y = -5; req_access_txt = "0" }, @@ -258,7 +257,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -24; req_access = null }, @@ -532,7 +530,6 @@ /area/shuttle/pirate/vault) "br" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = 28 }, /turf/open/floor/pod/dark, @@ -550,8 +547,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/light/small{ dir = 1 @@ -650,8 +646,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/light/small{ dir = 1 @@ -719,7 +714,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24; req_access = 152 }, @@ -797,7 +791,6 @@ }, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -24; req_access = null }, @@ -853,7 +846,6 @@ name = "External Bolt Control"; normaldoorcontrol = 1; pixel_x = -24; - pixel_y = 0; req_access_txt = "0"; specialfunctions = 4 }, @@ -914,7 +906,6 @@ name = "External Bolt Control"; normaldoorcontrol = 1; pixel_x = 24; - pixel_y = 0; req_access_txt = "0"; specialfunctions = 4 }, @@ -1192,12 +1183,9 @@ "cH" = ( /obj/structure/chair/stool, /obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; icon_state = "4-8" }, /obj/structure/cable/yellow{ - d2 = 8; icon_state = "0-8" }, /obj/machinery/power/apc{ @@ -1216,7 +1204,6 @@ dir = 8 }, /obj/structure/cable/yellow{ - d2 = 8; icon_state = "0-8" }, /obj/effect/decal/cleanable/dirt, @@ -1308,8 +1295,7 @@ "cQ" = ( /obj/structure/table/reinforced, /obj/item/book/manual/barman_recipes{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -1354,8 +1340,7 @@ dir = 1 }, /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + icon_state = "0-2" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -1429,8 +1414,7 @@ /area/shuttle/pirate) "dc" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/light/small{ dir = 4 @@ -1494,10 +1478,7 @@ /area/shuttle/pirate) "dl" = ( /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -1616,10 +1597,7 @@ /area/shuttle/pirate) "dz" = ( /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/floorgrime, @@ -1672,7 +1650,6 @@ }, /obj/item/stack/sheet/glass{ amount = 50; - pixel_x = 0; pixel_y = 5 }, /obj/item/stack/sheet/mineral/plastitanium{ @@ -1735,10 +1712,7 @@ /area/shuttle/pirate) "dK" = ( /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/airlock/public/glass{ heat_proof = 1; @@ -1769,10 +1743,7 @@ /area/shuttle/pirate) "dO" = ( /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/engine/vacuum, /area/shuttle/pirate) @@ -1801,8 +1772,7 @@ "dR" = ( /obj/structure/cable, /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + icon_state = "0-2" }, /obj/machinery/power/compressor{ comp_id = "pirateturbine"; diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index c5e3d25375..f718d9865c 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -67,12 +67,25 @@ NOTE: there are two lists of areas in the end of this file: centcom and station valid_territory = FALSE ambientsounds = MINING +/area/asteroid/nearstation + dynamic_lighting = DYNAMIC_LIGHTING_FORCED + ambientsounds = RUINS + always_unpowered = FALSE + requires_power = TRUE + blob_allowed = TRUE + +/area/asteroid/nearstation/bomb_site + name = "Bomb Testing Asteroid" + /area/asteroid/cave name = "Asteroid - Underground" icon_state = "cave" requires_power = FALSE outdoors = TRUE +/area/asteroid/cave/space + name = "Asteroid - Space" + /area/asteroid/artifactroom name = "Asteroid - Artifact" icon_state = "cave" @@ -661,6 +674,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Chapel Asteroid" icon_state = "explored" +/area/chapel/asteroid/monastery + name = "Monastery Asteroid" + /area/chapel/dock name = "Chapel Dock" icon_state = "construction" diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 5fbbb2c30d..11bb88adb1 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -72,6 +72,24 @@ name = "Hotel Guest Room" icon_state = "Sleep" +/area/ruin/space/has_grav/hotel/guestroom/room_1 + name = "Hotel Guest Room 1" + +/area/ruin/space/has_grav/hotel/guestroom/room_2 + name = "Hotel Guest Room 2" + +/area/ruin/space/has_grav/hotel/guestroom/room_3 + name = "Hotel Guest Room 3" + +/area/ruin/space/has_grav/hotel/guestroom/room_4 + name = "Hotel Guest Room 4" + +/area/ruin/space/has_grav/hotel/guestroom/room_5 + name = "Hotel Guest Room 5" + +/area/ruin/space/has_grav/hotel/guestroom/room_6 + name = "Hotel Guest Room 6" + /area/ruin/space/has_grav/hotel/security name = "Hotel Security Post" icon_state = "security" diff --git a/code/game/area/areas/ruins/templates.dm b/code/game/area/areas/ruins/templates.dm new file mode 100644 index 0000000000..c37d3aec97 --- /dev/null +++ b/code/game/area/areas/ruins/templates.dm @@ -0,0 +1,12 @@ +//Template ruin areas + +/area/ruin/powered/shuttle + name = "Shuttle" + +/area/ruin/powered/shuttle/medium_1 + +/area/ruin/powered/shuttle/medium_2 + +/area/ruin/powered/shuttle/medium_3 + +/area/ruin/powered/shuttle/medium_4 diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index d27b4600c9..b0edb3b420 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -101,6 +101,14 @@ name = "Luxurious Emergency Shuttle" noteleport = TRUE +/area/shuttle/escape/arena + name = "The Arena" + noteleport = TRUE + +/area/shuttle/escape/meteor + name = "\proper a meteor with engines strapped to it" + luminosity = NONE + /area/shuttle/transport name = "Transport Shuttle" blob_allowed = FALSE diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 440ebcf361..ac2617b545 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -524,7 +524,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) var/list/areas_with_LS = list() var/list/areas_with_intercom = list() var/list/areas_with_camera = list() - var/list/station_areas_blacklist = typecacheof(list(/area/holodeck/rec_center, /area/shuttle, /area/engine/supermatter, /area/science/test_area, /area/space, /area/solar, /area/mine, /area/ruin)) + var/list/station_areas_blacklist = typecacheof(list(/area/holodeck/rec_center, /area/shuttle, /area/engine/supermatter, /area/science/test_area, /area/space, /area/solar, /area/mine, /area/ruin, /area/asteroid)) if(SSticker.current_state == GAME_STATE_STARTUP) to_chat(usr, "Game still loading, please hold!") diff --git a/tgstation.dme b/tgstation.dme index 7f35e065b8..8a0f051791 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -500,6 +500,7 @@ #include "code\game\area\areas\ruins\_ruins.dm" #include "code\game\area\areas\ruins\lavaland.dm" #include "code\game\area\areas\ruins\space.dm" +#include "code\game\area\areas\ruins\templates.dm" #include "code\game\gamemodes\antag_hud.dm" #include "code\game\gamemodes\antag_spawner.dm" #include "code\game\gamemodes\antag_spawner_cit.dm" diff --git a/tools/travis/build_byond.sh b/tools/travis/build_byond.sh index 286fbf68d2..1387b4174e 100755 --- a/tools/travis/build_byond.sh +++ b/tools/travis/build_byond.sh @@ -5,10 +5,25 @@ set -e shopt -s globstar if [ "$BUILD_TOOLS" = false ]; then + if grep '"aaa" = \(.+\)' _maps/**/*.dmm; then + echo "Non-TGM formatted map detected. Please convert it using Map Merger!" + exit 1 + fi; if grep 'step_[xy]' _maps/**/*.dmm; then echo "step_[xy] variables detected in maps, please remove them." exit 1 fi; + if grep 'pixel_[xy] = 0' _maps/**/*.dmm; then + echo "pixel_[xy] = 0 detected in maps, please review to ensure they are not dirty varedits." + fi; + if grep '\td[1-2] =' _maps/**/*.dmm; then + echo "d[1-2] cable variables detected in maps, please remove them." + exit 1 + fi; + if grep '^/area/.+[\{]' _maps/**/*.dmm; then + echo "Vareditted /area path use detected in maps, please replace with proper paths." + exit 1 + fi; if grep '\W\/turf\s*[,\){]' _maps/**/*.dmm; then echo "base /turf path use detected in maps, please replace with proper paths." exit 1