diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm index 1979231f243..f94d2051a42 100644 --- a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm +++ b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm @@ -329,7 +329,8 @@ bulb_power = 0.6 }, /obj/structure/industrial_lift/tram/purple, -/obj/effect/landmark/tram/hilbert/middle, +/obj/effect/landmark/tram/platform/hilbert/middle, +/obj/effect/landmark/tram/nav/hilbert/research, /turf/open/floor/engine, /area/ruin/space/has_grav/powered/hilbertresearchfacility) "iY" = ( @@ -936,6 +937,10 @@ }, /turf/open/floor/mineral/titanium/tiled/white, /area/ruin/space/has_grav/powered/hilbertresearchfacility) +"yf" = ( +/obj/effect/landmark/tram/nav/immovable_rod, +/turf/closed/indestructible/riveted/plastinum, +/area/ruin/space/has_grav/powered/hilbertresearchfacility) "yi" = ( /obj/structure/table/reinforced/rglass, /obj/item/food/grown/banana, @@ -1156,6 +1161,7 @@ /obj/machinery/door/airlock/science{ name = "Hilbert's Office" }, +/obj/effect/landmark/tram/nav/immovable_rod, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/hilbertresearchfacility) "BF" = ( @@ -1383,7 +1389,7 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/hilbertresearchfacility) "Gf" = ( -/obj/effect/landmark/tram/hilbert/right, +/obj/effect/landmark/tram/platform/hilbert/right, /turf/open/floor/engine, /area/ruin/space/has_grav/powered/hilbertresearchfacility) "Gi" = ( @@ -1477,7 +1483,7 @@ /turf/open/floor/grass/fairy, /area/ruin/space/has_grav/powered/hilbertresearchfacility) "It" = ( -/obj/effect/landmark/tram/hilbert/left, +/obj/effect/landmark/tram/platform/hilbert/left, /turf/open/floor/engine, /area/ruin/space/has_grav/powered/hilbertresearchfacility) "Iv" = ( @@ -2846,7 +2852,7 @@ Bo Bo Ok CP -Bo +yf CP Ok Bo diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index dc2e0aaced5..748aa80de1d 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -18607,7 +18607,8 @@ }, /obj/structure/industrial_lift/tram, /obj/machinery/door/window/tram/right/directional/north{ - pixel_y = -25 + pixel_y = -25; + associated_lift = "maint_tram" }, /turf/open/floor/noslip/tram_platform, /area/station/maintenance/port/aft) @@ -20581,6 +20582,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/firealarm/directional/east, +/obj/effect/landmark/tram/nav/immovable_rod, /turf/open/floor/iron, /area/station/hallway/secondary/entry) "hzK" = ( @@ -21988,7 +21990,8 @@ /obj/structure/industrial_lift/tram, /obj/machinery/door/window/tram/left/directional/north{ pixel_x = -32; - pixel_y = -25 + pixel_y = -25; + associated_lift = "maint_tram" }, /turf/open/floor/noslip/tram_platform, /area/station/maintenance/port/aft) @@ -26875,9 +26878,8 @@ /area/station/engineering/supermatter/room) "jMv" = ( /obj/structure/industrial_lift/tram, -/obj/effect/landmark/tram/birdshot/maint_left{ - specific_lift_id = "maint_tram" - }, +/obj/effect/landmark/tram/nav/birdshot/maint, +/obj/effect/landmark/tram/platform/birdshot/maint_left, /turf/open/floor/noslip/tram_plate, /area/station/maintenance/port/aft) "jMC" = ( @@ -28711,10 +28713,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "kvb" = ( -/obj/effect/landmark/tram/birdshot/sec_wing{ - specific_lift_id = "prison_tram" - }, /obj/structure/industrial_lift/tram/white, +/obj/effect/landmark/tram/nav/birdshot/prison, +/obj/effect/landmark/tram/platform/birdshot/sec_wing, /turf/open/floor/noslip/tram_platform, /area/station/security/tram) "kvf" = ( @@ -31602,6 +31603,7 @@ name = "Prison Garden" }, /obj/machinery/door/firedoor, +/obj/effect/landmark/tram/nav/immovable_rod, /turf/open/floor/iron/textured_half{ dir = 8 }, @@ -35628,9 +35630,7 @@ /turf/open/floor/light/colour_cycle/dancefloor_b, /area/station/maintenance/starboard/central) "mOP" = ( -/obj/effect/landmark/tram/birdshot/prison_wing{ - specific_lift_id = "prison_tram" - }, +/obj/effect/landmark/tram/platform/birdshot/prison_wing, /turf/open/floor/noslip/tram_platform, /area/station/security/tram) "mOT" = ( @@ -39687,9 +39687,7 @@ /turf/open/floor/iron, /area/station/hallway/secondary/dock) "oqS" = ( -/obj/effect/landmark/tram/birdshot/maint_right{ - specific_lift_id = "maint_tram" - }, +/obj/effect/landmark/tram/platform/birdshot/maint_right, /turf/open/floor/noslip/tram_plate, /area/station/maintenance/department/medical/central) "oqT" = ( @@ -41545,10 +41543,11 @@ /turf/open/floor/iron/smooth, /area/station/service/greenroom) "pca" = ( -/obj/structure/cable, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/landmark/tram/nav/immovable_rod, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "pcb" = ( /obj/effect/turf_decal/tile/dark_red{ dir = 4 @@ -45633,6 +45632,11 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"qop" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space/nearstation) "qoD" = ( /turf/closed/wall/r_wall, /area/station/command/corporate_showroom) @@ -63798,6 +63802,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"wiP" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/space/nearstation) "wiT" = ( /obj/effect/mapping_helpers/broken_floor, /obj/machinery/newscaster/directional/south, @@ -71056,6 +71065,10 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"yhE" = ( +/obj/effect/landmark/tram/nav/immovable_rod, +/turf/closed/wall, +/area/station/maintenance/port/aft) "yhF" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -85118,7 +85131,7 @@ uAi fEC rui qVP -blb +qop xkt nKf mVt @@ -85375,7 +85388,7 @@ xjU fEC kJJ qVP -blb +wiP xkt kJp pJx @@ -85621,7 +85634,7 @@ tdg wBm wXk bVv -xOS +pca rQC von vRe @@ -85632,7 +85645,7 @@ tAu fEC rui qVP -pca +rui qVP llW llW @@ -87732,7 +87745,7 @@ trp trp trp trp -trp +yhE trp trp trp diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 961dd88fc2a..7d260c68d24 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -3989,19 +3989,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"azh" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/machinery/firealarm/directional/south{ - pixel_x = 3 - }, -/obj/machinery/light_switch/directional/south{ - pixel_x = -8; - pixel_y = -23 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/lockers) "azk" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -4030,10 +4017,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"azP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, -/turf/closed/wall/r_wall, -/area/station/science/ordnance) "azU" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -4218,28 +4201,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/maintenance/tram/right) -"aCi" = ( -/obj/structure/table, -/obj/item/radio{ - pixel_x = -6; - pixel_y = -3 - }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 9; - pixel_y = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/obj/machinery/firealarm/directional/west{ - pixel_y = 5 - }, -/obj/machinery/light_switch/directional/west{ - pixel_x = -22; - pixel_y = -9 - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/medical) "aCp" = ( /obj/machinery/camera/directional/south{ c_tag = "Service - Bar Lounge South West" @@ -4534,22 +4495,6 @@ }, /turf/open/openspace, /area/station/hallway/primary/tram/center) -"aEr" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Science - Mixing Lab"; - network = list("ss13","rd") - }, -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/mixingchamber_access, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/science/ordnance/burnchamber) "aEu" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -5057,21 +5002,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"aHG" = ( -/obj/machinery/camera/emp_proof{ - c_tag = "Engineering - Atmospherics Incinerator"; - dir = 9; - network = list("ss13","engineering") - }, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ - dir = 4 - }, -/obj/item/radio/intercom/directional/north, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "aHO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -5557,6 +5487,17 @@ }, /turf/open/space/openspace, /area/station/solars/port) +"aMF" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/west, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit) "aMG" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/white, @@ -5624,17 +5565,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/closed/wall/r_wall, /area/station/engineering/atmos) -"aNj" = ( -/obj/machinery/firealarm/directional/east{ - pixel_y = -5 - }, -/obj/structure/reagent_dispensers/fueltank, -/obj/machinery/light_switch/directional/east{ - pixel_x = 23; - pixel_y = 8 - }, -/turf/open/floor/iron/dark, -/area/station/command/teleporter) "aNp" = ( /obj/structure/chair/office/light, /obj/effect/turf_decal/tile/green, @@ -5868,20 +5798,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/station/medical/virology) -"aPC" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 9 - }, -/obj/structure/table, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/iron/fifty, -/obj/item/storage/box/lights/mixed, -/obj/machinery/light_switch/directional/west{ - pixel_x = -23; - pixel_y = -8 - }, -/turf/open/floor/iron, -/area/station/commons/storage/tools) "aPI" = ( /obj/structure/rack, /obj/item/reagent_containers/cup/bottle/acidic_buffer{ @@ -6309,16 +6225,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/mid) -"aVN" = ( -/obj/machinery/firealarm/directional/east{ - pixel_y = 6 - }, -/obj/machinery/light_switch/directional/east{ - pixel_x = 23; - pixel_y = -8 - }, -/turf/open/floor/iron/grimy, -/area/station/service/chapel/office) "aVT" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -7580,6 +7486,11 @@ "bya" = ( /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +"byb" = ( +/obj/structure/lattice, +/obj/machinery/light/cold/dim/directional/east, +/turf/open/openspace, +/area/station/asteroid) "byh" = ( /obj/structure/table/glass, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -7782,14 +7693,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/miningdock) -"bBN" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/white, -/area/station/science/ordnance) "bCc" = ( /obj/machinery/status_display/evac/directional/north, /turf/open/misc/asteroid, @@ -7801,39 +7704,6 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/captain/private) -"bCz" = ( -/obj/machinery/button/door/directional/east{ - id = "armory"; - name = "Armory Shutters"; - req_access = list("armory") - }, -/obj/machinery/status_display/ai/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light_switch/directional/east{ - pixel_x = 23; - pixel_y = -8 - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) -"bDc" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Medical - Surgery B"; - network = list("ss13","medbay") - }, -/obj/machinery/vending/wallmed/directional/north, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, -/obj/machinery/light_switch/directional/east{ - pixel_x = 22; - pixel_y = -9 - }, -/turf/open/floor/iron/white, -/area/station/medical/surgery/aft) "bDf" = ( /obj/structure/table/reinforced, /obj/item/folder/yellow, @@ -8281,15 +8151,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/cargo/lobby) -"bLc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, -/obj/machinery/light/small/directional/south{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/disposal/incinerator) "bLd" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 8 @@ -9270,6 +9131,13 @@ /obj/effect/turf_decal/trimline/neutral/corner, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"bZI" = ( +/obj/machinery/door/window/brigdoor/left/directional/south{ + name = "Secure Morgue Trays"; + req_access = list("morgue_secure") + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "bZN" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -9866,24 +9734,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"ckn" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/machinery/firealarm/directional/east, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light_switch/directional/east{ - pixel_x = 22; - pixel_y = -9 - }, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "cko" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -9959,18 +9809,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lab) -"clJ" = ( -/obj/effect/turf_decal/box/white{ - color = "#52B4E9" - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/light_switch/directional/east{ - pixel_x = 22; - pixel_y = 8 - }, -/turf/open/floor/iron/freezer, -/area/station/medical/coldroom) "clT" = ( /turf/closed/wall, /area/station/security/checkpoint/medical) @@ -10068,17 +9906,6 @@ }, /turf/open/floor/wood, /area/station/service/library) -"cpb" = ( -/obj/effect/turf_decal/trimline/neutral/warning, -/obj/structure/table/reinforced, -/obj/item/table_clock{ - pixel_y = 8 - }, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "cpl" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, @@ -10118,22 +9945,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"cpW" = ( -/obj/machinery/firealarm/directional/west{ - pixel_y = 3 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/light_switch/directional/west{ - pixel_x = -23; - pixel_y = -8 - }, -/turf/open/floor/iron, -/area/station/security/processing) "cpY" = ( /obj/machinery/duct, /obj/structure/cable, @@ -10220,18 +10031,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/cargo/miningdock) -"crQ" = ( -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 - }, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "crR" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -10309,6 +10108,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/cafeteria, /area/station/command/heads_quarters/rd) +"csn" = ( +/obj/machinery/elevator_control_panel{ + layer = 3.1; + linked_elevator_id = "tram_xeno_lift"; + pixel_y = 2; + preset_destination_names = list("2"="Lower Deck","3"="Upper Deck") + }, +/turf/closed/wall, +/area/station/science/xenobiology) "csA" = ( /turf/closed/wall, /area/station/solars/starboard/fore) @@ -10332,19 +10140,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"ctI" = ( -/obj/machinery/airlock_sensor/incinerator_ordmix{ - pixel_x = 23; - pixel_y = 1 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/science/ordnance/burnchamber) "ctW" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -10782,10 +10577,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/engine, /area/station/science/xenobiology) -"cAU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/closed/wall, -/area/station/science/ordnance) "cBo" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -10857,6 +10648,16 @@ }, /turf/open/floor/iron/white, /area/station/science/lower) +"cDw" = ( +/obj/machinery/firealarm/directional/east{ + pixel_y = 6 + }, +/obj/machinery/light_switch/directional/east{ + pixel_x = 23; + pixel_y = -8 + }, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) "cDD" = ( /obj/effect/turf_decal/weather/snow, /obj/effect/turf_decal/weather/snow/corner, @@ -11096,22 +10897,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics/garden) -"cGx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/end{ - dir = 1 - }, -/obj/structure/closet/secure_closet/research_director, -/obj/machinery/camera/directional/south{ - c_tag = "Science - Research Director's Office"; - network = list("ss13","rd") - }, -/obj/machinery/light_switch/directional/south{ - pixel_x = -8; - pixel_y = -24 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/rd) "cGy" = ( /obj/structure/chair/stool/directional/north, /obj/structure/disposalpipe/segment{ @@ -11540,6 +11325,22 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/iron, /area/station/commons/dorms) +"cOE" = ( +/obj/item/radio/intercom/directional/west{ + pixel_y = 4 + }, +/obj/effect/turf_decal/trimline/dark_blue/arrow_cw{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/dark_blue/corner, +/obj/structure/railing/corner, +/obj/machinery/light/small/directional/west, +/obj/machinery/flasher/directional/west{ + pixel_x = -24; + pixel_y = -8 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) "cOF" = ( /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 8; @@ -11879,18 +11680,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/courtroom/holding) -"cTT" = ( -/obj/machinery/firealarm/directional/west{ - pixel_y = -3 +"cTR" = ( +/obj/effect/turf_decal/caution/stand_clear/white{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light_switch/directional/west{ - pixel_x = -23; - pixel_y = 8 +/obj/machinery/door/window/elevator/left/directional/south{ + elevator_linked_id = "tram_perma_lift"; + elevator_mode = 1 }, -/turf/open/floor/iron/dark, -/area/station/service/chapel/office) +/turf/open/floor/iron, +/area/station/security/brig) "cTU" = ( /turf/closed/wall, /area/station/cargo/storage) @@ -12091,12 +11890,6 @@ "cXL" = ( /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) -"cXM" = ( -/obj/machinery/atmospherics/components/tank/air{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/science/ordnance) "cXR" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -12141,6 +11934,17 @@ /obj/structure/railing/corner, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) +"cYq" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/tram, +/turf/open/floor/noslip/tram_plate/energized{ + inbound = 1; + outbound = 2 + }, +/area/station/hallway/primary/tram/center) "cYx" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room" @@ -13051,14 +12855,6 @@ }, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) -"dqA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/atmos{ - name = "Turbine Maintenance" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/plating, -/area/station/maintenance/disposal/incinerator) "dqK" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -13357,12 +13153,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"dwl" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ - dir = 1 - }, -/turf/open/floor/engine/vacuum, -/area/station/maintenance/disposal/incinerator) "dww" = ( /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -14906,17 +14696,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) -"dYH" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/tile/neutral/tram, -/turf/open/floor/noslip/tram_plate/energized{ - inbound = 2; - outbound = 3 - }, -/area/station/hallway/primary/tram/center) "dZu" = ( /obj/machinery/mecha_part_fabricator, /obj/effect/turf_decal/delivery, @@ -15110,6 +14889,19 @@ /obj/item/holosign_creator/robot_seat/bar, /turf/open/floor/wood, /area/station/service/bar/backroom) +"ecV" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 6 + }, +/obj/machinery/firealarm/directional/east{ + pixel_y = 4 + }, +/obj/machinery/light_switch/directional/east{ + pixel_x = 24; + pixel_y = -8 + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) "ecW" = ( /obj/structure/table/glass, /obj/machinery/cell_charger, @@ -15128,6 +14920,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) +"edu" = ( +/obj/machinery/seed_extractor, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/machinery/light_switch/directional/north{ + pixel_x = -8; + pixel_y = 23 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "edx" = ( /obj/effect/turf_decal/stripes/box, /obj/structure/ladder, @@ -15144,6 +14948,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"edP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/ordnance) "eep" = ( /turf/open/floor/plating, /area/station/service/barber) @@ -15660,26 +15468,6 @@ /obj/effect/landmark/navigate_destination/tcomms, /turf/open/floor/iron, /area/station/tcommsat/computer) -"eqw" = ( -/obj/structure/table/glass, -/obj/item/storage/box/petridish{ - pixel_x = -5; - pixel_y = 8 - }, -/obj/item/storage/box/petridish{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/item/radio/intercom/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Science - Cytology East"; - network = list("ss13","rd","xeno") - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "eqJ" = ( /obj/structure/cable/layer1, /obj/structure/cable, @@ -16072,6 +15860,28 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"exT" = ( +/obj/structure/table, +/obj/item/radio{ + pixel_x = -6; + pixel_y = -3 + }, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = 9; + pixel_y = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/obj/machinery/firealarm/directional/west{ + pixel_y = 5 + }, +/obj/machinery/light_switch/directional/west{ + pixel_x = -22; + pixel_y = -9 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/medical) "exV" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -16571,6 +16381,22 @@ }, /turf/open/floor/engine/n2, /area/station/engineering/atmos) +"eIS" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/light_switch/directional/east{ + pixel_x = 22; + pixel_y = -8 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/escape) "eIZ" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 9 @@ -16816,13 +16642,32 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) "eOZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) +"ePd" = ( +/obj/structure/sink{ + pixel_y = 15 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/machinery/light_switch/directional/east{ + pixel_x = 23; + pixel_y = -8 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "ePi" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"ePj" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ + dir = 1 + }, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) "ePw" = ( /obj/structure/filingcabinet, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -17870,18 +17715,6 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"fkf" = ( -/obj/effect/turf_decal/box/white{ - color = "#52B4E9" - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/light_switch/directional/east{ - pixel_x = 22; - pixel_y = -8 - }, -/turf/open/floor/iron/freezer, -/area/station/medical/coldroom) "fkh" = ( /obj/structure/sign/warning/docking, /obj/effect/spawner/structure/window/reinforced, @@ -18058,6 +17891,17 @@ dir = 8 }, /area/station/command/bridge) +"fnv" = ( +/obj/structure/table/wood, +/obj/machinery/firealarm/directional/south{ + pixel_x = 3 + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = -8; + pixel_y = -23 + }, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) "fnz" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 @@ -18295,6 +18139,10 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/supermatter) +"frT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall, +/area/station/science/ordnance) "frV" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance/testlab) @@ -18543,17 +18391,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"fwA" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/tile/neutral/tram, -/turf/open/floor/noslip/tram_plate/energized{ - inbound = 2; - outbound = 3 - }, -/area/station/hallway/primary/tram/right) "fwB" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/effect/turf_decal/trimline/green/filled/corner{ @@ -18583,20 +18420,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"fwH" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/machinery/firealarm/directional/east{ - pixel_y = -5 - }, -/obj/machinery/light/cold/directional/east, -/obj/machinery/light_switch/directional/east{ - pixel_x = 23; - pixel_y = 8 - }, -/turf/open/floor/iron, -/area/station/command/bridge) "fwJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -18712,6 +18535,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"fzg" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ + dir = 1 + }, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) "fzo" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/engine{ @@ -18851,6 +18680,10 @@ }, /turf/open/floor/glass/reinforced, /area/station/science/research) +"fDF" = ( +/obj/effect/landmark/tram/nav/immovable_rod, +/turf/open/floor/carpet, +/area/station/hallway/secondary/entry) "fDS" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Laser Room" @@ -19133,13 +18966,6 @@ dir = 8 }, /area/station/science/lobby) -"fIn" = ( -/obj/effect/turf_decal/tile/neutral/tram, -/turf/open/floor/noslip/tram_plate/energized{ - inbound = 2; - outbound = 3 - }, -/area/station/hallway/primary/tram/right) "fIB" = ( /obj/structure/table, /obj/machinery/recharger{ @@ -19167,11 +18993,6 @@ /obj/item/flashlight/lamp, /turf/open/floor/iron/dark, /area/station/escapepodbay) -"fJc" = ( -/obj/effect/spawner/random/engineering/tracking_beacon, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "fJe" = ( /obj/effect/turf_decal/siding/thinplating, /obj/structure/cable, @@ -19368,6 +19189,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/virology) +"fLW" = ( +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) "fMm" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 @@ -19553,13 +19385,6 @@ /obj/effect/turf_decal/trimline/yellow/arrow_ccw, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"fQU" = ( -/obj/machinery/door/window/brigdoor/left/directional/south{ - name = "Secure Morgue Trays"; - req_access = list("morgue_secure") - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "fQV" = ( /obj/machinery/button/door/directional/east{ id = "offstationaccess"; @@ -19891,6 +19716,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/service/barber) +"fXd" = ( +/obj/machinery/firealarm/directional/north{ + pixel_x = 5 + }, +/obj/machinery/light_switch/directional/north{ + pixel_x = -8; + pixel_y = 23 + }, +/turf/open/floor/wood/large, +/area/station/service/barber) "fXf" = ( /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 @@ -20036,6 +19871,11 @@ "gaH" = ( /turf/open/floor/catwalk_floor, /area/station/hallway/primary/tram/right) +"gaO" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/science/ordnance) "gaY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20114,25 +19954,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -"gbJ" = ( -/obj/machinery/button/door/directional/west{ - id = "commissarydeezdoorz"; - name = "Commissary Shutter Access" - }, -/obj/machinery/button/door/directional/west{ - id = "vacant_space"; - name = "Privacy Bolts"; - normaldoorcontrol = 1; - pixel_y = -9; - specialfunctions = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light_switch/directional/west{ - pixel_x = -22; - pixel_y = 9 - }, -/turf/open/floor/iron/dark, -/area/station/commons/vacant_room/commissary) "gbW" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -20832,18 +20653,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/brig) -"gop" = ( -/obj/machinery/seed_extractor, -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 1 - }, -/obj/machinery/light_switch/directional/north{ - pixel_x = -8; - pixel_y = 23 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "gov" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -21532,16 +21341,6 @@ /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/iron/white, /area/station/science/research) -"gBZ" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/obj/machinery/door/window/elevator/left/directional/south{ - elevator_linked_id = "tram_perma_lift"; - elevator_mode = 1 - }, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "gCq" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -21591,23 +21390,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/virology) -"gCJ" = ( -/obj/structure/closet/l3closet/janitor, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 6 - }, -/obj/item/restraints/legcuffs/beartrap, -/obj/item/restraints/legcuffs/beartrap, -/obj/machinery/light_switch/directional/east{ - pixel_x = 23; - pixel_y = 8 - }, -/turf/open/floor/iron, -/area/station/service/janitor) "gCQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21622,21 +21404,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"gDj" = ( -/obj/machinery/firealarm/directional/south{ - pixel_x = -3 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/light_switch/directional/south{ - pixel_x = 8; - pixel_y = -23 - }, -/turf/open/floor/iron, -/area/station/cargo/miningdock/cafeteria) "gDq" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 1 @@ -21894,23 +21661,6 @@ /obj/machinery/light/cold/directional/north, /turf/open/floor/iron/white, /area/station/science/lower) -"gHN" = ( -/obj/machinery/disposal/bin, -/obj/machinery/firealarm/directional/west{ - pixel_y = 5 - }, -/obj/structure/plaque/static_plaque/golden/captain{ - pixel_y = 32 - }, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, -/obj/machinery/light_switch/directional/west{ - pixel_x = -23; - pixel_y = -8 - }, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain) "gIf" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ dir = 1 @@ -22031,6 +21781,17 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) +"gKF" = ( +/obj/machinery/firealarm/directional/east{ + pixel_y = -5 + }, +/obj/structure/reagent_dispensers/fueltank, +/obj/machinery/light_switch/directional/east{ + pixel_x = 23; + pixel_y = 8 + }, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) "gKJ" = ( /obj/machinery/suit_storage_unit/ce, /obj/machinery/airalarm/directional/north, @@ -22245,6 +22006,19 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/command/nuke_storage) +"gOA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/firealarm/directional/south{ + pixel_x = 3 + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = -8; + pixel_y = -23 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/lockers) "gOF" = ( /obj/structure/fluff/tram_rail/floor{ dir = 1 @@ -23777,10 +23551,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/tram/left) -"hus" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/closed/wall, -/area/station/maintenance/disposal/incinerator) "huz" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 4 @@ -23851,19 +23621,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) -"hvF" = ( -/obj/structure/sink{ - pixel_y = 15 - }, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 5 - }, -/obj/machinery/light_switch/directional/east{ - pixel_x = 23; - pixel_y = -8 - }, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics) "hvJ" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -23944,6 +23701,17 @@ }, /turf/open/floor/iron/dark/smooth_corner, /area/station/commons/fitness) +"hze" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 9 + }, +/obj/machinery/light_switch/directional/west{ + pixel_x = -22; + pixel_y = -8 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "hzk" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -24015,6 +23783,10 @@ "hBf" = ( /turf/open/floor/iron/grimy, /area/station/security/detectives_office) +"hBl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall/r_wall, +/area/station/science/ordnance/burnchamber) "hBr" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -24106,6 +23878,19 @@ /obj/machinery/vending/cigarette, /turf/open/floor/iron/cafeteria, /area/station/science/breakroom) +"hCA" = ( +/obj/machinery/chem_master/condimaster{ + desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; + name = "HoochMaster Deluxe"; + pixel_x = -4 + }, +/obj/structure/sign/clock/directional/north, +/obj/machinery/light_switch/directional/north{ + pixel_x = -8; + pixel_y = 23 + }, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "hCN" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/machinery/light/floor, @@ -24350,19 +24135,6 @@ }, /turf/open/floor/iron, /area/station/engineering/engine_smes) -"hGP" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/camera/directional/south{ - c_tag = "Secure - EVA Storage" - }, -/obj/machinery/light_switch/directional/south{ - pixel_x = 8; - pixel_y = -23 - }, -/turf/open/floor/iron, -/area/station/ai_monitored/command/storage/eva) "hHf" = ( /obj/structure/closet/bombcloset/security, /turf/open/floor/iron/showroomfloor, @@ -24949,25 +24721,6 @@ /obj/machinery/telecomms/server/presets/command, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) -"hSS" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/corner{ - dir = 8 - }, -/obj/machinery/firealarm/directional/north{ - pixel_x = 4 - }, -/obj/machinery/light_switch/directional/north{ - pixel_x = -6; - pixel_y = 28 - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/science) "hTa" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, @@ -25010,6 +24763,28 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"hUa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/tank/air{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"hUf" = ( +/obj/machinery/camera/emp_proof{ + c_tag = "Engineering - Atmospherics Incinerator"; + dir = 9; + network = list("ss13","engineering") + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/item/radio/intercom/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "hUr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -25103,10 +24878,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) -"hVR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, -/turf/closed/wall/r_wall, -/area/station/science/ordnance/burnchamber) "hVZ" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -25366,21 +25137,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor, /area/station/maintenance/tram/mid) -"iaC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 10 - }, -/obj/structure/ore_box, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/light_switch/directional/west{ - pixel_x = -22; - pixel_y = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "iaE" = ( /obj/machinery/door/airlock{ id_tag = "private_e"; @@ -26062,6 +25818,16 @@ /obj/effect/turf_decal/sand/plating, /turf/open/misc/asteroid/airless, /area/station/asteroid) +"ioU" = ( +/obj/effect/turf_decal/caution/stand_clear/white{ + dir = 8 + }, +/obj/machinery/door/window/elevator/left/directional/east{ + elevator_linked_id = "tram_dorm_lift"; + elevator_mode = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/left) "ipe" = ( /obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 8 @@ -26145,6 +25911,20 @@ }, /turf/open/floor/glass/reinforced, /area/station/security/brig) +"irf" = ( +/obj/machinery/button/door/directional/east{ + id = "armory"; + name = "Armory Shutters"; + req_access = list("armory") + }, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light_switch/directional/east{ + pixel_x = 23; + pixel_y = -8 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "irv" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 9 @@ -27352,6 +27132,17 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) +"iPP" = ( +/obj/effect/landmark/start/hangover, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/right) "iPQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -27660,19 +27451,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"iVd" = ( -/obj/machinery/chem_master/condimaster{ - desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; - name = "HoochMaster Deluxe"; - pixel_x = -4 - }, -/obj/structure/sign/clock/directional/north, -/obj/machinery/light_switch/directional/north{ - pixel_x = -8; - pixel_y = 23 - }, -/turf/open/floor/wood, -/area/station/service/bar/backroom) "iVj" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -27725,30 +27503,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"iVB" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/firealarm/directional/north{ - pixel_x = 3 - }, -/obj/machinery/light_switch/directional/north{ - pixel_x = -8; - pixel_y = 23 - }, -/turf/open/floor/iron/dark, -/area/station/security/evidence) -"iVD" = ( -/obj/machinery/atmospherics/components/binary/pump/on, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/science/ordnance/burnchamber) "iVG" = ( /obj/effect/turf_decal/trimline/green/corner{ dir = 8 @@ -28277,6 +28031,21 @@ }, /turf/open/floor/wood, /area/station/service/bar/backroom) +"jeC" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/rack, +/obj/item/clipboard, +/obj/item/chair/plastic, +/obj/item/chair/plastic{ + pixel_y = 5 + }, +/obj/effect/spawner/random/bureaucracy/briefcase, +/obj/machinery/light_switch/directional/east{ + pixel_x = 23; + pixel_y = -8 + }, +/turf/open/floor/wood, +/area/station/service/lawoffice) "jeO" = ( /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/freezer, @@ -28921,13 +28690,6 @@ }, /turf/open/floor/wood, /area/station/command/meeting_room) -"jpb" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/science/ordnance) "jpd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -29642,18 +29404,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) -"jBb" = ( -/obj/structure/table, -/obj/item/storage/box/donkpockets, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 4 - }, -/obj/machinery/light_switch/directional/east{ - pixel_x = 23; - pixel_y = -8 - }, -/turf/open/floor/iron/dark, -/area/station/security/courtroom) "jBk" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/structure/cable, @@ -30219,13 +29969,6 @@ "jLf" = ( /turf/open/floor/iron/chapel, /area/station/service/chapel) -"jLg" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance) "jLx" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -30242,6 +29985,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/tcommsat/computer) +"jLH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/closed/wall, +/area/station/science/ordnance) "jLI" = ( /obj/effect/turf_decal/trimline/dark_green/line{ dir = 8 @@ -31110,19 +30857,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) -"kbx" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 6 - }, -/obj/machinery/firealarm/directional/east{ - pixel_y = 4 - }, -/obj/machinery/light_switch/directional/east{ - pixel_x = 24; - pixel_y = -8 - }, -/turf/open/floor/iron, -/area/station/science/robotics/lab) "kbz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31152,6 +30886,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) +"kbW" = ( +/obj/structure/table/wood, +/obj/machinery/firealarm/directional/north{ + pixel_x = -2 + }, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/machinery/light_switch/directional/north{ + pixel_x = 8; + pixel_y = 23 + }, +/turf/open/floor/carpet, +/area/station/service/chapel/monastery) "kcb" = ( /obj/structure/table/wood, /obj/item/storage/secure/briefcase{ @@ -31161,6 +30910,17 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"kck" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/tram, +/turf/open/floor/noslip/tram_plate/energized{ + inbound = 2; + outbound = 3 + }, +/area/station/hallway/primary/tram/right) "kcm" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -31389,6 +31149,11 @@ /obj/machinery/light/dim/directional/west, /turf/open/floor/iron, /area/station/science/lower) +"kfr" = ( +/obj/effect/turf_decal/tile/neutral/tram, +/obj/effect/landmark/tram/platform/tramstation/east, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/right) "kfD" = ( /obj/effect/turf_decal/sand, /obj/machinery/door/airlock/external{ @@ -31739,18 +31504,6 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) -"kls" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 9 - }, -/obj/item/radio/intercom/directional/west, -/obj/machinery/airalarm/directional/north, -/obj/machinery/light_switch/directional/west{ - pixel_x = -23; - pixel_y = -8 - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/arrivals) "kly" = ( /obj/structure/cable, /obj/structure/disposalpipe/junction/flip{ @@ -32126,17 +31879,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"ksO" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit) "ksP" = ( /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 @@ -32184,12 +31926,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"ktO" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ - dir = 1 - }, -/turf/open/floor/engine/vacuum, -/area/station/maintenance/disposal/incinerator) "ktX" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -32409,6 +32145,23 @@ }, /turf/open/floor/plating, /area/station/maintenance/tram/left) +"kyN" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/firealarm/directional/north{ + pixel_x = 3 + }, +/obj/machinery/light_switch/directional/north{ + pixel_x = -8; + pixel_y = 23 + }, +/turf/open/floor/iron/dark, +/area/station/security/evidence) "kyU" = ( /obj/docking_port/stationary{ dir = 4; @@ -32526,16 +32279,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) -"kBD" = ( -/obj/machinery/firealarm/directional/north{ - pixel_x = 5 - }, -/obj/machinery/light_switch/directional/north{ - pixel_x = -8; - pixel_y = 23 - }, -/turf/open/floor/wood/large, -/area/station/service/barber) "kCm" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/structure/table, @@ -32914,6 +32657,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/dorms) +"kHt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/air_sensor/incinerator_tank, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) "kHv" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon/burgundy, @@ -34057,29 +33806,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"lav" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/trimline/neutral/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/corner, -/obj/effect/turf_decal/bot, -/obj/machinery/status_display/evac/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Departures - West Main" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "lax" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -34422,22 +34148,37 @@ /obj/machinery/telecomms/server/presets/security, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) +"liB" = ( +/obj/effect/turf_decal/trimline/neutral/warning, +/obj/structure/table/reinforced, +/obj/item/table_clock{ + pixel_y = 8 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "liC" = ( /obj/machinery/porta_turret/ai{ dir = 4 }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/hallway) -"liJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/pump/on/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/plating, -/area/station/maintenance/disposal/incinerator) "liN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/commons/dorms) +"liX" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/right) "liZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34650,21 +34391,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) -"lmg" = ( -/obj/structure/table/wood, -/obj/machinery/firealarm/directional/north{ - pixel_x = -2 - }, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 8 - }, -/obj/machinery/light_switch/directional/north{ - pixel_x = 8; - pixel_y = 23 - }, -/turf/open/floor/carpet, -/area/station/service/chapel/monastery) "lml" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/pumproom) @@ -34701,20 +34427,6 @@ }, /turf/open/floor/wood, /area/station/command/meeting_room) -"lmO" = ( -/obj/structure/table/reinforced, -/obj/machinery/firealarm/directional/west, -/obj/item/storage/box, -/obj/item/hand_labeler{ - pixel_y = 8 - }, -/obj/effect/turf_decal/tile/brown/fourcorners, -/obj/machinery/light_switch/directional/west{ - pixel_x = -22; - pixel_y = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) "lmZ" = ( /obj/machinery/conveyor{ dir = 8; @@ -35297,6 +35009,12 @@ /obj/structure/cable, /turf/open/floor/engine/hull/reinforced, /area/space/nearstation) +"lwt" = ( +/obj/machinery/atmospherics/components/binary/pump/on/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/science/ordnance) "lwx" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -35498,16 +35216,6 @@ /obj/machinery/door/window/left/directional/south, /turf/open/floor/grass, /area/station/service/hydroponics) -"lzs" = ( -/obj/effect/turf_decal/caution/stand_clear/white{ - dir = 8 - }, -/obj/machinery/door/window/elevator/left/directional/east{ - elevator_linked_id = "tram_dorm_lift"; - elevator_mode = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/left) "lzu" = ( /obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, @@ -35630,6 +35338,18 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"lDl" = ( +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/light_switch/directional/east{ + pixel_x = 22; + pixel_y = 8 + }, +/turf/open/floor/iron/freezer, +/area/station/medical/coldroom) "lDo" = ( /obj/structure/table, /obj/item/storage/box/prisoner, @@ -35763,6 +35483,16 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) +"lEI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "lEL" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -36074,6 +35804,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/circuit, /area/station/ai_monitored/command/nuke_storage) +"lKE" = ( +/obj/structure/table, +/obj/item/storage/box/donkpockets, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/machinery/light_switch/directional/east{ + pixel_x = 23; + pixel_y = -8 + }, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) "lKI" = ( /obj/structure/chair/stool/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/violet/visible, @@ -36269,21 +36011,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"lNK" = ( -/obj/machinery/airalarm/directional/north, -/obj/structure/rack, -/obj/item/clipboard, -/obj/item/chair/plastic, -/obj/item/chair/plastic{ - pixel_y = 5 - }, -/obj/effect/spawner/random/bureaucracy/briefcase, -/obj/machinery/light_switch/directional/east{ - pixel_x = 23; - pixel_y = -8 - }, -/turf/open/floor/wood, -/area/station/service/lawoffice) "lNP" = ( /obj/structure/fluff/tram_rail, /turf/open/openspace, @@ -36737,11 +36464,6 @@ /obj/machinery/door/poddoor/incinerator_ordmix, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) -"lUP" = ( -/obj/effect/landmark/tram/tramstation/west, -/obj/effect/turf_decal/tile/neutral/tram, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/left) "lUZ" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=8"; @@ -36820,19 +36542,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"lWi" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/structure/table, -/obj/machinery/recharger, -/obj/structure/cable, -/obj/machinery/light_switch/directional/east{ - pixel_x = 23; - pixel_y = -8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/warden) "lWj" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -36848,6 +36557,21 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) +"lWu" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/blood_filter, +/obj/item/clothing/gloves/latex/nitrile, +/obj/machinery/light_switch/directional/east{ + pixel_x = 22; + pixel_y = -9 + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) "lWv" = ( /obj/structure/table, /obj/machinery/button/door{ @@ -37007,6 +36731,13 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) +"lZJ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance) "lZW" = ( /turf/closed/wall, /area/station/maintenance/department/cargo) @@ -37275,6 +37006,19 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) +"meA" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/machinery/airalarm/directional/north, +/obj/structure/disposalpipe/trunk, +/obj/machinery/light_switch/directional/west{ + pixel_x = -23; + pixel_y = -8 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "meD" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -37784,6 +37528,22 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/station/security/checkpoint/science) +"moQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/obj/structure/closet/secure_closet/research_director, +/obj/machinery/camera/directional/south{ + c_tag = "Science - Research Director's Office"; + network = list("ss13","rd") + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = -8; + pixel_y = -24 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) "moU" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 5 @@ -38301,17 +38061,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"mAc" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/tile/neutral/tram, -/turf/open/floor/noslip/tram_plate/energized{ - inbound = 1; - outbound = 2 - }, -/area/station/hallway/primary/tram/center) "mAf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -38373,6 +38122,17 @@ }, /turf/open/floor/plating, /area/station/science/xenobiology) +"mBo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/machinery/incident_display/tram/directional/north{ + desc = "A display that indicates how many dents that'll need fixed after the shift is over."; + name = "darwin award counter" + }, +/turf/open/floor/iron, +/area/station/maintenance/port/central) "mBq" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/crew_quarters/dorms) @@ -38414,16 +38174,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"mCM" = ( -/obj/machinery/firealarm/directional/east{ - pixel_y = -5 - }, -/obj/machinery/light_switch/directional/east{ - pixel_x = 23; - pixel_y = 8 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "mCO" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ @@ -39156,11 +38906,6 @@ }, /turf/open/floor/iron, /area/station/security/courtroom/holding) -"mQE" = ( -/obj/effect/landmark/tram/tramstation/east, -/obj/effect/turf_decal/tile/neutral/tram, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/right) "mQS" = ( /obj/structure/chair/comfy/beige, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -39349,6 +39094,12 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) +"mWp" = ( +/obj/machinery/atmospherics/components/tank/air{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/science/ordnance) "mWu" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -41463,11 +41214,6 @@ }, /turf/open/floor/iron/white, /area/station/security/medical) -"nHs" = ( -/obj/machinery/igniter/incinerator_atmos, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, -/turf/open/floor/engine/vacuum, -/area/station/maintenance/disposal/incinerator) "nHu" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -41492,22 +41238,6 @@ /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/iron, /area/station/commons/fitness) -"nIk" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/light_switch/directional/east{ - pixel_x = 22; - pixel_y = -8 - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/escape) "nIr" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -42045,6 +41775,25 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"nSd" = ( +/obj/machinery/button/door/directional/west{ + id = "commissarydeezdoorz"; + name = "Commissary Shutter Access" + }, +/obj/machinery/button/door/directional/west{ + id = "vacant_space"; + name = "Privacy Bolts"; + normaldoorcontrol = 1; + pixel_y = -9; + specialfunctions = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light_switch/directional/west{ + pixel_x = -22; + pixel_y = 9 + }, +/turf/open/floor/iron/dark, +/area/station/commons/vacant_room/commissary) "nSf" = ( /obj/structure/table, /obj/item/pai_card, @@ -42209,6 +41958,18 @@ /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/plating, /area/station/engineering/atmos/pumproom) +"nVd" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/light_switch/directional/south{ + pixel_x = 10; + pixel_y = -24 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "nVg" = ( /obj/machinery/door/airlock/hatch{ name = "Radstorm Shelter" @@ -42229,6 +41990,18 @@ /obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/iron/cafeteria, /area/station/science/breakroom) +"nVo" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/west, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit) "nVq" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -42939,6 +42712,21 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"oiI" = ( +/obj/machinery/firealarm/directional/south{ + pixel_x = -3 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/light_switch/directional/south{ + pixel_x = 8; + pixel_y = -23 + }, +/turf/open/floor/iron, +/area/station/cargo/miningdock/cafeteria) "oiL" = ( /obj/structure/filingcabinet, /obj/structure/window/spawner/directional/north, @@ -43430,17 +43218,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/corner, /turf/open/floor/iron/dark, /area/station/security/prison/garden) -"otr" = ( -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/turf/open/floor/engine/vacuum, -/area/station/maintenance/disposal/incinerator) "ots" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -43557,6 +43334,15 @@ }, /turf/open/floor/glass/reinforced, /area/station/science/research) +"ovK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/light/small/directional/south{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/science/ordnance) "ovL" = ( /turf/open/floor/iron, /area/station/hallway/secondary/service) @@ -43774,6 +43560,19 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/catwalk_floor, /area/station/solars/starboard/fore) +"oAn" = ( +/obj/machinery/airlock_sensor/incinerator_ordmix{ + pixel_x = 23; + pixel_y = 1 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) "oAG" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/effect/turf_decal/stripes{ @@ -44038,6 +43837,13 @@ /obj/structure/bookcase/random/nonfiction, /turf/open/floor/wood/large, /area/station/service/library) +"oHq" = ( +/obj/effect/turf_decal/tile/neutral/tram, +/turf/open/floor/noslip/tram_plate/energized{ + inbound = 2; + outbound = 3 + }, +/area/station/hallway/primary/tram/right) "oHC" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -44116,12 +43922,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, /area/station/medical/surgery/fore) -"oJV" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{ - dir = 8 - }, -/turf/open/floor/engine, -/area/station/science/ordnance/burnchamber) "oKe" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -44144,6 +43944,15 @@ /obj/structure/grille, /turf/open/space/openspace, /area/space/nearstation) +"oKn" = ( +/obj/machinery/elevator_control_panel{ + layer = 3.1; + linked_elevator_id = "tram_xeno_lift"; + pixel_y = 2; + preset_destination_names = list("2"="Lower Deck","3"="Upper Deck") + }, +/turf/closed/wall/r_wall, +/area/station/science/xenobiology) "oKZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -44232,18 +44041,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos) -"oNu" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/obj/structure/cable, -/obj/machinery/light_switch/directional/south{ - pixel_x = 10; - pixel_y = -24 - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) "oNA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown/fourcorners, @@ -44792,6 +44589,18 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"oZh" = ( +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 + }, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "oZq" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning{ dir = 8 @@ -44812,12 +44621,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"oZC" = ( -/obj/structure/industrial_lift/tram/white, -/obj/effect/landmark/tram/tramstation/central, -/obj/effect/turf_decal/tile/neutral/tram, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/center) "pal" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -45071,6 +44874,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/prison/safe) +"peB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/pump/on/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "peO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, @@ -45854,22 +45663,6 @@ }, /turf/open/floor/iron/white, /area/station/science/explab) -"prO" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 5 - }, -/obj/structure/table, -/obj/item/holosign_creator/atmos, -/obj/item/holosign_creator/atmos{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/structure/cable, -/obj/machinery/light/directional/east, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/science/ordnance) "prW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -45942,6 +45735,15 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"pts" = ( +/obj/machinery/power/smes{ + capacity = 9e+006; + charge = 10000 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "ptu" = ( /obj/structure/table/wood, /obj/item/folder/red, @@ -47158,6 +46960,18 @@ /obj/structure/ladder, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"pMS" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/airalarm/directional/north, +/obj/machinery/light_switch/directional/west{ + pixel_x = -23; + pixel_y = -8 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/arrivals) "pMW" = ( /turf/open/space/openspace, /area/space) @@ -47988,6 +47802,12 @@ }, /turf/open/floor/iron, /area/station/cargo/lobby) +"qeg" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) "qel" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -48309,6 +48129,19 @@ /obj/item/plant_analyzer, /turf/open/floor/iron/dark, /area/station/security/prison/garden) +"qjI" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/structure/table, +/obj/machinery/recharger, +/obj/structure/cable, +/obj/machinery/light_switch/directional/east{ + pixel_x = 23; + pixel_y = -8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "qjT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -48567,11 +48400,6 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) -"qoY" = ( -/obj/structure/lattice, -/obj/machinery/light/dim/directional/north, -/turf/open/openspace, -/area/station/asteroid) "qoZ" = ( /obj/item/paper/fluff/ids_for_dummies, /turf/open/misc/asteroid/airless, @@ -48976,12 +48804,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/cargo/warehouse) -"qyn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, -/obj/machinery/air_sensor/incinerator_tank, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/turf/open/floor/engine/vacuum, -/area/station/maintenance/disposal/incinerator) "qyr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk, @@ -49080,17 +48902,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"qzR" = ( -/obj/structure/table/wood, -/obj/machinery/firealarm/directional/south{ - pixel_x = 3 - }, -/obj/machinery/light_switch/directional/south{ - pixel_x = -8; - pixel_y = -23 - }, -/turf/open/floor/wood, -/area/station/commons/vacant_room/office) "qAb" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/decal/cleanable/dirt, @@ -49137,6 +48948,11 @@ /obj/machinery/door/window/right/directional/east, /turf/open/floor/iron, /area/station/security/brig) +"qBa" = ( +/obj/structure/lattice, +/obj/machinery/light/cold/dim/directional/west, +/turf/open/openspace, +/area/station/asteroid) "qBg" = ( /turf/open/floor/engine/plasma, /area/station/engineering/atmos) @@ -49152,6 +48968,23 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/command/bridge) +"qBA" = ( +/obj/machinery/disposal/bin, +/obj/machinery/firealarm/directional/west{ + pixel_y = 5 + }, +/obj/structure/plaque/static_plaque/golden/captain{ + pixel_y = 32 + }, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/obj/machinery/light_switch/directional/west{ + pixel_x = -23; + pixel_y = -8 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) "qBL" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -49499,6 +49332,20 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/dorms) +"qHI" = ( +/obj/structure/table/reinforced, +/obj/machinery/firealarm/directional/west, +/obj/item/storage/box, +/obj/item/hand_labeler{ + pixel_y = 8 + }, +/obj/effect/turf_decal/tile/brown/fourcorners, +/obj/machinery/light_switch/directional/west{ + pixel_x = -22; + pixel_y = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) "qHM" = ( /obj/structure/table/wood, /obj/effect/spawner/random/food_or_drink/refreshing_beverage, @@ -50018,6 +49865,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/science/xenobiology) +"qTg" = ( +/obj/effect/turf_decal/caution/stand_clear/white{ + dir = 8 + }, +/obj/machinery/door/window/elevator/left/directional/east{ + elevator_linked_id = "tram_dorm_lift"; + elevator_mode = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/tram/left) "qTp" = ( /obj/machinery/door/airlock{ id_tag = "private_b"; @@ -50208,6 +50065,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +"qWf" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white, +/area/station/science/ordnance) "qWy" = ( /obj/item/kirbyplants/random, /obj/machinery/newscaster/directional/south, @@ -50472,17 +50337,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/gravity_generator) -"qZZ" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit) "ram" = ( /obj/machinery/atmospherics/pipe/smart/manifold/violet/visible{ dir = 4 @@ -50654,6 +50508,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) +"rcx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/south{ + c_tag = "Secure - EVA Storage" + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = 8; + pixel_y = -23 + }, +/turf/open/floor/iron, +/area/station/ai_monitored/command/storage/eva) "rcA" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -50796,6 +50663,15 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/tram/right) +"rfe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, +/obj/machinery/light/small/directional/south{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "rff" = ( /obj/effect/turf_decal/trimline/dark_red/warning{ dir = 10 @@ -50834,11 +50710,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron, /area/station/engineering/atmos) -"rga" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/science/ordnance) "rge" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating/airless, @@ -51617,17 +51488,6 @@ "rtp" = ( /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation/entertainment) -"rtW" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ - dir = 8 - }, -/obj/machinery/firealarm/directional/west, -/obj/machinery/electrolyzer, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "run" = ( /turf/closed/wall/r_wall, /area/station/security/medical) @@ -51676,6 +51536,17 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/security/prison) +"ruF" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/tram, +/turf/open/floor/noslip/tram_plate/energized{ + inbound = 2; + outbound = 3 + }, +/area/station/hallway/primary/tram/center) "ruV" = ( /obj/machinery/computer/accounting{ dir = 1 @@ -51849,6 +51720,13 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) +"ryK" = ( +/obj/machinery/door/airlock/research{ + name = "Burn Chamber Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/plating, +/area/station/science/ordnance) "ryS" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -52565,17 +52443,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/tram/right) -"rOL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 4 - }, -/obj/machinery/incident_display/tram/directional/north{ - desc = "A display that indicates how many dents that'll need fixed after the shift is over."; - name = "darwin award counter" - }, -/turf/open/floor/iron, -/area/station/maintenance/port/central) "rOT" = ( /obj/machinery/airalarm/directional/north, /obj/structure/cable, @@ -52618,22 +52485,6 @@ /obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/center) -"rPr" = ( -/obj/item/radio/intercom/directional/west{ - pixel_y = 4 - }, -/obj/effect/turf_decal/trimline/dark_blue/arrow_cw{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/dark_blue/corner, -/obj/structure/railing/corner, -/obj/machinery/light/small/directional/west, -/obj/machinery/flasher/directional/west{ - pixel_x = -24; - pixel_y = -8 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hop) "rPs" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -52660,6 +52511,13 @@ }, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) +"rPL" = ( +/obj/structure/industrial_lift/tram/white, +/obj/effect/turf_decal/tile/neutral/tram, +/obj/effect/landmark/tram/nav/tramstation/main, +/obj/effect/landmark/tram/platform/tramstation/central, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "rPP" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -52943,16 +52801,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/science/explab) -"rUw" = ( -/obj/effect/turf_decal/caution/stand_clear/white{ - dir = 8 - }, -/obj/machinery/door/window/elevator/left/directional/east{ - elevator_linked_id = "tram_dorm_lift"; - elevator_mode = 1 - }, -/turf/open/floor/iron, -/area/station/maintenance/tram/left) "rUQ" = ( /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, @@ -53598,6 +53446,25 @@ dir = 4 }, /area/station/service/theater) +"siE" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Medical - Surgery B"; + network = list("ss13","medbay") + }, +/obj/machinery/vending/wallmed/directional/north, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/obj/machinery/light_switch/directional/east{ + pixel_x = 22; + pixel_y = -9 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) "siL" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -54008,15 +53875,6 @@ "spF" = ( /turf/open/floor/engine/vacuum, /area/station/engineering/atmos) -"spM" = ( -/obj/machinery/power/smes{ - capacity = 9e+006; - charge = 10000 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "sqc" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -54200,6 +54058,24 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/courtroom/holding) +"ssF" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/machinery/firealarm/directional/east, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light_switch/directional/east{ + pixel_x = 22; + pixel_y = -9 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "ssH" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/door/airlock/maintenance_hatch{ @@ -54285,6 +54161,18 @@ }, /turf/open/floor/wood/large, /area/station/service/theater) +"stJ" = ( +/obj/machinery/firealarm/directional/west{ + pixel_y = -3 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light_switch/directional/west{ + pixel_x = -23; + pixel_y = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) "stK" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/corner{ @@ -54684,16 +54572,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"sAW" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit) "sBr" = ( /obj/machinery/newscaster/directional/west, /obj/structure/disposalpipe/segment{ @@ -54818,15 +54696,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"sEt" = ( -/obj/machinery/elevator_control_panel{ - layer = 3.1; - linked_elevator_id = "tram_xeno_lift"; - pixel_y = 2; - preset_destination_names = list("2"="Lower Deck","3"="Upper Deck") - }, -/turf/closed/wall, -/area/station/science/xenobiology) "sEx" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -54999,6 +54868,13 @@ /obj/effect/mapping_helpers/airlock/access/all/security/entrance, /turf/open/floor/iron, /area/station/security/brig) +"sHB" = ( +/obj/effect/landmark/start/atmospheric_technician, +/obj/effect/landmark/navigate_destination/incinerator, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "sHH" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/ce) @@ -55243,16 +55119,6 @@ /obj/machinery/digital_clock/directional/south, /turf/open/floor/iron, /area/station/engineering/main) -"sMc" = ( -/obj/effect/turf_decal/caution/stand_clear/white{ - dir = 1 - }, -/obj/machinery/door/window/elevator/left/directional/south{ - elevator_linked_id = "tram_perma_lift"; - elevator_mode = 1 - }, -/turf/open/floor/iron, -/area/station/security/brig) "sMi" = ( /obj/machinery/modular_computer/preset/cargochat/service{ dir = 1 @@ -55633,6 +55499,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"sTn" = ( +/obj/structure/closet/toolcloset, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 10 + }, +/obj/machinery/airalarm/directional/west, +/obj/machinery/firealarm/directional/south{ + pixel_x = -3 + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = 8; + pixel_y = -23 + }, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) "sTq" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -56660,6 +56541,22 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/miningdock) +"tkH" = ( +/obj/machinery/firealarm/directional/west{ + pixel_y = 3 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/light_switch/directional/west{ + pixel_x = -23; + pixel_y = -8 + }, +/turf/open/floor/iron, +/area/station/security/processing) "tkP" = ( /obj/structure/railing{ dir = 8 @@ -56865,16 +56762,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) -"tpn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "tpp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -57293,6 +57180,10 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"twv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/closed/wall/r_wall, +/area/station/science/ordnance) "twz" = ( /turf/open/openspace, /area/station/hallway/secondary/entry) @@ -57712,6 +57603,13 @@ /obj/structure/fluff/tram_rail, /turf/open/openspace, /area/station/hallway/primary/tram/center) +"tCo" = ( +/obj/effect/turf_decal/tile/neutral/tram, +/turf/open/floor/noslip/tram_plate/energized{ + inbound = 1; + outbound = 2 + }, +/area/station/hallway/primary/tram/left) "tCw" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/corner{ @@ -58138,6 +58036,30 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/warehouse) +"tKm" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/trimline/neutral/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/corner, +/obj/effect/turf_decal/bot, +/obj/machinery/status_display/evac/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Departures - West Main" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/tram/nav/immovable_rod, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "tKt" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -58497,6 +58419,16 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/dorms) +"tRV" = ( +/obj/machinery/firealarm/directional/east{ + pixel_y = -5 + }, +/obj/machinery/light_switch/directional/east{ + pixel_x = 23; + pixel_y = 8 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "tRX" = ( /obj/machinery/vending/wardrobe/chef_wardrobe, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -58623,13 +58555,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"tTX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/tank/air{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/disposal/incinerator) "tUk" = ( /obj/structure/industrial_lift/tram, /obj/structure/window/reinforced/tram/directional/north, @@ -59177,16 +59102,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/medical/chemistry) -"udX" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit) "udY" = ( /obj/structure/table/wood, /obj/item/paper_bin/carbon{ @@ -59257,19 +59172,6 @@ /obj/machinery/light/cold/directional/north, /turf/open/floor/grass, /area/station/commons/dorms) -"ufg" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 9 - }, -/obj/machinery/airalarm/directional/north, -/obj/structure/disposalpipe/trunk, -/obj/machinery/light_switch/directional/west{ - pixel_x = -23; - pixel_y = -8 - }, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics) "ufh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59512,18 +59414,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) -"ujw" = ( -/obj/machinery/airalarm/directional/east, -/obj/effect/landmark/start/hangover, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "ujx" = ( /obj/machinery/conveyor{ dir = 6; @@ -60006,6 +59896,21 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) +"urf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 10 + }, +/obj/structure/ore_box, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/light_switch/directional/west{ + pixel_x = -22; + pixel_y = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "urm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1 @@ -60577,17 +60482,6 @@ }, /turf/open/floor/engine/hull, /area/station/solars/starboard/fore) -"uBh" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 9 - }, -/obj/machinery/light_switch/directional/west{ - pixel_x = -22; - pixel_y = -8 - }, -/turf/open/floor/iron, -/area/station/cargo/drone_bay) "uBo" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -60708,6 +60602,20 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance) +"uCB" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/storage/box/lights/mixed, +/obj/machinery/light_switch/directional/west{ + pixel_x = -23; + pixel_y = -8 + }, +/turf/open/floor/iron, +/area/station/commons/storage/tools) "uCC" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -61118,13 +61026,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"uHC" = ( -/obj/machinery/door/airlock/research{ - name = "Burn Chamber Maintenance" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, -/turf/open/floor/plating, -/area/station/science/ordnance) "uHF" = ( /obj/structure/railing{ dir = 4 @@ -61406,6 +61307,26 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"uMu" = ( +/obj/structure/table/glass, +/obj/item/storage/box/petridish{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/storage/box/petridish{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/item/radio/intercom/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Science - Cytology East"; + network = list("ss13","rd","xeno") + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "uME" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -61591,6 +61512,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/gravity_generator) +"uPp" = ( +/obj/effect/turf_decal/tile/neutral/tram, +/obj/effect/landmark/tram/platform/tramstation/west, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/left) "uPv" = ( /obj/machinery/washing_machine, /turf/open/floor/iron/cafeteria, @@ -61960,6 +61886,22 @@ /obj/item/pen, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) +"uXn" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Science - Mixing Lab"; + network = list("ss13","rd") + }, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/science/ordnance/burnchamber) "uXv" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -62332,11 +62274,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit) -"veJ" = ( -/obj/structure/lattice, -/obj/machinery/light/dim/directional/south, -/turf/open/openspace, -/area/station/asteroid) "veV" = ( /turf/closed/wall, /area/station/commons/toilet) @@ -62501,6 +62438,14 @@ /obj/effect/mapping_helpers/trapdoor_placer, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +"vhI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/atmos{ + name = "Turbine Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "vic" = ( /obj/machinery/lift_indicator{ linked_elevator_id = "tram_lower_center_lift"; @@ -63662,13 +63607,6 @@ /obj/machinery/light/cold/directional/south, /turf/open/openspace, /area/station/science/research) -"vCi" = ( -/obj/effect/landmark/start/atmospheric_technician, -/obj/effect/landmark/navigate_destination/incinerator, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "vCl" = ( /obj/effect/turf_decal/delivery/white, /obj/structure/holosign/barrier/atmos/tram, @@ -63833,6 +63771,23 @@ /obj/machinery/light/cold/directional/west, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"vEy" = ( +/obj/structure/closet/l3closet/janitor, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 6 + }, +/obj/item/restraints/legcuffs/beartrap, +/obj/item/restraints/legcuffs/beartrap, +/obj/machinery/light_switch/directional/east{ + pixel_x = 23; + pixel_y = 8 + }, +/turf/open/floor/iron, +/area/station/service/janitor) "vEK" = ( /obj/machinery/medical_kiosk, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -64106,6 +64061,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall/r_wall, /area/station/engineering/break_room) +"vJC" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/ordnance) "vKd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64393,6 +64355,17 @@ }, /turf/open/floor/iron/dark, /area/station/medical/break_room) +"vPw" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/electrolyzer, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "vPB" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -65206,21 +65179,6 @@ /obj/item/pickaxe/mini, /turf/open/misc/asteroid, /area/station/medical/chemistry) -"wgr" = ( -/obj/structure/closet/toolcloset, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 10 - }, -/obj/machinery/airalarm/directional/west, -/obj/machinery/firealarm/directional/south{ - pixel_x = -3 - }, -/obj/machinery/light_switch/directional/south{ - pixel_x = 8; - pixel_y = -23 - }, -/turf/open/floor/iron, -/area/station/construction/mining/aux_base) "wgB" = ( /obj/machinery/status_display/door_timer{ id = "engcell"; @@ -65542,15 +65500,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/greater) -"wlJ" = ( -/obj/machinery/elevator_control_panel{ - layer = 3.1; - linked_elevator_id = "tram_xeno_lift"; - pixel_y = 2; - preset_destination_names = list("2"="Lower Deck","3"="Upper Deck") - }, -/turf/closed/wall/r_wall, -/area/station/science/xenobiology) +"wlM" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "wlQ" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -65560,10 +65514,6 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) -"wmc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, -/turf/closed/wall, -/area/station/science/ordnance) "wml" = ( /obj/structure/chair/stool/directional/south, /turf/open/floor/carpet, @@ -65638,6 +65588,16 @@ /obj/effect/turf_decal/caution/stand_clear/red, /turf/open/floor/plating/elevatorshaft, /area/station/maintenance/tram/mid) +"wox" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/obj/machinery/door/window/elevator/left/directional/south{ + elevator_linked_id = "tram_perma_lift"; + elevator_mode = 1 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "woB" = ( /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/iron/white/smooth_corner{ @@ -65771,21 +65731,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"wqM" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/blood_filter, -/obj/item/clothing/gloves/latex/nitrile, -/obj/machinery/light_switch/directional/east{ - pixel_x = 22; - pixel_y = -9 - }, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/surgery/fore) "wqY" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -66437,6 +66382,18 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/station/engineering/atmos) +"wDi" = ( +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/light_switch/directional/east{ + pixel_x = 22; + pixel_y = -8 + }, +/turf/open/floor/iron/freezer, +/area/station/medical/coldroom) "wDt" = ( /obj/effect/landmark/event_spawn, /obj/structure/chair/stool/directional/east, @@ -66950,6 +66907,11 @@ }, /turf/open/floor/iron/white, /area/station/security/medical) +"wNq" = ( +/obj/machinery/igniter/incinerator_atmos, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) "wNs" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -67610,10 +67572,36 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/station/maintenance/tram/mid) +"xei" = ( +/obj/machinery/atmospherics/components/binary/pump/on, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) "xet" = ( /obj/machinery/hydroponics/constructable, /turf/open/floor/grass, /area/station/service/hydroponics) +"xeC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 8 + }, +/obj/machinery/firealarm/directional/north{ + pixel_x = 4 + }, +/obj/machinery/light_switch/directional/north{ + pixel_x = -6; + pixel_y = 28 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/science) "xeE" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=8"; @@ -68474,6 +68462,22 @@ "xwf" = ( /turf/closed/wall/r_wall, /area/station/maintenance/central/greater) +"xwi" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 5 + }, +/obj/structure/table, +/obj/item/holosign_creator/atmos, +/obj/item/holosign_creator/atmos{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/structure/cable, +/obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/science/ordnance) "xwz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68950,6 +68954,20 @@ /obj/structure/chair/office/tactical, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"xHB" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east{ + pixel_y = -5 + }, +/obj/machinery/light/cold/directional/east, +/obj/machinery/light_switch/directional/east{ + pixel_x = 23; + pixel_y = 8 + }, +/turf/open/floor/iron, +/area/station/command/bridge) "xHP" = ( /obj/machinery/medical_kiosk, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -68961,13 +68979,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/command/meeting_room) -"xIE" = ( -/obj/effect/turf_decal/tile/neutral/tram, -/turf/open/floor/noslip/tram_plate/energized{ - inbound = 1; - outbound = 2 - }, -/area/station/hallway/primary/tram/left) "xIL" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -69067,6 +69078,10 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"xKN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/closed/wall, +/area/station/maintenance/disposal/incinerator) "xKR" = ( /obj/machinery/button/door/directional/west{ id = "private_q"; @@ -69164,10 +69179,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"xMB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/science/ordnance) "xMI" = ( /obj/structure/window/spawner/directional/south, /obj/effect/turf_decal/stripes/line, @@ -69296,12 +69307,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/checkpoint/science) -"xNJ" = ( -/obj/machinery/atmospherics/components/binary/pump/on/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/science/ordnance) "xNP" = ( /obj/structure/chair/stool/bar/directional/south, /turf/open/floor/eighties, @@ -70005,15 +70010,6 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"ybO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/generic_maintenance_landmark, -/obj/machinery/light/small/directional/south{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/science/ordnance) "ybW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -86151,7 +86147,7 @@ fea jWs lDo ucA -gBZ +wox lvz gTv jWs @@ -90542,7 +90538,7 @@ abM pZW pZW pZW -rOL +mBo uss xir uwf @@ -91844,7 +91840,7 @@ mdI ewh ncF nJr -rUw +qTg nJr elr vay @@ -100049,7 +100045,7 @@ ekB bxX hIg hBr -gCJ +vEy ekB jkw bgp @@ -100281,7 +100277,7 @@ hFr nMu hFr kmh -jBb +lKE fwk paS lJS @@ -100290,7 +100286,7 @@ kpt haB kEf iTz -lNK +jeC jmk pYt lSI @@ -101566,7 +101562,7 @@ nUP nUP nUP nUP -ufg +meA cNr pKI qVV @@ -102870,7 +102866,7 @@ dNp ptn xyu cWZ -iVd +hCA jxV iAb iLv @@ -103622,7 +103618,7 @@ nUP sTz nUP nUP -hvF +ePd vCt jQS adi @@ -104917,7 +104913,7 @@ uAC qeD qxU alg -aPC +uCB aeG tMD aeG @@ -104929,7 +104925,7 @@ abM abM abM mGw -kBD +fXd aFb sKp sKp @@ -109096,7 +109092,7 @@ eqY rjw ucn rCd -rtW +vPw tzL gDq gwy @@ -109353,16 +109349,16 @@ eqY wJv xoW rCd -aHG -tpn +hUf +lEI saj shF tnj -crQ +oZh jMo -otr -qyn -dwl +fLW +kHt +ePj qha vXM vXM @@ -109611,15 +109607,15 @@ wJv bNN hDj tFe -fJc -vCi +wlM +sHB gqV sPv qWU vkW qWU -nHs -ktO +wNq +fzg qWU vXM vXM @@ -110381,7 +110377,7 @@ ibY hiT gjj rCd -spM +pts gEs nXQ rnA @@ -110639,9 +110635,9 @@ bNz bNz bNz rRy -dqA -hus -hus +vhI +xKN +xKN rdO rdO xOL @@ -110896,9 +110892,9 @@ aaa aaa aaa rRy -liJ -bLc -tTX +peB +rfe +hUa qWU aaa aeQ @@ -115712,7 +115708,7 @@ unl pfT jCH lob -gDj +oiI unl eyR djI @@ -116294,7 +116290,7 @@ hDT keT iEF fof -sEt +csn sXX akC hFP @@ -121425,7 +121421,7 @@ dfz xVv qOo qOo -jLg +lZJ yei gBr hee @@ -121680,11 +121676,11 @@ hox hox dfz vqO -xMB -xMB -aEr -eOZ -eOZ +edP +edP +uXn +hBl +hBl gkD gkD gkD @@ -121941,7 +121937,7 @@ wRv wRv vTp aei -iVD +xei aei aOB nzR @@ -122198,7 +122194,7 @@ nCh qOo qOo lfw -oJV +qeg puL fMQ cXy @@ -122455,7 +122451,7 @@ qOo qOo jGx aej -ctI +oAn aej dyX nzR @@ -122707,12 +122703,12 @@ mPV xjx qjp frV -prO -jpb -bBN +xwi +vJC +qWf rLG -hVR -hVR +eOZ +eOZ gkD gkD gkD @@ -122964,11 +122960,11 @@ qME qME stU frV -cAU -uHC -wmc -wmc -azP +frT +ryK +jLH +jLH +twv aaa aaa aaa @@ -123221,10 +123217,10 @@ qAl nMB ryI frV -ybO -xNJ -rga -cXM +ovK +lwt +gaO +mWp wBV aaa aaa @@ -146561,7 +146557,7 @@ tCX bUG azk hqi -qzR +fnv iyc kIZ kqf @@ -147856,7 +147852,7 @@ rlv oca uhv vyI -wgr +sTn oca jNb qsa @@ -149405,14 +149401,14 @@ xIL eVh kJU xQS -ski +fDF xQS pJE aGx uzt hTa ckM -gop +edu aUh mdY mpw @@ -150155,7 +150151,7 @@ hzN hzN exq fTM -hGP +rcx hzN xQv xQv @@ -150905,7 +150901,7 @@ xSX lJu avq avy -cpW +tkH xSX nDj aBK @@ -151461,7 +151457,7 @@ kcb wHT omH jKZ -rPr +cOE mHX jtg jvf @@ -151687,7 +151683,7 @@ qkr wjT stL kdr -sMc +cTR nca nca yji @@ -151703,7 +151699,7 @@ xMK xMK xQw nTm -aNj +gKF aBV utk aBV @@ -151968,7 +151964,7 @@ wHT fEf yhe vBn -mCM +tRV sik iOm ofA @@ -152269,7 +152265,7 @@ oVN hGD lue tEw -cTT +stJ lje jFJ pMW @@ -152521,7 +152517,7 @@ kzT aOC aNQ aPf -aVN +cDw oVN jFJ jFJ @@ -153260,7 +153256,7 @@ nYq yiM cFs lNP -xIE +tCo vVY cFs yiM @@ -153781,7 +153777,7 @@ aQm pow pyf fSr -kls +pMS ejD gzY fSr @@ -154068,7 +154064,7 @@ dVo eGl aUC vCZ -lmg +kbW jwf kkg buB @@ -154545,7 +154541,7 @@ erO aII cFs bEt -lUP +uPp rib cFs aMD @@ -155276,7 +155272,7 @@ dbo kkV dEv nJd -lWi +qjI hzk pfj awz @@ -155302,7 +155298,7 @@ eVC qyZ gWd azo -fwH +xHB qvK obW uvu @@ -155526,7 +155522,7 @@ rmB rmB dEv dEv -bCz +irf mcU eka dEv @@ -157101,7 +157097,7 @@ ltw xEo xEo xEo -gHN +qBA irG mcg xEo @@ -157380,7 +157376,7 @@ rnR tkv yiM nyM -lzs +ioU nyM fsC dmf @@ -158351,7 +158347,7 @@ auG idF idF idF -azh +gOA tag tFJ xeE @@ -158398,11 +158394,11 @@ yiM aEh iPy yiM -qoY +afz afS lzu afY -veJ +afz yiM iPy tBu @@ -158613,7 +158609,7 @@ tag abM abM tFJ -iVB +kyN qnr tyx qnr @@ -158654,13 +158650,13 @@ aaS afz afA afz -afz +qBa afy afP lzu afX afy -afz +qBa afz age abM @@ -164051,13 +164047,13 @@ afv afz afA afz -afz +byb afy afP wJq afX afy -afz +byb afz age afz @@ -164075,9 +164071,9 @@ odH kRL dJG qcj -clJ +lDl xUb -fkf +wDi qif apC abM @@ -164309,11 +164305,11 @@ izU vMI nEl izU -qoY +afz afV wJq aga -veJ +afz izU nEl dnp @@ -165615,11 +165611,11 @@ glU aKM oDd xRx -wqM +lWu tTN net xRx -bDc +siE hsh gnM apC @@ -165865,7 +165861,7 @@ iYv kFf ujv mOM -ckn +ssF kTS jyH dTZ @@ -166110,7 +166106,7 @@ lnx lHs kNT brr -mAc +cYq fbk kNT cYi @@ -166367,7 +166363,7 @@ nzj rqG kNT brr -mAc +cYq fbk kNT poG @@ -168166,7 +168162,7 @@ wCl fld tsf xXU -oZC +rPL ycE jSX jEO @@ -169965,7 +169961,7 @@ vok aFp kNT brr -dYH +ruF fbk kNT xXb @@ -170222,7 +170218,7 @@ hEp qRq kNT brr -dYH +ruF fbk kNT wuH @@ -170490,7 +170486,7 @@ wza izU fLb fIB -aCi +exT cuP iFP qPd @@ -172019,11 +172015,11 @@ izU eqK nEl izU -qoY +afz afS wJq afY -veJ +afz izU nEl mhE @@ -172275,13 +172271,13 @@ afv afz afA afz -afz +qBa afy afP wJq afX afy -afz +qBa afz age aaS @@ -172550,7 +172546,7 @@ hiZ wTP sFA uKP -cpb +liB qfS gNN whz @@ -172804,7 +172800,7 @@ abM abM oIa ePi -fQU +bZI fuo nXh axE @@ -177672,13 +177668,13 @@ afv afz afA afz -afz +byb afy afP lMF afX afy -afz +byb afz age aaS @@ -177930,11 +177926,11 @@ bMb lyt ghV bMb -qoY +afz afS lMF afY -veJ +afz bMb ghV bXG @@ -179467,7 +179463,7 @@ usY mgh uYZ oSB -oNu +nVd vUE bMb car @@ -179731,7 +179727,7 @@ psy jip seR kTK -fwA +kck gOF seR srW @@ -179988,7 +179984,7 @@ yeB hYv seR kTK -fwA +kck gOF seR ptB @@ -180517,7 +180513,7 @@ nUy ccO sPI piv -kbx +ecV ccO qUA uCQ @@ -181576,7 +181572,7 @@ eJQ bNx aSt aSt -wlJ +oKn aaa aaa aaa @@ -181787,7 +181783,7 @@ nqj dCf brm puY -mQE +kfr bTT brm nwQ @@ -182072,7 +182068,7 @@ tes lWv xPR kye -cGx +moQ pbH kBo kJA @@ -182553,7 +182549,7 @@ lSM aDv bKY fgi -rEB +liX eOw dfx brm @@ -182857,7 +182853,7 @@ qVr kvO cZH pWw -eqw +uMu mLO qVr qVr @@ -183053,14 +183049,14 @@ eVn eVn eVn eCw -iaC +urf pRM uHb aAN aBe vCv mAS -lmO +qHI fur cJm jjS @@ -183072,7 +183068,7 @@ iIS bMb brm iOd -fIn +oHq vPi brm bMb @@ -183843,7 +183839,7 @@ rsP raY ljn ljn -ujw +iPP ljn ljn eRQ @@ -184124,7 +184120,7 @@ kvt kvt kvt syv -hSS +xeC gFO beF syv @@ -184363,7 +184359,7 @@ brm nSI awY vDI -gbJ +nSd rMB gAQ eoX @@ -184846,7 +184842,7 @@ aac aac aaa xxZ -uBh +hze bYD axz uwE @@ -185382,13 +185378,13 @@ iSf jha qDn ajg -qZZ -ksO +nVo +ajg hSt pgo kAO -sAW -udX +kAO +aMF kAO duA bPO @@ -186927,7 +186923,7 @@ qFH kIo tEk jBk -lav +tKm nfJ rdT lgO @@ -187691,7 +187687,7 @@ pMW pSV xpE krq -nIk +eIS vQX dJp jrc diff --git a/code/__DEFINES/industrial_lift.dm b/code/__DEFINES/industrial_lift.dm index a5b8a9f756b..5ab2406229d 100644 --- a/code/__DEFINES/industrial_lift.dm +++ b/code/__DEFINES/industrial_lift.dm @@ -12,6 +12,9 @@ ///debug lift_id #define DEBUG_LIFT_ID "debug" +///used for navigation aids that aren't actual platforms +#define TRAM_NAV_BEACONS "tram_nav" +#define IMMOVABLE_ROD_DESTINATIONS "immovable_rod" //specific_lift_id's ///the specific_lift_id of the main station tram landmark for tramstation that spawns roundstart. diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 8ca80414a15..84c475779cd 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -212,6 +212,8 @@ GLOBAL_LIST_INIT(turfs_openspace, typecacheof(list( #define ismachinery(A) (istype(A, /obj/machinery)) +#define istramwall(A) (istype(A, /obj/structure/window/reinforced/tram/front)) + #define isvendor(A) (istype(A, /obj/machinery/vending)) #define isvehicle(A) (istype(A, /obj/vehicle)) diff --git a/code/__DEFINES/tram.dm b/code/__DEFINES/tram.dm index 8b7ff3a0bac..a88086b36a5 100644 --- a/code/__DEFINES/tram.dm +++ b/code/__DEFINES/tram.dm @@ -26,3 +26,7 @@ #define BIRDSHOT_MAINTENANCE_LEFT 1 #define BRIDSHOT_MAINTENANCE_RIGHT 2 + +/// Tram navigation directions +#define OUTBOUND 1 +#define INBOUND -1 diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm index 552b995aab4..8ca5fd8b10e 100644 --- a/code/modules/assembly/doorcontrol.dm +++ b/code/modules/assembly/doorcontrol.dm @@ -221,9 +221,12 @@ if(!tram || !tram.is_operational) //tram is QDEL or has no power say("The tram is not in service. Please send a technician to repair the internals of the tram.") return - if(tram.travelling) //in use + if(tram.travelling) //already on its way say("The tram is already travelling to [tram.idle_platform].") return + if(tram.controls_locked) //attempting a dispatch or on cooldown + say("The tram controller is busy. Try again in a moment.") + return if(!destination_platform) return var/obj/effect/landmark/tram/current_location = destination_platform.resolve() @@ -233,5 +236,8 @@ say("The tram is already here. Please board the tram and select a destination.") return - say("The tram has been called to [current_location.name]. Please wait for its arrival.") - tram.tram_travel(current_location) + if(tram.tram_travel(current_location)) + say("The tram has been called to [current_location.name]. Please wait for its arrival.") + return + else + say("The tram controller has encountered an error. Try again in a moment.") diff --git a/code/modules/events/immovable_rod/immovable_rod.dm b/code/modules/events/immovable_rod/immovable_rod.dm index 07aa4d25683..e2350d810a6 100644 --- a/code/modules/events/immovable_rod/immovable_rod.dm +++ b/code/modules/events/immovable_rod/immovable_rod.dm @@ -182,7 +182,12 @@ SSexplosions.highturf += clong return ..() + // If we Bump into the tram front or back, push the tram. Otherwise smash the object as usual. if(isobj(clong)) + if(istramwall(clong) && !special_target) + rod_vs_tram_battle(clong) + return ..() + var/obj/clong_obj = clong clong_obj.take_damage(INFINITY, BRUTE, NONE, TRUE, dir, INFINITY) return ..() @@ -290,3 +295,25 @@ /obj/effect/immovablerod/proc/walk_in_direction(direction) destination_turf = get_edge_target_turf(src, direction) SSmove_manager.move_towards(src, destination_turf) + +/** + * Rod will push the tram to a landmark if it hits the tram from the front/back + * while flying parallel. + */ +/obj/effect/immovablerod/proc/rod_vs_tram_battle() + var/obj/structure/industrial_lift/tram/industrial_lift = locate() in src.loc + + if(isnull(industrial_lift)) + return + + var/datum/lift_master/tram/lift_master = industrial_lift.lift_master_datum + + if(isnull(lift_master)) + return + + var/push_target = lift_master.rod_collision(src) + + if(!push_target) + return + + go_for_a_walk(push_target) diff --git a/code/modules/industrial_lift/tram/tram_landmark.dm b/code/modules/industrial_lift/tram/tram_landmark.dm index 0c6648c6d42..72dd32698dc 100644 --- a/code/modules/industrial_lift/tram/tram_landmark.dm +++ b/code/modules/industrial_lift/tram/tram_landmark.dm @@ -19,44 +19,9 @@ GLOBAL_LIST_EMPTY(tram_landmarks) LAZYREMOVEASSOC(GLOB.tram_landmarks, specific_lift_id, src) return ..() -//tramstation - -/obj/effect/landmark/tram/tramstation/west - name = "West Wing" - platform_code = TRAMSTATION_WEST - tgui_icons = list("Arrivals" = "plane-arrival", "Command" = "bullhorn", "Security" = "gavel") - -/obj/effect/landmark/tram/tramstation/central - name = "Central Wing" - platform_code = TRAMSTATION_CENTRAL - tgui_icons = list("Service" = "cocktail", "Medical" = "plus", "Engineering" = "wrench") - -/obj/effect/landmark/tram/tramstation/east - name = "East Wing" - platform_code = TRAMSTATION_EAST - tgui_icons = list("Departures" = "plane-departure", "Cargo" = "box", "Science" = "flask") - -//birdshot - -/obj/effect/landmark/tram/birdshot/sec_wing - name = "Security Wing" - platform_code = BIRDSHOT_SECURITY_WING - tgui_icons = list("Security" = "gavel") - -/obj/effect/landmark/tram/birdshot/prison_wing - name = "Prison Wing" - platform_code = BIRDSHOT_PRISON_WING - tgui_icons = list("Prison" = "box") - -/obj/effect/landmark/tram/birdshot/maint_left - name = "Port Platform" - platform_code = BIRDSHOT_MAINTENANCE_LEFT - tgui_icons = list("Port Platform" = "plane-departure") - -/obj/effect/landmark/tram/birdshot/maint_right - name = "Starboard Platform" - platform_code = BRIDSHOT_MAINTENANCE_RIGHT - tgui_icons = list("Starboard Platform" = "plane-arrival") +/obj/effect/landmark/tram/nav + name = "tram nav beacon" + invisibility = INVISIBILITY_MAXIMUM // nav aids can't be abstract since they stay with the tram /** * lift_id landmarks. used to map in specific_lift_id to trams. when the trams lift_master encounters one on a trams tile @@ -65,6 +30,80 @@ GLOBAL_LIST_EMPTY(tram_landmarks) /obj/effect/landmark/lift_id name = "lift id setter" icon_state = "lift_id" - - ///what specific id we give to the tram we're placed on, should explicitely set this if its a subtype, or weird things might happen + ///what specific id we give to the tram we're placed on, should explicitly set this if its a subtype, or weird things might happen var/specific_lift_id = MAIN_STATION_TRAM + +//tramstation + +/obj/effect/landmark/tram/nav/tramstation/main + name = MAIN_STATION_TRAM + specific_lift_id = TRAM_NAV_BEACONS + dir = WEST + +/obj/effect/landmark/tram/platform/tramstation/west + name = "West Wing" + platform_code = TRAMSTATION_WEST + tgui_icons = list("Arrivals" = "plane-arrival", "Command" = "bullhorn", "Security" = "gavel") + +/obj/effect/landmark/tram/platform/tramstation/central + name = "Central Wing" + platform_code = TRAMSTATION_CENTRAL + tgui_icons = list("Service" = "cocktail", "Medical" = "plus", "Engineering" = "wrench") + +/obj/effect/landmark/tram/platform/tramstation/east + name = "East Wing" + platform_code = TRAMSTATION_EAST + tgui_icons = list("Departures" = "plane-departure", "Cargo" = "box", "Science" = "flask") + +//map-agnostic landmarks + +/obj/effect/landmark/tram/nav/immovable_rod + name = "DESTINATION/NOT/FOUND" + specific_lift_id = IMMOVABLE_ROD_DESTINATIONS + +/obj/effect/landmark/tram/nav/hilbert/research + name = HILBERT_TRAM + specific_lift_id = TRAM_NAV_BEACONS + dir = WEST + +//birdshot + +/obj/effect/landmark/lift_id/birdshot/prison + specific_lift_id = PRISON_TRAM + +/obj/effect/landmark/lift_id/birdshot/maint + specific_lift_id = MAINTENANCE_TRAM + +/obj/effect/landmark/tram/nav/birdshot/prison + name = PRISON_TRAM + specific_lift_id = TRAM_NAV_BEACONS + dir = NORTH + +/obj/effect/landmark/tram/nav/birdshot/maint + name = MAINTENANCE_TRAM + specific_lift_id = TRAM_NAV_BEACONS + dir = WEST + +/obj/effect/landmark/tram/platform/birdshot/sec_wing + name = "Security Wing" + specific_lift_id = PRISON_TRAM + platform_code = BIRDSHOT_SECURITY_WING + tgui_icons = list("Security" = "gavel") + +/obj/effect/landmark/tram/platform/birdshot/prison_wing + name = "Prison Wing" + specific_lift_id = PRISON_TRAM + platform_code = BIRDSHOT_PRISON_WING + tgui_icons = list("Prison" = "box") + +/obj/effect/landmark/tram/platform/birdshot/maint_left + name = "Port Platform" + specific_lift_id = MAINTENANCE_TRAM + platform_code = BIRDSHOT_MAINTENANCE_LEFT + tgui_icons = list("Port Platform" = "plane-departure") + +/obj/effect/landmark/tram/platform/birdshot/maint_right + name = "Starboard Platform" + specific_lift_id = MAINTENANCE_TRAM + platform_code = BRIDSHOT_MAINTENANCE_RIGHT + tgui_icons = list("Starboard Platform" = "plane-arrival") diff --git a/code/modules/industrial_lift/tram/tram_lift_master.dm b/code/modules/industrial_lift/tram/tram_lift_master.dm index ed031d3dd24..0a60eedfb43 100644 --- a/code/modules/industrial_lift/tram/tram_lift_master.dm +++ b/code/modules/industrial_lift/tram/tram_lift_master.dm @@ -17,6 +17,9 @@ /// and the destination landmark. var/obj/effect/landmark/tram/idle_platform + /// a navigational landmark that we use to find the tram's location on the map at any time + var/obj/effect/landmark/tram/nav/nav_beacon + ///decisecond delay between horizontal movement. cannot make the tram move faster than 1 movement per world.tick_lag. ///this var is poorly named its actually horizontal movement delay but whatever. var/horizontal_speed = 0.5 @@ -58,14 +61,18 @@ /datum/lift_master/tram/check_for_landmarks(obj/structure/industrial_lift/tram/new_lift_platform) . = ..() for(var/turf/platform_loc as anything in new_lift_platform.locs) - var/obj/effect/landmark/tram/initial_destination = locate() in platform_loc + var/obj/effect/landmark/tram/platform/initial_destination = locate() in platform_loc + var/obj/effect/landmark/tram/nav/beacon = locate() in platform_loc if(initial_destination) idle_platform = initial_destination + if(initial_destination) + nav_beacon = beacon + /datum/lift_master/tram/proc/check_starting_landmark() - if(!idle_platform) - CRASH("a tram lift_master was initialized without any tram landmark to give it direction!") + if(!idle_platform || !nav_beacon) + CRASH("a tram lift_master was initialized without the required landmarks to give it direction!") SStramprocess.can_fire = TRUE @@ -114,19 +121,21 @@ */ /datum/lift_master/tram/proc/tram_travel(obj/effect/landmark/tram/destination_platform, rapid = FALSE) if(destination_platform == idle_platform) - return + return FALSE - travel_direction = get_dir(idle_platform, destination_platform) - travel_distance = get_dist(idle_platform, destination_platform) + travel_direction = get_dir(nav_beacon, destination_platform) + travel_distance = get_dist(nav_beacon, destination_platform) travel_trip_length = travel_distance idle_platform = destination_platform set_travelling(TRUE) set_controls(LIFT_PLATFORM_LOCKED) if(rapid) // bypass for unsafe, rapid departure dispatch_tram(destination_platform) + return TRUE else update_tram_doors(CLOSE_DOORS) addtimer(CALLBACK(src, PROC_REF(dispatch_tram), destination_platform), 3 SECONDS) + return TRUE /datum/lift_master/tram/proc/dispatch_tram(obj/effect/landmark/tram/destination_platform) SEND_SIGNAL(src, COMSIG_TRAM_TRAVEL, idle_platform, destination_platform) @@ -219,3 +228,103 @@ else stack_trace("Tram doors update_tram_doors called with an improper action ([action]).") + +/datum/lift_master/tram/proc/set_operational(new_value) + if(is_operational != new_value) + is_operational = new_value + +/** + * Returns the closest tram nav beacon to an atom + * + * Creates a list of nav beacons in the requested direction + * and returns the closest to be passed to the industrial_lift + * + * Arguments: source: the starting point to find a beacon + * travel_dir: travel direction in tram form, INBOUND or OUTBOUND + * beacon_type: what list of beacons we pull from + */ +/datum/lift_master/tram/proc/closest_nav_in_travel_dir(atom/origin, travel_dir, beacon_type) + if(!istype(origin) || !origin.z) + return FALSE + + var/list/obj/effect/landmark/tram/nav/inbound_candidates = list() + var/list/obj/effect/landmark/tram/nav/outbound_candidates = list() + + for(var/obj/effect/landmark/tram/nav/candidate_beacon in GLOB.tram_landmarks[beacon_type]) + if(candidate_beacon.z != origin.z || candidate_beacon.z != nav_beacon.z) + continue + + switch(nav_beacon.dir) + if(EAST, WEST) + if(candidate_beacon.y != nav_beacon.y) + continue + else if(candidate_beacon.x < nav_beacon.x) + inbound_candidates += candidate_beacon + else + outbound_candidates += candidate_beacon + if(NORTH, SOUTH) + if(candidate_beacon.x != nav_beacon.x) + continue + else if(candidate_beacon.y < nav_beacon.y) + inbound_candidates += candidate_beacon + else + outbound_candidates += candidate_beacon + + switch(travel_dir) + if(INBOUND) + var/obj/effect/landmark/tram/nav/selected = get_closest_atom(/obj/effect/landmark/tram/nav, inbound_candidates, origin) + if(selected) + return selected + stack_trace("No inbound beacon candidate found for [origin]. Cancelling dispatch.") + return FALSE + + if(OUTBOUND) + var/obj/effect/landmark/tram/nav/selected = get_closest_atom(/obj/effect/landmark/tram/nav, outbound_candidates, origin) + if(selected) + return selected + stack_trace("No outbound beacon candidate found for [origin]. Cancelling dispatch.") + return FALSE + + else + stack_trace("Tram receieved invalid travel direction [travel_dir]. Cancelling dispatch.") + + return FALSE + +/** + * Moves the tram when hit by an immovable rod + * + * Tells the individual tram parts where to actually go and has an extra safety checks + * incase multiple inputs get through, preventing conflicting directions and the tram + * literally ripping itself apart. all of the actual movement is handled by SStramprocess + * + * Arguments: collided_rod (the immovable rod that hit the tram) + * Return: push_destination (the landmark /obj/effect/landmark/tram/nav that the tram is being pushed to due to the rod's trajectory) + */ +/datum/lift_master/tram/proc/rod_collision(obj/effect/immovablerod/collided_rod) + if(!is_operational) + return + var/rod_velocity_sign + // Determine inbound or outbound + if(collided_rod.dir & (NORTH|SOUTH)) + rod_velocity_sign = collided_rod.dir & NORTH ? OUTBOUND : INBOUND + else + rod_velocity_sign = collided_rod.dir & EAST ? OUTBOUND : INBOUND + + var/obj/effect/landmark/tram/nav/push_destination = closest_nav_in_travel_dir(origin = nav_beacon, travel_dir = rod_velocity_sign, beacon_type = IMMOVABLE_ROD_DESTINATIONS) + if(!push_destination) + return + travel_direction = get_dir(nav_beacon, push_destination) + travel_distance = get_dist(nav_beacon, push_destination) + travel_trip_length = travel_distance + idle_platform = push_destination + // Don't bother processing crossing signals, where this tram's going there are no signals + for(var/obj/machinery/crossing_signal/xing as anything in GLOB.tram_signals) + xing.temp_malfunction() + priority_announce("In a turn of rather peculiar events, it appears that [GLOB.station_name] has struck an immovable rod. (Don't ask us where it came from.) This has led to a station brakes failure on one of the tram platforms.\n\n\ + Our diligent team of engineers have been informed and they're rushing over - although not quite at the speed of our recently flying tram.\n\n\ + So while we all look in awe at the universe's mysterious sense of humour, please stand clear of the tracks and remember to stand behind the yellow line.", "Braking News") + set_travelling(TRUE) + set_controls(LIFT_PLATFORM_LOCKED) + dispatch_tram(destination_platform = push_destination) + set_operational(FALSE) + return push_destination diff --git a/code/modules/industrial_lift/tram/tram_machinery.dm b/code/modules/industrial_lift/tram/tram_machinery.dm index 1a092052229..2e4399cce70 100644 --- a/code/modules/industrial_lift/tram/tram_machinery.dm +++ b/code/modules/industrial_lift/tram/tram_machinery.dm @@ -144,7 +144,8 @@ GLOBAL_LIST_EMPTY(tram_doors) return FALSE if(tram_part.controls_locked || tram_part.travelling) // someone else started already return FALSE - tram_part.tram_travel(destination_platform) + if(!tram_part.tram_travel(destination_platform)) + return FALSE // lift_master failure say("The next station is: [destination_platform.name]") update_appearance() return TRUE @@ -412,6 +413,10 @@ GLOBAL_LIST_EMPTY(tram_doors) malfunctioning = FALSE process() +/obj/machinery/crossing_signal/proc/temp_malfunction() + start_malfunction() + addtimer(CALLBACK(src, PROC_REF(end_malfunction)), 15 SECONDS) + /** * Finds the tram, just like the tram computer * @@ -692,44 +697,44 @@ GLOBAL_LIST_EMPTY(tram_doors) return PROCESS_KILL if(!tram.travelling) - if(istype(tram.idle_platform, /obj/effect/landmark/tram/tramstation/west)) + if(istype(tram.idle_platform, /obj/effect/landmark/tram/platform/tramstation/west)) icon_state = "[base_icon_state][DESTINATION_WEST_IDLE]" light_mask = "[base_icon_state][DESTINATION_WEST_IDLE]_e" previous_destination = tram.idle_platform update_appearance() return PROCESS_KILL - if(istype(tram.idle_platform, /obj/effect/landmark/tram/tramstation/central)) + if(istype(tram.idle_platform, /obj/effect/landmark/tram/platform/tramstation/central)) icon_state = "[base_icon_state][DESTINATION_CENTRAL_IDLE]" light_mask = "[base_icon_state][DESTINATION_CENTRAL_IDLE]_e" previous_destination = tram.idle_platform update_appearance() return PROCESS_KILL - if(istype(tram.idle_platform, /obj/effect/landmark/tram/tramstation/east)) + if(istype(tram.idle_platform, /obj/effect/landmark/tram/platform/tramstation/east)) icon_state = "[base_icon_state][DESTINATION_EAST_IDLE]" light_mask = "[base_icon_state][DESTINATION_EAST_IDLE]_e" previous_destination = tram.idle_platform update_appearance() return PROCESS_KILL - if(istype(tram.idle_platform, /obj/effect/landmark/tram/tramstation/west)) + if(istype(tram.idle_platform, /obj/effect/landmark/tram/platform/tramstation/west)) icon_state = "[base_icon_state][DESTINATION_WEST_ACTIVE]" light_mask = "[base_icon_state][DESTINATION_WEST_ACTIVE]_e" update_appearance() return PROCESS_KILL - if(istype(tram.idle_platform, /obj/effect/landmark/tram/tramstation/central)) - if(istype(previous_destination, /obj/effect/landmark/tram/tramstation/west)) + if(istype(tram.idle_platform, /obj/effect/landmark/tram/platform/tramstation/central)) + if(istype(previous_destination, /obj/effect/landmark/tram/platform/tramstation/west)) icon_state = "[base_icon_state][DESTINATION_CENTRAL_EASTBOUND_ACTIVE]" light_mask = "[base_icon_state][DESTINATION_CENTRAL_EASTBOUND_ACTIVE]_e" - if(istype(previous_destination, /obj/effect/landmark/tram/tramstation/east)) + if(istype(previous_destination, /obj/effect/landmark/tram/platform/tramstation/east)) icon_state = "[base_icon_state][DESTINATION_CENTRAL_WESTBOUND_ACTIVE]" light_mask = "[base_icon_state][DESTINATION_CENTRAL_WESTBOUND_ACTIVE]_e" update_appearance() return PROCESS_KILL - if(istype(tram.idle_platform, /obj/effect/landmark/tram/tramstation/east)) + if(istype(tram.idle_platform, /obj/effect/landmark/tram/platform/tramstation/east)) icon_state = "[base_icon_state][DESTINATION_EAST_ACTIVE]" light_mask = "[base_icon_state][DESTINATION_EAST_ACTIVE]_e" update_appearance() diff --git a/code/modules/industrial_lift/tram/tram_remote.dm b/code/modules/industrial_lift/tram/tram_remote.dm index d29d595e08d..abb3b430e18 100644 --- a/code/modules/industrial_lift/tram/tram_remote.dm +++ b/code/modules/industrial_lift/tram/tram_remote.dm @@ -1,5 +1,3 @@ -#define TRAMCTRL_INBOUND 1 -#define TRAMCTRL_OUTBOUND 0 #define TRAMCTRL_FAST 1 #define TRAMCTRL_SAFE 0 @@ -13,7 +11,7 @@ desc = "A remote control that can be linked to a tram. This can only go well." w_class = WEIGHT_CLASS_TINY ///desired tram direction - var/direction = TRAMCTRL_INBOUND + var/direction = INBOUND ///fast and fun, or safe and boring var/mode = TRAMCTRL_FAST ///weakref to the tram piece we control @@ -37,10 +35,10 @@ ///set tram control direction /obj/item/tram_remote/attack_self_secondary(mob/user) switch(direction) - if(TRAMCTRL_INBOUND) - direction = TRAMCTRL_OUTBOUND - if(TRAMCTRL_OUTBOUND) - direction = TRAMCTRL_INBOUND + if(INBOUND) + direction = OUTBOUND + if(OUTBOUND) + direction = INBOUND update_appearance() balloon_alert(user, "[direction ? "< inbound" : "outbound >"]") return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN @@ -77,9 +75,9 @@ icon_state = "tramremote_nis" return switch(direction) - if(TRAMCTRL_INBOUND) + if(INBOUND) icon_state = "tramremote_ib" - if(TRAMCTRL_OUTBOUND) + if(OUTBOUND) icon_state = "tramremote_ob" /obj/item/tram_remote/update_overlays() @@ -107,9 +105,9 @@ var/destination_platform = null var/platform = 0 switch(direction) - if(TRAMCTRL_INBOUND) + if(INBOUND) platform = clamp(tram_part.idle_platform.platform_code - 1, 1, INFINITY) - if(TRAMCTRL_OUTBOUND) + if(OUTBOUND) platform = clamp(tram_part.idle_platform.platform_code + 1, 1, INFINITY) if(platform == tram_part.idle_platform.platform_code) balloon_alert(user, "invalid command!") @@ -148,7 +146,5 @@ balloon_alert(user, "link failed!") update_appearance() -#undef TRAMCTRL_INBOUND -#undef TRAMCTRL_OUTBOUND #undef TRAMCTRL_FAST #undef TRAMCTRL_SAFE diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm index 71e897438b4..4fcc88b89bc 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm @@ -527,22 +527,26 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) to_chat(user, "No vacated rooms.") return . -/obj/effect/landmark/lift_id/hilbert +/obj/effect/landmark/lift_id/hilbert/research specific_lift_id = HILBERT_TRAM -/obj/effect/landmark/tram/hilbert/left +/obj/effect/landmark/tram/nav/hilbert/research + name = HILBERT_TRAM + specific_lift_id = TRAM_NAV_BEACONS + +/obj/effect/landmark/tram/platform/hilbert/left name = "Port" specific_lift_id = HILBERT_TRAM platform_code = HILBERT_PORT tgui_icons = list("Reception" = "briefcase", "Botany" = "leaf", "Chemistry" = "flask") -/obj/effect/landmark/tram/hilbert/middle +/obj/effect/landmark/tram/platform/hilbert/middle name = "Central" specific_lift_id = HILBERT_TRAM platform_code = HILBERT_CENTRAL tgui_icons = list("Processing" = "cogs", "Xenobiology" = "paw") -/obj/effect/landmark/tram/hilbert/right +/obj/effect/landmark/tram/platform/hilbert/right name = "Starboard" specific_lift_id = HILBERT_TRAM platform_code = HILBERT_STARBOARD