From 2ed900066df7763c24c914caae2815d8468c7cc8 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Sun, 1 Dec 2024 02:01:24 -0600 Subject: [PATCH 1/2] BoxStation Post-Merge Fixes 4.3 Further continuation of pull requests 3405 and 4054. --- _maps/map_files/BoxStation/BoxStation.dmm | 3720 +++++++++-------- .../RandomEngines/BoxStation/empty.dmm | 175 +- .../BoxStation/particle_accelerator.dmm | 395 +- .../RandomEngines/BoxStation/sm_teg.dmm | 3251 +++++++------- .../RandomEngines/BoxStation/supermatter.dmm | 199 +- .../RandomEngines/BoxStation/teg.dmm | 327 +- .../code/modules/_paperwork/paper_premade.dm | 15 + 7 files changed, 4386 insertions(+), 3696 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 81453cd19b59..3adba1e4507d 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -65,13 +65,13 @@ /area/station/security/warden) "abf" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 + dir = 5 }, -/obj/machinery/light/directional/north, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/structure/chair/stool/directional/east, -/obj/effect/landmark/start/geneticist, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/duct, /turf/open/floor/iron/white, /area/station/science/genetics/cloning) "abv" = ( @@ -145,6 +145,7 @@ dir = 4 }, /obj/machinery/camera/autoname/directional/west, +/obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "acE" = ( @@ -171,6 +172,7 @@ "acX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/cable/layer1, /turf/open/floor/iron, /area/station/engineering/engine_smes) "adc" = ( @@ -397,9 +399,11 @@ /turf/open/floor/carpet/neon/simple/pink, /area/station/science/xenobiology) "agn" = ( -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/north{ + pixel_x = 5 + }, /obj/machinery/light_switch/directional/north{ - pixel_x = -8 + pixel_x = -5 }, /obj/structure/disposalpipe/trunk{ dir = 8 @@ -585,9 +589,6 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "ajR" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -613,10 +614,9 @@ /area/station/maintenance/port/fore) "aks" = ( /obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/pink/hidden{ + dir = 8 }, -/obj/machinery/portable_atmospherics/canister, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "akO" = ( @@ -723,6 +723,12 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) +"ami" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/engineering/atmos/office) "aml" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -773,7 +779,7 @@ "anm" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/plumbing/ooze_compressor{ - dir = 4 + dir = 8 }, /turf/open/floor/iron/white, /area/station/science/xenobiology) @@ -791,8 +797,8 @@ "any" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/service/hydroponics/garden) "anF" = ( @@ -889,7 +895,9 @@ /turf/open/floor/wood, /area/station/command/meeting_room) "aoX" = ( -/turf/open/floor/wood, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/molten_object, +/turf/open/floor/stone, /area/station/smithing) "aoZ" = ( /obj/machinery/power/apc/auto_name/directional/north, @@ -1002,7 +1010,6 @@ /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/turret_protected/aisat/foyer) "aqj" = ( -/obj/machinery/light/directional/west, /obj/structure/chair/comfy/brown, /obj/effect/landmark/start/hangover, /turf/open/floor/carpet, @@ -1011,7 +1018,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 }, -/obj/machinery/status_display/evac/directional/west, +/obj/machinery/status_display/ai/directional/south, /obj/machinery/mecha_part_fabricator{ dir = 4 }, @@ -1076,7 +1083,6 @@ /turf/open/floor/plating, /area/station/service/hydroponics/garden) "arN" = ( -/obj/structure/window/reinforced/spawner/directional/south, /obj/structure/cable/multilayer/connected, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) @@ -1145,7 +1151,6 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 1 }, -/obj/structure/cable, /obj/structure/filingcabinet, /turf/open/floor/iron/dark, /area/station/security/office) @@ -1595,31 +1600,10 @@ }, /obj/machinery/light/small/directional/west, /obj/structure/table, -/obj/item/clothing/suit/hazardvest{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/suit/hazardvest{ - pixel_x = 3 - }, -/obj/item/clothing/mask/gas{ - pixel_y = -3; - pixel_x = -6 - }, -/obj/item/clothing/mask/gas{ - pixel_y = 3; - pixel_x = -6 - }, -/obj/item/tank/internals/oxygen/yellow{ - pixel_x = -6; +/obj/item/storage/medkit/regular{ + pixel_x = 6; pixel_y = 6 }, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_y = 3 - }, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_x = 3 - }, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -1770,7 +1754,9 @@ /area/station/maintenance/port/fore) "aEg" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/binary/pump/off/general/hidden/layer2{ + name = "Emergency Scrubbers" + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/duct, @@ -2029,6 +2015,11 @@ /area/station/maintenance/port/fore) "aIK" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/box/red, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron/dark, /area/station/security/execution) "aIN" = ( @@ -2186,7 +2177,6 @@ dir = 1 }, /obj/machinery/status_display/evac/directional/north, -/obj/machinery/light/directional/north, /obj/structure/table, /turf/open/floor/iron/dark/side{ dir = 1 @@ -2217,9 +2207,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /obj/machinery/duct, -/turf/open/floor/iron/dark/side, -/area/station/service/janitor) +/turf/open/floor/plating, +/area/station/maintenance/port) "aMD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood, @@ -2240,7 +2233,10 @@ /area/station/service/chapel/funeral) "aMX" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Prison, Cell 6"; + name = "security camera" + }, /obj/machinery/duct, /turf/open/floor/carpet/red, /area/station/security/prison/safe) @@ -2296,6 +2292,7 @@ /turf/open/floor/plating, /area/station/engineering/main) "aNC" = ( +/obj/machinery/status_display/evac/directional/west, /obj/machinery/newscaster/directional/north, /obj/structure/table, /obj/item/paper_bin, @@ -2607,7 +2604,7 @@ /obj/structure/cable, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ - name = "Robotics Lab" + name = "Robotics Garage" }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/iron/textured, @@ -2635,7 +2632,10 @@ /area/station/hallway/secondary/service) "aSP" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Prison, Cell 2"; + name = "security camera" + }, /obj/machinery/duct, /turf/open/floor/carpet/blue, /area/station/security/prison/safe) @@ -2644,7 +2644,7 @@ dir = 4 }, /obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/nestbox, +/mob/living/basic/chicken, /turf/open/floor/grass, /area/station/service/hydroponics) "aSW" = ( @@ -2659,6 +2659,7 @@ "aTb" = ( /obj/effect/turf_decal/box, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/holopad, /turf/open/floor/iron/white/smooth_large, /area/station/science/explab) @@ -2677,7 +2678,7 @@ /turf/open/floor/iron/dark, /area/station/security/prison/visit) "aTB" = ( -/obj/effect/turf_decal/trimline/yellow/filled/warning{ +/obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 }, /obj/machinery/light_switch/directional/north{ @@ -2824,6 +2825,7 @@ /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) "aVV" = ( +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/components/tank/oxygen{ dir = 1 }, @@ -3262,6 +3264,7 @@ /area/space/nearstation) "ben" = ( /obj/machinery/camera/autoname/directional/north, +/obj/structure/cable, /obj/item/radio/intercom/directional/north, /turf/open/floor/carpet, /area/station/service/chapel) @@ -3674,7 +3677,6 @@ /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) "bkM" = ( -/obj/machinery/light/directional/east, /obj/effect/spawner/random/vending/colavend, /turf/open/floor/carpet, /area/station/hallway/secondary/entry) @@ -3878,7 +3880,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/extinguisher_cabinet/directional/east, /obj/structure/table, -/obj/machinery/light/small/directional/east, /obj/item/flashlight{ pixel_y = 13 }, @@ -3993,14 +3994,14 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "bpj" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; shuttledocked = 1 }, /obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, /turf/open/floor/iron/dark/textured_large, /area/station/security/processing) "bpB" = ( @@ -4041,6 +4042,7 @@ /turf/open/floor/iron/white/textured, /area/station/science/research) "bpU" = ( +/obj/machinery/light/small/directional/west, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -4380,7 +4382,7 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "bva" = ( -/turf/open/floor/wood/tile, +/turf/open/floor/wood, /area/station/service/chapel/office) "bvc" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -4421,10 +4423,8 @@ /obj/effect/turf_decal/trimline/dark_blue/corner{ dir = 8 }, -/obj/structure/chair{ - dir = 8 - }, /obj/machinery/firealarm/directional/north, +/obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "bvp" = ( @@ -4491,8 +4491,8 @@ }, /area/station/hallway/secondary/service) "bwg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/pink/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden{ + dir = 4 }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) @@ -4562,7 +4562,6 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, -/obj/machinery/light/directional/south, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -4686,9 +4685,19 @@ /area/station/hallway/primary/port) "byp" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 6 + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Science - Genetics, Cloning Lab"; + network = list("ss13","rd"); + name = "science camera" + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/machinery/computer/cloning{ + dir = 8 }, -/obj/machinery/clonepod, /turf/open/floor/iron/white, /area/station/science/genetics/cloning) "bys" = ( @@ -4838,8 +4847,8 @@ /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/hop) "bBA" = ( -/obj/item/radio/intercom/directional/west, -/obj/machinery/status_display/evac/directional/south, +/obj/machinery/light/small/directional/south, +/obj/machinery/status_display/ai/directional/south, /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/service/chapel/funeral) @@ -5032,6 +5041,17 @@ }, /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) +"bEC" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/hallway/primary/aft) "bEE" = ( /obj/machinery/duct, /turf/open/floor/wood, @@ -5379,6 +5399,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/patients_rooms/room_b) +"bJu" = ( +/obj/machinery/status_display/ai/directional/east, +/obj/effect/spawner/random/entertainment/arcade{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/security/prison/rec) "bJw" = ( /obj/effect/turf_decal/tile/dark_blue{ dir = 1 @@ -5454,7 +5481,7 @@ /obj/machinery/airalarm/directional/south, /obj/machinery/newscaster/directional/east, /obj/structure/table/reinforced, -/obj/item/paper_bin, +/obj/machinery/recharger, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "bJW" = ( @@ -6113,7 +6140,10 @@ /area/station/service/hydroponics/garden) "bVs" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Prison, Cell 8"; + name = "security camera" + }, /obj/machinery/duct, /turf/open/floor/wood/tile, /area/station/security/prison/safe) @@ -6135,25 +6165,10 @@ /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) "bVU" = ( -/obj/machinery/light/small/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "Science - Genetics, Cloning Lab"; - name = "science camera"; - network = list("ss13","rd") - }, -/obj/machinery/firealarm/directional/south{ - pixel_x = 5 - }, -/obj/machinery/light_switch/directional/south{ - pixel_x = -5 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 10 - }, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/structure/closet/wardrobe/mixed, -/turf/open/floor/iron/white, -/area/station/science/genetics/cloning) +/obj/structure/cable, +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "bVW" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 @@ -6168,7 +6183,12 @@ }, /area/station/hallway/primary/aft) "bVX" = ( -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/light/small/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Science - Xenobiology, Workstation 1"; + name = "science camera"; + network = list("ss13","rd") + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "bWl" = ( @@ -6321,7 +6341,8 @@ "bZa" = ( /obj/machinery/light/directional/west, /obj/machinery/electroplater, -/turf/open/floor/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/smithing) "bZj" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -6504,13 +6525,6 @@ "ccp" = ( /turf/open/floor/wood, /area/station/service/library) -"ccs" = ( -/obj/structure/closet/cardboard{ - name = "Mime's Cardboard box"; - desc = "The mime uses this box to store his resentment for the clown for getting so many brand deals. It also serves as a bed" - }, -/turf/open/floor/carpet/black, -/area/station/service/theater) "ccL" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 @@ -6547,11 +6561,16 @@ /turf/open/floor/iron/checker, /area/station/science/lab) "cde" = ( -/obj/structure/mirror/directional/north, -/obj/structure/sink/directional/south, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron/dark, -/area/station/service/janitor) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/service/theater, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/port) "cdi" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -6859,6 +6878,7 @@ dir = 1 }, /obj/machinery/light/directional/north, +/obj/machinery/status_display/ai/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/engineering/main) @@ -6942,16 +6962,22 @@ /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/nt_rep) "cim" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "garbage" +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, /obj/machinery/door/poddoor/preopen{ id = "disposal_exit"; name = "Disposal Exit Vent" }, +/obj/machinery/conveyor{ + dir = 8; + id = "garbage" + }, /obj/structure/plasticflaps, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/textured, /area/station/maintenance/disposal) "civ" = ( /obj/effect/turf_decal/siding/wood/corner{ @@ -7007,6 +7033,11 @@ /turf/open/floor/plating, /area/station/engineering/atmos) "cjf" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Science - Robotics, Garage"; + network = list("ss13","rd"); + name = "science camera" + }, /obj/machinery/computer/mechpad{ dir = 8 }, @@ -7413,6 +7444,7 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "cpX" = ( +/obj/machinery/light/directional/east, /obj/structure/sign/poster/contraband/clown/directional/east, /obj/structure/closet/secure_closet/freezer/cream_pie{ anchored = 1 @@ -7796,13 +7828,11 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/department/science) "czu" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/wood/tile, +/obj/machinery/disposal/bin, +/turf/open/floor/wood, /area/station/service/chapel/office) "czB" = ( /obj/effect/turf_decal/stripes/line{ @@ -7830,6 +7860,9 @@ /obj/machinery/light_switch/directional/south{ pixel_x = 5 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/floor/wood, /area/station/service/chapel/funeral) "czE" = ( @@ -8197,6 +8230,7 @@ dir = 1 }, /obj/effect/mapping_helpers/mail_sorting/service/janitor_closet, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port) "cGj" = ( @@ -8250,10 +8284,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron/dark/side{ - dir = 6 - }, +/turf/open/floor/iron, /area/station/service/janitor) "cHh" = ( /turf/closed/wall/r_wall, @@ -8315,6 +8346,7 @@ network = list("ss13","rd"); name = "science camera" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, /area/station/science/explab) "cIL" = ( @@ -8324,7 +8356,8 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "cIV" = ( -/obj/machinery/light/small/directional/east, +/obj/machinery/light/small/directional/north, +/obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/cargo) @@ -8389,6 +8422,7 @@ /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) "cJW" = ( +/obj/machinery/light/small/directional/south, /obj/machinery/camera/directional/south{ c_tag = "Security - Visitation, Visitor Side"; name = "security camera" @@ -8499,7 +8533,7 @@ "cLR" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/binary/pump/on{ - name = "Incinerator Output Pump"; + name = "Incinerator Output"; target_pressure = 4500; dir = 4 }, @@ -8548,11 +8582,9 @@ /turf/open/floor/plating, /area/station/maintenance/department/science) "cMB" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/turf/open/floor/wood/tile, +/obj/machinery/light/small/directional/west, +/obj/structure/filingcabinet, +/turf/open/floor/wood, /area/station/service/chapel/office) "cML" = ( /obj/effect/turf_decal/vg_decals/atmos/oxygen, @@ -8636,7 +8668,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ +/obj/machinery/atmospherics/components/unary/portables_connector/layer2{ dir = 8 }, /obj/machinery/portable_atmospherics/scrubber, @@ -8767,9 +8799,8 @@ /turf/open/floor/iron/white, /area/station/science/research) "cPV" = ( -/turf/open/floor/iron/dark/side{ - dir = 8 - }, +/obj/machinery/duct, +/turf/open/floor/iron, /area/station/service/janitor) "cPX" = ( /obj/structure/cable, @@ -8950,9 +8981,11 @@ /turf/closed/wall, /area/station/maintenance/department/cargo) "cRq" = ( -/obj/structure/closet/emcloset/wall/directional/west, -/turf/open/floor/iron/dark, -/area/station/service/chapel) +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/chapel/funeral) "cRQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/table_or_rack, @@ -9031,8 +9064,8 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "cSY" = ( -/obj/machinery/light/directional/west, -/turf/open/floor/grass, +/obj/structure/foamedmetal, +/turf/open/floor/plating, /area/station/service/chapel/funeral) "cTn" = ( /mob/living/basic/pet/potty, @@ -9068,7 +9101,6 @@ /area/station/engineering/atmos/office) "cTK" = ( /obj/structure/sink/directional/south, -/obj/effect/spawner/random/trash/bucket, /turf/open/floor/plating, /area/station/maintenance/port) "cTL" = ( @@ -9375,7 +9407,7 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/blueshield) "cYN" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/aft) @@ -9383,6 +9415,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 }, +/obj/machinery/light/small/directional/west, /obj/machinery/status_display/evac/directional/west, /obj/machinery/computer/diseasesplicer, /turf/open/floor/iron/white, @@ -9614,8 +9647,7 @@ dir = 1 }, /obj/structure/railing{ - dir = 4; - layer = 4.1 + dir = 4 }, /turf/open/floor/plating/airless, /area/space/nearstation) @@ -9910,6 +9942,10 @@ /area/station/service/bar/backroom) "did" = ( /obj/machinery/light/directional/west, +/obj/structure/sign/poster/official/there_is_no_gas_giant/directional/west, +/obj/structure/chair/sofa/middle/brown{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/security/prison) "dim" = ( @@ -10043,7 +10079,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/line, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ +/obj/machinery/atmospherics/components/unary/portables_connector/layer2{ dir = 4 }, /obj/machinery/portable_atmospherics/pump, @@ -10270,11 +10306,13 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "doW" = ( +/obj/effect/turf_decal/box, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/processing) +/obj/machinery/holopad, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/brig) "dpc" = ( /obj/machinery/conveyor{ dir = 6; @@ -10310,28 +10348,6 @@ /obj/item/storage/box/drinkingglasses, /turf/open/floor/iron/kitchen, /area/station/security/prison/mess) -"dpu" = ( -/obj/machinery/airalarm/directional/south, -/obj/structure/table/wood, -/obj/item/cigbutt{ - pixel_y = 16; - pixel_x = -3 - }, -/obj/effect/spawner/random/entertainment/cigarette_pack{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/bottle/champagne{ - pixel_x = 8; - pixel_y = 12 - }, -/obj/effect/spawner/random/entertainment/lighter{ - pixel_x = -7; - pixel_y = -2 - }, -/obj/item/toy/figure/mime, -/turf/open/floor/carpet/black, -/area/station/service/theater) "dpy" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -10443,14 +10459,16 @@ /turf/open/floor/iron/dark/textured, /area/station/commons/dorms/laundry) "drR" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark/side{ - dir = 8 +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, -/area/station/cargo/miningoffice) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "dsc" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/effect/turf_decal/trimline/neutral/line{ @@ -10710,8 +10728,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, /area/station/service/janitor) "dyv" = ( /obj/effect/turf_decal/stripes/line, @@ -10809,7 +10828,7 @@ name = "Security Requests Console" }, /obj/structure/table/reinforced, -/obj/machinery/recharger, +/obj/item/paper_bin, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "dzR" = ( @@ -10853,17 +10872,10 @@ /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/rd) "dAo" = ( -/obj/machinery/light/small/directional/west, -/obj/structure/sign/warning/radiation/directional/west, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/effect/mapping_helpers/apc/cell_5k, -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/landmark/start/station_engineer, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron, -/area/station/engineering/engine_smes) +/area/station/engineering/main) "dAx" = ( /obj/effect/turf_decal/tile/red/fourcorners, /obj/structure/rack, @@ -10921,7 +10933,6 @@ }, /obj/item/radio/intercom/directional/south, /obj/machinery/rnd/production/techfab/department/security, -/obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/security/office) "dBd" = ( @@ -11013,7 +11024,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/turf/open/floor/iron/white, +/turf/open/floor/engine, /area/station/science/explab) "dCO" = ( /obj/structure/sign/picture_frame/showroom/four{ @@ -11328,6 +11339,7 @@ /turf/open/floor/iron, /area/station/science/robotics/mechbay) "dIg" = ( +/obj/machinery/light/small/directional/north, /obj/structure/sign/poster/random/directional/north, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/graffiti, @@ -11399,9 +11411,9 @@ /turf/open/floor/iron/dark/side, /area/station/commons/dorms) "dIJ" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Service - Custodial Closet"; - name = "service camera" +/obj/structure/closet/crate/wooden/toy, +/obj/effect/turf_decal/siding/dark{ + dir = 4 }, /obj/machinery/firealarm/directional/north{ pixel_x = -5 @@ -11409,7 +11421,6 @@ /obj/machinery/light_switch/directional/north{ pixel_x = 5 }, -/obj/structure/closet/crate/wooden/toy, /turf/open/floor/iron/dark/side{ dir = 5 }, @@ -11799,7 +11810,6 @@ /turf/open/floor/iron, /area/station/maintenance/department/science) "dOL" = ( -/obj/machinery/light/small/directional/north, /obj/structure/rack{ icon = 'icons/obj/stationobjs.dmi'; icon_state = "minibar"; @@ -12224,8 +12234,8 @@ /turf/open/floor/wood, /area/station/command/meeting_room) "dWw" = ( -/obj/structure/cable, /obj/machinery/station_map/directional/west, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/xenobiology) "dWS" = ( @@ -12241,10 +12251,10 @@ /turf/open/floor/wood, /area/station/service/library) "dXk" = ( +/obj/structure/cable, /obj/machinery/atmospherics/components/binary/pump/on/supply/hidden{ dir = 8 }, -/obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "dXF" = ( @@ -12413,8 +12423,15 @@ /turf/open/floor/engine/air, /area/station/engineering/atmos) "dZU" = ( -/obj/structure/chair{ - dir = 1 +/obj/machinery/camera/directional/north{ + c_tag = "Service - Custodial Closet"; + name = "service camera" + }, +/obj/structure/bed{ + dir = 4 + }, +/obj/item/bedsheet/random{ + dir = 4 }, /obj/effect/landmark/start/janitor, /turf/open/floor/iron/dark/side{ @@ -12548,10 +12565,8 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "eaV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark/smooth_large, -/area/station/hallway/secondary/entry) +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) "eaW" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -12653,6 +12668,10 @@ /obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/iron/white, /area/station/medical/surgery) +"ecI" = ( +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "ecX" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -12672,7 +12691,6 @@ }, /area/station/hallway/secondary/exit/departure_lounge) "edf" = ( -/obj/machinery/light/directional/east, /obj/machinery/biomass_recycler, /obj/item/stack/biomass, /obj/item/stack/biomass, @@ -12989,6 +13007,16 @@ /obj/structure/cable, /turf/open/floor/iron/large, /area/station/commons/storage/primary) +"ejs" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "ejt" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -13035,9 +13063,6 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "ekn" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -13096,6 +13121,7 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 1 }, +/obj/machinery/light/directional/south, /obj/machinery/newscaster/directional/south, /obj/machinery/computer/security{ dir = 1 @@ -13108,6 +13134,10 @@ /obj/structure/cable, /turf/open/floor/iron/dark/smooth_corner, /area/station/service/chapel) +"emb" = ( +/obj/effect/turf_decal/caution/red, +/turf/open/floor/iron/dark/smooth_large/airless, +/area/space/nearstation) "emc" = ( /obj/structure/cable, /obj/machinery/netpod, @@ -13160,10 +13190,7 @@ /area/station/maintenance/starboard/fore) "ent" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Justice Gas Pump" - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/machinery/door/window/right/directional/north{ name = "Justice Storage"; req_access = list("security") @@ -13191,7 +13218,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/port) "enD" = ( +/obj/machinery/light/small/directional/north, /obj/machinery/airalarm/directional/west, +/obj/item/radio/intercom/directional/north, /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/service/chapel/funeral) @@ -13325,6 +13354,12 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"eqy" = ( +/obj/effect/turf_decal/caution/red{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large/airless, +/area/space/nearstation) "eqJ" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -13452,7 +13487,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "ete" = ( -/obj/machinery/atmospherics/components/tank/air{ +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, /turf/open/floor/plating, @@ -13577,6 +13612,7 @@ /turf/open/floor/plating, /area/station/engineering/atmos/pumproom) "euP" = ( +/obj/machinery/light/small/directional/west, /obj/machinery/camera/directional/west{ c_tag = "Science - Ordnance, Launcher"; name = "science camera"; @@ -13663,6 +13699,9 @@ /area/station/maintenance/department/science) "evu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/hidden, +/obj/machinery/igniter{ + id = "execution_burn" + }, /turf/open/floor/engine, /area/station/security/execution) "evx" = ( @@ -13711,11 +13750,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 }, -/obj/machinery/camera/directional/west{ - c_tag = "Science - Server Room"; - name = "science camera"; - network = list("ss13","rd") - }, +/obj/item/radio/intercom/directional/west, /obj/structure/chair/office/light{ dir = 1 }, @@ -14246,10 +14281,10 @@ /turf/open/floor/iron, /area/station/science/ordnance/office) "eFX" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 }, -/obj/effect/turf_decal/trimline/yellow/line{ +/obj/effect/turf_decal/trimline/neutral/line{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, @@ -14281,7 +14316,6 @@ }, /area/station/cargo/storage) "eGs" = ( -/obj/machinery/light/small/directional/west, /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/binary/tank_compressor, /turf/open/floor/iron, @@ -14576,6 +14610,8 @@ /turf/open/floor/iron/dark/textured, /area/station/command/heads_quarters/cmo) "eLo" = ( +/obj/machinery/firealarm/directional/west, +/obj/structure/sign/poster/official/random/directional/north, /obj/structure/chair/plastic{ dir = 4 }, @@ -14697,10 +14733,10 @@ /turf/closed/wall, /area/station/hallway/primary/central) "eNx" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 }, -/obj/effect/turf_decal/trimline/yellow/line{ +/obj/effect/turf_decal/trimline/neutral/line{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -14846,8 +14882,14 @@ /turf/open/floor/wood, /area/station/service/lawoffice) "ePX" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/closet/l3closet/janitor, +/obj/item/clothing/under/costume/maid, +/obj/item/clothing/gloves/maid, +/obj/item/clothing/head/costume/maidheadband, +/obj/item/grenade/clusterbuster/cleaner, /turf/open/floor/iron/dark/side{ - dir = 9 + dir = 1 }, /area/station/service/janitor) "ePY" = ( @@ -15031,6 +15073,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) "eTg" = ( +/obj/machinery/status_display/ai/directional/south, /obj/structure/closet/toolcloset, /turf/open/floor/iron/dark/side{ dir = 6 @@ -15049,7 +15092,7 @@ c_tag = "Hallway, South - North" }, /obj/machinery/status_display/evac/directional/west, -/obj/structure/chair/sofa/bench{ +/obj/structure/chair/sofa/bench/right{ dir = 4 }, /obj/effect/landmark/start/assistant, @@ -15153,7 +15196,6 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "eUV" = ( -/obj/machinery/light/directional/east, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /obj/effect/mapping_helpers/apc/cell_10k, @@ -15238,30 +15280,18 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 }, -/obj/machinery/airalarm/directional/south, /obj/structure/table, -/obj/item/stack/sheet/glass/fifty{ - pixel_y = 5; - pixel_x = -4 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_y = 5 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_y = 5; - pixel_x = 4 - }, -/obj/item/stack/rods/fifty{ - pixel_y = 6; - pixel_x = -6 +/obj/item/storage/toolbox/electrical{ + pixel_y = 7 }, -/obj/item/stack/rods/fifty, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/iron, /area/station/engineering/storage) "eWv" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/white, /area/station/science/genetics) "eWw" = ( @@ -15302,7 +15332,6 @@ /area/station/commons/fitness/recreation) "eXJ" = ( /obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "eXL" = ( @@ -15335,6 +15364,7 @@ /turf/open/floor/iron/dark, /area/station/security/holding_cell) "eYX" = ( +/obj/machinery/light/small/directional/north, /obj/machinery/camera/directional/north{ c_tag = "Security - Visitation, Prisoner Side"; name = "security camera" @@ -15386,6 +15416,7 @@ /turf/open/floor/iron/white, /area/station/medical/surgery) "fak" = ( +/obj/machinery/status_display/ai/directional/west, /obj/structure/extinguisher_cabinet/directional/south, /obj/structure/table, /turf/open/floor/iron/dark/side/airless{ @@ -15530,10 +15561,10 @@ /turf/open/floor/iron/vaporwave, /area/station/command/heads_quarters/rd) "fcr" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/line{ +/obj/effect/turf_decal/trimline/neutral/line{ dir = 8 }, /obj/machinery/light/small/directional/east, @@ -15737,15 +15768,11 @@ /turf/open/space/basic, /area/space/nearstation) "fgw" = ( -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/camera/autoname/directional/north, -/obj/machinery/firealarm/directional/east, -/obj/structure/chair{ - dir = 8 +/obj/machinery/atmospherics/components/binary/pump/on/supply/hidden{ + dir = 1 }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/starboard) +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "fgC" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 @@ -15769,11 +15796,13 @@ dir = 1 }, /obj/machinery/disposal/bin, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, /area/station/service/janitor) "fgE" = ( /obj/item/radio/intercom/directional/west, -/turf/open/floor/wood/tile, +/turf/open/floor/wood, /area/station/service/chapel/office) "fgR" = ( /obj/structure/reagent_dispensers/plumbed{ @@ -15950,7 +15979,10 @@ /turf/open/floor/plating, /area/station/maintenance/department/science) "fjx" = ( -/obj/item/radio/intercom/directional/north, +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/wood, /area/station/service/chapel/funeral) "fjT" = ( @@ -16043,10 +16075,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "flJ" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/storage/photo_album/chapel, -/obj/item/camera, -/turf/open/floor/wood/tile, +/obj/machinery/light/small/directional/east, +/obj/item/kirbyplants/random, +/turf/open/floor/wood, /area/station/service/chapel/office) "flK" = ( /obj/effect/turf_decal/trimline/red/filled/line{ @@ -16196,13 +16227,14 @@ /turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "fnK" = ( +/obj/effect/turf_decal/box, /obj/structure/disposalpipe/segment{ dir = 6 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron, +/obj/machinery/holopad, +/turf/open/floor/iron/large, /area/station/service/hydroponics/garden) "fnN" = ( /obj/structure/chair/stool/directional/west, @@ -16397,9 +16429,6 @@ "fqJ" = ( /obj/machinery/light/small/directional/south, /obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/smithing) @@ -16473,7 +16502,6 @@ /turf/open/floor/iron, /area/station/science/xenobiology) "frS" = ( -/obj/machinery/camera/autoname/directional/east, /obj/machinery/recharge_station, /obj/effect/landmark/start/cyborg, /turf/open/floor/iron, @@ -16621,10 +16649,9 @@ /area/station/maintenance/department/security/brig) "fvH" = ( /obj/machinery/light/small/directional/north, -/obj/structure/chair/comfy/brown, -/obj/effect/landmark/start/medical_doctor, +/obj/machinery/firealarm/directional/north, /turf/open/floor/iron/white, -/area/station/medical/break_room) +/area/station/science/xenobiology) "fvT" = ( /obj/effect/turf_decal/box, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16792,6 +16819,11 @@ dir = 4 }, /area/station/hallway/primary/aft) +"fyG" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance/five, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "fyZ" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -16852,7 +16884,6 @@ /turf/open/floor/iron/white, /area/station/science/research) "fzZ" = ( -/obj/structure/closet/emcloset/wall/directional/south, /obj/structure/rack, /obj/item/tank/internals/oxygen/yellow{ pixel_x = 4; @@ -16919,11 +16950,10 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat/foyer) "fAQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil/streak, +/obj/structure/cable, /obj/structure/table, -/turf/open/floor/stone, -/area/station/smithing) +/turf/open/floor/iron/dark, +/area/station/security/prison) "fBd" = ( /obj/structure/table, /obj/item/radio/off, @@ -16978,6 +17008,7 @@ /obj/structure/railing{ dir = 4 }, +/obj/machinery/slime_extract_requestor, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "fCT" = ( @@ -16988,8 +17019,8 @@ /area/station/commons/fitness) "fDb" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/stripes/end{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, /obj/structure/closet/emcloset/anchored, /obj/effect/landmark/start/hangover/closet, @@ -17294,10 +17325,9 @@ "fHz" = ( /obj/machinery/status_display/evac/directional/east, /obj/structure/sign/warning/vacuum/directional/north, -/obj/structure/table, -/obj/item/wrench, -/obj/item/crowbar/red, -/obj/item/clothing/mask/gas, +/obj/machinery/doppler_array{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) "fHA" = ( @@ -17357,9 +17387,6 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat/foyer) "fIt" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, /obj/machinery/camera/autoname/directional/west, /obj/machinery/airalarm/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -17369,10 +17396,13 @@ /turf/open/floor/stone, /area/station/smithing) "fIw" = ( -/obj/machinery/light/directional/east, -/obj/machinery/atmospherics/components/tank/oxygen, -/turf/open/floor/iron, -/area/station/science/ordnance) +/obj/machinery/light/directional/south, +/obj/machinery/status_display/evac/directional/south, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/chapel/funeral) "fIz" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -17433,6 +17463,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, /area/station/security/office) "fJl" = ( @@ -17443,13 +17474,6 @@ dir = 4 }, /area/station/service/janitor) -"fJv" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, -/turf/open/floor/iron, -/area/station/engineering/main) "fJx" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 9 @@ -17633,6 +17657,14 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel/office) +"fNc" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/line, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/starboard) "fNy" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/structure/reagent_dispensers/fueltank, @@ -17869,12 +17901,16 @@ /area/station/commons/fitness/recreation) "fRr" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, +/obj/machinery/airalarm/directional/south, /obj/structure/table, /obj/item/clothing/gloves/color/yellow, +/obj/item/crowbar/large, /obj/item/flashlight{ - pixel_y = 9 + pixel_y = 12 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -3 }, /turf/open/floor/iron, /area/station/engineering/storage) @@ -18039,7 +18075,7 @@ }, /area/station/security/prison/workout) "fTE" = ( -/obj/effect/turf_decal/trimline/yellow/filled/warning{ +/obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 }, /turf/open/floor/iron, @@ -18051,7 +18087,6 @@ /area/station/maintenance/port/fore) "fTU" = ( /obj/machinery/airalarm/directional/north, -/obj/machinery/light/small/directional/north, /obj/machinery/vending/boozeomat, /turf/open/floor/wood, /area/station/service/bar) @@ -18261,6 +18296,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) +"fXn" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, +/area/station/smithing) "fXu" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/window/reinforced/spawner/directional/south, @@ -18457,7 +18498,6 @@ "gax" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/west, /obj/machinery/vending/imported, /turf/open/floor/iron/dark, /area/station/commons/storage/primary) @@ -18539,6 +18579,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 9 }, +/obj/machinery/firealarm/directional/west, /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/engineering/storage) @@ -18626,10 +18667,10 @@ /turf/open/floor/iron, /area/station/engineering/storage_shared) "geG" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) +/obj/machinery/light/small/directional/south, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "geR" = ( /obj/machinery/atmospherics/pipe/smart/manifold/brown/visible{ dir = 8 @@ -18701,7 +18742,10 @@ /turf/open/floor/iron/dark/corner, /area/station/cargo/storage) "ggq" = ( -/obj/structure/cable, +/obj/effect/turf_decal/siding/dark/corner, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -19098,7 +19142,6 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, -/obj/machinery/light/directional/east, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/chair/office{ @@ -19253,6 +19296,11 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, +/obj/machinery/camera/directional/west{ + c_tag = "Science - Genetics"; + name = "science camera"; + network = list("ss13","rd") + }, /obj/machinery/airalarm/directional/west, /obj/structure/table/reinforced/rglass, /obj/machinery/computer/records/medical/laptop, @@ -19267,7 +19315,6 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "gqE" = ( -/obj/machinery/light/directional/north, /obj/machinery/asteroid_magnet{ center_x = 148; center_y = 186; @@ -19293,14 +19340,20 @@ /turf/open/floor/iron/dark, /area/station/security/warden) "gqK" = ( -/obj/machinery/duct, +/obj/structure/chair{ + dir = 4 + }, /turf/open/floor/iron/white, -/area/station/science/genetics) +/area/station/science/xenobiology) "gqL" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, -/obj/machinery/light/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Science - Robotics"; + name = "science camera"; + network = list("ss13","rd") + }, /obj/machinery/autolathe, /turf/open/floor/iron, /area/station/science/robotics/lab) @@ -19350,13 +19403,12 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "grI" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 8 +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 }, -/obj/structure/mirror/directional/south, -/obj/machinery/shower/directional/west, -/obj/structure/drain, -/turf/open/floor/iron/showroomfloor, +/obj/machinery/airalarm/directional/east, +/obj/machinery/dna_scannernew, +/turf/open/floor/iron/white, /area/station/science/genetics/cloning) "grL" = ( /obj/effect/turf_decal/trimline/red/filled/line{ @@ -19378,7 +19430,6 @@ /obj/machinery/light_switch/directional/east{ pixel_y = 5 }, -/obj/structure/cable/layer1, /turf/open/floor/iron, /area/station/engineering/engine_smes) "gsh" = ( @@ -19470,11 +19521,6 @@ /area/station/service/lawoffice) "gtA" = ( /obj/effect/turf_decal/tile/green, -/obj/machinery/button/door/directional/north{ - id = "hydro_back_shutters"; - name = "Hydroponics Backroom Shutters Control"; - req_access = list("hydroponics") - }, /obj/structure/table, /obj/item/fish_feed{ pixel_y = 3 @@ -19903,7 +19949,6 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) "gyK" = ( -/obj/machinery/light/small/directional/west, /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/wood, /area/station/service/chapel/funeral) @@ -20180,9 +20225,12 @@ /turf/open/floor/plating, /area/station/engineering/main) "gDV" = ( -/obj/machinery/vending/wardrobe/jani_wardrobe, -/turf/open/floor/iron/dark, -/area/station/service/janitor) +/obj/machinery/vending/autodrobe, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/station/service/theater) "gEg" = ( /turf/closed/wall/r_wall, /area/station/medical/psychology) @@ -20285,6 +20333,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 }, +/obj/machinery/light/small/directional/east, /obj/structure/table/reinforced/rglass, /obj/item/paper_bin{ pixel_x = -7; @@ -20414,11 +20463,10 @@ /turf/open/floor/iron/kitchen, /area/station/security/prison/mess) "gGX" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/wood, +/obj/machinery/light/directional/west, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/growing/soil, +/turf/open/floor/grass, /area/station/service/chapel/funeral) "gGY" = ( /obj/machinery/light/small/directional/east, @@ -20651,6 +20699,7 @@ /area/station/security/prison/mess) "gJU" = ( /obj/effect/turf_decal/bot_red, +/obj/machinery/light/directional/west, /obj/machinery/status_display/evac/directional/west, /obj/machinery/suit_storage_unit/standard_unit, /turf/open/floor/iron/large, @@ -21117,7 +21166,10 @@ /area/station/tcommsat/server) "gQi" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Prison, Cell 5"; + name = "security camera" + }, /obj/machinery/duct, /turf/open/floor/wood/parquet, /area/station/security/prison/safe) @@ -21179,9 +21231,9 @@ /area/station/science/server) "gRf" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 + dir = 6 }, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/sign/warning/vacuum/external/directional/south, /turf/open/floor/iron, /area/station/engineering/main) "gRk" = ( @@ -21335,9 +21387,9 @@ /turf/open/floor/carpet/purple, /area/station/command/heads_quarters/rd) "gSG" = ( -/obj/machinery/light/small/directional/north, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "gSL" = ( @@ -21378,9 +21430,11 @@ }, /area/station/cargo/office) "gTp" = ( -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/showroomfloor, -/area/station/science/xenobiology/hallway) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/chapel/office) "gTH" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -21472,6 +21526,27 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/department/engine/atmos) "gVV" = ( +/obj/machinery/requests_console/directional/north{ + department = "Janitorial"; + name = "Janitorial Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clipboard{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/toy/figure/janitor{ + pixel_x = 9 + }, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -21611,7 +21686,9 @@ /obj/machinery/airalarm/directional/east, /obj/item/radio/intercom/directional/south, /obj/structure/table/wood, -/obj/item/toy/figure/curator, +/obj/machinery/computer/libraryconsole/bookmanagement{ + dir = 8 + }, /turf/open/floor/iron/vaporwave, /area/station/service/library/printer) "gYt" = ( @@ -21640,10 +21717,9 @@ /area/station/security/prison/rec) "gYL" = ( /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/wood/tile, +/obj/machinery/light/small/directional/east, +/obj/item/kirbyplants/random, +/turf/open/floor/wood, /area/station/service/chapel/office) "gYS" = ( /obj/effect/turf_decal/box, @@ -21763,6 +21839,10 @@ "haG" = ( /obj/machinery/light/directional/south, /obj/structure/table/wood, +/obj/effect/spawner/random/bureaucracy/briefcase{ + spawn_loot_count = 2; + spawn_random_offset = 1 + }, /turf/open/floor/wood, /area/station/service/library/private) "haO" = ( @@ -21887,9 +21967,6 @@ /turf/open/floor/iron/white/textured, /area/station/medical/office) "hdm" = ( -/obj/machinery/sparker/directional/north{ - id = "execution_burn" - }, /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer4, /turf/open/floor/engine, /area/station/security/execution) @@ -21992,7 +22069,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/hydroponics/glass{ +/obj/machinery/door/airlock/hydroponics{ name = "Hydroponics" }, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, @@ -22142,9 +22219,6 @@ /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/security/brig) "hhJ" = ( @@ -22263,17 +22337,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 10 }, -/obj/structure/table, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock{ - pixel_x = -6; - pixel_y = 9 - }, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil{ - pixel_y = 3; - pixel_x = 3 - }, +/obj/machinery/vending/engivend, /turf/open/floor/iron, /area/station/engineering/storage) "hjT" = ( @@ -22440,6 +22504,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/security/prison) +"hmO" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "hmP" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/cable, @@ -22496,9 +22567,16 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"hnV" = ( +/obj/machinery/light/small/directional/west, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology/hallway) "hoa" = ( /obj/structure/table/wood, -/obj/machinery/computer/libraryconsole, +/obj/machinery/computer/libraryconsole{ + dir = 4 + }, /turf/open/floor/wood, /area/station/service/library) "hoe" = ( @@ -22744,7 +22822,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "hsg" = ( -/obj/machinery/light/directional/north, /obj/machinery/airalarm/directional/north, /obj/machinery/computer/atmos_control/ordnancemix, /turf/open/floor/iron, @@ -22863,7 +22940,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/science/ordnance) "hui" = ( @@ -23058,8 +23134,9 @@ /area/station/ai_monitored/turret_protected/aisat_interior) "hvX" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 + dir = 1 }, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "hwe" = ( @@ -23294,6 +23371,7 @@ /area/station/science/lab) "hAE" = ( /obj/effect/turf_decal/trimline/brown/filled/line, +/obj/machinery/light/directional/south, /obj/structure/sign/warning/vacuum/external/directional/south, /obj/machinery/computer/security/mining{ dir = 4 @@ -23353,7 +23431,6 @@ /area/station/engineering/storage_shared) "hBK" = ( /obj/effect/turf_decal/stripes/box, -/obj/machinery/camera/autoname/directional/west, /obj/machinery/computer/mech_bay_power_console{ dir = 4 }, @@ -23471,7 +23548,9 @@ }, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, -/obj/machinery/atmospherics/components/binary/volume_pump/on{ +/obj/machinery/atmospherics/components/binary/pump/on/general/visible{ + name = "Cryogenics Supply"; + target_pressure = 500; dir = 4 }, /turf/open/floor/iron/white, @@ -23501,10 +23580,20 @@ /turf/open/floor/iron/dark, /area/station/security/brig/entrance) "hDv" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron, -/area/station/engineering/main) +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/cable/layer1, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering{ + name = "SMES Chamber" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/turf/open/floor/iron/textured, +/area/station/engineering/engine_smes) "hDz" = ( /obj/effect/turf_decal/tile/red/fourcorners, /obj/machinery/light/directional/east, @@ -23698,6 +23787,14 @@ /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/security/prison/safe) +"hGe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/medical/virology) "hGj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood, @@ -23833,8 +23930,11 @@ /turf/open/floor/iron/dark, /area/station/security/office) "hIE" = ( -/obj/machinery/newscaster/directional/west, -/turf/open/floor/iron/dark, +/obj/structure/mirror/directional/west, +/obj/structure/sink/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, /area/station/service/janitor) "hIN" = ( /obj/effect/turf_decal/tile/dark_blue/full, @@ -24000,7 +24100,6 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 9 }, -/obj/item/radio/intercom/directional/west, /obj/machinery/computer/rdservercontrol, /turf/open/floor/iron/dark, /area/station/science/server) @@ -24045,7 +24144,6 @@ c_tag = "Service - Chapel Funeral Parlor"; name = "service camera" }, -/obj/machinery/light/small/directional/east, /turf/open/floor/wood, /area/station/service/chapel/funeral) "hMe" = ( @@ -24084,22 +24182,19 @@ /turf/open/floor/iron, /area/station/command/gateway) "hMB" = ( -/obj/machinery/light/directional/west, /obj/machinery/newscaster/directional/west, /obj/structure/chair/comfy/brown{ dir = 4 }, /obj/effect/landmark/start/chaplain, -/turf/open/floor/wood/tile, +/turf/open/floor/wood, /area/station/service/chapel/office) "hMD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/duct, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, +/turf/open/floor/iron, /area/station/service/janitor) "hME" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -24138,6 +24233,7 @@ dir = 5 }, /obj/machinery/light/small/directional/east, +/obj/machinery/firealarm/directional/east, /obj/machinery/computer/department_orders/science{ dir = 8 }, @@ -24607,11 +24703,11 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "hWv" = ( -/obj/structure/sign/poster/ripped/directional/east, -/obj/structure/bed/pod, -/obj/item/bedsheet/mime, -/obj/effect/landmark/start/mime, -/turf/open/floor/carpet/black, +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/holopad, +/turf/open/floor/iron/large, /area/station/service/theater) "hWF" = ( /obj/effect/turf_decal/tile/green/anticorner/contrasted, @@ -24661,10 +24757,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/structure/table, /obj/item/crowbar/large, -/obj/item/storage/medkit/regular{ - pixel_x = 6; - pixel_y = 6 - }, /turf/open/floor/iron/dark/side, /area/station/engineering/storage_shared) "hYj" = ( @@ -24677,15 +24769,16 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "hYk" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/obj/effect/turf_decal/trimline/red/line{ +/obj/effect/turf_decal/trimline/blue/line{ dir = 4 }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/office) +/obj/machinery/light/directional/west, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) "hYC" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -24816,7 +24909,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "iaL" = ( -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/east, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /obj/structure/closet/l3closet/scientist, @@ -24901,10 +24994,6 @@ }, /obj/item/radio/intercom/directional/north, /obj/structure/table/wood, -/obj/effect/spawner/random/bureaucracy/briefcase{ - spawn_loot_count = 2; - spawn_random_offset = 1 - }, /turf/open/floor/wood, /area/station/service/library/private) "icZ" = ( @@ -24992,6 +25081,7 @@ /area/station/hallway/primary/central) "ifE" = ( /obj/effect/turf_decal/bot, +/obj/machinery/status_display/ai/directional/east, /obj/machinery/atmospherics/components/trinary/mixer/flipped, /turf/open/floor/iron, /area/station/science/ordnance) @@ -25029,9 +25119,11 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "ihc" = ( -/turf/open/floor/iron/dark/side{ - dir = 8 +/obj/effect/turf_decal/siding/dark, +/obj/effect/turf_decal/siding/dark{ + dir = 1 }, +/turf/open/floor/iron/dark, /area/station/service/theater) "ihg" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -25518,11 +25610,8 @@ /turf/open/floor/plating, /area/station/engineering/break_room) "ioJ" = ( -/obj/machinery/airalarm/directional/south, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/turf/open/floor/iron, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/station/engineering/engine_smes) "ioZ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -25573,11 +25662,8 @@ }, /obj/structure/cable, /obj/structure/table/reinforced, -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring medbay to ensure patient safety."; - name = "Medbay Monitor"; - network = list("medbay") - }, +/obj/item/folder/red, +/obj/item/pen, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "ipC" = ( @@ -25587,9 +25673,6 @@ /obj/machinery/light_switch/directional/east{ pixel_y = 5 }, -/obj/structure/chair{ - dir = 8 - }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -25716,6 +25799,8 @@ /area/station/engineering/atmos/storage) "iqQ" = ( /obj/machinery/airalarm/directional/north, +/obj/structure/chair/wood, +/obj/effect/landmark/start/chaplain, /turf/open/floor/wood, /area/station/service/chapel/funeral) "iqS" = ( @@ -25760,7 +25845,6 @@ /turf/open/floor/iron/dark, /area/station/construction/mining/aux_base) "irR" = ( -/obj/machinery/light/directional/west, /obj/machinery/status_display/evac/directional/west, /obj/structure/table/reinforced/rglass, /obj/item/screwdriver{ @@ -25768,6 +25852,7 @@ }, /obj/item/wirecutters, /obj/item/vacuum_pack, +/obj/item/disk/vacuum_upgrade/biomass, /turf/open/floor/iron/white, /area/station/science/xenobiology) "isa" = ( @@ -25792,7 +25877,9 @@ /obj/structure/sign/painting/library{ pixel_y = 32 }, -/obj/structure/filingcabinet, +/obj/structure/chair/office{ + dir = 8 + }, /turf/open/floor/wood, /area/station/service/library) "isM" = ( @@ -25804,13 +25891,11 @@ /turf/open/floor/iron/dark/side, /area/station/commons/fitness/recreation) "isR" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/directional/north, -/mob/living/basic/chicken, -/turf/open/floor/grass, -/area/station/service/hydroponics) +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/west, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) "ita" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26139,6 +26224,14 @@ /obj/machinery/atmospherics/pipe/smart/simple/brown/visible, /turf/open/floor/plating, /area/station/maintenance/department/engineering/central) +"ivZ" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/line, +/obj/structure/closet/firecloset/wall/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "iwa" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 10 @@ -26226,19 +26319,9 @@ /turf/open/floor/iron/white, /area/station/medical/exam_room) "iya" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Storage" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, -/turf/open/floor/iron/textured, -/area/station/engineering/storage) +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) "iyf" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/duct, @@ -26291,9 +26374,11 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/north{ + pixel_x = -5 + }, /obj/machinery/light_switch/directional/north{ - pixel_x = 8 + pixel_x = 5 }, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -26354,9 +26439,8 @@ /turf/open/floor/glass/reinforced, /area/station/engineering/main) "izX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, /obj/structure/table, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/smithing) "iAb" = ( @@ -26483,6 +26567,7 @@ "iDA" = ( /obj/structure/cable/layer1, /obj/structure/cable, +/obj/effect/turf_decal/bot_red, /turf/open/floor/plating/airless, /area/space/nearstation) "iDN" = ( @@ -26513,7 +26598,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/hydroponics/glass{ +/obj/machinery/door/airlock/hydroponics{ name = "Hydroponics" }, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, @@ -26570,7 +26655,6 @@ /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) "iFL" = ( -/obj/machinery/light/small/directional/south, /obj/machinery/newscaster/directional/south, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -26652,7 +26736,10 @@ /area/station/maintenance/port/fore) "iHe" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Prison, Cell 4"; + name = "security camera" + }, /obj/machinery/duct, /turf/open/floor/wood/large, /area/station/security/prison/safe) @@ -26733,6 +26820,14 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/iron/white, /area/station/science/auxlab) +"iIC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "iID" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 @@ -27129,6 +27224,7 @@ /area/station/science/ordnance/freezerchamber) "iOi" = ( /obj/machinery/light/directional/north, +/obj/item/radio/intercom/prison/directional/north, /obj/structure/table, /turf/open/floor/iron/dark, /area/station/security/prison) @@ -27297,6 +27393,9 @@ /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "iQE" = ( +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -27409,6 +27508,7 @@ /area/station/command/bridge) "iSr" = ( /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/directional/south, /obj/machinery/keycard_auth/directional/south, /obj/machinery/pdapainter/medbay, /turf/open/floor/iron/dark, @@ -27605,10 +27705,8 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/science/explab) "iXl" = ( @@ -27650,7 +27748,7 @@ /area/station/security/execution/transfer) "iXR" = ( /obj/machinery/vending/wardrobe/chap_wardrobe, -/turf/open/floor/wood/tile, +/turf/open/floor/iron/dark, /area/station/service/chapel/office) "iXS" = ( /obj/effect/turf_decal/trimline/red/filled/line{ @@ -27832,6 +27930,7 @@ /obj/effect/turf_decal/trimline/red/warning{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron/dark, @@ -27946,6 +28045,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 }, +/obj/machinery/light/directional/north, /obj/structure/closet/wardrobe/miner, /turf/open/floor/iron/dark/side{ dir = 1 @@ -27959,11 +28059,10 @@ /area/station/maintenance/department/security/brig) "jdb" = ( /obj/machinery/firealarm/directional/west, -/obj/machinery/light/small/directional/west, /turf/open/floor/wood, /area/station/service/chapel/funeral) "jdg" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/primary/aft) @@ -28059,13 +28158,10 @@ /turf/open/floor/iron, /area/station/engineering/atmos/office) "jeL" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/stone, -/area/station/smithing) +/obj/machinery/light/small/directional/south, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/prison) "jeX" = ( /obj/effect/turf_decal/trimline/brown/line{ dir = 8 @@ -28196,6 +28292,7 @@ /area/station/engineering/main) "jhJ" = ( /obj/machinery/camera/autoname/directional/west, +/obj/structure/closet/emcloset/wall/directional/west, /turf/open/floor/iron/dark, /area/station/service/chapel) "jhR" = ( @@ -28277,7 +28374,6 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "jjx" = ( -/obj/machinery/light/small/directional/east, /obj/machinery/cryopod{ dir = 8 }, @@ -28346,6 +28442,7 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/primary/central) "jkE" = ( +/obj/machinery/light/floor/has_bulb, /obj/machinery/duct, /turf/open/floor/plastic, /area/station/security/prison/safe) @@ -28386,6 +28483,7 @@ "jkZ" = ( /obj/structure/table/wood, /obj/item/paper_bin, +/obj/item/folder, /obj/item/pen, /turf/open/floor/wood, /area/station/service/library/private) @@ -28860,6 +28958,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Escape Pod Three" @@ -29117,11 +29216,11 @@ /area/station/maintenance/port/fore) "jyS" = ( /obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, /obj/machinery/door/poddoor/shutters{ id = "robotics_pub_shutters"; name = "Robotics Shutters" }, -/obj/structure/cable, /turf/open/floor/plating, /area/station/science/robotics/lab) "jyV" = ( @@ -29131,6 +29230,16 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +"jyX" = ( +/obj/effect/turf_decal/box, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/holopad, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology/hallway) "jzd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29161,10 +29270,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/fore) -"jzo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/office) "jzq" = ( /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark/corner, @@ -29177,11 +29282,13 @@ /turf/open/floor/iron, /area/station/engineering/break_room) "jzQ" = ( -/obj/structure/cable, -/obj/machinery/duct, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/duct, /turf/open/floor/iron/white, /area/station/science/genetics/cloning) "jAb" = ( @@ -29235,6 +29342,14 @@ /obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +"jBl" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Science - Xenobiology, Maintenance Access, Southeast"; + name = "science camera"; + network = list("ss13","rd") + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "jBr" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Pure to Mix"; @@ -29265,9 +29380,8 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "jCu" = ( -/obj/effect/spawner/random/structure/table_or_rack, +/obj/structure/rack, /obj/item/storage/box/lights/mixed, -/obj/item/toy/plush/slimeplushie, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "jCx" = ( @@ -29462,6 +29576,7 @@ /obj/item/storage/box/syringes{ pixel_y = 5 }, +/obj/item/storage/box/monkeycubes, /turf/open/floor/iron/white, /area/station/science/xenobiology) "jEi" = ( @@ -29571,6 +29686,7 @@ dir = 4 }, /obj/structure/sign/departments/maint/directional/south, +/obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "jFF" = ( @@ -29597,9 +29713,19 @@ /turf/open/floor/iron, /area/station/engineering/storage) "jGl" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/item/kirbyplants/random, -/turf/open/floor/iron, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engine SMES Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/iron/dark/textured, /area/station/engineering/main) "jGm" = ( /obj/effect/spawner/random/trash/cigbutt, @@ -29621,6 +29747,13 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark/side, /area/station/security/interrogation) +"jGy" = ( +/obj/structure/sign/poster/official/random/directional/north, +/obj/structure/chair/plastic{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison) "jGA" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -29763,7 +29896,7 @@ /turf/open/floor/wood/tile, /area/station/commons/dorms/room4) "jIp" = ( -/obj/machinery/firealarm/directional/north, +/obj/structure/table/wood, /turf/open/floor/wood, /area/station/service/chapel/funeral) "jIr" = ( @@ -29817,11 +29950,10 @@ /turf/open/floor/iron/large, /area/station/commons/dorms) "jJq" = ( -/obj/effect/turf_decal/trimline/purple/filled/corner, -/obj/effect/turf_decal/box, +/obj/structure/cable, /obj/machinery/duct, -/obj/machinery/holopad, -/turf/open/floor/iron/white/smooth_large, +/obj/structure/chair/stool/directional/east, +/turf/open/floor/iron/white, /area/station/science/genetics/cloning) "jJz" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -29895,10 +30027,21 @@ /obj/machinery/atmospherics/components/tank/oxygen, /turf/open/floor/iron, /area/station/science/ordnance) -"jKE" = ( -/obj/structure/chair{ +"jKD" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Commons - Cryogenics, Departures"; + name = "commons camera" + }, +/obj/machinery/cryopod{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ dir = 8 }, +/area/station/hallway/secondary/exit/departure_lounge) +"jKE" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark/side{ dir = 5 }, @@ -29923,14 +30066,18 @@ dir = 4 }, /obj/machinery/light/directional/west, +/obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "jLl" = ( +/obj/effect/turf_decal/siding/wood, /obj/machinery/camera/autoname/directional/east, -/obj/structure/chair/wood{ - dir = 8 - }, -/obj/effect/landmark/start/chaplain, +/obj/item/radio/intercom/directional/east, +/obj/structure/closet/crate/hydroponics, +/obj/item/seeds/tower, +/obj/item/seeds/tower, +/obj/item/seeds/tower, +/obj/item/shovel/spade, /turf/open/floor/wood, /area/station/service/chapel/funeral) "jLn" = ( @@ -30166,8 +30313,8 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "jPc" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/material_analyzer, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/smithing) "jPm" = ( @@ -30197,6 +30344,7 @@ /turf/open/floor/iron/white, /area/station/science/research) "jPy" = ( +/obj/machinery/light/small/directional/west, /obj/structure/noticeboard/directional/west, /obj/structure/table/wood, /obj/item/storage/photo_album/library, @@ -30305,13 +30453,10 @@ /turf/open/floor/plating, /area/station/maintenance/central) "jSu" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/light/directional/west, /obj/structure/extinguisher_cabinet/directional/west, -/obj/structure/chair/sofa/bench/right{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/hallway/primary/aft) "jSE" = ( @@ -30339,12 +30484,26 @@ /turf/open/floor/iron/white, /area/station/medical/cryo) "jSO" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/structure/table/wood, +/obj/item/cigbutt{ + pixel_y = 16; + pixel_x = -3 }, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/grass, -/area/station/service/hydroponics) +/obj/effect/spawner/random/entertainment/cigarette_pack{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/bottle/champagne{ + pixel_x = 8; + pixel_y = 12 + }, +/obj/effect/spawner/random/entertainment/lighter{ + pixel_x = -7; + pixel_y = -2 + }, +/obj/item/toy/figure/mime, +/turf/open/floor/carpet/black, +/area/station/service/theater) "jSP" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/bz, @@ -30428,8 +30587,7 @@ /turf/open/floor/iron, /area/station/engineering/main) "jUj" = ( -/obj/effect/spawner/random/structure/table_or_rack, -/obj/item/storage/box/lights/mixed, +/obj/structure/rack, /obj/effect/spawner/random/entertainment/plushie, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) @@ -30506,7 +30664,10 @@ /area/station/maintenance/port/aft) "jVE" = ( /obj/structure/table/wood/fancy/black, -/turf/open/floor/wood/tile, +/obj/item/storage/photo_album/chapel, +/obj/item/camera_film, +/obj/item/camera, +/turf/open/floor/wood, /area/station/service/chapel/office) "jVP" = ( /obj/effect/turf_decal/bot_white, @@ -30523,7 +30684,8 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "jVU" = ( -/obj/structure/cable/multilayer/connected, +/obj/structure/cable, +/obj/effect/turf_decal/bot_red/left, /turf/open/floor/plating/airless, /area/space/nearstation) "jVY" = ( @@ -30653,6 +30815,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, +/obj/machinery/light/small/directional/west, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, /obj/structure/rack, @@ -30830,11 +30993,11 @@ /turf/open/floor/iron/vaporwave, /area/station/command/heads_quarters/rd) "kaX" = ( -/obj/structure/reagent_dispensers/plumbed{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/port) +/obj/structure/bed/pod, +/obj/item/bedsheet/mime, +/obj/effect/landmark/start/mime, +/turf/open/floor/carpet/black, +/area/station/service/theater) "kbj" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/airalarm/directional/south, @@ -30981,10 +31144,10 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "kdZ" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/line{ +/obj/effect/turf_decal/trimline/neutral/line{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -31068,10 +31231,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1 - }, -/obj/effect/mapping_helpers/mail_sorting/service/theater, +/obj/structure/disposalpipe/segment, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port) "kfI" = ( @@ -31282,7 +31443,7 @@ "kix" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/button/door/directional/west{ - id = "med_front_desk_shutters"; + id = "medbay_desk_shutters"; name = "Front Desk Shutters Control"; req_access = list("medical"); pixel_y = -5 @@ -31378,6 +31539,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/department/electrical) +"kjS" = ( +/obj/structure/noticeboard/directional/east, +/obj/item/paper/fluff/stations/boxstation/external_engine_smes, +/obj/item/paper/fluff/stations/boxstation/external_pa_wiring, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/main) "kjV" = ( /obj/machinery/firealarm/directional/west{ pixel_y = -5 @@ -31588,14 +31755,11 @@ /turf/open/floor/iron, /area/station/maintenance/disposal) "knl" = ( -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/light/small/directional/west, -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/starboard) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) "knr" = ( /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, @@ -31622,6 +31786,7 @@ /turf/open/floor/carpet, /area/station/service/chapel) "knA" = ( +/mob/living/basic/chicken, /turf/open/floor/grass, /area/station/service/hydroponics) "knI" = ( @@ -31663,6 +31828,14 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/starboard/fore) +"koe" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/line, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "koo" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/structure/disposalpipe/segment{ @@ -31766,7 +31939,7 @@ name = "Chapel Requests Console" }, /obj/effect/mapping_helpers/requests_console/assistance, -/turf/open/floor/wood/tile, +/turf/open/floor/wood, /area/station/service/chapel/office) "kpW" = ( /obj/machinery/light/small/directional/south, @@ -31828,7 +32001,6 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 }, -/obj/machinery/light/directional/east, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -31840,7 +32012,11 @@ /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) "krD" = ( -/obj/machinery/camera/autoname/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Science - Server Room"; + name = "science camera"; + network = list("ss13","rd") + }, /obj/machinery/atmospherics/components/unary/passive_vent{ name = "freezer passive vent" }, @@ -31864,6 +32040,7 @@ c_tag = "Engineering - Shipbreaking, Storage Room"; name = "engineering camera" }, +/obj/structure/closet/emcloset/wall/directional/north, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron/dark/side/airless{ dir = 1 @@ -31968,7 +32145,7 @@ /turf/open/floor/iron/kitchen, /area/station/security/prison/mess) "ktn" = ( -/obj/machinery/atmospherics/components/binary/volume_pump{ +/obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "Waste Collection" }, @@ -32021,7 +32198,6 @@ /area/station/ai_monitored/turret_protected/ai) "kun" = ( /obj/machinery/camera/autoname/directional/west, -/obj/structure/closet/emcloset/wall/directional/west, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) "kuz" = ( @@ -32231,6 +32407,10 @@ /obj/structure/flora/bush/leafy, /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) +"kxQ" = ( +/obj/machinery/light_switch/directional/north, +/turf/open/floor/carpet, +/area/station/service/chapel) "kxU" = ( /obj/effect/spawner/random/structure/chair_flipped{ dir = 8 @@ -32797,6 +32977,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/cable, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /obj/machinery/door/poddoor/preopen{ id = "engineering"; name = "Engineering Blast Door" @@ -32872,7 +33056,6 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 1 }, -/obj/machinery/light/directional/south, /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/station/security/office) @@ -32881,6 +33064,7 @@ dir = 1 }, /obj/machinery/camera/autoname/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/station/engineering/main) "kKH" = ( @@ -33225,6 +33409,7 @@ }, /area/station/commons/fitness) "kQq" = ( +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 8; name = "freezer passive vent" @@ -33624,9 +33809,10 @@ /turf/open/floor/iron/dark/textured, /area/station/commons/dorms/room2) "kWu" = ( -/obj/structure/nestbox, -/turf/open/floor/grass, -/area/station/service/hydroponics) +/obj/effect/turf_decal/box, +/obj/machinery/holopad, +/turf/open/floor/iron/large, +/area/station/service/janitor) "kWy" = ( /obj/effect/turf_decal/bot, /obj/structure/table, @@ -33798,6 +33984,7 @@ /obj/structure/sign/picture_frame/portrait/bar{ pixel_y = 32 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/wood, /area/station/service/bar) "kZf" = ( @@ -33920,13 +34107,13 @@ "lbK" = ( /obj/structure/noticeboard/directional/north, /obj/structure/table/wood, -/obj/item/paper_bin, -/obj/effect/spawner/random/bureaucracy/folder{ +/obj/item/storage/fancy/candle_box{ pixel_y = 6 }, -/obj/effect/spawner/random/bureaucracy/pen{ - pixel_y = 5 +/obj/item/storage/fancy/candle_box/amber{ + pixel_y = 3 }, +/obj/item/storage/fancy/candle_box/vanilla, /turf/open/floor/wood, /area/station/service/chapel/funeral) "lbL" = ( @@ -34232,7 +34419,7 @@ /area/station/engineering/engine_smes) "lfT" = ( /obj/machinery/light/directional/south, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ +/obj/machinery/atmospherics/components/unary/portables_connector{ dir = 1 }, /obj/machinery/portable_atmospherics/canister/plasma, @@ -34365,16 +34552,17 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "liB" = ( -/obj/machinery/camera/autoname/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Science - Xenobiology, Access"; + network = list("ss13","rd"); + name = "science camera" + }, /obj/structure/closet/emcloset, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology/hallway) "liC" = ( -/obj/effect/turf_decal/bot_red, -/obj/machinery/light/directional/east, -/obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/iron/large, -/area/station/ai_monitored/command/storage/eva) +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) "liD" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -34387,7 +34575,7 @@ /obj/structure/cable, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ - name = "Bitrunner Den" + name = "Bitrunning Den" }, /obj/effect/landmark/navigate_destination/common/bitrunner, /turf/open/floor/iron/dark/textured, @@ -34410,19 +34598,25 @@ /turf/open/floor/plating, /area/station/security/checkpoint/medical) "liN" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/layer1, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "engineering"; - name = "Engineering Blast Door" +/obj/structure/cable/layer1, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Storage" }, -/turf/open/floor/plating, +/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, +/turf/open/floor/iron/textured, /area/station/engineering/storage) "liQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34447,6 +34641,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/light/directional/west, /obj/machinery/keycard_auth/directional/west, /obj/structure/cable, /obj/machinery/computer/accounting{ @@ -34484,6 +34679,9 @@ pixel_y = 28 }, /obj/structure/table/reinforced, +/obj/item/wrench, +/obj/item/crowbar/red, +/obj/item/clothing/mask/gas, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) "lkq" = ( @@ -34513,7 +34711,6 @@ /area/station/engineering/main) "lkV" = ( /obj/structure/sign/warning/vacuum/external/directional/east, -/obj/machinery/light/small/directional/east, /turf/open/floor/wood, /area/station/service/chapel/funeral) "lkX" = ( @@ -34772,7 +34969,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/machinery/light/directional/east, /obj/machinery/computer/operating{ name = "Robotics Operating Computer"; dir = 8 @@ -34801,7 +34997,6 @@ /turf/open/floor/catwalk_floor/iron, /area/station/maintenance/disposal/incinerator) "lpE" = ( -/obj/machinery/light/small/directional/east, /obj/machinery/camera/directional/east{ c_tag = "Command - Captain's Office"; name = "command camera" @@ -35011,8 +35206,11 @@ /area/station/medical/virology) "ltf" = ( /obj/effect/turf_decal/stripes/red/line, -/obj/machinery/light/small/directional/south, -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Science - Xenobiology, Cytology Pen"; + name = "science camera"; + network = list("ss13","rd") + }, /turf/open/floor/engine, /area/station/science/xenobiology) "ltg" = ( @@ -35060,11 +35258,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/door/poddoor/shutters{ - id = "custodial_shutters"; - name = "Custodial Closet Shutters"; - dir = 4 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/service{ + name = "Custodial Closet" }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, +/obj/effect/landmark/navigate_destination/janitor, /turf/open/floor/iron/dark/textured, /area/station/service/janitor) "ltM" = ( @@ -35240,7 +35439,6 @@ dir = 8 }, /obj/effect/landmark/start/assistant, -/obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "lvV" = ( @@ -35981,6 +36179,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon, /turf/open/floor/engine, /area/station/security/execution) +"lGM" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/suit_storage_unit/standard_unit, +/turf/open/floor/iron/white/textured, +/area/station/science/explab) "lGU" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 5 @@ -36008,6 +36211,7 @@ }, /obj/machinery/firealarm/directional/north, /obj/structure/rack, +/obj/item/crowbar/red, /obj/item/wrench/medical, /turf/open/floor/iron/white, /area/station/medical/cryo) @@ -36266,6 +36470,7 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 1 }, +/obj/machinery/light/directional/south, /obj/structure/table, /obj/machinery/fax{ fax_name = "Security Office"; @@ -36338,9 +36543,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/cargo) "lMK" = ( -/obj/structure/cable/layer1, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/machinery/power/rad_collector/anchored, /turf/open/floor/plating/airless, /area/space/nearstation) "lMP" = ( @@ -36431,13 +36634,13 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "lOf" = ( -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/siding/wood, /obj/machinery/button/door/directional/north{ id = "cap_privacy"; name = "Privacy Shutters Control"; req_access = list("command") }, -/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) "lOo" = ( @@ -36595,6 +36798,10 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/science) +"lTD" = ( +/obj/machinery/power/energy_accumulator/tesla_coil, +/turf/open/floor/plating/airless, +/area/space/nearstation) "lTH" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/effect/turf_decal/trimline/green/line{ @@ -36615,6 +36822,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, +/obj/structure/cable, /obj/structure/chair/sofa/bench, /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron, @@ -36684,7 +36892,7 @@ "lVb" = ( /obj/vehicle/ridden/janicart, /obj/item/key/janitor, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side, /area/station/service/janitor) "lVd" = ( /obj/machinery/light/directional/east, @@ -36736,15 +36944,12 @@ /turf/open/floor/iron/dark, /area/station/security/execution/transfer) "lWH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/service/theater) "lWJ" = ( /obj/machinery/light/directional/west, +/obj/structure/closet/firecloset/wall/directional/west, /turf/open/floor/iron/dark, /area/station/service/chapel) "lXl" = ( @@ -36762,6 +36967,12 @@ dir = 4 }, /area/station/command/heads_quarters/ce) +"lXq" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/camera/autoname/directional/south, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/starboard) "lXu" = ( /turf/open/floor/iron/white, /area/station/science/lab) @@ -36811,6 +37022,7 @@ /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "lYt" = ( +/obj/machinery/light/small/directional/north, /obj/machinery/firealarm/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 @@ -36905,7 +37117,7 @@ /turf/open/space/basic, /area/space) "lZA" = ( -/obj/machinery/light/small/directional/east, +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) @@ -36914,6 +37126,7 @@ /turf/open/floor/iron/sepia, /area/station/service/library/artgallery) "lZJ" = ( +/obj/machinery/light/small/directional/south, /obj/structure/chair/comfy/brown{ dir = 8 }, @@ -37181,7 +37394,23 @@ dir = 4 }, /obj/machinery/status_display/ai/directional/east, -/obj/machinery/vending/engivend, +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty{ + pixel_y = 5; + pixel_x = -4 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_y = 5 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_y = 5; + pixel_x = 4 + }, +/obj/item/stack/rods/fifty{ + pixel_y = 6; + pixel_x = -6 + }, +/obj/item/stack/rods/fifty, /turf/open/floor/iron, /area/station/engineering/storage) "mcO" = ( @@ -37305,13 +37534,10 @@ /turf/open/floor/wood/large, /area/station/command/heads_quarters/nt_rep) "mfd" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/shovel/spade, -/obj/item/seeds/tower, -/obj/item/seeds/tower, -/obj/item/seeds/tower, -/turf/open/floor/wood, -/area/station/service/chapel/funeral) +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/starboard/fore) "mfe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -37526,7 +37752,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, -/obj/machinery/camera/autoname/directional/west, +/obj/machinery/light/directional/west, /obj/structure/table, /obj/item/storage/belt/utility, /obj/item/borg/upgrade/rename, @@ -37554,8 +37780,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light/directional/west, /obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, /obj/structure/table/wood, /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -3; @@ -37704,6 +37931,7 @@ c_tag = "Engineering - External Particle Accelerator, West"; name = "engineering camera" }, +/obj/machinery/power/energy_accumulator/grounding_rod, /turf/open/floor/plating/airless, /area/space/nearstation) "mmS" = ( @@ -37802,13 +38030,14 @@ /turf/open/space, /area/space/nearstation) "mpo" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "engineering"; - name = "Engineering Blast Door" - }, -/turf/open/floor/plating, -/area/station/engineering/main) +/obj/machinery/light/small/directional/west, +/obj/structure/sign/warning/radiation/directional/west, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/cell_5k, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) "mpw" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -37924,6 +38153,21 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark/textured, /area/station/security/checkpoint/escape) +"mrB" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 10 + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/firealarm/directional/south{ + pixel_x = 5 + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = -5 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/chair/stool/directional/east, +/turf/open/floor/iron/white, +/area/station/science/genetics/cloning) "mrF" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 8 @@ -38273,6 +38517,7 @@ /turf/open/floor/iron/dark, /area/station/science/breakroom) "mxf" = ( +/obj/machinery/light/directional/west, /obj/structure/table, /obj/item/raw_anomaly_core/random{ pixel_x = -5; @@ -38477,9 +38722,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -38494,6 +38736,12 @@ /obj/effect/turf_decal/siding/thinplating/corner, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) +"mzT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/service/chapel/office) "mzY" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/iron/white, @@ -38507,6 +38755,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/office) +"mAw" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/line, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/starboard) "mAB" = ( /obj/machinery/light/small/built/directional/south, /obj/machinery/camera/directional/south{ @@ -38535,10 +38791,10 @@ /turf/open/floor/iron/white, /area/station/science/research) "mAO" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 }, -/obj/effect/turf_decal/trimline/yellow/line{ +/obj/effect/turf_decal/trimline/neutral/line{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ @@ -38780,6 +39036,7 @@ "mFO" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/light/directional/south, /turf/open/floor/iron/white, /area/station/medical/virology) "mFS" = ( @@ -38805,7 +39062,7 @@ /obj/machinery/door/airlock/external{ name = "Security External Access" }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/dark/textured_large, /area/station/security/lockers) @@ -38821,6 +39078,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/department/science) +"mHe" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/chapel/office) "mHm" = ( /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/dark/side{ @@ -38866,7 +39129,7 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "mIf" = ( -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -39091,7 +39354,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, -/obj/machinery/light/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -39269,6 +39531,11 @@ /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "mPp" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Science - Xenobiology, Cytology Workstation"; + name = "science camera"; + network = list("ss13","rd") + }, /obj/structure/table/reinforced/rglass, /obj/machinery/reagentgrinder{ pixel_y = 5 @@ -39337,30 +39604,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/commons/dorms/laundry) -"mRp" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/orange, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -9; - pixel_y = 9 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = 9; - pixel_y = 9 - }, -/obj/item/grenade/chem_grenade/cleaner{ - pixel_x = -9; - pixel_y = 3 - }, -/obj/item/grenade/chem_grenade/cleaner{ - pixel_y = 3 - }, -/obj/item/grenade/chem_grenade/cleaner{ - pixel_x = 9; - pixel_y = 3 - }, -/turf/open/floor/iron/dark, -/area/station/service/janitor) "mRx" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -39396,6 +39639,7 @@ /turf/open/floor/plating, /area/station/maintenance/port) "mSC" = ( +/obj/machinery/light/small/directional/north, /obj/machinery/vending/boozeomat/all_access, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) @@ -39434,13 +39678,8 @@ }, /area/station/commons/fitness) "mTk" = ( -/obj/machinery/firealarm/directional/east{ - pixel_y = 5 - }, -/obj/machinery/light_switch/directional/east{ - pixel_y = -5 - }, -/obj/item/radio/intercom/directional/south, +/obj/machinery/status_display/evac/directional/south, +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/table, /obj/item/stack/package_wrap, /obj/item/hand_labeler, @@ -39450,7 +39689,9 @@ /obj/item/restraints/legcuffs/beartrap, /obj/item/restraints/legcuffs/beartrap, /obj/item/restraints/legcuffs/beartrap, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 6 + }, /area/station/service/janitor) "mTp" = ( /obj/effect/turf_decal/stripes/line{ @@ -39568,7 +39809,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, -/obj/machinery/status_display/ai/directional/north, +/obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/engineering/main) "mVa" = ( @@ -39631,12 +39872,11 @@ /area/station/medical/morgue) "mVX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/obj/machinery/computer/shuttle/mining/common{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/computer/shuttle/mining/common, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "mWa" = ( @@ -39770,6 +40010,7 @@ /area/station/maintenance/department/science) "mZp" = ( /obj/effect/turf_decal/trimline/brown/filled/line, +/obj/machinery/light/directional/south, /obj/structure/sign/warning/vacuum/external/directional/south, /obj/machinery/computer/shuttle/mining{ dir = 8 @@ -39972,28 +40213,8 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 9 }, -/obj/machinery/airalarm/directional/north, -/obj/structure/table/reinforced/rglass, -/obj/item/storage/pill_bottle/mutadone{ - pixel_x = 8; - pixel_y = 12 - }, -/obj/item/storage/pill_bottle/mannitol{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/folder/white{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/item/pen{ - pixel_x = -4; - pixel_y = 7 - }, +/obj/machinery/light/small/directional/west, +/obj/structure/closet/wardrobe/mixed, /turf/open/floor/iron/white, /area/station/science/genetics/cloning) "ndQ" = ( @@ -40052,13 +40273,10 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "neG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/chair{ +/obj/structure/chair/wood{ dir = 8 }, -/turf/open/floor/wood/tile, +/turf/open/floor/wood, /area/station/service/chapel/office) "neW" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -40119,8 +40337,6 @@ "nfz" = ( /obj/machinery/light/directional/east, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, /turf/open/floor/stone, /area/station/smithing) "nfA" = ( @@ -40248,6 +40464,9 @@ }, /obj/effect/turf_decal/stripes/line, /obj/structure/cable, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /obj/machinery/door/poddoor/preopen{ id = "engineering"; name = "Engineering Blast Door" @@ -40280,7 +40499,6 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 9 }, -/obj/machinery/light/small/directional/north, /obj/machinery/firealarm/directional/north{ pixel_x = -5 }, @@ -40409,11 +40627,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) -"nkb" = ( -/obj/machinery/duct, -/obj/effect/spawner/random/structure/crate, -/turf/open/floor/plating, -/area/station/maintenance/port) "nkc" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/door/window/brigdoor/left/directional/north{ @@ -40441,6 +40654,12 @@ dir = 1 }, /area/station/cargo/storage) +"nkm" = ( +/obj/machinery/light/directional/north, +/obj/structure/chair/comfy/brown, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/station/medical/break_room) "nks" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -40616,6 +40835,12 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"nnz" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "nnB" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -40654,18 +40879,12 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "nnZ" = ( -/obj/machinery/light/small/directional/north, -/obj/structure/table, -/obj/item/reagent_containers/cup/bucket{ - pixel_y = 6; - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bucket{ - pixel_y = 9; - pixel_x = 6 +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 10 }, -/turf/open/floor/iron/dark, -/area/station/service/janitor) +/obj/structure/sign/warning/vacuum/external/directional/south, +/turf/open/floor/iron, +/area/station/engineering/main) "noa" = ( /obj/structure/chair/comfy/black{ dir = 1 @@ -40699,7 +40918,7 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/blueshield) "noM" = ( -/obj/machinery/atmospherics/components/binary/volume_pump/on{ +/obj/machinery/atmospherics/components/binary/valve/digital/on{ name = "Waste Release" }, /turf/open/floor/plating, @@ -40796,6 +41015,7 @@ "nqm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -40850,14 +41070,12 @@ }, /area/station/command/heads_quarters/ce) "nrl" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/machinery/status_display/evac/directional/west, +/obj/effect/spawner/random/entertainment/arcade{ + dir = 4 }, -/obj/effect/turf_decal/siding/wood, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, -/turf/open/floor/stone, -/area/station/smithing) +/turf/open/floor/wood, +/area/station/security/prison/rec) "nrz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -40947,11 +41165,12 @@ /turf/open/floor/plating, /area/station/security/bitden) "nsA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/table/wood/fancy/black, +/obj/item/storage/crayons, +/obj/item/storage/fancy/candle_box{ + pixel_y = 5 }, -/obj/structure/filingcabinet, -/turf/open/floor/wood/tile, +/turf/open/floor/wood, /area/station/service/chapel/office) "nsB" = ( /obj/machinery/light/small/directional/south, @@ -41395,6 +41614,7 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 8 }, +/obj/machinery/light/small/directional/west, /turf/open/floor/engine, /area/station/science/xenobiology) "nzT" = ( @@ -41570,6 +41790,7 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/department/science) "nBX" = ( +/obj/machinery/light/small/directional/south, /obj/machinery/firealarm/directional/south, /turf/open/floor/carpet, /area/station/hallway/secondary/entry) @@ -41728,7 +41949,6 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "nDK" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/service/hydroponics/garden) "nEb" = ( @@ -41975,9 +42195,6 @@ /turf/closed/wall, /area/station/commons/dorms/room2) "nIW" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, /obj/machinery/firealarm/directional/south{ pixel_x = 5 }, @@ -41988,7 +42205,7 @@ c_tag = "Service - Chapel Office"; name = "service camera" }, -/turf/open/floor/wood/tile, +/turf/open/floor/wood, /area/station/service/chapel/office) "nJa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42068,17 +42285,8 @@ /turf/open/floor/iron/white, /area/station/science/research) "nJN" = ( -/obj/effect/turf_decal/trimline/neutral/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/entry) +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/aft) "nJS" = ( /obj/effect/turf_decal/box, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42321,7 +42529,8 @@ /obj/structure/cable, /obj/structure/table/reinforced, /obj/item/stack/sheet/mineral/coal/five, -/turf/open/floor/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/smithing) "nOj" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -42385,7 +42594,9 @@ /area/station/medical/medbay/central) "nPf" = ( /obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/carpet/blue, /area/station/medical/psychology) "nPl" = ( @@ -42476,13 +42687,14 @@ /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) "nQD" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/components/binary/pump/on/general/hidden/layer2{ + dir = 4; + name = "External Ports to Scrubbers" }, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/stone, -/area/station/smithing) +/turf/open/floor/iron, +/area/station/engineering/break_room) "nQN" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/computer/records/medical{ @@ -42589,7 +42801,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light/directional/south, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /obj/structure/tank_dispenser, @@ -42918,7 +43129,7 @@ /area/station/service/library/lounge) "nYx" = ( /obj/machinery/camera/directional/west{ - c_tag = "Science - Access"; + c_tag = "Science - Access, Main"; name = "science camera"; network = list("ss13","rd") }, @@ -43039,7 +43250,7 @@ /obj/effect/turf_decal/trimline/green/line{ dir = 1 }, -/obj/machinery/light/small/directional/south, +/obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) "nZW" = ( @@ -43236,6 +43447,7 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "ocP" = ( +/obj/machinery/light/small/directional/south, /obj/structure/extinguisher_cabinet/directional/west, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -43261,6 +43473,7 @@ /area/station/maintenance/port/fore) "odz" = ( /obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/engine, /area/station/science/explab) "odC" = ( @@ -43416,6 +43629,7 @@ dir = 8 }, /obj/machinery/light/small/directional/east, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "ogY" = ( @@ -43500,8 +43714,10 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "oij" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/light/small/directional/west, /obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/wood/tile, +/turf/open/floor/wood, /area/station/service/chapel/office) "oim" = ( /obj/machinery/light/directional/south, @@ -43563,7 +43779,8 @@ "ojr" = ( /obj/machinery/light/directional/east, /obj/machinery/electroplater, -/turf/open/floor/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/smithing) "oju" = ( /obj/effect/turf_decal/stripes/line{ @@ -43690,6 +43907,7 @@ dir = 4 }, /obj/machinery/light/directional/west, +/obj/structure/sign/poster/official/random/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, @@ -43785,13 +44003,6 @@ dir = 4 }, /area/station/engineering/break_room) -"onq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/spawner/random/trash/garbage, -/turf/open/floor/plating, -/area/station/maintenance/port) "ony" = ( /obj/docking_port/stationary{ dir = 2; @@ -43937,8 +44148,9 @@ name = "Custodial Shutters Control"; req_access = list("janitor") }, -/obj/machinery/duct, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, /area/station/service/janitor) "opK" = ( /obj/effect/turf_decal/box, @@ -44079,16 +44291,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"osq" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 4 - }, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "osP" = ( /obj/machinery/computer/cryopod/directional/north, /turf/open/floor/iron/dark/side{ @@ -44279,10 +44481,10 @@ /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "ovM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/wood/tile, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood, /area/station/service/chapel/office) "ovO" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, @@ -44678,7 +44880,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/structure/reagent_forge, -/turf/open/floor/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/smithing) "oDg" = ( /obj/effect/spawner/structure/window/reinforced, @@ -44707,10 +44910,8 @@ /turf/open/floor/wood/large, /area/station/command/heads_quarters/nt_rep) "oDL" = ( -/obj/machinery/status_display/ai/directional/east, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, +/obj/structure/cable, +/turf/open/floor/iron, /area/station/engineering/atmos/office) "oDQ" = ( /obj/effect/landmark/start/hangover, @@ -44848,7 +45049,8 @@ /obj/machinery/camera/directional/south{ c_tag = "AI Sat - External, Northeast"; network = list("minisat"); - start_active = 1 + start_active = 1; + name = "exterior camera" }, /turf/open/space/basic, /area/space/nearstation) @@ -44883,7 +45085,8 @@ /turf/open/floor/plating, /area/station/cargo/lobby) "oHe" = ( -/turf/open/floor/grass, +/obj/effect/turf_decal/siding/wood/corner, +/turf/open/floor/wood, /area/station/service/chapel/funeral) "oHl" = ( /turf/closed/wall, @@ -45519,6 +45722,7 @@ /area/station/maintenance/solars/port/fore) "oRb" = ( /obj/effect/turf_decal/trimline/red/filled/line, +/obj/machinery/light/small/directional/south, /obj/structure/filingcabinet, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) @@ -45764,6 +45968,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 }, +/obj/machinery/light/directional/north, /obj/structure/extinguisher_cabinet/directional/north, /obj/structure/closet/crate, /obj/item/stack/ore/silver{ @@ -45820,6 +46025,11 @@ /obj/machinery/duct, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) +"oWD" = ( +/obj/effect/turf_decal/box, +/obj/machinery/holopad, +/turf/open/floor/iron/large, +/area/station/hallway/primary/aft) "oWG" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46070,8 +46280,17 @@ }, /obj/machinery/light/directional/east, /obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/closet/radiation, -/obj/item/crowbar/large, +/obj/structure/table, +/obj/item/electronics/airlock{ + pixel_x = -6; + pixel_y = 9 + }, +/obj/item/electronics/airlock, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil{ + pixel_y = 3; + pixel_x = 3 + }, /turf/open/floor/iron, /area/station/engineering/storage) "pap" = ( @@ -46195,6 +46414,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine) "pcT" = ( +/obj/machinery/light/small/directional/north, /obj/structure/table, /obj/item/paper_bin, /turf/open/floor/iron/white, @@ -46256,12 +46476,13 @@ /turf/open/floor/iron/dark, /area/station/security/processing) "peO" = ( -/obj/machinery/firealarm/directional/south{ - pixel_x = -5 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/light_switch/directional/south{ pixel_x = 5 }, +/obj/machinery/firealarm/directional/south{ + pixel_x = -5 + }, /turf/open/floor/wood, /area/station/service/bar) "peS" = ( @@ -46278,9 +46499,11 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "pfy" = ( -/obj/structure/closet/firecloset/wall/directional/west, -/turf/open/floor/iron/dark, -/area/station/service/chapel) +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/chapel/funeral) "pfJ" = ( /obj/machinery/door/firedoor/border_only, /obj/structure/window/reinforced/spawner/directional/south, @@ -46309,11 +46532,6 @@ }, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, -/obj/machinery/camera/directional/west{ - c_tag = "Science - Genetics"; - name = "science camera"; - network = list("ss13","rd") - }, /obj/structure/table/reinforced/rglass, /obj/item/storage/box/monkeycubes, /turf/open/floor/iron/white, @@ -46431,6 +46649,7 @@ }, /obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/firealarm/directional/east, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/science/breakroom) "pin" = ( @@ -46536,6 +46755,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port) "pkv" = ( @@ -46557,7 +46777,8 @@ /area/station/commons/fitness/recreation) "pkR" = ( /obj/structure/machine/assembly_bench, -/turf/open/floor/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/smithing) "plq" = ( /obj/effect/turf_decal/trimline/brown/line{ @@ -46618,6 +46839,7 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/light/directional/south, /obj/structure/bookcase/manuals/botany, /turf/open/floor/iron/dark/side, /area/station/service/hydroponics) @@ -46724,6 +46946,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron/dark, @@ -46876,8 +47099,8 @@ /turf/open/floor/iron, /area/station/engineering/main) "pqq" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/arc_forge, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/smithing) "pqw" = ( @@ -46950,7 +47173,7 @@ dir = 4 }, /obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/east, +/obj/machinery/light/directional/east, /obj/structure/closet/secure_closet/security/sec, /turf/open/floor/iron/dark, /area/station/security/lockers) @@ -47000,6 +47223,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "prE" = ( +/obj/machinery/light/small/directional/east, /obj/item/radio/intercom/directional/east, /obj/structure/table, /obj/item/paper_bin{ @@ -47059,16 +47283,11 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "ptd" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white/textured, -/area/station/science/research) +/turf/open/floor/iron/white, +/area/station/science/explab) "pte" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/corner, /obj/effect/turf_decal/trimline/dark_blue/line{ @@ -47354,12 +47573,12 @@ /turf/open/floor/iron/white, /area/station/medical/exam_room) "pxU" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/structure/railing{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/stone, -/area/station/smithing) +/turf/open/floor/iron/dark, +/area/station/hallway/primary/starboard) "pxW" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt, @@ -47602,7 +47821,10 @@ /area/station/security/prison/mess) "pBK" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Prison, Cell 3"; + name = "security camera" + }, /obj/machinery/duct, /turf/open/floor/carpet/purple, /area/station/security/prison/safe) @@ -47758,8 +47980,8 @@ "pDJ" = ( /obj/machinery/light/small/directional/east, /obj/item/radio/intercom/chapel/directional/east, -/obj/structure/chair, -/turf/open/floor/iron/dark, +/obj/structure/chair/wood, +/turf/open/floor/wood, /area/station/service/chapel/office) "pDN" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -47876,6 +48098,7 @@ /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) "pGf" = ( +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 4; name = "freezer passive vent" @@ -48013,12 +48236,13 @@ /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) "pHX" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/storage/fancy/candle_box{ - pixel_y = 5 +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/obj/item/storage/crayons, -/turf/open/floor/wood/tile, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/wood, /area/station/service/chapel/office) "pIi" = ( /obj/machinery/door/window/right/directional/south, @@ -48158,7 +48382,6 @@ /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) "pKY" = ( -/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1 }, @@ -48373,6 +48596,7 @@ }, /obj/effect/turf_decal/trimline/red/line, /obj/machinery/airalarm/directional/north, +/obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/security/office) "pOt" = ( @@ -48532,12 +48756,11 @@ /area/station/command/heads_quarters/cmo) "pSn" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/status_display/evac/directional/south, /obj/structure/table, /obj/item/storage/box/lights/mixed, /obj/item/storage/box/lights/mixed, /obj/item/lightreplacer, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side, /area/station/service/janitor) "pSt" = ( /obj/effect/turf_decal/stripes/line{ @@ -48597,8 +48820,9 @@ /turf/open/floor/iron/white, /area/station/science/auxlab) "pTC" = ( -/obj/machinery/duct, -/obj/effect/spawner/random/trash/garbage, +/obj/structure/reagent_dispensers/plumbed{ + dir = 4 + }, /turf/open/floor/plating, /area/station/maintenance/port) "pTI" = ( @@ -48714,7 +48938,6 @@ "pVJ" = ( /obj/structure/table/wood, /obj/effect/spawner/random/decoration/flower, -/obj/effect/spawner/random/decoration/flower, /turf/open/floor/iron/dark, /area/station/service/chapel) "pVV" = ( @@ -48869,6 +49092,7 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/office) "pXY" = ( +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/showroomfloor, /area/station/security/prison/shower) "pYd" = ( @@ -49169,7 +49393,7 @@ /turf/open/floor/iron/dark/side, /area/station/engineering/storage_shared) "qde" = ( -/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/small/directional/north, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, /turf/open/floor/iron/white, @@ -49390,11 +49614,9 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/office) "qgz" = ( -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 6 - }, -/obj/machinery/duct, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/box, +/obj/machinery/holopad, +/turf/open/floor/iron/white/smooth_large, /area/station/science/genetics/cloning) "qgA" = ( /turf/open/floor/iron/dark, @@ -49534,8 +49756,25 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "qjP" = ( -/obj/machinery/duct, -/turf/open/floor/iron/dark, +/obj/machinery/status_display/ai/directional/north, +/obj/machinery/firealarm/directional/east{ + pixel_y = -5 + }, +/obj/machinery/light_switch/directional/east{ + pixel_y = 5 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/bucket{ + pixel_y = 6; + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bucket{ + pixel_y = 9; + pixel_x = 6 + }, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, /area/station/service/janitor) "qkl" = ( /obj/item/seeds/banana, @@ -49615,9 +49854,7 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "qlI" = ( -/obj/machinery/status_display/evac/directional/east, -/obj/structure/table/wood, -/obj/item/storage/fancy/candle_box/vanilla, +/obj/machinery/firealarm/directional/east, /turf/open/floor/wood, /area/station/service/chapel/funeral) "qlK" = ( @@ -49824,6 +50061,7 @@ c_tag = "Engineering - External Particle Accelerator, East"; name = "engineering camera" }, +/obj/machinery/power/rad_collector/anchored, /turf/open/floor/plating/airless, /area/space/nearstation) "qph" = ( @@ -49917,6 +50155,7 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard/aft) "qqi" = ( +/obj/machinery/status_display/evac/directional/south, /obj/structure/closet/secure_closet/atmospherics, /turf/open/floor/iron/dark/side{ dir = 10 @@ -50183,9 +50422,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -50301,6 +50537,33 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/wood, /area/station/service/library) +"qxj" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 6 + }, +/obj/structure/table/reinforced/rglass, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/folder/white{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/storage/pill_bottle/mutadone{ + pixel_x = 8; + pixel_y = 12 + }, +/obj/item/storage/pill_bottle/mannitol{ + pixel_x = 8; + pixel_y = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/genetics/cloning) "qxm" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -50352,9 +50615,8 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/entry) "qyx" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/smooth_large, /area/station/security/office) "qyB" = ( @@ -50501,6 +50763,7 @@ "qAo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark/side, /area/station/security/prison/workout) "qAq" = ( @@ -50550,9 +50813,6 @@ /obj/machinery/firealarm/directional/south{ pixel_x = -5 }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, /turf/open/floor/stone, @@ -50574,7 +50834,6 @@ /turf/open/floor/iron/checker, /area/station/science/lab) "qBU" = ( -/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -50634,7 +50893,6 @@ /area/station/command/heads_quarters/nt_rep) "qDz" = ( /obj/structure/sign/warning/radiation/directional/west, -/obj/structure/cable/layer1, /turf/open/floor/iron, /area/station/engineering/engine_smes) "qDZ" = ( @@ -50686,7 +50944,7 @@ /turf/open/floor/iron/dark, /area/station/security/prison/workout) "qEI" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/item/kirbyplants/random, /turf/open/floor/carpet/blue, /area/station/medical/psychology) "qET" = ( @@ -50776,9 +51034,9 @@ /area/station/science/genetics) "qGx" = ( /obj/machinery/light/directional/east, -/obj/structure/table/wood, -/obj/item/storage/fancy/candle_box, -/turf/open/floor/wood, +/obj/machinery/status_display/ai/directional/east, +/obj/machinery/growing/soil, +/turf/open/floor/grass, /area/station/service/chapel/funeral) "qGy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50862,6 +51120,7 @@ dir = 8 }, /obj/machinery/light/directional/east, +/obj/structure/closet/emcloset/wall/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "qHq" = ( @@ -50879,10 +51138,10 @@ /obj/effect/turf_decal/trimline/blue/corner{ dir = 4 }, +/obj/machinery/firealarm/directional/west, /obj/structure/chair{ dir = 1 }, -/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "qHC" = ( @@ -51242,20 +51501,11 @@ /obj/machinery/duct, /turf/open/floor/iron/kitchen, /area/station/command/heads_quarters/nt_rep) -"qPn" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/south, -/mob/living/basic/chicken, -/turf/open/floor/grass, -/area/station/service/hydroponics) "qPo" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/delivery/red, /obj/machinery/newscaster/directional/east, +/obj/machinery/light/directional/east, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) @@ -51277,9 +51527,12 @@ /area/station/security/brig) "qPL" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/delivery/red, +/obj/effect/turf_decal/box/red, /obj/machinery/light/small/directional/east, -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron/dark, /area/station/security/execution) "qPO" = ( @@ -51487,6 +51740,16 @@ /obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/iron/white/textured, /area/station/science/circuits) +"qTm" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 8 + }, +/obj/structure/closet/firecloset/wall/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) "qTs" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51635,14 +51898,15 @@ /turf/open/floor/carpet, /area/station/service/chapel) "qWn" = ( +/obj/machinery/firealarm/directional/north, /obj/structure/table, -/obj/item/book/manual/wiki/atmospherics, /obj/item/tank/internals/plasmaman/belt/empty{ - pixel_x = 9 + pixel_x = -11 }, /obj/item/tank/internals/plasmaman/belt/empty{ - pixel_x = -11 + pixel_x = 9 }, +/obj/item/book/manual/wiki/atmospherics, /obj/item/crowbar/red, /obj/item/toy/figure/atmos{ pixel_y = 16 @@ -51985,10 +52249,14 @@ /area/station/hallway/secondary/entry) "rcG" = ( /obj/structure/table/wood/fancy/black, +/obj/item/paper_bin, +/obj/item/folder, +/obj/item/pen/fountain, /obj/item/toy/figure/chaplain{ - pixel_y = -9 + pixel_y = 16; + pixel_x = -8 }, -/turf/open/floor/wood/tile, +/turf/open/floor/wood, /area/station/service/chapel/office) "rcS" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -52049,6 +52317,11 @@ /obj/item/storage/crayons, /turf/open/floor/iron, /area/station/commons/dorms) +"rdL" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/station/science/robotics/lab) "rdQ" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/effect/landmark/start/hangover, @@ -52181,7 +52454,6 @@ "rgE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/molten_object/large, -/obj/structure/cable, /turf/open/floor/stone, /area/station/smithing) "rgJ" = ( @@ -52217,6 +52489,10 @@ }, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/aft) +"rhe" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "rhh" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -52227,10 +52503,9 @@ /turf/open/floor/iron/white, /area/station/medical/exam_room) "rhs" = ( -/obj/machinery/light/directional/east, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, -/turf/open/floor/wood/tile, +/turf/open/floor/wood, /area/station/service/chapel/office) "rhv" = ( /obj/effect/turf_decal/stripes/line, @@ -52323,12 +52598,12 @@ }, /area/station/security/prison) "rjf" = ( -/obj/machinery/light/small/directional/west, +/obj/machinery/light/small/directional/east, /obj/item/radio/intercom/chapel/directional/east, -/obj/structure/chair{ +/obj/structure/chair/wood{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/wood, /area/station/service/chapel/office) "rjp" = ( /obj/structure/table/wood, @@ -52525,13 +52800,11 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/blueshield) "rnN" = ( -/obj/effect/turf_decal/box, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/holopad, /obj/machinery/duct, -/turf/open/floor/iron/dark/smooth_large, +/turf/open/floor/iron/dark, /area/station/security/execution) "rnO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -52584,12 +52857,11 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "rov" = ( -/obj/effect/turf_decal/box, /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/wood/tile, +/turf/open/floor/wood, /area/station/service/chapel/office) "roO" = ( /obj/machinery/power/transmission_laser{ @@ -52747,8 +53019,8 @@ /area/station/medical/medbay/central) "rrR" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/machinery/airalarm/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron/white, /area/station/medical/cryo) "rsn" = ( @@ -52947,19 +53219,18 @@ /turf/open/floor/catwalk_floor/iron, /area/station/maintenance/department/science) "rvC" = ( -/obj/machinery/light/small/directional/north, -/obj/structure/closet/l3closet/janitor, -/obj/item/clothing/under/costume/maid, -/obj/item/clothing/gloves/maid, -/obj/item/clothing/head/costume/maidheadband, -/obj/item/grenade/clusterbuster/cleaner, -/turf/open/floor/iron/dark, -/area/station/service/janitor) +/obj/machinery/light/small/broken/directional/east, +/obj/structure/sign/poster/ripped/directional/east, +/obj/structure/closet/cardboard{ + name = "Mime's Cardboard box"; + desc = "The mime uses this box to store his resentment for the clown for getting so many brand deals. It also serves as a bed" + }, +/turf/open/floor/carpet/black, +/area/station/service/theater) "rvW" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, -/obj/machinery/light/directional/west, /obj/machinery/airalarm/directional/west, /obj/structure/table, /obj/item/stack/sheet/iron/fifty{ @@ -53065,7 +53336,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/hydroponics/glass{ +/obj/machinery/door/airlock/hydroponics{ name = "Hydroponics" }, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, @@ -53124,8 +53395,11 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/port) "rxv" = ( -/obj/machinery/light/small/directional/north, -/obj/machinery/camera/autoname/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Science - Xenobiology, Kill Chamber"; + name = "science camera"; + network = list("ss13","rd") + }, /turf/open/floor/iron/freezer, /area/station/science/xenobiology) "rxF" = ( @@ -53156,6 +53430,9 @@ }, /obj/structure/cable, /obj/machinery/duct, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /obj/machinery/door/poddoor/preopen{ id = "bridge_blast_doors"; name = "Bridge Access Blast Door" @@ -53329,7 +53606,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light/directional/east, /obj/machinery/smartfridge/chemistry/virology/preloaded, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -53464,6 +53740,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, +/obj/machinery/light/small/directional/north, /obj/machinery/requests_console/directional/north{ department = "Security"; name = "Security Requests Console" @@ -53484,19 +53761,14 @@ /turf/open/floor/iron/dark/textured_large, /area/station/security/processing) "rCa" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - id = "hydro_back_shutters"; - name = "Hydroponics Backroom Shutters"; - dir = 1 - }, /turf/open/floor/plating, -/area/station/service/hydroponics) +/area/station/maintenance/solars/port/fore) "rCh" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, /obj/effect/turf_decal/trimline/red/line, +/obj/machinery/light/directional/north, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, /turf/open/floor/iron/dark, @@ -53642,12 +53914,12 @@ /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/nt_rep) "rEf" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/structure/cable, +/obj/machinery/atmospherics/components/tank/air{ dir = 8 }, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron, -/area/station/engineering/storage) +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "rEo" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/trimline/yellow/line{ @@ -53879,6 +54151,7 @@ /turf/open/floor/iron/dark/textured, /area/station/service/abandoned_gambling_den) "rHN" = ( +/obj/machinery/light/small/directional/north, /obj/structure/table, /obj/machinery/chem_dispenser/drinks/beer{ dir = 4 @@ -53945,17 +54218,12 @@ /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "rJk" = ( -/obj/machinery/door/firedoor/border_only{ +/obj/structure/chair{ dir = 1 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/north, -/mob/living/basic/chicken, -/turf/open/floor/grass, -/area/station/service/hydroponics) +/obj/effect/landmark/start/janitor, +/turf/open/floor/iron, +/area/station/service/janitor) "rJu" = ( /obj/machinery/telecomms/bus/preset_three, /turf/open/floor/circuit/green/telecomms, @@ -54053,14 +54321,11 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/command/storage/eva) "rMk" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/light/directional/south, -/obj/structure/chair/sofa/bench/left{ - dir = 1 +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 }, -/obj/effect/landmark/start/station_engineer, /turf/open/floor/iron, -/area/station/engineering/main) +/area/station/engineering/storage) "rMm" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/turf_decal/trimline/red/line{ @@ -54127,11 +54392,15 @@ /turf/open/floor/wood, /area/station/commons/locker) "rNF" = ( -/obj/machinery/light/small/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/garbage, +/obj/machinery/atmospherics/components/binary/pump/on/supply/hidden, /turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/area/station/maintenance/department/science/xenobiology) +"rNH" = ( +/obj/effect/turf_decal/caution/red{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large/airless, +/area/space/nearstation) "rNL" = ( /obj/effect/turf_decal/tile/purple/fourcorners, /obj/structure/cable, @@ -54149,10 +54418,7 @@ /turf/closed/wall, /area/station/commons/dorms/room3) "rOu" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Commons - Cryogenics, Departures"; - name = "commons camera" - }, +/obj/machinery/light/directional/west, /obj/structure/sign/poster/official/help_others/directional/west, /obj/machinery/cryopod{ dir = 4 @@ -54166,7 +54432,10 @@ /turf/open/floor/iron, /area/station/engineering/main) "rOy" = ( -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Prison, Cell, Isolation"; + name = "security camera" + }, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -54286,7 +54555,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/light/small/directional/west, /obj/machinery/camera/directional/west{ c_tag = "Security - Head of Security Room"; name = "security camera" @@ -54295,18 +54563,21 @@ /obj/structure/table/wood, /obj/item/phone{ pixel_x = -6; - pixel_y = 10 + pixel_y = 12 }, /obj/machinery/recharger{ - pixel_x = -4; - pixel_y = -1 + pixel_x = -6 }, /obj/item/paper_bin{ - pixel_y = 4; - pixel_x = 9 + pixel_y = 3; + pixel_x = 7 + }, +/obj/item/folder/red{ + pixel_x = 7; + pixel_y = 5 }, /obj/item/stamp/head/hos{ - pixel_x = 10; + pixel_x = 7; pixel_y = 6 }, /turf/open/floor/wood, @@ -54322,6 +54593,14 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"rQA" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/line, +/obj/machinery/station_map/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "rQO" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/turf_decal/trimline/red/line{ @@ -54433,11 +54712,8 @@ /area/station/maintenance/department/cargo) "rSx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/left/directional/south{ - name = "SMES Chamber"; - req_access = list("engineering") - }, /obj/structure/cable, +/obj/structure/cable/layer1, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) "rSy" = ( @@ -54616,6 +54892,13 @@ /obj/item/tank/jetpack/carbondioxide, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"rUo" = ( +/obj/machinery/light/directional/north, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/chapel/funeral) "rUL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/closet_maintenance, @@ -55132,9 +55415,8 @@ /area/station/commons/vacant_room/commissary) "sgJ" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 6 + dir = 4 }, -/obj/structure/sign/warning/vacuum/external/directional/south, /obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/station/engineering/main) @@ -55394,6 +55676,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 }, +/obj/machinery/light/small/directional/east, /obj/machinery/status_display/evac/directional/east, /obj/machinery/computer/diseasesplicer, /turf/open/floor/iron/white, @@ -55495,9 +55778,7 @@ }, /obj/machinery/newscaster/directional/east, /obj/structure/table/wood, -/obj/machinery/computer/libraryconsole/bookmanagement{ - dir = 8 - }, +/obj/item/toy/figure/curator, /turf/open/floor/iron/vaporwave, /area/station/service/library/printer) "slS" = ( @@ -55686,6 +55967,12 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"snY" = ( +/obj/structure/chair/sofa/left/brown{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison) "sob" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -55698,22 +55985,17 @@ /area/station/maintenance/starboard/fore) "soj" = ( /obj/effect/turf_decal/trimline/red/filled/warning, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/security/brig) "sos" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/components/binary/volume_pump/layer2{ - name = "Emergency Waste Release" - }, -/obj/machinery/atmospherics/components/binary/pump/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/binary/pump/off/general/hidden/layer4{ dir = 1; - name = "Emergency Air Supply"; - target_pressure = 250 + name = "Emergency Supply" }, +/obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology/hallway) "soB" = ( @@ -55754,8 +56036,9 @@ /turf/open/floor/iron/dark, /area/station/security/evidence) "spr" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron/dark, +/obj/machinery/light/small/directional/south, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, /area/station/engineering/engine_smes) "spv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -55778,17 +56061,18 @@ /area/station/hallway/primary/port) "sqZ" = ( /obj/structure/table/wood/fancy/black, -/obj/item/paper_bin, -/obj/item/folder, -/obj/item/pen/fountain, -/turf/open/floor/wood/tile, +/obj/item/flashlight/lamp, +/turf/open/floor/wood, /area/station/service/chapel/office) +"srN" = ( +/obj/effect/turf_decal/trimline/purple/filled/warning, +/turf/open/floor/iron/white, +/area/station/science/genetics/cloning) "srQ" = ( -/obj/effect/turf_decal/bot_red, -/obj/machinery/light/directional/west, -/obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/iron/large, -/area/station/ai_monitored/command/storage/eva) +/obj/machinery/light/directional/south, +/obj/structure/nestbox, +/turf/open/floor/grass, +/area/station/service/hydroponics) "srS" = ( /obj/structure/table/wood, /obj/machinery/computer/records/medical/laptop, @@ -55830,12 +56114,12 @@ /obj/structure/flora/tree/jungle/style_random, /turf/open/floor/grass, /area/station/hallway/primary/central) -"stx" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +"stk" = ( +/obj/structure/chair/sofa/right/brown{ + dir = 4 + }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison) "stB" = ( /obj/effect/turf_decal/tile/red/fourcorners, /obj/machinery/button/door/directional/east{ @@ -55922,7 +56206,7 @@ /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side, /area/station/service/janitor) "suC" = ( /obj/machinery/conveyor{ @@ -56014,6 +56298,12 @@ dir = 1 }, /area/station/commons/fitness) +"svS" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "swd" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -56076,7 +56366,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /obj/structure/table, /obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = -6; @@ -56308,7 +56598,6 @@ /area/station/maintenance/port/fore) "sCj" = ( /obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/east, /obj/machinery/status_display/evac/directional/east, /obj/machinery/atmospherics/components/trinary/mixer/flipped, /turf/open/floor/iron, @@ -56428,8 +56717,31 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "sEf" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/newscaster/directional/north, +/obj/structure/table, +/obj/item/clothing/gloves/color/orange, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -9; + pixel_y = 9 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 9; + pixel_y = 9 + }, +/obj/item/grenade/chem_grenade/cleaner{ + pixel_x = 9; + pixel_y = 3 + }, +/obj/item/grenade/chem_grenade/cleaner{ + pixel_y = 3 + }, +/obj/item/grenade/chem_grenade/cleaner{ + pixel_x = -9; + pixel_y = 3 + }, /turf/open/floor/iron/dark/side{ - dir = 5 + dir = 1 }, /area/station/service/janitor) "sEm" = ( @@ -56495,14 +56807,19 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "sFS" = ( -/obj/machinery/light/directional/south, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/structure/dresser, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, /turf/open/floor/iron/dark/side{ - dir = 6 + dir = 4 }, /area/station/service/theater) +"sFX" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "sGk" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -56619,12 +56936,6 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/department/engine/atmos) "sIW" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/stone, @@ -56657,7 +56968,11 @@ /area/station/security/prison/garden) "sJo" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Science - Xenobiology, Maintenance Access, North"; + name = "science camera"; + network = list("ss13","rd") + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "sJq" = ( @@ -56692,7 +57007,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light/small/directional/west, +/obj/machinery/light/directional/west, /obj/structure/sign/warning/fire/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron, @@ -56844,6 +57159,7 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 4 }, +/obj/machinery/light/small/directional/east, /turf/open/floor/engine, /area/station/science/xenobiology) "sMr" = ( @@ -56944,7 +57260,7 @@ /turf/open/floor/iron/dark/side, /area/station/cargo/office) "sNp" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -57008,7 +57324,7 @@ /area/station/security/prison/work) "sOh" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/delivery, +/obj/machinery/light/small/directional/east, /obj/machinery/status_display/evac/directional/north, /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/disposalpipe/trunk, @@ -57033,8 +57349,8 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/storage/tech) "sOo" = ( -/obj/machinery/firealarm/directional/north, /obj/machinery/light/directional/north, +/obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark, /area/station/service/chapel) "sOH" = ( @@ -57157,6 +57473,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, +/obj/machinery/light/directional/east, /obj/structure/table, /obj/item/healthanalyzer{ pixel_x = -1; @@ -57166,9 +57483,10 @@ /turf/open/floor/iron/white, /area/station/science/robotics/lab) "sQN" = ( -/obj/machinery/vending/autodrobe, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, /turf/open/floor/iron/dark/side{ - dir = 10 + dir = 8 }, /area/station/service/theater) "sQS" = ( @@ -57211,12 +57529,11 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "sRt" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/structure/sink/directional/west, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "sRA" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 5 @@ -57233,8 +57550,15 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron/white, /area/station/science/genetics) +"sRG" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/line, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "sRJ" = ( -/obj/machinery/light/small/directional/west, /obj/machinery/cryopod{ dir = 4 }, @@ -57413,9 +57737,6 @@ /area/station/science/research) "sVo" = ( /obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, /turf/open/floor/iron/white, /area/station/science/explab) "sVp" = ( @@ -57533,7 +57854,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/duct, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, /area/station/service/janitor) "sWy" = ( /turf/open/floor/iron, @@ -57583,9 +57906,12 @@ /area/station/service/chapel/funeral) "sXd" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 + dir = 5 }, -/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/clonepod, /turf/open/floor/iron/white, /area/station/science/genetics/cloning) "sXe" = ( @@ -57706,7 +58032,7 @@ name = "Ordnance Launcher"; req_access = list("ordnance") }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/smooth_large, /area/station/science/ordnance/testlab) "sYD" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -57781,6 +58107,11 @@ /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/science/breakroom) +"sZK" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) "sZN" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor, @@ -58061,7 +58392,6 @@ dir = 8 }, /obj/machinery/light/directional/west, -/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "tds" = ( @@ -58083,7 +58413,7 @@ /area/station/command/heads_quarters/captain) "tdR" = ( /obj/structure/cable, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/effect/turf_decal/bot_red/right, /turf/open/floor/plating/airless, /area/space/nearstation) "tdV" = ( @@ -58211,7 +58541,7 @@ }, /obj/structure/fans/tiny, /obj/machinery/door/poddoor/massdriver_trash, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/textured, /area/station/maintenance/disposal) "tgW" = ( /obj/effect/turf_decal/box, @@ -58267,15 +58597,15 @@ /turf/open/floor/iron/white, /area/station/science/research) "tiV" = ( -/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/stripes/line{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ name = "Labor Camp Shuttle Dock" @@ -58687,8 +59017,11 @@ /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /obj/structure/table/reinforced, -/obj/item/folder/red, -/obj/item/pen, +/obj/machinery/computer/security/telescreen{ + desc = "Used for monitoring medbay to ensure patient safety."; + name = "Medbay Monitor"; + network = list("medbay") + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "tqd" = ( @@ -59187,6 +59520,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /obj/machinery/door/window/left/directional/west{ name = "Security Delivery"; req_access = list("security") @@ -59209,6 +59545,7 @@ }, /area/station/engineering/break_room) "twv" = ( +/obj/machinery/light/small/directional/south, /obj/structure/table/wood, /obj/machinery/fax{ fax_name = "Captain's Office"; @@ -59257,28 +59594,16 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "twU" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Service - Custodial Closet"; - name = "service camera" - }, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clipboard{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/pen{ - pixel_x = -3; - pixel_y = 6 +/obj/effect/turf_decal/siding/dark, +/obj/effect/turf_decal/siding/dark{ + dir = 1 }, -/obj/item/toy/figure/janitor{ - pixel_x = 9 +/obj/machinery/camera/directional/east{ + c_tag = "Service - Theater Backstage"; + name = "service camera" }, /turf/open/floor/iron/dark, -/area/station/service/janitor) +/area/station/service/theater) "twW" = ( /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark/side{ @@ -59454,6 +59779,7 @@ /area/station/security/interrogation) "tzV" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/light/small/directional/west, /obj/machinery/firealarm/directional/west, /obj/machinery/status_display/ai/directional/north, /obj/structure/table/reinforced/rglass, @@ -59491,6 +59817,11 @@ dir = 8 }, /area/station/hallway/primary/aft) +"tAz" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/white, +/area/station/science/explab) "tAI" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/structure/table, @@ -59513,6 +59844,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "tBh" = ( +/obj/machinery/light/directional/west, /obj/effect/turf_decal/box, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -59530,10 +59862,13 @@ /turf/open/floor/plating/airless, /area/station/asteroid) "tBn" = ( -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron, -/area/station/science/robotics/lab) +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/machinery/newscaster/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/white, +/area/station/science/genetics/cloning) "tBp" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -59589,20 +59924,13 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "tBq" = ( -/obj/structure/bed{ - dir = 4 - }, -/obj/item/bedsheet/random{ - dir = 4 +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/iron/dark/side{ + dir = 8 }, -/obj/effect/landmark/start/janitor, -/turf/open/floor/iron/dark, /area/station/service/janitor) "tBy" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/newscaster/directional/west, /obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/smithing) @@ -59656,6 +59984,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) +"tDg" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/visit) "tDO" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -59775,6 +60110,7 @@ c_tag = "Engineering - Equipment Storage"; name = "engineering camera" }, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/station/engineering/storage) "tGs" = ( @@ -59811,7 +60147,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/table/reinforced, /obj/item/forging/billow, -/turf/open/floor/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/smithing) "tGD" = ( /obj/effect/turf_decal/trimline/purple/line, @@ -59886,7 +60223,7 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "tHx" = ( -/obj/effect/turf_decal/trimline/yellow/filled/warning{ +/obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 9 }, /turf/open/floor/iron, @@ -59919,6 +60256,7 @@ /turf/open/floor/grass, /area/station/service/hydroponics/garden) "tIU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark/smooth_large, /area/station/security/office) "tJc" = ( @@ -60187,6 +60525,7 @@ /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) "tNM" = ( +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/components/binary/pump{ name = "Burn Chamber"; dir = 1 @@ -60254,10 +60593,11 @@ /turf/closed/wall/r_wall, /area/station/science/lab) "tOZ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/explab) "tPs" = ( @@ -60269,7 +60609,12 @@ /turf/open/floor/iron/dark/side, /area/station/cargo/storage) "tPv" = ( -/obj/machinery/camera/autoname/directional/north, +/obj/machinery/light/small/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Science - Xenobiology, Workstation 2"; + name = "science camera"; + network = list("ss13","rd") + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "tPw" = ( @@ -60335,7 +60680,7 @@ dir = 1; name = "Supply to Cooling Loop" }, -/obj/machinery/atmospherics/components/binary/volume_pump/layer2{ +/obj/machinery/atmospherics/components/binary/pump/layer2{ name = "Cooling Loop to Waste" }, /obj/structure/kitchenspike, @@ -60442,7 +60787,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/obj/machinery/camera/autoname/directional/west, /obj/structure/bodycontainer/morgue{ dir = 2 }, @@ -60539,7 +60883,7 @@ /area/station/maintenance/port) "tUa" = ( /obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/table, /turf/open/floor/iron/white, /area/station/science/xenobiology) "tUg" = ( @@ -60577,7 +60921,8 @@ dir = 10 }, /obj/item/radio/intercom/directional/south, -/obj/structure/filingcabinet, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, +/obj/structure/closet/secure_closet/security/med/blueshirt, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "tUG" = ( @@ -60662,10 +61007,10 @@ dir = 8 }, /obj/machinery/firealarm/directional/east{ - pixel_y = 6 + pixel_y = 5 }, /obj/machinery/light_switch/directional/east{ - pixel_y = -4 + pixel_y = -5 }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) @@ -60850,7 +61195,7 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/blueshield) "tZH" = ( -/obj/effect/turf_decal/trimline/yellow/filled/warning{ +/obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, /turf/open/floor/iron, @@ -60980,6 +61325,12 @@ "ucP" = ( /turf/closed/wall, /area/station/cargo/office) +"ucW" = ( +/obj/structure/reagent_dispensers/plumbed{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "ucY" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/window/reinforced/spawner/directional/south, @@ -61134,6 +61485,7 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "ufQ" = ( +/obj/machinery/light/directional/east, /obj/effect/turf_decal/box/red, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -61200,15 +61552,11 @@ "ugC" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/machinery/light/directional/south, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, /obj/structure/table, -/obj/item/storage/toolbox/electrical{ - pixel_y = 7 - }, -/obj/item/storage/toolbox/mechanical, -/obj/item/clothing/ears/earmuffs{ - pixel_x = -3; - pixel_y = -3 - }, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, /turf/open/floor/iron, /area/station/engineering/storage) "ugD" = ( @@ -61413,15 +61761,13 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "ujA" = ( -/obj/effect/turf_decal/box, /obj/structure/disposalpipe/segment{ dir = 10 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/holopad, -/turf/open/floor/iron/white/smooth_large, +/turf/open/floor/iron/white, /area/station/science/explab) "ujN" = ( /obj/effect/turf_decal/stripes/line{ @@ -61660,6 +62006,7 @@ /turf/open/floor/carpet/blue, /area/station/medical/psychology) "umP" = ( +/obj/machinery/light/directional/east, /obj/structure/sign/poster/official/do_not_question/directional/east, /obj/machinery/cryopod{ dir = 8 @@ -61798,14 +62145,6 @@ /obj/machinery/door/poddoor/massdriver_chapel, /turf/open/floor/iron/dark/textured_large, /area/station/service/chapel/funeral) -"uoW" = ( -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_blue/line, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "uoX" = ( /obj/structure/foamedmetal, /turf/open/floor/plating, @@ -61878,7 +62217,7 @@ /area/station/medical/medbay/central) "uqM" = ( /obj/machinery/light/small/directional/east, -/obj/structure/reagent_dispensers/plumbed, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port) "uqS" = ( @@ -62144,9 +62483,7 @@ /area/station/maintenance/port/aft) "uuA" = ( /obj/item/radio/intercom/directional/south, -/obj/machinery/doppler_array{ - dir = 1 - }, +/obj/structure/table, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) "uuD" = ( @@ -62379,6 +62716,14 @@ /obj/structure/ghost_critter_spawn, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"uyL" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/line, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "uyP" = ( /obj/structure/lattice, /obj/structure/sign/warning/secure_area/directional/south, @@ -62399,9 +62744,6 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) "uza" = ( -/obj/machinery/sparker/directional/south{ - id = "execution_burn" - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ dir = 1 }, @@ -62547,11 +62889,10 @@ /area/station/maintenance/port/fore) "uCi" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/box/red, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Justice Gas Pump" }, -/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron/dark, /area/station/security/execution) "uCk" = ( @@ -62695,6 +63036,12 @@ /obj/effect/spawner/random/entertainment/coin, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"uFu" = ( +/obj/effect/turf_decal/caution/red{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_large/airless, +/area/space/nearstation) "uFv" = ( /obj/effect/turf_decal/tile/green/anticorner/contrasted, /obj/structure/table, @@ -62801,8 +63148,8 @@ /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) "uGS" = ( -/obj/machinery/light/floor/has_bulb, -/mob/living/basic/chicken, +/obj/machinery/light/directional/north, +/obj/structure/nestbox, /turf/open/floor/grass, /area/station/service/hydroponics) "uHc" = ( @@ -63015,8 +63362,7 @@ "uKb" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/fore) "uKf" = ( /obj/structure/chair{ @@ -63144,6 +63490,7 @@ name = "Genetics Requests console" }, /obj/effect/mapping_helpers/requests_console/supplies, +/obj/machinery/duct, /turf/open/floor/iron/white, /area/station/science/genetics) "uLS" = ( @@ -63246,18 +63593,13 @@ /obj/effect/turf_decal/trimline/neutral/filled/warning{ dir = 8 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "uNa" = ( /obj/machinery/light/small/directional/east, /obj/item/radio/intercom/directional/south, +/obj/structure/extinguisher_cabinet/directional/east, /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/engineering/engine_smes) @@ -63287,13 +63629,13 @@ /obj/machinery/door/window/left/directional/south{ name = "Reception" }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /obj/machinery/door/poddoor/shutters{ id = "robotics_pub_shutters"; name = "Robotics Shutters" }, -/obj/structure/desk_bell{ - pixel_x = 7 - }, /turf/open/floor/iron/textured, /area/station/science/robotics/lab) "uNE" = ( @@ -63542,7 +63884,7 @@ "uSp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood/tile, +/turf/open/floor/wood, /area/station/service/chapel/office) "uSA" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -63572,12 +63914,10 @@ /turf/open/floor/iron/dark, /area/station/security/office) "uTb" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/firealarm/directional/east, -/obj/structure/chair/sofa/bench/right{ - dir = 1 +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 }, -/obj/effect/landmark/start/station_engineer, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron, /area/station/engineering/main) "uTo" = ( @@ -63741,7 +64081,6 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "uVG" = ( -/obj/machinery/light/directional/west, /obj/structure/table, /obj/item/assembly/timer{ pixel_x = -4; @@ -63823,6 +64162,9 @@ "uWp" = ( /obj/machinery/light/small/directional/west, /obj/item/radio/intercom/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/carpet/blue, /area/station/medical/psychology) "uWr" = ( @@ -63981,7 +64323,8 @@ /turf/open/floor/wood, /area/station/maintenance/starboard/fore) "uZm" = ( -/obj/machinery/airalarm/directional/north, +/obj/structure/rack, +/obj/item/toy/plush/slimeplushie, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "uZz" = ( @@ -64345,6 +64688,13 @@ /obj/machinery/disease2/incubator, /turf/open/floor/iron/white, /area/station/medical/virology) +"veM" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "veQ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -64701,7 +65051,6 @@ /area/station/engineering/atmos) "vkc" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light/small/directional/east, /obj/machinery/requests_console/directional/east{ department = "Chief Medical Officer's Desk"; name = "Chief Medical Officer's Requests Console" @@ -64721,6 +65070,7 @@ /area/station/hallway/secondary/entry) "vki" = ( /obj/effect/turf_decal/bot_red, +/obj/machinery/light/directional/east, /obj/machinery/status_display/ai/directional/east, /obj/machinery/suit_storage_unit/standard_unit, /turf/open/floor/iron/large, @@ -64741,6 +65091,7 @@ name = "medical camera"; network = list("ss13","medbay") }, +/obj/structure/mirror/directional/north, /obj/structure/sink/directional/south, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -64755,7 +65106,6 @@ "vkz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/light/small/directional/north, -/obj/machinery/camera/autoname/directional/north, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, /obj/structure/rack, @@ -64797,10 +65147,9 @@ /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "vla" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/engine, +/obj/effect/turf_decal/box, +/obj/machinery/holopad, +/turf/open/floor/iron/white/smooth_large, /area/station/science/explab) "vlf" = ( /obj/effect/turf_decal/trimline/red/filled/line{ @@ -64949,7 +65298,8 @@ /area/station/service/lawoffice) "voi" = ( /obj/structure/anvil, -/turf/open/floor/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/smithing) "voo" = ( /obj/structure/extinguisher_cabinet/directional/east, @@ -65197,7 +65547,7 @@ /obj/effect/turf_decal/trimline/blue/corner, /obj/structure/sign/poster/official/random/directional/north, /obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ +/obj/machinery/atmospherics/components/unary/portables_connector/layer4{ dir = 4 }, /obj/machinery/portable_atmospherics/pump, @@ -65335,12 +65685,10 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine) "vtD" = ( -/obj/machinery/requests_console/directional/west{ - department = "Janitorial"; - name = "Janitorial Requests Console" +/obj/machinery/vending/wardrobe/jani_wardrobe, +/turf/open/floor/iron/dark/side{ + dir = 9 }, -/obj/effect/mapping_helpers/requests_console/assistance, -/turf/open/floor/iron/dark, /area/station/service/janitor) "vtJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65508,10 +65856,7 @@ pixel_x = -4 }, /obj/item/bikehorn/rubberducky{ - pixel_x = -10 - }, -/obj/item/flashlight/lamp/bananalamp{ - pixel_y = 3 + pixel_x = -5 }, /turf/open/floor/eighties/red, /area/station/service/theater) @@ -65598,16 +65943,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"vyc" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 8 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "vyg" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -65730,6 +66065,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/science) "vzx" = ( +/obj/machinery/light/small/directional/east, /obj/structure/table/wood, /obj/item/radio/radio_mic{ pixel_y = 7 @@ -65820,6 +66156,14 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"vBj" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/line, +/obj/structure/closet/emcloset/wall/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "vBm" = ( /obj/machinery/biogenerator, /turf/open/floor/iron/dark, @@ -65866,9 +66210,11 @@ /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/security/brig) "vBP" = ( @@ -65894,6 +66240,7 @@ /area/station/science/ordnance) "vCn" = ( /obj/machinery/light/small/directional/south, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/dark, /area/station/security/prison) "vCp" = ( @@ -66004,6 +66351,7 @@ dir = 8 }, /obj/effect/turf_decal/bot, +/obj/machinery/light/directional/west, /obj/structure/sign/poster/official/space_cops/directional/west, /obj/structure/closet/l3closet/security, /turf/open/floor/iron/dark, @@ -66016,7 +66364,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, -/obj/machinery/status_display/ai/directional/west, +/obj/machinery/light/directional/west, /obj/machinery/mecha_part_fabricator{ dir = 4 }, @@ -66171,11 +66519,11 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "vEV" = ( -/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden{ - dir = 9 +/obj/structure/chair{ + dir = 8 }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "vFa" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/security/armory) @@ -66204,10 +66552,13 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "vFJ" = ( -/obj/machinery/status_display/evac/directional/east, -/turf/open/floor/iron/dark/side{ - dir = 4 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "engineering"; + name = "Engineering Blast Door" }, +/turf/open/floor/plating, /area/station/engineering/atmos/office) "vFV" = ( /obj/effect/turf_decal/stripes/line{ @@ -66303,20 +66654,22 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "vHb" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; req_access = list("brig") }, /obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /turf/open/floor/iron/dark/textured_large, /area/station/security/processing) "vHc" = ( /obj/effect/turf_decal/trimline/red/filled/warning, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/security/brig) "vHf" = ( @@ -66638,9 +66991,6 @@ /area/station/hallway/primary/central) "vNF" = ( /obj/machinery/light/small/directional/south, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/smithing) @@ -66921,10 +67271,12 @@ }, /obj/structure/table, /obj/item/storage/box/bodybags{ - pixel_x = 5 + pixel_x = 6; + pixel_y = 6 }, /obj/item/storage/box/bodybags{ - pixel_x = -5 + pixel_x = -6; + pixel_y = -3 }, /turf/open/floor/iron/white, /area/station/science/robotics/lab) @@ -67035,7 +67387,7 @@ }, /area/station/command/heads_quarters/cmo) "vTN" = ( -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/east, /obj/machinery/airalarm/directional/east, /obj/structure/chair/comfy/brown{ dir = 8 @@ -67085,6 +67437,7 @@ /obj/structure/extinguisher_cabinet/directional/west, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -67127,6 +67480,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "vUY" = ( +/obj/machinery/light/small/directional/north, /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/carpet, /area/station/hallway/secondary/entry) @@ -67300,7 +67654,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "vXY" = ( -/obj/machinery/light/small/directional/west, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, @@ -67395,6 +67749,7 @@ dir = 1 }, /obj/machinery/light/small/directional/south, +/obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "vZu" = ( @@ -67619,7 +67974,7 @@ /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/foyer) "wcL" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /turf/open/floor/plating, @@ -67840,6 +68195,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 }, +/obj/machinery/light/small/directional/west, /obj/structure/table/reinforced/rglass, /obj/item/paper_bin{ pixel_x = -7; @@ -67970,12 +68326,12 @@ dir = 1 }, /obj/item/mop, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side, /area/station/service/janitor) "wiL" = ( /obj/machinery/light/small/directional/east, /obj/machinery/camera/directional/east{ - c_tag = "Science - Xenobiology Secure Cell Interior"; + c_tag = "Science - Xenobiology, Secure Chamber, Interior"; network = list("ss13","test","rd","xeno"); name = "science camera" }, @@ -68454,7 +68810,6 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 8 }, -/obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/station/security/office) "wqq" = ( @@ -68636,7 +68991,7 @@ /area/station/science/circuits) "wsT" = ( /obj/machinery/status_display/evac/directional/west, -/turf/open/floor/wood/tile, +/turf/open/floor/wood, /area/station/service/chapel/office) "wtn" = ( /obj/effect/turf_decal/trimline/neutral/line, @@ -68683,15 +69038,14 @@ /turf/open/floor/iron/dark/textured, /area/station/service/abandoned_gambling_den) "wtQ" = ( -/obj/machinery/atmospherics/components/binary/pump/on/layer2{ - name = "External Ports to Scrubbers"; +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump/on/layer4{ +/obj/machinery/atmospherics/components/binary/pump/on/general/hidden/layer4{ dir = 8; name = "Supply to External Ports" }, -/obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/break_room) "wtX" = ( @@ -68718,6 +69072,7 @@ /area/station/service/bar) "wuk" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/east, /obj/structure/table, /obj/item/storage/box/lights/mixed, /obj/item/storage/box/lights/mixed{ @@ -68777,6 +69132,10 @@ dir = 1 }, /obj/structure/table, +/obj/machinery/camera/motion/directional/west{ + c_tag = "Command - EVA Storage, West"; + name = "motion-sensitive command camera" + }, /obj/item/radio/off{ pixel_x = -6; pixel_y = 4 @@ -68942,7 +69301,33 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 }, -/obj/structure/tank_holder/extinguisher, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/table, +/obj/item/clothing/suit/hazardvest{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/suit/hazardvest{ + pixel_x = 3 + }, +/obj/item/clothing/mask/gas{ + pixel_y = -3; + pixel_x = -6 + }, +/obj/item/clothing/mask/gas{ + pixel_y = 3; + pixel_x = -6 + }, +/obj/item/tank/internals/oxygen/yellow{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/tank/internals/emergency_oxygen/engi{ + pixel_y = 3 + }, +/obj/item/tank/internals/emergency_oxygen/engi{ + pixel_x = 3 + }, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -69167,7 +69552,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "wDe" = ( -/obj/machinery/light/small/directional/north, /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/vaporwave, /area/station/service/library/printer) @@ -69184,11 +69568,8 @@ "wDy" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/camera/autoname/directional/east, -/obj/effect/turf_decal/box/red, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/plasma, +/obj/effect/turf_decal/delivery/red, +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron/dark, /area/station/security/execution) "wDM" = ( @@ -69281,7 +69662,6 @@ /area/station/science/genetics) "wFn" = ( /obj/machinery/newscaster/directional/east, -/obj/machinery/light/directional/east, /obj/machinery/modular_computer/preset/civilian{ dir = 8 }, @@ -69298,6 +69678,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/electrical) "wGc" = ( +/obj/machinery/light/small/directional/south, /obj/structure/extinguisher_cabinet/directional/west, /obj/structure/table, /obj/machinery/reagentgrinder{ @@ -69351,8 +69732,9 @@ /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "wGm" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/candle_box/amber, +/obj/effect/turf_decal/siding/wood, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/wood, /area/station/service/chapel/funeral) "wGs" = ( @@ -69481,8 +69863,10 @@ /turf/open/floor/grass, /area/station/ai_monitored/security/armory) "wIn" = ( +/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/table, -/turf/open/floor/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/smithing) "wIr" = ( /obj/structure/chair/pew/left{ @@ -69584,11 +69968,14 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "wKr" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced/spawner/directional/south, -/mob/living/basic/chicken, -/turf/open/floor/grass, -/area/station/service/hydroponics) +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/structure/dresser, +/turf/open/floor/iron/dark/side{ + dir = 6 + }, +/area/station/service/theater) "wKv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -69746,9 +70133,7 @@ /area/station/maintenance/department/engine/atmos) "wMG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/science/explab) "wMK" = ( @@ -70026,7 +70411,6 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/aft) "wRh" = ( -/obj/structure/closet/emcloset/wall/directional/south, /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/iron/dark/side/airless{ dir = 6 @@ -70037,6 +70421,14 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"wRI" = ( +/obj/machinery/camera/autoname/directional/north, +/obj/structure/sign/poster/official/random/directional/north, +/obj/structure/chair/plastic{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison) "wRJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70092,12 +70484,10 @@ /turf/open/floor/iron, /area/station/command/gateway) "wSC" = ( -/obj/machinery/airalarm/directional/north, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/item/kirbyplants/random, -/turf/open/floor/carpet, -/area/station/service/chapel) +/obj/machinery/light/small/directional/north, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "wSN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70234,6 +70624,11 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, +/obj/machinery/camera/directional/west{ + c_tag = "Science - Robotics, Lab, Surgery"; + name = "science camera"; + network = list("ss13","rd") + }, /obj/structure/table, /obj/item/mmi, /obj/item/mmi{ @@ -70257,6 +70652,10 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +"wWV" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/white, +/area/station/science/explab) "wXi" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -70267,10 +70666,6 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "wXz" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/table/wood, /obj/item/reagent_containers/cup/watering_can, /turf/open/floor/wood, @@ -70390,9 +70785,8 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/service) "wZk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/service/hydroponics/garden) "wZx" = ( @@ -70426,8 +70820,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) "xau" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "xaB" = ( @@ -70464,14 +70857,6 @@ "xba" = ( /turf/closed/wall/r_wall, /area/station/maintenance/port/aft) -"xbb" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/line, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "xbz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, /obj/machinery/meter, @@ -70638,7 +71023,7 @@ /obj/effect/turf_decal/trimline/red/corner{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ +/obj/machinery/atmospherics/components/unary/portables_connector/layer4{ dir = 8 }, /obj/machinery/portable_atmospherics/scrubber, @@ -70983,11 +71368,21 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"xjB" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, +/area/station/smithing) "xjF" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/white, /area/station/medical/virology) +"xjG" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "xjO" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -71012,7 +71407,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, -/obj/machinery/light/directional/north, /obj/machinery/requests_console/directional/north{ department = "Virology"; name = "Pathology Requests Console" @@ -71264,6 +71658,11 @@ /obj/machinery/vending/cigarette, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) +"xpG" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "xpK" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -71311,8 +71710,7 @@ /turf/open/floor/iron/dark, /area/station/security/brig/entrance) "xqN" = ( -/obj/machinery/light_switch/directional/north, -/obj/structure/cable, +/obj/machinery/airalarm/directional/north, /turf/open/floor/carpet, /area/station/service/chapel) "xqQ" = ( @@ -71347,10 +71745,7 @@ "xqW" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/bot_red, -/obj/machinery/camera/motion/directional/west{ - c_tag = "Command - EVA Storage, West"; - name = "motion-sensitive command camera" - }, +/obj/machinery/light/directional/west, /obj/machinery/recharge_station, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) @@ -71473,7 +71868,6 @@ dir = 8 }, /obj/structure/sign/warning/cold_temp/directional/south, -/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/components/binary/pump{ name = "Director"; dir = 4 @@ -71620,6 +72014,7 @@ /turf/open/floor/iron/kitchen, /area/station/command/heads_quarters/nt_rep) "xvo" = ( +/obj/machinery/light/small/directional/north, /obj/machinery/airalarm/directional/east, /obj/structure/filingcabinet, /turf/open/floor/wood, @@ -72074,14 +72469,13 @@ }, /area/station/service/hydroponics) "xCk" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/firealarm/directional/south, /obj/structure/sign/departments/maint/directional/west, /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/hallway/primary/aft) "xCo" = ( -/obj/machinery/light/directional/south, /obj/machinery/firealarm/directional/south{ pixel_x = 5 }, @@ -72420,7 +72814,7 @@ /area/station/hallway/secondary/entry) "xIH" = ( /obj/machinery/firealarm/directional/east, -/turf/open/floor/wood/tile, +/turf/open/floor/wood, /area/station/service/chapel/office) "xIL" = ( /obj/effect/spawner/structure/window/reinforced, @@ -72511,6 +72905,11 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/security/prison) +"xKM" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "xKR" = ( /obj/structure/chair/sofa/right/maroon{ dir = 1 @@ -72550,9 +72949,12 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "xLn" = ( -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron, -/area/station/engineering/engine_smes) +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "xLy" = ( /obj/effect/turf_decal/box, /obj/machinery/portable_atmospherics/scrubber/huge, @@ -72772,15 +73174,16 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "xPw" = ( +/obj/machinery/light/small/directional/north, /obj/structure/table/wood, -/obj/effect/spawner/random/food_or_drink/refreshing_beverage{ - pixel_y = 6; - pixel_x = 8 - }, /obj/effect/spawner/random/food_or_drink/snack{ pixel_x = -3; pixel_y = 2 }, +/obj/effect/spawner/random/food_or_drink/refreshing_beverage{ + pixel_y = 6; + pixel_x = 8 + }, /turf/open/floor/carpet, /area/station/hallway/secondary/entry) "xPz" = ( @@ -72792,6 +73195,7 @@ name = "medical camera"; network = list("ss13","medbay") }, +/obj/structure/mirror/directional/north, /obj/structure/sink/directional/south, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -72884,12 +73288,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/service{ - name = "Custodial Closet" +/obj/machinery/door/poddoor/shutters{ + id = "custodial_shutters"; + name = "Custodial Closet Shutters"; + dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/service/janitor, -/obj/effect/landmark/navigate_destination/janitor, /turf/open/floor/iron/dark/textured, /area/station/service/janitor) "xRs" = ( @@ -73090,7 +73493,10 @@ /area/station/security/execution/transfer) "xTT" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Prison, Cell 1"; + name = "security camera" + }, /obj/machinery/duct, /turf/open/floor/wood, /area/station/security/prison/safe) @@ -73181,9 +73587,12 @@ /turf/open/floor/iron/white/textured, /area/station/medical/pharmacy) "xVj" = ( -/obj/structure/closet/emcloset/wall/directional/west, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/main) +/obj/machinery/airalarm/directional/west, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/service/theater) "xVA" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, @@ -73346,7 +73755,10 @@ /area/station/service/abandoned_gambling_den) "xXc" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Prison, Cell 7"; + name = "security camera" + }, /obj/machinery/duct, /turf/open/floor/carpet/orange, /area/station/security/prison/safe) @@ -73504,8 +73916,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 9 }, -/obj/structure/reagent_dispensers/wall/peppertank/directional/west, -/obj/structure/closet/secure_closet/security/med/blueshirt, +/obj/structure/filingcabinet, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "xZt" = ( @@ -73866,8 +74277,9 @@ /turf/open/floor/iron/white/textured, /area/station/medical/pharmacy) "yen" = ( -/obj/machinery/airalarm/directional/south, -/obj/structure/closet/emcloset/anchored, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/office) "yeo" = ( @@ -74049,6 +74461,7 @@ dir = 8 }, /obj/structure/sign/warning/pods/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron/dark, @@ -74079,14 +74492,10 @@ /turf/open/floor/iron, /area/station/engineering/break_room) "yiI" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 5 - }, -/obj/machinery/newscaster/directional/north, -/obj/machinery/computer/cloning{ - dir = 8 - }, -/turf/open/floor/iron/white, +/obj/structure/mirror/directional/north, +/obj/machinery/shower/directional/west, +/obj/structure/drain, +/turf/open/floor/iron/showroomfloor, /area/station/science/genetics/cloning) "yiR" = ( /turf/open/floor/iron/dark/side{ @@ -74198,9 +74607,10 @@ /turf/open/floor/carpet/purple, /area/station/command/heads_quarters/rd) "ylx" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/carpet/blue, -/area/station/medical/psychology) +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/service/chapel) "yly" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -74217,6 +74627,7 @@ dir = 8 }, /obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron/dark, @@ -74240,7 +74651,6 @@ dir = 8 }, /obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/west, /obj/machinery/camera/directional/west{ c_tag = "Security - Brig Equipment Room"; name = "security camera" @@ -82345,11 +82755,11 @@ dsc uho ksa ksa -xXP uho +uiu bsl +uiu uho -xXP ksa ksa uho @@ -82602,11 +83012,11 @@ tbO uiu uoo mpi -uoo -uiu +uho +qyd shF -uiu -uoo +dbz +uho mpi uoo uiu @@ -82859,11 +83269,11 @@ hTV uho ksa uho -uiu -uho -eaV uho uiu +qOX +uiu +uho uho ksa uho @@ -83117,9 +83527,9 @@ uho uiu uho mVX -uho -qOX -uho +ejs +drR +veM fDb uho uiu @@ -83374,9 +83784,9 @@ ghp bgK tcZ mzF -nJN +rFP uMW -nJN +rFP quV iwZ rFP @@ -85353,8 +85763,8 @@ uoo xXP xXP uoo -xXP -uoo +cpz +oAe cpz cpz cpz @@ -85611,7 +86021,7 @@ ahA uoo uoo cpz -oAe +rCa cpz qXm xSJ @@ -85742,7 +86152,7 @@ noh ksa ksa ksa -ksa +xXP ksa xXP ksa @@ -85997,9 +86407,9 @@ xXP xXP noh ksa -ksa xXP ksa +xXP ksa xXP ksa @@ -86125,7 +86535,7 @@ ahA uoo uoo cpz -oAe +rCa cpz ogg mCt @@ -86254,10 +86664,10 @@ ksa ksa noh ksa -ksa xXP -ksa -ksa +xXP +xXP +xXP xXP ksa ksa @@ -86381,8 +86791,8 @@ uoo uoo uoo uoo -xXP -uoo +cpz +oAe cpz cpz cpz @@ -86511,10 +86921,10 @@ ksa ksa noh ksa -ksa xXP ksa ksa +ksa xXP ksa ksa @@ -87015,11 +87425,11 @@ ksa ksa ksa ksa -xXP +amD amD yeu amD -xXP +amD ksa ksa ksa @@ -87272,11 +87682,11 @@ ksa ksa ksa ksa -xXP bhd +eaV xSu +eaV bhd -xXP ksa ksa ksa @@ -88493,7 +88903,7 @@ smQ hCj ezf gax -jlA +isR gLv afR enx @@ -88511,13 +88921,13 @@ kgn nJa wGE pEY -kWu +knA pfJ fLi tEZ bSc eaL -kWu +knA bnl rFC fUs @@ -88767,14 +89177,14 @@ kgn kgn nJa xqS -rCa +pEY uGS wNw emg ohF pig wKV -uGS +srQ bnl bnl ohf @@ -89024,14 +89434,14 @@ fzI cTn nJa xqS -rCa -jSO -qPn +pEY +aSR +guH emg ohF pig -rJk -jSO +aBL +aSR bnl wgX fUs @@ -89046,7 +89456,7 @@ rDR bHL bjg kzJ -drR +kzJ fvX rCj ksa @@ -89281,13 +89691,13 @@ juc juc nJa xqS -rCa +pEY knA -wKr +pfJ emg ohF pig -isR +eaL knA bnl epc @@ -89538,14 +89948,14 @@ kgn kgn nJa xqS -rCa +pEY uGS wNw emg ohF pig wKV -uGS +srQ bnl gAb fUs @@ -90747,10 +91157,8 @@ uoo ksa ksa ksa -ksa xXP ksa -xXP ksa xXP ksa @@ -90759,6 +91167,8 @@ ksa xXP ksa ksa +xXP +ksa ksa rxc nGn @@ -91004,10 +91414,8 @@ ksa ksa ksa ksa -ksa xXP ksa -xXP ksa xXP ksa @@ -91016,6 +91424,8 @@ ksa xXP ksa ksa +xXP +ksa ksa ksa fPN @@ -91261,14 +91671,15 @@ ksa ksa ksa ksa -ksa fEP xXP giM giM +giM ybj giM giM +giM xXP fEP ksa @@ -91278,7 +91689,6 @@ ksa ksa ksa ksa -ksa nGn aZe qRD @@ -91286,7 +91696,7 @@ pBu fPN wTz aKf -uUa +qPS uUa kzX uUa @@ -91294,12 +91704,12 @@ fFP kJs tfb oPp -qPS +uUa hRV uUa kzX uUa -uUa +qPS aKf xZj rOt @@ -91389,6 +91799,7 @@ uoo uoo uoo uoo +uoo eZG eZG eZG @@ -91406,7 +91817,6 @@ rxc ksa ksa ksa -ksa fdt uoo uoo @@ -91518,13 +91928,14 @@ ksa ksa ksa ksa -ksa fEP ksa giM -qgq +xRl +snY did -qgq +stk +xRl giM ksa fEP @@ -91533,7 +91944,6 @@ ksa ksa ksa ksa -ksa fEP xXP nGn @@ -91646,6 +92056,7 @@ ksa ksa ksa ksa +ksa eZG oZv ycH @@ -91663,7 +92074,6 @@ uoo ksa ksa ksa -ksa fdt ksa ksa @@ -91776,14 +92186,15 @@ fEP fEP fEP fEP -fEP -xXP +ksa giM mRx mRx +fAQ +mRx mRx giM -xXP +ksa fEP fEP fEP @@ -91791,7 +92202,6 @@ fEP fEP xXP xXP -xXP ksa nGn xWa @@ -91903,6 +92313,7 @@ wEB uoo uoo uoo +uoo eZG ara xKT @@ -91920,7 +92331,6 @@ uoo ksa ksa ksa -ksa fdt uoo uoo @@ -92028,17 +92438,18 @@ ksa xXP ksa ksa -ksa -ksa xXP ksa ksa xXP ksa +ksa giM qgq +qgq mRx qgq +knr giM ksa xXP @@ -92049,7 +92460,6 @@ xXP ksa ksa ksa -ksa fPN fPN eKg @@ -92160,6 +92570,7 @@ saV ksa ksa ksa +ksa eZG vjv leD @@ -92181,7 +92592,6 @@ ksa ksa ksa ksa -ksa uoo ksa uoo @@ -92292,11 +92702,11 @@ wZx wZx wZx wZx -ybj +cbB aBX ggV aBX -ybj +cbB ybj ybj ybj @@ -92417,6 +92827,7 @@ saV uoo uoo uoo +uoo eZG ara jZq @@ -92438,7 +92849,6 @@ ksa ksa ksa ksa -ksa sxb sxb uoC @@ -92674,6 +93084,7 @@ saV ksa ksa ksa +ksa eZG oZv pDN @@ -92695,7 +93106,6 @@ ksa ksa ksa ksa -ksa sxb aNC fho @@ -92931,6 +93341,7 @@ wEB uoo uoo uoo +uoo eZG eZG eZG @@ -92952,7 +93363,6 @@ ksa ksa ksa ksa -ksa sxb uZR hXf @@ -93063,7 +93473,7 @@ bXU cnP vzd bXU -umJ +wRI qgq ipb qgq @@ -93149,10 +93559,10 @@ bnl rTu bnl bnl -jIv -tpf -tpf -kaX +pTC +pTC +pTC +pTC bnl lSy qzg @@ -93190,6 +93600,7 @@ ksa ksa ksa ksa +ksa xXP ksa xXP @@ -93209,7 +93620,6 @@ ksa ksa ksa ksa -ksa sxb eGu idr @@ -93308,22 +93718,22 @@ ybj giM giM wZx -aRy +gSu bXU bXU xow bXU bXU -eSL +pgB bXU bXU ujZ bXU bXU cbB -fTm +qgq ipb -vCn +jeL cbB cbB cbB @@ -93406,10 +93816,10 @@ tsD slx dgd bnl -nkb -wji tpf -nkb +tpf +tpf +tpf bnl kQR cLZ @@ -93451,6 +93861,7 @@ vcG vcG vcG vcG +vcG eZG eZG mUA @@ -93466,7 +93877,6 @@ uoo fdt ksa ksa -ksa sxb sxb sxb @@ -93664,9 +94074,9 @@ kSL mNd ejD tpf -tpf -tpf -pTC +cLZ +cLZ +tei luw cLZ cLZ @@ -93709,9 +94119,10 @@ mWC wTD mWC arN +ioJ qDz -alj -dAo +knl +mpo vcG qTv hfb @@ -93724,7 +94135,6 @@ fdt ksa ksa ksa -ksa sxb umW iLC @@ -93922,7 +94332,7 @@ uwJ bnl rmn tei -cLZ +wji rmn bnl sJM @@ -93965,10 +94375,11 @@ nlj nfa jet nfa -spr -gIR -alj +ecI ioJ +gIR +knl +iya vcG xRh oyi @@ -93981,7 +94392,6 @@ fdt ksa ksa ksa -ksa sxb krJ kND @@ -94174,7 +94584,7 @@ lUP szd bnl bnl -ohf +rTu bnl bnl wgX @@ -94223,6 +94633,7 @@ njn fOe uJu rSx +hDv acX hph nqN @@ -94238,7 +94649,6 @@ fdt ksa ksa ksa -ksa sxb uMx idr @@ -94336,20 +94746,20 @@ ybj giM giM wZx -gSu +aRy bXU bXU kBA bXU bXU -pgB +eSL bXU bXU ukT bXU bXU cbB -qgq +fTm jou vCn cbB @@ -94431,7 +94841,7 @@ lUP ipL bnl uKO -fUs +kSL tei bnl bnl @@ -94479,7 +94889,8 @@ nlj nfa jet nfa -spr +ecI +ioJ fBY alj eOe @@ -94495,7 +94906,6 @@ fdt ksa ksa ksa -ksa sxb sxb uoC @@ -94523,9 +94933,9 @@ fOA xpD xpD xpD -xpD +lTD mmy -xpD +lTD xpD xpD xpD @@ -94605,7 +95015,7 @@ bXU fwb wxS bXU -eLo +jGy qgq jou qgq @@ -94688,7 +95098,7 @@ lUP oKm bnl wji -fUs +kSL cLZ bnl uKO @@ -94737,6 +95147,7 @@ kvY oXb pEy arN +ioJ grW alj uNa @@ -94752,7 +95163,6 @@ fdt ksa ksa ksa -ksa uoo ksa uoo @@ -94945,7 +95355,7 @@ pdr ylS bnl gFs -onq +kSL cLZ luw cLZ @@ -94994,6 +95404,7 @@ mDv mDv mDv mDv +mDv vcG eaC vcG @@ -95009,7 +95420,6 @@ fdt ksa ksa ksa -ksa fdt fdt fdt @@ -95119,7 +95529,7 @@ bXU bsx pZX bXU -umJ +wRI qgq jou qgq @@ -95202,7 +95612,7 @@ bVu vtc hCe rug -kKf +aMw gAb bnl eTW @@ -95242,20 +95652,20 @@ snL xUa vCq vHk -bsX xzN xUa uoX uoX +uoX xUa uoX uoX +uoX mDv jKB alj -xLn +spr vcG -ksa uoo ksa ksa @@ -95281,7 +95691,7 @@ ksa ksa fOA eTq -jVU +cuo tMQ aHT aHT @@ -95459,7 +95869,7 @@ snx bDJ bnl jEi -tTR +uHf jEi bnl bnl @@ -95499,7 +95909,6 @@ kgS xUa bsX vHk -bsX pHn mDv mDv @@ -95508,11 +95917,12 @@ mDv mDv mDv mDv +mDv +mDv vcG qHa vcG vcG -cHh igm igm ksa @@ -95550,11 +95960,11 @@ aHT xpD xpD wnr -xpD -tdR -lMK +eqy +jVU +iDA tdR -xpD +eqy wnr xpD xpD @@ -95720,7 +96130,7 @@ pkn bnl bnl rmn -cLZ +tei cLZ jEi jEi @@ -95757,8 +96167,8 @@ rBa bsX vHk fiT -bsX mDv +wCD twO wCD vQf @@ -95766,8 +96176,8 @@ gct eKr bsK tGq +rMk jFP -rEf hjP cHh rcy @@ -95973,7 +96383,7 @@ ksa ksa nfj mbi -tTR +uHf tei uKO cLZ @@ -96014,17 +96424,17 @@ xUa bsX vHk bsX -bsX oVA wCD wCD +wCD nhq kHh oLh oPA oPA -uHh oPA +uHh ugC cHh cHh @@ -96062,7 +96472,7 @@ xpD aHT xpD xpD -xpD +uFu xpD ald xpD @@ -96070,7 +96480,7 @@ uoo xpD ald xpD -xpD +emb xpD xpD aHT @@ -96230,15 +96640,15 @@ ksa ksa lUr fUs -bsR +oFP +kfC +cde +kfC +kfC +kfC +kfC +kfC kfC -kLu -kLu -kLu -kLu -kLu -kLu -kLu cGh kLu qmb @@ -96270,9 +96680,9 @@ dbt xUa xzN vHk -bsX pIs mDv +wCD ygq wCD vQf @@ -96280,8 +96690,8 @@ krW oLh bff tYy -kZD oPA +kZD dgz igm xPP @@ -96319,7 +96729,7 @@ xpD aHT xpD xpD -qEw +jVU itV xpD uoo @@ -96327,7 +96737,7 @@ uoo uoo xpD sHw -qEw +tdR xpD xpD aHT @@ -96488,16 +96898,16 @@ ksa bnl vCE cLZ -tTR cLZ +tTR cdP dGu tei plt -bnl +tei uqM jDq -kaX +tei bnl nwz rrq @@ -96538,7 +96948,7 @@ cMy aFt gRr kZD -oPA +kZD oEN kTz pht @@ -96745,8 +97155,8 @@ ksa bnl bnl bnl -aJV bnl +aJV bnl bnl bnl @@ -96833,7 +97243,7 @@ xpD aHT xpD xpD -qEw +tdR sHw xpD uoo @@ -96841,7 +97251,7 @@ uoo uoo xpD itV -qEw +jVU xpD xpD aHT @@ -97002,11 +97412,11 @@ ksa ksa cui vUq +xVj dDZ -ihc sQN -cui gDV +mHQ vtD tBq hIE @@ -97049,10 +97459,10 @@ iko itL rlK xgs -oLh -oLh -oLh -oLh +oPA +oPA +oPA +oPA fRr cHh cHh @@ -97090,7 +97500,7 @@ xpD aHT xpD xpD -xpD +uFu xpD ald xpD @@ -97098,7 +97508,7 @@ uoo xpD ald xpD -xpD +emb xpD xpD aHT @@ -97191,11 +97601,11 @@ mvS eil jve ent +uCi eNV -auu qKU -aIK -aIK +auu +auu nZL qPR wfE @@ -97260,12 +97670,12 @@ ksa gkP qET lWH +hWv pzI rin -cui -rvC +mHQ ePX -cPV +gYW cPV hMD sux @@ -97449,9 +97859,9 @@ sEr vBx lrv hzc -uCi -wDy xcW +wDy +aIK qPL nZL fPN @@ -97516,15 +97926,15 @@ ksa ksa cui dIJ -ggq +sFS ggq sFS -cui -twU +wKr +mHQ dZU gYW kYL -aMw +cHc wiI wEB cuU @@ -97561,16 +97971,16 @@ mDv mDv mDv mDv -iya +vQf liN -iya +vQf +cHh cHh cHh cHh cHh cHh cHh -igm uoo uoo uoo @@ -97606,11 +98016,11 @@ aHT xpD xpD wGD -xpD +rNH tdR -lMK -tdR -xpD +iDA +jVU +rNH wGD xpD xpD @@ -97774,14 +98184,14 @@ ksa cui vwh erC +ihc pho -dpu -cui -mRp +jSO +mHQ gVV -gYW +rJk lRi -aMw +cHc lVb wEB dDE @@ -97821,15 +98231,15 @@ fxk tHx sNp fTE -dmm +uTb +nnZ fxk -xVj +rjW miM kun fxk wIO ksa -ksa uoo ksa ksa @@ -97851,7 +98261,7 @@ ksa ksa fOA cnu -jVU +cuo tMQ aHT aHT @@ -98031,13 +98441,13 @@ ksa cui aKY uuG +ihc pho -ccs -cui -nnZ +kaX +mHQ sEf -fJn -fJn +gYW +kWu cHc pSn wEB @@ -98078,6 +98488,7 @@ fxk arR adw nZg +nZg lfo vJc tSE @@ -98102,7 +98513,6 @@ lwj lwj lwj lwj -lwj uoo uoo uoo @@ -98239,7 +98649,7 @@ nJS gtp cSJ roc -doW +nJS gtp mra eBl @@ -98288,12 +98698,12 @@ ksa cui cpX gVf +twU lBX -hWv -cui -cde -qjP +rvC +mHQ qjP +fJn opE dyq mTk @@ -98336,14 +98746,14 @@ bGX adw jwu sgJ +gRf fxk rjW -rjW +kjS rjW fxk iCE ksa -ksa uoo ksa ksa @@ -98549,7 +98959,7 @@ cui cui cui mHQ -ltF +mHQ ltF mHQ xRn @@ -98589,18 +98999,18 @@ rFn rFn rFn fxk -gRf +bGX adw -hDv -blv +ihh +fxk +fxk +fxk fxk fxk -mpo fxk fxk uoo ksa -ksa uoo ksa ksa @@ -98635,9 +99045,9 @@ fOA xpD xpD xpD -xpD +lMK qpg -xpD +lMK xpD xpD xpD @@ -98708,7 +99118,7 @@ sdP dNt vhu xOf -xOf +nrl wHt sdP tvc @@ -98804,10 +99214,10 @@ vui wBB vui vui +vui fXZ vui rAq -rAq wae ifC dsU @@ -98849,7 +99259,7 @@ fxk kKw adw ihh -jGl +fxk ksa ksa ksa @@ -99105,8 +99515,8 @@ cGM fxk mUZ adw -fVA -fJv +ihh +fxk ksa ksa ksa @@ -99361,8 +99771,8 @@ lOo lOo fxk bGX -qRc -ihh +adw +fVA jGl ksa ksa @@ -99516,7 +99926,7 @@ scL pCA tcY fyc -fsm +doW xnG yfL ksp @@ -99545,7 +99955,7 @@ hkn rDG gJU oCA -srQ +oCA wvg xqW xuu @@ -99620,7 +100030,7 @@ fxk chg qRc ihh -rMk +fxk ksa ksa ksa @@ -99876,8 +100286,8 @@ lNF blv bGX qRc -ihh -uTb +dAo +fxk ksa ksa ksa @@ -100134,7 +100544,7 @@ blv kHL cJu kHL -blv +fxk ksa ksa ksa @@ -100250,7 +100660,7 @@ sdP dNt vhu seS -seS +bJu rbe sdP tvc @@ -100528,7 +100938,7 @@ qgq lMT kxd kml -vXY +tDg aTv ukF mLh @@ -101087,7 +101497,7 @@ nVk rfW vki oCA -liC +oCA rTP qPo lhp @@ -102077,7 +102487,7 @@ xSA bGJ lLj vfX -stx +opK cWL nke fsm @@ -102934,7 +103344,7 @@ tAf tAf eNx qGy -tAf +bEC nyW mAO jHl @@ -103204,7 +103614,7 @@ uIi fpF qFt jVm -mkG +oWD lEv enU eHe @@ -104736,7 +105146,7 @@ woV fiv ior sxJ -tQt +nQD fiv ior sxJ @@ -105682,8 +106092,8 @@ oMj sHr mAr kvZ -prj -cXi +pEr +khr tWx luI moo @@ -105710,13 +106120,13 @@ cMA wEA iJc mZc +jki +uiX aoX -aoX -aoX -aoX -nrl +uiX +jki tGC -pxU +uiX tZr xAc gbD @@ -105926,8 +106336,8 @@ iUB iUB iUB kIR -prf aYE +prf aYE aYE sDq @@ -105939,7 +106349,7 @@ sHr sHr mAr asC -prj +pEr cXi tWx fVB @@ -105967,11 +106377,11 @@ wEA cTL wEA kwK -aoX -aoX -aoX -aoX -jeL +uiX +jki +uiX +sIW +uiX oCJ ekn pMU @@ -106043,7 +106453,7 @@ ppP tfN oYQ qzl -qzl +sgJ qzl fBU xOH @@ -106196,7 +106606,7 @@ eri eri mAr lLk -prj +pEr cXi tWx gnK @@ -106224,11 +106634,11 @@ ogk wEA lTB mZc +sIW +uiX +uiX aoX -aoX -aoX -aoX -jeL +uiX nNQ qBy tZr @@ -106433,11 +106843,11 @@ uoo ksa ksa ksa -ksa -ksa fEP ksa xXP +ksa +xXP mrP pOC rQs @@ -106446,7 +106856,7 @@ lFE bLO mrP uqt -hYk +yio mKa rlB kYB @@ -106484,7 +106894,7 @@ mZc pkR ojr voi -wIn +xjB sIW ajR vNF @@ -106690,11 +107100,11 @@ ksa ksa ksa ksa -ksa -ksa fEP ksa xXP +ksa +xXP ygY abT mqW @@ -106712,7 +107122,7 @@ qlQ ciG pEr khr -tWx +doW tWx wYE tWx @@ -106742,7 +107152,7 @@ mZc mZc tZr tZr -nQD +uiX aYu qss tZr @@ -106947,9 +107357,9 @@ ksa ksa rxc xXP +fEP xXP xXP -fEP xXP xXP ygY @@ -107001,7 +107411,7 @@ uiX pqq jki aYu -fAQ +izX tZr tGD gbD @@ -107204,11 +107614,11 @@ ksa ksa ksa ksa -ksa -ksa fEP ksa xXP +ksa +xXP ygY fSW aAl @@ -107310,7 +107720,7 @@ hEh rgL tYU fpq -cTG +oDL cTG gSg cTG @@ -107461,11 +107871,11 @@ ksa ksa ksa ksa -ksa -ksa fEP ksa xXP +ksa +xXP mrP mta jOV @@ -107514,7 +107924,7 @@ mZc uiX uiX nfz -uiX +fXn izX tZr dIF @@ -107567,10 +107977,10 @@ oqK oqK oqK qWn +ami hkj -vFJ uBG -oDL +hkj xMu eTg jaf @@ -107718,11 +108128,11 @@ ksa ksa ksa ksa -ksa -xXP fEP xXP xXP +xXP +xXP mrP mrP mrP @@ -107823,9 +108233,9 @@ alM pZj elt oqK -tYU +vFJ kJo -tYU +vFJ oqK oqK ycz @@ -108006,7 +108416,7 @@ cmI cmI cmI cmI -wIv +cmI wIv wIv mZc @@ -108760,7 +109170,7 @@ ksa ksa ebw tvH -jzo +qyx ats cmI cCF @@ -109018,7 +109428,7 @@ ieK rVT tIU qyx -tIU +yen wIv xCc kpE @@ -109275,7 +109685,7 @@ ksa ebw cmP muu -yen +cmP wIv mlN sZN @@ -109811,7 +110221,7 @@ ghk mZc lTB mov -lTB +ucW mov xzK bLy @@ -109855,7 +110265,7 @@ wDg sUx rQv rFk -bkW +koe nCY rei uII @@ -110317,7 +110727,7 @@ pcT ciP xRd nKK -qZk +lGM bLy fGh fuh @@ -110569,10 +110979,10 @@ aVH xXP xXP xXP -icx +aFe tUu ePr -cch +ptd nKK qZk bLy @@ -110826,7 +111236,7 @@ aVH ksa ksa ksa -icx +aFe gqE cch aTb @@ -110883,7 +111293,7 @@ qwG nDn lvR rFk -bkW +uyL nCY mOZ nMn @@ -111083,7 +111493,7 @@ aVH xXP xXP xXP -icx +aFe sHA cch tOZ @@ -111140,7 +111550,7 @@ qOH qOH qOH qOH -xbb +rQA nCY mOZ fep @@ -111344,8 +111754,8 @@ icx qde fpZ iWL -nKK -qZk +tAz +lGM bLy fGh fuh @@ -111383,7 +111793,7 @@ mZT hxw cnA sAJ -nVy +pxU cHJ wxL lbf @@ -111674,7 +112084,7 @@ lmY lgx rvZ bID -fvH +mGu doy gPO dvO @@ -111856,7 +112266,7 @@ aFe rNP aFe cch -cch +wWV eyG sVo tah @@ -111894,7 +112304,7 @@ cev piC cev cev -hXt +cev mzY sAJ cNc @@ -111931,7 +112341,7 @@ jNd lBE azt bID -mGu +nkm nMo vuu dvO @@ -112113,7 +112523,7 @@ apK rkF vdN cch -cch +vla ujA sPm sPm @@ -112150,8 +112560,8 @@ hXt hXt gKi hXt +hXt cev -gqK uLQ fsE fsE @@ -112188,7 +112598,7 @@ hNA tvY pvI bID -fvH +mGu bys kpd dvO @@ -112372,7 +112782,7 @@ aFe cch cIK gCo -dCC +cch lca bLy fGh @@ -112407,8 +112817,8 @@ rxH ikD oaQ jFw +ikD tqK -sRt eWv xSh fsE @@ -112455,8 +112865,8 @@ cjZ tgG fEa lku -cNO pZj +uAC pYA tgG mzf @@ -112664,8 +113074,8 @@ bsd emk dMO dMO -bZN dMO +bZN dMO fsE fsE @@ -112682,7 +113092,7 @@ qOH qOH qOH qOH -bkW +ivZ nCY mOZ nMn @@ -112886,7 +113296,7 @@ icx hzD odz wMG -mCx +dCC crm bLy fGh @@ -112921,12 +113331,12 @@ fqQ rrv dMO ndK +tBn xAL jbt -bVU +mrB fJA -knl -neW +mAw wxL lbf xAf @@ -112947,12 +113357,12 @@ owt eKx owt olq -osq +owt owt dIC owt owt -jLa +hYk owt owt bpi @@ -112967,10 +113377,10 @@ owt qqZ jFA tgG -geG +pZj lku cNO -cNO +pZj cNO tgG jqd @@ -113142,7 +113552,7 @@ xXP icx mCx mCx -vla +mCx mCx mCx bLy @@ -113181,8 +113591,8 @@ abf jzQ jJq qgz +srN vGf -nVy mIl vbD esr @@ -113438,12 +113848,12 @@ yiI sXd byp grI +qxj fJA -fgw -neW +fNc wxL lbf -iuK +lXq rFk bvm adc @@ -113472,7 +113882,7 @@ cdm qdu sxi sxi -vyc +qTm lfs cNw iOG @@ -113481,11 +113891,11 @@ ukr ukr vZe tgG -pZj cNO +pZj cNO xgp -cNO +pZj tgG fgR fgR @@ -113696,7 +114106,7 @@ rkB rkB rkB fJA -rCT +fJA xBK cAM xBK @@ -113710,7 +114120,7 @@ lWn lWn lWn lWn -aio +vBj nCY mZR kDm @@ -114208,7 +114618,7 @@ ssD nKa nKa nKa -tBn +cgC fIX iTg cHJ @@ -114451,7 +114861,7 @@ vzn sCj ifE aVV -fIw +jKC kzv tcP qZu @@ -114465,7 +114875,7 @@ eoB tUg oZf uWa -cgC +rdL fIX biI neW @@ -114491,7 +114901,7 @@ eaS biu bJU kDm -ylx +qEI nPf hDP srS @@ -114765,8 +115175,8 @@ aoo mMX rtJ mFO -aoo -aoo +nIN +nIN oqK oqK oqK @@ -115027,15 +115437,15 @@ gOr xQC kFe khD -coz +xpG aks hvX nBE nxW raC +tpC mhc -mhc -mhc +woy nBE aAL vBP @@ -115227,7 +115637,7 @@ xXP sYk fzW auK -dJe +sZK dxk lLi vkB @@ -115286,13 +115696,13 @@ oim gJp uMO bwg -vEV +coz nBE gWu +kIt mhc mhc -tpC -woy +fyG nBE aAL vBP @@ -115549,7 +115959,7 @@ tpC mhc mhc mhc -yeo +fyG nBE nBE apm @@ -115741,7 +116151,7 @@ oIP oIP yjo ofh -ptd +yjo iaT iaT iaT @@ -115766,7 +116176,7 @@ khD lWn lWn lWn -uoW +sRG nCY dQC fpy @@ -116015,7 +116425,7 @@ wxL mOH nBE tpC -vLk +kIt tLM mhc tpC @@ -116255,7 +116665,7 @@ nVs nVs nVs auK -dJe +sZK iaT tpr sKj @@ -116275,7 +116685,7 @@ tLM tLM tLM mhc -mhc +kIt tvs nOZ nOZ @@ -116317,7 +116727,7 @@ dCs gGs nBE cUL -mhc +kIt hbb ewP ewP @@ -116530,8 +116940,8 @@ pUp nBE rHt tLM -rNF -grF +tpC +sRt bxE nBE uqE @@ -117218,8 +117628,8 @@ ksa fEP ksa oDg -fRT -whv +rhe +iFl xfI fJl ljv @@ -117242,13 +117652,13 @@ tPv fRT huF fRT -cMv +geG iqY gso whv cnk iqY -cMv +wSC fRT huF fRT @@ -117333,7 +117743,7 @@ mhP xjF nIN dUX -hQX +hGe vIM dgS gOp @@ -117475,8 +117885,8 @@ ksa fEP ksa oDg -fRT -iFl +gqK +iIC fRT hYH ckD @@ -117511,8 +117921,8 @@ dvl fRT hWs sEO -gTp eDg +hnV tsi bLy ocY @@ -117769,7 +118179,7 @@ sCN rEL vhh sos -aEg +jyX aEg kNH eCE @@ -117803,7 +118213,7 @@ jxy jxy jxy jxy -jxy +mfd jxy jxy jxy @@ -117989,7 +118399,7 @@ ksa fEP ksa oDg -fRT +vEV poS fRT hYH @@ -118059,12 +118469,12 @@ jxy tWR fiS bPd -pfy bPd -cRq +bPd +bPd jhJ lWJ -bPd +gHr pmV lLd nte @@ -118246,7 +118656,7 @@ ksa fEP ksa oDg -fRT +rhe poS sJo fJl @@ -118270,17 +118680,17 @@ lYt fRT fRT fRT -cnk +xfI iqY fRT jdJ fRT iqY -gso +fvH fRT whv fRT -ejK +hmO sEO sEO sEO @@ -118313,7 +118723,7 @@ jxy jxy jxy jxy -gIG +ylx gIG bPd bPd @@ -118570,7 +118980,7 @@ kpP oij iXR sfC -gIG +knz gIG gIG pVZ @@ -118762,7 +119172,7 @@ ksa aIr mnA pYv -mze +mnA gQX ogZ fck @@ -118824,7 +119234,7 @@ bva sqZ rcG jVE -bva +mHe sfC sfC ben @@ -119017,9 +119427,9 @@ ksa fEP ksa bzJ -mnA -pYv jUj +pYv +mnA gQX ogZ fck @@ -119072,19 +119482,19 @@ iLB bTN iLB kJI -eGM -wiD -wic -tRo +umd +iLB +iLB +jxy czu -ovM +bva ovM neG -bva +gTp nIW sfC tWR -gIG +knz vkj gIG gIG @@ -119274,7 +119684,7 @@ ksa fEP uoo bzJ -ujP +bVU pYv cWj gQX @@ -119329,16 +119739,16 @@ iLB nnv aQR iLB -iLB -iLB -aij -jxy +eGM +wiD +wiD +tRo pHX -uSp -bva +mzT +mzT rov -ovM -ovM +mzT +mzT gZc qDZ qDZ @@ -119531,7 +119941,7 @@ ksa fEP ksa bzJ -mnA +jCu pYv mnA gQX @@ -119855,7 +120265,7 @@ edQ sfC sfC sfC -knz +kxQ oTd gIG xEj @@ -120046,16 +120456,16 @@ fEP uoo aIr aIr -aIr +bzJ aIr aIr aIr aIr aIr mnA -mnA +gSG sDm -mnA +svS mnA aIr aIr @@ -120112,7 +120522,7 @@ pDJ jWN rjf ucr -knz +gIG gIG gIG iLG @@ -120309,16 +120719,16 @@ ksa uoo ksa aIr -mUz +xjG mnA dXk -mnA -cWj +ujP +nnz aIr ksa ksa aIr -gSG +mUz oak dTN nwZ @@ -120335,7 +120745,7 @@ ufB ufB fRT fRT -fRT +sFX fRT fJl uoo @@ -120567,10 +120977,10 @@ fEP uoo aIr lcH -lcH +rNF jOq -lcH -lcH +fgw +xKM aIr uoo uoo @@ -120579,7 +120989,7 @@ uZm iLF mnA gQX -fRT +jBl gKT fRT sCP @@ -120622,11 +121032,11 @@ aUh fMC eNN sfC -cSx cSY -cSx +cSY +cSY sms -wSC +tWR qWj bPd bPd @@ -120634,7 +121044,7 @@ bPd lIF bTT sbL -bPd +gHr pmV lLd xFr @@ -120823,9 +121233,9 @@ ksa fEP ksa aIr -ete +xLn xau -jOq +rEf wcL ete aIr @@ -120879,9 +121289,9 @@ jxy sfC sfC sfC -cSx -oHe -cSx +sms +sms +sms sms sms pmV @@ -121136,10 +121546,10 @@ jxy bix uLz wXz -vXz -vXz -vXz +wGm gGX +cSx +cSx sms mjw rEE @@ -121393,10 +121803,10 @@ ezZ pgh pgh eUW -eUW -eUW -eUW -mfd +cRq +vXz +vXz +vXz sms sOo bPd @@ -122421,9 +122831,9 @@ jxy fjx xUZ eUW -eUW -eUW -eUW +oHe +pfy +pfy czD sms bpB @@ -122677,11 +123087,11 @@ dhE jxy jIp xUZ -eUW +qlI jLl qGx -qlI -wGm +cSx +cSx sms gHr xcb @@ -122932,9 +123342,9 @@ jxy jxy jxy jxy -xYi +sms snk -xYi +sms sms sms lKY @@ -123189,16 +123599,16 @@ aMJ sms enD gyK -eUW +jdb xUZ eUW -jdb +eUW bBA lKY wfT sRJ rOu -sRJ +jKD bpI lKY tnK @@ -123449,8 +123859,8 @@ eUW eUW xUZ eUW -eUW -eUW +lsC +gcx lKY sVt gLh @@ -124036,8 +124446,8 @@ khD khD khD khD -xXP -xXP +qHu +seP xXP xXP xXP @@ -124215,13 +124625,13 @@ bkD aMJ aMJ sms -gcx +rUo gcx hLW eUW lkV lsC -gcx +fIw lKY sue jjx @@ -124293,7 +124703,7 @@ koC qgd vNr seP -qHu +nJN seP uoo uoo @@ -124702,8 +125112,8 @@ aVH uoo uoo uoo -uoo -uoo +kjj +jse kjj kjj kjj @@ -124731,9 +125141,9 @@ iLB jxy ksa ksa -sms +dXd mqZ -sms +dXd ksa ksa xvI @@ -124807,7 +125217,7 @@ lLb gGY ddK seP -qHu +nJN seP uoo uoo @@ -124960,7 +125370,7 @@ sWc uoo uoo kjj -jse +liC kjj vGz tNL @@ -125064,8 +125474,8 @@ seP seP seP seP -uoo -uoo +qHu +seP uoo uoo uoo @@ -125474,7 +125884,7 @@ sWc uoo uoo kjj -jse +liC kjj rgi fSi @@ -125730,8 +126140,8 @@ uoo xXP xXP xXP -xXP -xXP +kjj +jse kjj kjj kjj diff --git a/_maps/~monkestation/RandomEngines/BoxStation/empty.dmm b/_maps/~monkestation/RandomEngines/BoxStation/empty.dmm index c11aa7dd26f6..9e1c243f7bac 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/empty.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/empty.dmm @@ -2,39 +2,12 @@ "a" = ( /turf/open/floor/iron, /area/station/engineering/main) -"b" = ( -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/main) -"c" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/engineering/main) -"e" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/engineering/main) "f" = ( /turf/template_noop, /area/template_noop) "h" = ( /turf/closed/wall/r_wall, /area/space/nearstation) -"i" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engine Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "l" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -53,10 +26,8 @@ /turf/open/space/basic, /area/space/nearstation) "o" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, /area/station/engineering/main) "r" = ( /obj/structure/lattice/catwalk, @@ -68,10 +39,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"v" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron, -/area/station/engineering/main) "z" = ( /obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ dir = 4 @@ -89,12 +56,6 @@ "C" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/engineering/central) -"D" = ( -/obj/machinery/light/directional/north, -/obj/machinery/airalarm/directional/north, -/obj/structure/table, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "E" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -115,51 +76,35 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "J" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Engine Room" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engine SMES Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) -"K" = ( -/obj/structure/table, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "L" = ( /obj/structure/grille, /turf/open/floor/plating/airless, /area/space/nearstation) "M" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/engineering/main) -"N" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron, -/area/station/engineering/main) -"Q" = ( -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, /area/station/engineering/main) "R" = ( /turf/closed/wall/r_wall, /area/station/engineering/main) -"W" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "Y" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -170,11 +115,11 @@ /area/station/maintenance/department/engineering/central) (1,1,1) = {" -R B B B -R +B +B R f A @@ -198,11 +143,11 @@ f f "} (2,1,1) = {" -i -M -M B -b +B +B +B +B R A A @@ -226,12 +171,12 @@ f f "} (3,1,1) = {" -R -Q -M B B -R +B +B +B +E f A m @@ -254,12 +199,12 @@ f f "} (4,1,1) = {" -R -K -M -W B -E +B +B +B +B +R A A m @@ -282,12 +227,12 @@ m f "} (5,1,1) = {" -R -D -M B B -E +B +B +B +R f A m @@ -311,11 +256,11 @@ f "} (6,1,1) = {" R -K +o M o -B -E +R +R A A m @@ -340,11 +285,11 @@ f (7,1,1) = {" R B -M B B R f +f A m A @@ -368,10 +313,10 @@ m (8,1,1) = {" R B -M B -b -R +B +E +A A A m @@ -396,19 +341,19 @@ f (9,1,1) = {" R B -M B B R f +f +A +A +A +A A -m A -m A -m A -m A f f @@ -423,9 +368,9 @@ f "} (10,1,1) = {" R -Y +E J -Y +E R R R @@ -436,7 +381,7 @@ R Y Y R -A +f f f f @@ -452,7 +397,7 @@ f (11,1,1) = {" R a -c +a a a a @@ -480,7 +425,7 @@ A (12,1,1) = {" R a -c +a a a a @@ -508,7 +453,7 @@ f (13,1,1) = {" Y a -c +a a a a @@ -536,7 +481,7 @@ f (14,1,1) = {" Y a -c +a a a a @@ -564,7 +509,7 @@ A (15,1,1) = {" R a -c +a a a a @@ -591,8 +536,8 @@ f "} (16,1,1) = {" R -v -c +a +a a a a @@ -620,7 +565,7 @@ f (17,1,1) = {" F a -e +a a a a @@ -648,7 +593,7 @@ A (18,1,1) = {" Y a -e +a a a a @@ -676,7 +621,7 @@ f (19,1,1) = {" F a -e +a a a a @@ -703,8 +648,8 @@ A "} (20,1,1) = {" R -N -e +a +a a a a diff --git a/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm b/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm index aaca9b27c89f..98b5b97f9dc5 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm @@ -1,8 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/cell_charger, /turf/open/floor/iron/dark, /area/station/engineering/main) "aW" = ( @@ -18,6 +21,10 @@ /obj/structure/particle_accelerator/particle_emitter/center, /turf/open/floor/plating, /area/station/engineering/main) +"bZ" = ( +/obj/effect/turf_decal/caution/red, +/turf/open/floor/iron/dark/smooth_large/airless, +/area/space/nearstation) "cp" = ( /obj/machinery/camera/emp_proof/directional/north{ c_tag = "Engineering - Station Particle Accelerator, Northwest"; @@ -63,9 +70,10 @@ dir = 1 }, /obj/structure/cable/layer1, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/textured_large, /area/station/engineering/main) "ge" = ( +/obj/machinery/light/small/directional/north, /obj/structure/cable, /obj/machinery/power/smes/engineering, /turf/open/floor/iron/dark, @@ -89,6 +97,12 @@ "gu" = ( /turf/open/floor/plating, /area/station/engineering/main) +"gQ" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/cable, +/obj/machinery/power/smes/engineering, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "gV" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -107,10 +121,8 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "hl" = ( -/obj/structure/cable/layer1, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/rack, +/obj/item/crowbar/red, /turf/open/floor/iron/dark, /area/station/engineering/main) "hn" = ( @@ -133,10 +145,13 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "hE" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/cable/layer1, +/obj/machinery/holopad, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) "hI" = ( /obj/machinery/power/emitter, @@ -155,10 +170,7 @@ /turf/open/floor/iron, /area/station/engineering/main) "jL" = ( -/obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 4 - }, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/engineering/main) "jV" = ( @@ -192,12 +204,6 @@ /obj/item/stack/cable_coil, /turf/open/floor/plating, /area/station/engineering/main) -"lg" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/cable, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "lC" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -216,13 +222,19 @@ /area/station/engineering/main) "mJ" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/structure/closet/radiation, +/obj/structure/table, +/obj/item/folder/yellow, /turf/open/floor/iron, /area/station/engineering/main) "mK" = ( /obj/structure/particle_accelerator/power_box, /turf/open/floor/plating, /area/station/engineering/main) +"mP" = ( +/obj/machinery/light/small/directional/north, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "na" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -260,11 +272,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/main) "pQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) "pW" = ( /obj/effect/turf_decal/stripes/line, @@ -287,13 +295,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"rU" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/cable, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "sM" = ( /obj/effect/turf_decal/bot_white/right, /turf/open/floor/plating/airless, @@ -306,7 +307,9 @@ /turf/open/floor/plating, /area/station/engineering/main) "sQ" = ( -/obj/structure/chair, +/obj/machinery/light/directional/north, +/obj/machinery/airalarm/directional/north, +/obj/structure/rack, /turf/open/floor/iron/dark, /area/station/engineering/main) "tq" = ( @@ -321,7 +324,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/textured_large, /area/station/engineering/main) "tJ" = ( /obj/effect/turf_decal/stripes/line, @@ -340,44 +343,35 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/cable/layer1, /obj/structure/fans/tiny, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/textured_large, /area/station/engineering/main) "ug" = ( -/obj/machinery/light/directional/north, -/obj/machinery/airalarm/directional/north, -/obj/structure/table, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, /area/station/engineering/main) "vF" = ( /obj/structure/chair/stool/directional/north, /turf/open/floor/plating, /area/station/engineering/main) -"vQ" = ( -/obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "vZ" = ( /obj/machinery/power/energy_accumulator/grounding_rod, /turf/open/floor/plating/airless, /area/space/nearstation) -"wD" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ +"we" = ( +/obj/effect/turf_decal/caution/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engine SMES Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) +/turf/open/floor/iron/dark/smooth_large/airless, +/area/space/nearstation) "wK" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -397,7 +391,15 @@ /turf/open/floor/plating, /area/station/engineering/main) "xu" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - SMES, Engine"; + name = "engineering camera" + }, +/obj/structure/noticeboard/directional/west, /obj/structure/cable/multilayer/connected, +/obj/structure/table, +/obj/item/paper/fluff/stations/boxstation/station_engine_smes, +/obj/item/paper/fluff/stations/boxstation/station_pa_wiring, /turf/open/floor/iron/dark, /area/station/engineering/main) "xR" = ( @@ -420,6 +422,13 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"yp" = ( +/obj/structure/cable/layer1, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "yD" = ( /obj/effect/turf_decal/bot_red, /obj/structure/cable, @@ -429,10 +438,10 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "zd" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 8 +/obj/structure/chair{ + dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/station/engineering/main) "zk" = ( /obj/effect/turf_decal/stripes/line{ @@ -447,22 +456,27 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/engineering/main) -"zF" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Engine SMES Room" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +"zv" = ( /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/machinery/door/firedoor, +/obj/effect/turf_decal/bot_red/right, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"zF" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable/layer1, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engine SMES Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) "zZ" = ( @@ -486,12 +500,8 @@ /turf/open/floor/iron, /area/station/engineering/main) "Cp" = ( -/obj/structure/table, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - SMES, Engine"; - name = "engineering camera" - }, -/turf/open/floor/iron/dark, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, /area/station/engineering/main) "Cq" = ( /obj/effect/spawner/structure/window/reinforced/plasma, @@ -502,9 +512,11 @@ /turf/open/space/basic, /area/space/nearstation) "CY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 +/obj/structure/rack, +/obj/item/storage/toolbox/electrical{ + pixel_y = 7 }, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/iron/dark, /area/station/engineering/main) "Da" = ( @@ -514,8 +526,17 @@ /area/space/nearstation) "Df" = ( /obj/structure/cable/layer1, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/main) +"Dl" = ( +/obj/effect/turf_decal/caution/red{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large/airless, +/area/space/nearstation) "Ds" = ( /obj/effect/turf_decal/bot_red, /obj/item/toy/plush/space_lizard_plushie, @@ -532,7 +553,7 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/fans/tiny, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/textured_large, /area/station/engineering/main) "El" = ( /turf/closed/wall/r_wall, @@ -548,9 +569,6 @@ /turf/open/floor/iron, /area/station/engineering/main) "FH" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, /obj/machinery/button/door/directional/west{ id = "engine_storage"; name = "Engine Storage Control"; @@ -558,7 +576,7 @@ }, /obj/machinery/camera/autoname/directional/west, /obj/structure/tank_holder/oxygen/yellow, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) "FJ" = ( /obj/effect/turf_decal/bot, @@ -584,13 +602,6 @@ "GW" = ( /turf/template_noop, /area/template_noop) -"Hi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "Hj" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/structure/table, @@ -598,7 +609,10 @@ /turf/open/floor/iron, /area/station/engineering/main) "HB" = ( -/obj/structure/table, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/main) "HF" = ( @@ -639,12 +653,8 @@ /turf/open/floor/iron, /area/station/engineering/main) "Lo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, /obj/structure/cable/layer1, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) "Lt" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, @@ -652,6 +662,11 @@ /obj/item/crowbar/red, /turf/open/floor/iron, /area/station/engineering/main) +"Mc" = ( +/obj/machinery/light/small/directional/south, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "MB" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -676,10 +691,17 @@ /turf/open/floor/plating, /area/station/engineering/main) "NO" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 4 +/obj/structure/cable, +/obj/machinery/power/terminal, +/obj/structure/table, +/obj/item/stock_parts/cell/upgraded{ + pixel_y = 10 }, -/turf/open/floor/plating, +/obj/item/stock_parts/cell/upgraded{ + pixel_y = 5 + }, +/obj/item/stock_parts/cell/upgraded, +/turf/open/floor/iron/dark, /area/station/engineering/main) "NU" = ( /obj/machinery/power/energy_accumulator/tesla_coil, @@ -691,6 +713,12 @@ }, /turf/open/floor/plating, /area/station/engineering/main) +"Og" = ( +/obj/effect/turf_decal/caution/red{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large/airless, +/area/space/nearstation) "Pl" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -715,14 +743,15 @@ /turf/closed/wall/r_wall, /area/station/engineering/main) "PV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, /obj/machinery/light/small/directional/north, /obj/structure/sign/warning/vacuum/external/directional/north, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) +"Qs" = ( +/obj/structure/cable, +/obj/effect/turf_decal/bot_red/left, +/turf/open/floor/plating/airless, +/area/space/nearstation) "QT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -730,18 +759,14 @@ /turf/open/floor/plating, /area/station/engineering/main) "Ra" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, /obj/machinery/camera/autoname/directional/east, /obj/structure/tank_holder/oxygen/yellow, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) "Rw" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/structure/table, /obj/item/storage/toolbox/mechanical, -/obj/item/folder/yellow, /turf/open/floor/iron, /area/station/engineering/main) "RH" = ( @@ -764,6 +789,12 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/station/engineering/main) +"Ti" = ( +/obj/structure/cable/layer1, +/obj/structure/cable, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/plating/airless, +/area/space/nearstation) "TF" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -827,11 +858,11 @@ /area/space/nearstation) (1,1,1) = {" -PG -oN -oN -oN -PG +ge +aD +xu +NO +gQ PG GW GW @@ -855,19 +886,19 @@ GW GW "} (2,1,1) = {" -wD -aD -Hi hq -rU +oN +Df +oN +hq PG -GW +wX wX GW GW GW wX -GW +wX El El El @@ -883,17 +914,17 @@ GW GW "} (3,1,1) = {" -PG -hn -hl -oN -ge -PG -wX +yp +yp +hE +HB +hq +aW +GW wX wX GW -wX +GW wX GW El @@ -911,12 +942,12 @@ GW GW "} (4,1,1) = {" +hn +oN +yp +oN +oN PG -HB -hl -hE -vQ -aW wX wX wX @@ -931,7 +962,7 @@ Zp vZ vZ El -GW +wX Va GW Cs @@ -939,19 +970,19 @@ GW GW "} (5,1,1) = {" +mP +oN +yp +oN +Mc PG -ug -hl -Df -xu -aW -wX wX wX wX wX wX wX +GW El HF HF @@ -969,17 +1000,17 @@ GW (6,1,1) = {" PG Cp -GK -CY -jL -aW +ug +Cp +PG +PG wX wX GW wX wX wX -wX +GW El hI gX @@ -996,18 +1027,18 @@ GW "} (7,1,1) = {" PG -sQ +hl GK -oN -ge +zd PG +GW wX GW GW wX wX -GW -GW +wX +wX El Zp Zp @@ -1015,7 +1046,7 @@ Zp Zp Zp El -GW +wX Va GW Cs @@ -1026,15 +1057,15 @@ Cs PG sQ GK -hq -lg -PG +jL +aW GW +wX GW GW wX GW -GW +wX GW El Zp @@ -1052,9 +1083,9 @@ GW "} (9,1,1) = {" PG -sQ +CY GK -oN +zd PG PG PG @@ -1196,7 +1227,7 @@ Hj kr Px PG -NO +pQ Cq Zp Zp @@ -1205,11 +1236,11 @@ HP Zp Zp zZ -Zp -VS -HP -VS -Zp +Og +Qs +Ti +zv +Og zZ Zp Zp @@ -1259,7 +1290,7 @@ Zp Da Zp Zp -Zp +we Zp FJ Zp @@ -1267,7 +1298,7 @@ wX Zp FJ Zp -Zp +bZ Zp Zp HP @@ -1287,7 +1318,7 @@ Zp HP Zp Zp -VS +Qs sM Zp wX @@ -1295,7 +1326,7 @@ wX wX Zp YE -VS +zv Zp Zp HP @@ -1315,7 +1346,7 @@ VS HP di di -HP +Ti dc wX wX @@ -1323,7 +1354,7 @@ Ds wX wX dc -HP +Ti di di HP @@ -1343,7 +1374,7 @@ Zp HP Zp Zp -VS +zv YE Zp wX @@ -1351,7 +1382,7 @@ wX wX Zp sM -VS +Qs Zp Zp HP @@ -1371,7 +1402,7 @@ Zp Da Zp Zp -Zp +we Zp FJ Zp @@ -1379,7 +1410,7 @@ wX Zp FJ Zp -Zp +bZ Zp Zp HP @@ -1420,7 +1451,7 @@ Rw qo Kd PG -zd +pQ Cq Zp Zp @@ -1429,11 +1460,11 @@ HP Zp Zp yD -Zp -VS -HP -VS -Zp +Dl +zv +Ti +Qs +Dl yD Zp Zp diff --git a/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm b/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm index 431736541f74..d4068db362b1 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm @@ -1,8 +1,9 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aU" = ( -/obj/structure/cable/layer1, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ + dir = 1 + }, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "bg" = ( @@ -10,46 +11,37 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/brown/visible, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ name = "Engine Room" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible, /turf/open/floor/iron/dark/textured_large, -/area/station/engineering/main) -"bi" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "bC" = ( -/obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 4 +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) +/turf/open/floor/plating/airless, +/area/space/nearstation) "bQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light/directional/east, +/obj/effect/turf_decal/stripes/corner, /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/main) "bX" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/power/emitter/welded{ + dir = 8 }, /turf/open/floor/plating, -/area/station/engineering/supermatter/room) +/area/station/engineering/main) "ce" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/camera/autoname/directional/west, @@ -62,6 +54,13 @@ /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"cH" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "cV" = ( /obj/structure/foamedmetal, /turf/open/floor/plating, @@ -78,137 +77,144 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"dp" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ +"df" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"dL" = ( -/obj/structure/cable/layer1, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +"dp" = ( /obj/structure/cable, -/turf/open/floor/iron/dark/smooth_large, +/obj/machinery/power/terminal, +/obj/structure/table, +/obj/item/stock_parts/cell/upgraded{ + pixel_y = 10 + }, +/obj/item/stock_parts/cell/upgraded{ + pixel_y = 5 + }, +/obj/item/stock_parts/cell/upgraded, +/turf/open/floor/iron/dark, /area/station/engineering/main) -"dX" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/camera/autoname/directional/east, -/obj/structure/tank_holder/oxygen/yellow, +"dL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/main) -"eq" = ( +/area/station/engineering/supermatter/room) +"dV" = ( +/obj/structure/cable/layer1, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"ev" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, -/area/station/engineering/main) -"eG" = ( +"dX" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/structure/table, -/obj/item/storage/toolbox/mechanical, -/obj/item/folder/yellow, +/obj/structure/sign/warning/directional/west, /turf/open/floor/iron, /area/station/engineering/main) -"eI" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ - dir = 6 +"ec" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/turf/open/space/basic, -/area/space/nearstation) -"eL" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Filter to Waste"; +/obj/structure/sign/warning/radiation/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 }, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"eT" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 5 - }, +"eq" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"eU" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "eng_burn"; - name = "Burn Chamber Radiation Shutters" +"es" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 10 + }, +/turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"eZ" = ( -/obj/effect/turf_decal/stripes/end, -/obj/machinery/camera/directional/east{ - c_tag = "Engineering Supermatter Chamber"; - name = "engineering camera"; - network = list("engine") +"ev" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/machinery/light/directional/east, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/unlocked, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"eL" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, -/area/station/engineering/supermatter) -"fw" = ( +/area/station/engineering/supermatter/room) +"eT" = ( /obj/effect/turf_decal/stripes/line{ - dir = 8 + dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Filter to Waste"; - dir = 1 +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 5 }, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"fy" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) -"fX" = ( +"eU" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"eZ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 8 }, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"fy" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) "gf" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ +/obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "gm" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engine Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/simple/brown/visible, -/turf/open/floor/iron/dark/textured_large, -/area/station/engineering/main) +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) "gu" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 4 +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Hot Loop"; + dir = 1 }, -/turf/open/space/basic, -/area/space/nearstation) +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "gK" = ( -/obj/structure/cable/layer1, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "gQ" = ( @@ -236,99 +242,74 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/light/small/directional/west, /obj/structure/cable, -/obj/machinery/power/emitter/welded{ - dir = 4 - }, /turf/open/floor/plating, /area/station/engineering/main) "hG" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/button/door/directional/west{ + id = "eng_sm"; + name = "Radiation Shutters Control"; + req_access = list("engineering") + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "hK" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/bridge_pipe/brown/visible, +/obj/machinery/button/door/directional/east{ + id = "eng_sm"; + name = "Radiation Shutters Control"; + req_access = list("engineering") + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "hQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "hT" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "eng_sm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/hidden/layer4, +/turf/open/space/basic, +/area/space/nearstation) "hU" = ( -/obj/structure/table, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - SMES, Engine"; - name = "engineering camera" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) -"in" = ( -/obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 8 - }, -/turf/open/floor/iron/dark, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, /area/station/engineering/main) "io" = ( +/obj/machinery/igniter{ + id = "teg_burn_igniter" + }, /turf/open/floor/engine/vacuum, /area/station/engineering/supermatter/room) "it" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/turf/open/floor/plating, -/area/station/engineering/supermatter) -"ix" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Director" +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 4; + name = "Waste" }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "iC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/portable_atmospherics/canister/plasma, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/floor/plating/airless, +/area/space/nearstation) "iR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/turf/open/floor/plating, +/obj/structure/sign/delam_procedure/directional/east, +/turf/open/floor/engine, /area/station/engineering/supermatter) "iV" = ( +/obj/structure/cable/layer1, /obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ - dir = 1 + dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -344,6 +325,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/main) +"jj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "jz" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -354,6 +341,7 @@ /turf/open/floor/plating, /area/station/engineering/main) "jO" = ( +/obj/machinery/light/small/directional/north, /obj/structure/cable, /obj/machinery/power/smes/engineering, /turf/open/floor/iron/dark, @@ -367,6 +355,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/light/small/directional/east, /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/main) @@ -380,6 +369,11 @@ }, /turf/open/floor/circuit/green, /area/station/engineering/supermatter/room) +"kj" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "kn" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, @@ -391,11 +385,11 @@ /turf/open/floor/engine, /area/station/engineering/supermatter) "ky" = ( -/obj/machinery/firealarm/directional/north{ - pixel_x = -5 +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 6 }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/main) +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "kN" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -418,9 +412,6 @@ /obj/structure/cable/layer1, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) -"lb" = ( -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/main) "lf" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -429,29 +420,77 @@ /obj/item/pipe_dispenser, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"lg" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ + dir = 1 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "li" = ( -/obj/machinery/light/small/directional/south, -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/engine_access, -/turf/open/floor/engine, -/area/station/engineering/supermatter) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "ll" = ( -/obj/machinery/light/small/directional/north, /turf/open/floor/engine, /area/station/engineering/supermatter) "lm" = ( -/obj/machinery/light/small/directional/west, -/obj/machinery/camera/autoname/directional/west, -/obj/structure/tank_holder/oxygen/yellow, +/obj/machinery/light/small/directional/east, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/closet/radiation, /turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/main) +/area/station/engineering/supermatter/room) "lq" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Waste"; - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/button/door/directional/east{ + id = "eng_brn"; + name = "Burn Chamber Radiation Shutters Control"; + req_access = list("engineering"); + pixel_y = 6 + }, +/obj/machinery/button/door/directional/east{ + id = "burn_vent"; + name = "Burn Chamber Vent Control"; + req_access = list("engineering"); + pixel_y = -6 + }, +/obj/machinery/button/ignition{ + id = "teg_burn_igniter"; + pixel_x = 36; + pixel_y = -6; + name = "Burn Chamber Ignition Switch" + }, +/obj/machinery/button/door/directional/east{ + id = "eng_brn_ext"; + name = "Burn Chamber External Radiation Shutters Control"; + req_access = list("engineering"); + pixel_y = 6; + pixel_x = 36 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"lt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ + dir = 1 }, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"lA" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/sign/warning/engine_safety/directional/west, +/obj/structure/closet/radiation, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) "lE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -471,79 +510,59 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"lQ" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ +"lX" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Burn to Waste"; dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"lS" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2{ - dir = 10 - }, -/turf/open/space/basic, -/area/space/nearstation) "mg" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 10 +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/violet/visible{ + dir = 4 }, -/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "mw" = ( -/obj/machinery/atmospherics/components/trinary/filter/flipped{ +/obj/machinery/atmospherics/components/trinary/filter/flipped/on{ dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "mB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, +/obj/structure/window/reinforced/plasma/spawner/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, /turf/open/floor/engine, /area/station/engineering/supermatter) -"mF" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engine SMES Room" +"mE" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 10 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "mL" = ( /obj/effect/turf_decal/stripes/line{ - dir = 5 + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/obj/machinery/button/door/directional/north{ + id = "emitter_room"; + name = "Emitter Room Shutters Control"; + req_access = list("engineering") }, -/obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/main) "mN" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Mix to TEG Hot Loop" +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 5 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -562,36 +581,71 @@ /area/station/engineering/supermatter/room) "mR" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ dir = 6 }, /turf/open/floor/iron, /area/station/engineering/main) +"nq" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/hidden/layer4{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) "nr" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"nt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/heater{ dir = 1 }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"nT" = ( -/obj/effect/turf_decal/stripes/corner{ +"nu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ny" = ( +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/light/small/directional/east, +/obj/machinery/status_display/evac/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"nT" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "of" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 }, -/turf/open/floor/plating, +/turf/open/floor/engine/vacuum, /area/station/engineering/supermatter/room) "og" = ( /obj/effect/turf_decal/stripes/line{ @@ -606,82 +660,166 @@ /obj/item/clothing/glasses/meson/engine, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"ot" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "eng_burn"; - name = "Burn Chamber Radiation Shutters" - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) -"oA" = ( +"oj" = ( /obj/effect/turf_decal/stripes/line{ - dir = 4 + dir = 8 }, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4, -/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"oB" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Engine Room, Northwest"; - name = "engineering camera" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +"or" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 9 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"oO" = ( +"ot" = ( /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 8 + }, +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 9 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ov" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"oA" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"oB" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Engine Room, Northwest"; + name = "engineering camera" + }, +/obj/machinery/firealarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) +"oG" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"oO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, /obj/machinery/light/directional/north, -/obj/machinery/status_display/ai/directional/north, -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "oV" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 5 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "oZ" = ( /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) -"pN" = ( +"pc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /obj/machinery/atmospherics/components/binary/pump{ - name = "Hot Loop" + name = "TEG Cold Loop"; + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"pj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"pN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/pink/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/passive_vent/layer4, +/turf/open/floor/engine/vacuum, +/area/station/engineering/supermatter/room) +"pR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering - Engine Room, East"; + name = "engineering camera" }, +/obj/machinery/atmospherics/components/trinary/mixer, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"pT" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/layer_manifold/yellow/hidden, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "qa" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "qm" = ( -/obj/machinery/light/directional/north, -/obj/machinery/airalarm/directional/north, +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 1 + }, /obj/structure/table, +/obj/machinery/cell_charger, /turf/open/floor/iron/dark, /area/station/engineering/main) -"rf" = ( -/obj/effect/turf_decal/stripes/line{ +"qC" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/hidden/layer4, +/turf/open/space/basic, +/area/space/nearstation) +"qL" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ - dir = 1 +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"qY" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"rf" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2{ + dir = 4 }, -/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "rg" = ( @@ -690,16 +828,7 @@ /turf/open/floor/iron, /area/station/engineering/main) "rj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light/small/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Engineering - Engine Room, East"; - name = "engineering camera" - }, -/obj/machinery/status_display/evac/directional/east, -/obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible, +/obj/structure/cable/layer1, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "ru" = ( @@ -713,24 +842,43 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ - dir = 1 - }, +/obj/structure/sign/warning/radiation/directional/west, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "rB" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 5 +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"rF" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ + dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "rJ" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/structure/table, -/obj/item/storage/toolbox/electrical, -/turf/open/floor/iron, -/area/station/engineering/main) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 10 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"rN" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "sg" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -747,16 +895,25 @@ }, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) +"sj" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "sm" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 9 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "eng_burn"; - name = "Burn Chamber Radiation Shutters" +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/textured, /area/station/engineering/supermatter/room) "sn" = ( /obj/effect/turf_decal/stripes/line{ @@ -775,55 +932,55 @@ /area/station/engineering/supermatter/room) "su" = ( /obj/machinery/light/small/directional/south, -/obj/structure/cable, /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/engineering/main) "sA" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Cold Loop" }, -/obj/machinery/atmospherics/pipe/bridge_pipe/violet/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "sC" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/light/directional/south, -/obj/machinery/firealarm/directional/south{ - pixel_x = 5 - }, /obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ dir = 4 }, /turf/open/floor/iron, /area/station/engineering/main) "sG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"sO" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 10 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"sT" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma{ dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"sW" = ( +"sV" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 10 }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"sW" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter) "tb" = ( @@ -831,37 +988,38 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"tw" = ( +"tt" = ( /obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 4 }, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + name = "Director" + }, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Director" + }, +/obj/machinery/atmospherics/components/binary/pump/layer4{ + name = "Director" + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"tx" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2{ - dir = 5 +"tw" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/hidden/layer4{ + dir = 4 }, /turf/open/space/basic, /area/space/nearstation) "tK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ + dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -869,101 +1027,108 @@ /turf/template_noop, /area/template_noop) "tV" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "uh" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/structure/cable/layer1, -/turf/open/floor/plating, -/area/station/engineering/supermatter) -"uz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "SM Loop" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ui" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer2, +/turf/open/space/basic, +/area/space/nearstation) +"uz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, /obj/structure/cable, +/obj/machinery/power/emitter/welded{ + dir = 4 + }, /turf/open/floor/plating, /area/station/engineering/main) "uI" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/cable/layer1, +/obj/machinery/holopad, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) "uU" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 5 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "uW" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/light/directional/west, /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/main) "vh" = ( -/obj/effect/turf_decal/delivery/red, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/turf/open/floor/iron/dark/smooth_large, +/turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "vj" = ( /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) "vn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/turf/open/floor/plating/airless, +/area/space/nearstation) "vp" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"vD" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) "vG" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "vR" = ( /obj/effect/turf_decal/delivery/red, -/obj/machinery/atmospherics/pipe/layer_manifold/green/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible/layer4{ + dir = 1 }, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) -"wC" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ - dir = 9 +"wi" = ( +/obj/machinery/atmospherics/components/binary/valve/digital{ + name = "Burn Bypass"; + dir = 4 }, -/turf/open/space/basic, -/area/space/nearstation) +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "wG" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/turf/open/space/basic, -/area/space/nearstation) +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "wQ" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/structure/cable/layer1, @@ -973,13 +1138,16 @@ /turf/open/floor/iron, /area/station/engineering/main) "wR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + name = "Waste Release" + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "wS" = ( /obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Waste to Filter" + name = "Director"; + dir = 1 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -988,15 +1156,15 @@ dir = 8 }, /obj/machinery/light/directional/west, -/obj/structure/closet/radiation, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "xs" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, -/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "xu" = ( @@ -1004,12 +1172,15 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "xw" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 6 - }, -/turf/open/space/basic, +/turf/open/floor/plating/airless, /area/space/nearstation) +"xy" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "xB" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 8 @@ -1017,6 +1188,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/delam_scram/directional/west, /turf/open/floor/engine, /area/station/engineering/supermatter) "xD" = ( @@ -1026,30 +1198,49 @@ /obj/machinery/atmospherics/pipe/smart/simple/brown/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"xK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "xQ" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/turf/open/space/basic, -/area/space/nearstation) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) "xR" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/east, /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 5 }, -/turf/closed/wall/r_wall, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/turf/open/floor/engine, /area/station/engineering/supermatter) "ya" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/sign/delam_procedure/directional/south, +/obj/machinery/incident_display/delam/directional/south, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "yg" = ( -/obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 10 + dir = 4 }, -/turf/open/space/basic, +/turf/open/floor/plating/airless, /area/space/nearstation) "yi" = ( /obj/structure/cable/layer1, @@ -1062,65 +1253,70 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light/directional/east, -/obj/machinery/airalarm/directional/east, -/obj/effect/mapping_helpers/airalarm/unlocked, -/obj/machinery/atmospherics/components/unary/thermomachine/heater{ +/obj/machinery/atmospherics/components/binary/pump{ + name = "Filter to Waste"; + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"yv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ dir = 8 }, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "yx" = ( /obj/effect/turf_decal/delivery/red, -/obj/structure/cable/layer1, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible, +/obj/machinery/meter, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) +"yD" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "yR" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ - dir = 1 +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Hot Loop" }, -/turf/open/space/basic, -/area/space/nearstation) +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "zd" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible, -/obj/machinery/meter, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "SM Loop" + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "zf" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/button/door/directional/north{ - id = "emitter_room"; - name = "Emitter Room Shutters Control"; - req_access = list("engineering") - }, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Emitters Room"; - name = "engineering camera" - }, -/obj/structure/cable, +/obj/structure/reflector/box/anchored, /turf/open/floor/plating, /area/station/engineering/main) "zh" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Mix to TEG Cold Loop" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) -"zj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/engineering/main) "zR" = ( /obj/effect/turf_decal/stripes/red/line, /turf/open/floor/engine, /area/station/engineering/supermatter) +"zX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "Ae" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 10 @@ -1130,29 +1326,28 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter) +"Ag" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/hidden/layer4{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) "Aj" = ( /obj/effect/turf_decal/stripes/red/box, /obj/machinery/power/supermatter_crystal/engine, /turf/open/floor/engine, /area/station/engineering/supermatter) -"Am" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2, -/turf/open/space/basic, -/area/space/nearstation) "As" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron, /area/station/engineering/main) -"AA" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/structure/table, -/obj/item/crowbar/red, -/turf/open/floor/iron, -/area/station/engineering/main) "AB" = ( -/obj/machinery/igniter{ - id = "teg_burn_igniter" +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ + dir = 8 }, /turf/open/floor/engine/vacuum, /area/station/engineering/supermatter/room) @@ -1160,10 +1355,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/light/directional/south, -/obj/machinery/button/delam_scram{ - pixel_y = -32 +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 }, +/obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "AH" = ( @@ -1173,34 +1369,58 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) +"AO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"AQ" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/hidden/layer4{ + dir = 9 + }, +/turf/open/space/basic, +/area/space/nearstation) "AU" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/sign/warning/directional/east, +/turf/open/floor/iron, +/area/station/engineering/main) +"AV" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, -/obj/machinery/portable_atmospherics/canister/plasma, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/hidden/layer4, +/turf/open/floor/engine/vacuum, /area/station/engineering/supermatter/room) "Bc" = ( /turf/open/floor/iron/dark, /area/station/engineering/main) -"Bq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 +"Bo" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 4 }, -/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Bs" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 +/obj/effect/turf_decal/stripes/line, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/atmospherics/components/unary/thermomachine/heater{ + dir = 1 }, -/obj/machinery/meter, -/turf/open/floor/engine, -/area/station/engineering/supermatter) +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "Bx" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - SMES, Engine"; + name = "engineering camera" + }, +/obj/structure/noticeboard/directional/west, /obj/structure/cable/multilayer/connected, +/obj/structure/table, +/obj/item/paper/fluff/stations/boxstation/station_engine_smes, +/obj/item/paper/fluff/stations/boxstation/station_pa_wiring, /turf/open/floor/iron/dark, /area/station/engineering/main) "BA" = ( @@ -1211,11 +1431,9 @@ /turf/open/floor/iron/dark, /area/station/engineering/main) "BE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 +/obj/machinery/atmospherics/components/binary/valve/digital{ + name = "Space Bypass"; + dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -1223,15 +1441,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light/small/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Engine Room, West"; - name = "engineering camera" - }, -/obj/machinery/status_display/ai/directional/west, -/obj/machinery/atmospherics/components/trinary/mixer/flipped{ - dir = 1 - }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Ca" = ( @@ -1248,16 +1458,13 @@ name = "Engine Room" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/dark/textured_large, -/area/station/engineering/main) +/area/station/engineering/supermatter/room) "Cw" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/binary/valve/digital/on{ - dir = 4; - name = "Plasma Release" +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 }, -/turf/open/floor/iron/dark, +/turf/open/floor/engine/vacuum, /area/station/engineering/supermatter/room) "Dj" = ( /obj/machinery/atmospherics/pipe/smart/simple/violet/visible, @@ -1277,6 +1484,17 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"Ds" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "DL" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -1289,15 +1507,14 @@ /turf/open/floor/engine, /area/station/engineering/supermatter) "DP" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/cable, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating, /area/station/engineering/main) "DQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/brown/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ + dir = 9 }, /obj/machinery/meter, /turf/open/floor/iron/dark, @@ -1306,7 +1523,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/structure/sign/warning/fire/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"DX" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/violet/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Ee" = ( @@ -1327,13 +1550,12 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter) -"Eo" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ - dir = 5 - }, -/turf/open/space/basic, -/area/space/nearstation) +"El" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/cable, +/obj/machinery/power/smes/engineering, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "Eu" = ( /obj/structure/cable, /obj/machinery/power/thermoelectric_generator, @@ -1353,119 +1575,79 @@ /turf/open/floor/plating, /area/station/engineering/main) "Ew" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/components/trinary/filter/atmos/o2{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "EY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/button/door/directional/west{ + id = "sm_vent"; + name = "Supermatter Vent Control"; + req_access = list("engineering") }, -/obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/engine, /area/station/engineering/supermatter) -"Fc" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Burn to Hot Loop"; - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) -"Fr" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/violet/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) -"FF" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) -"FJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/button/door/directional/east{ - id = "eng_burn"; - name = "Burn Chamber Radiation Shutters Control"; - req_access = list("engineering"); - pixel_y = 6 - }, -/obj/machinery/button/door/directional/east{ - id = "burn_vent"; - name = "Burn Chamber Vent Control"; - req_access = list("engineering"); - pixel_y = -6 - }, -/obj/machinery/button/ignition{ - id = "teg_burn_igniter"; - pixel_x = 36; - pixel_y = -6; - name = "Burn Chamber Ignition Switch" +"Fj" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer2{ + dir = 5 }, -/obj/machinery/atmospherics/components/unary/thermomachine/heater{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/hidden/layer4{ + dir = 5 }, -/turf/open/floor/iron/dark, +/turf/open/space/basic, +/area/space/nearstation) +"Fr" = ( +/obj/effect/turf_decal/delivery/red, +/obj/machinery/atmospherics/pipe/layer_manifold/green/visible, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) +"Fz" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "FY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/light/directional/west, +/obj/machinery/button/door/directional/west{ + id = "emitter_room"; + name = "Emitter Room Shutters Control"; + req_access = list("engineering") }, -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/turf/open/floor/iron, +/area/station/engineering/main) "FZ" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "SM Loop" +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/engine_access, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"Ga" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 }, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"Ga" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +"Gg" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"Gd" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ +"Gk" = ( +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"Gg" = ( -/obj/effect/turf_decal/delivery/red, -/obj/structure/cable/layer1, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/supermatter) -"Gj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, -/turf/open/floor/iron/dark, -/area/station/engineering/main) -"Gk" = ( -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/main) "Gm" = ( -/obj/effect/turf_decal/delivery/red, -/obj/structure/cable/multilayer/connected, -/turf/open/floor/iron/dark/smooth_large, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering Supermatter Chamber"; + network = list("engine") + }, +/turf/open/floor/engine, /area/station/engineering/supermatter) "Gn" = ( /obj/effect/turf_decal/stripes/red/line{ @@ -1488,6 +1670,10 @@ dir = 10 }, /obj/machinery/incident_display/delam/directional/south, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "GE" = ( @@ -1498,46 +1684,60 @@ /obj/structure/cable/layer1, /turf/open/floor/iron, /area/station/engineering/main) -"Hi" = ( +"GI" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ + dir = 4 + }, +/turf/open/floor/engine/vacuum, +/area/station/engineering/supermatter/room) +"GX" = ( /obj/effect/turf_decal/stripes/line{ - dir = 5 + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible/layer4{ +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Hi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + name = "Director"; dir = 4 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ +/obj/machinery/atmospherics/components/binary/pump/layer4{ + name = "Director"; dir = 4 }, -/obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Hj" = ( /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/main) -"HG" = ( -/obj/effect/turf_decal/delivery/red, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/supermatter/room) -"HK" = ( +"Hu" = ( /obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"HL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +"HG" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"HK" = ( +/obj/structure/rack, +/obj/item/storage/toolbox/electrical{ + pixel_y = 7 }, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"HL" = ( /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/main) @@ -1545,70 +1745,78 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/engineering/main) +"HX" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "HY" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/east, /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 6 }, -/turf/closed/wall/r_wall, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/turf/open/floor/engine, /area/station/engineering/supermatter) "Ic" = ( /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/main) -"Ij" = ( +"Io" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Iu" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Iv" = ( /obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ - dir = 5 + dir = 8 }, /obj/machinery/atmospherics/components/binary/pump{ - name = "Cold Loop to Space"; - dir = 4 + name = "TEG Hot Loop"; + dir = 8 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"In" = ( -/obj/effect/turf_decal/delivery/red, -/obj/structure/cable/layer1, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/supermatter/room) -"Io" = ( +"IA" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold/purple/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) -"Iu" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Engine Room, West"; + name = "engineering camera" + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "IB" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "eng_burn"; + id = "eng_brn"; name = "Burn Chamber Radiation Shutters" }, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"ID" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ - dir = 5 +"IK" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 }, -/turf/open/space/basic, -/area/space/nearstation) +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "IW" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump{ + name = "Mix to SM Loop"; + dir = 8 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -1616,16 +1824,18 @@ /turf/open/floor/plating, /area/station/engineering/main) "Jn" = ( -/obj/machinery/atmospherics/components/binary/valve/digital/on{ - dir = 4; - name = "Oxygen Release" +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Cold Loop"; + dir = 1 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Jp" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/obj/effect/turf_decal/delivery/red, -/turf/open/floor/iron/dark/smooth_large, +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, /area/station/engineering/supermatter) "Jq" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, @@ -1633,16 +1843,20 @@ /turf/open/floor/iron, /area/station/engineering/main) "Jr" = ( -/obj/structure/table, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/main) "Ju" = ( -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) -"Kb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/machinery/status_display/ai/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 6 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -1650,38 +1864,41 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Kp" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 }, -/turf/open/floor/iron/dark, +/turf/open/floor/engine/vacuum, /area/station/engineering/supermatter/room) "KB" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 - }, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "KF" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/cable/layer1, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Director" +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "KS" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/turf/open/floor/engine/vacuum, +/area/station/engineering/supermatter/room) +"KZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Ln" = ( @@ -1691,78 +1908,111 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/delam_scram/directional/west, /turf/open/floor/engine, /area/station/engineering/supermatter) "LC" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "eng_brn_ext"; + name = "Burn Chamber External Radiation Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/hidden/layer4, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"LE" = ( +/obj/machinery/light/small/directional/east, +/obj/structure/sign/warning/engine_safety/directional/east, +/obj/structure/closet/radiation, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) +"LT" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/brown/visible, +/turf/open/floor/iron, +/area/station/engineering/main) +"LY" = ( +/obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/cable/layer1, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Mk" = ( /obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ - dir = 4 + dir = 5 }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"Mt" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/structure/sign/warning/directional/south, -/obj/machinery/button/door/directional/east{ - id = "emitter_room"; - name = "Emitter Room Shutters Control"; - req_access = list("engineering") +"Mn" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Filter to Waste" }, -/obj/structure/closet/radiation, -/turf/open/floor/iron, -/area/station/engineering/main) +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "Mw" = ( -/obj/machinery/atmospherics/components/unary/passive_vent{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"ML" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/engine/vacuum, /area/station/engineering/supermatter/room) -"MM" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, -/turf/open/space/basic, -/area/space/nearstation) +"ML" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/main) "MO" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"Ni" = ( +"MU" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, -/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Ni" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Np" = ( -/obj/machinery/light/small/directional/west, -/obj/structure/closet/radiation, -/turf/open/floor/iron/dark/smooth_large, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Emitters Room"; + name = "engineering camera" + }, +/obj/machinery/light/small/directional/north, +/obj/machinery/button/door/directional/north{ + id = "emitter_room"; + name = "Emitter Room Shutters Control"; + req_access = list("engineering") + }, +/turf/open/floor/plating, /area/station/engineering/main) +"Nr" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/layer_manifold/pink/hidden, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "NA" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ND" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "NQ" = ( /obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ dir = 4 @@ -1793,49 +2043,22 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Oc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/power/emitter/welded{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/engineering/main) -"Og" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ - dir = 10 +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 }, -/turf/open/space/basic, +/turf/open/floor/plating/airless, /area/space/nearstation) "Ol" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/structure/cable/layer1, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engine Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/engineering/main) -"OL" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ - dir = 4 - }, -/obj/machinery/meter, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) +"Oo" = ( +/obj/effect/turf_decal/delivery/red, +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) "ON" = ( /obj/structure/lattice/catwalk, @@ -1854,161 +2077,183 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/cable/layer1, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "PC" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/stripes/corner{ +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/cable/multilayer/connected, /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "eng_sm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter) "PM" = ( /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line, /obj/machinery/door/poddoor{ id = "burn_vent"; name = "Burn Chamber Vent" }, /turf/open/floor/engine/vacuum, /area/station/engineering/supermatter/room) +"PO" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/components/binary/valve/digital{ + name = "SM Loop Cooling"; + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Qf" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + name = "Burn Chamber Supply Cutoff" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Qv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/supermatter/room) "Qy" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /obj/machinery/light/directional/east, -/obj/structure/closet/radiation, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "QM" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 5 +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"QR" = ( +/obj/machinery/button/delam_scram{ + pixel_x = 32 }, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"QT" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "eng_burn"; - name = "Burn Chamber Radiation Shutters" + id = "eng_brn_ext"; + name = "Burn Chamber External Radiation Shutters" }, /turf/open/floor/plating, /area/station/engineering/supermatter/room) "Rn" = ( /obj/structure/cable/layer1, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/main) "Rw" = ( /obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 8 + dir = 10 }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/turf/open/floor/plating, +/area/station/engineering/main) "Rx" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/closed/wall/r_wall, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/turf/open/floor/engine, /area/station/engineering/supermatter) -"Rz" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) "RD" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/engineering/central) -"RM" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/light/directional/south, -/obj/machinery/firealarm/directional/south{ - pixel_x = -5 - }, -/turf/open/floor/iron, -/area/station/engineering/main) "RP" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ - dir = 1 +/obj/machinery/atmospherics/components/binary/pump/layer2{ + name = "Director"; + dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) -"RR" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ - dir = 9 +/obj/machinery/atmospherics/components/binary/pump/layer4{ + name = "Director"; + dir = 8 }, -/turf/open/space/basic, -/area/space/nearstation) +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "Sb" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/west, /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 10 }, -/turf/closed/wall/r_wall, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/turf/open/floor/engine, /area/station/engineering/supermatter) "Sr" = ( /obj/structure/foamedmetal, /turf/open/floor/plating/airless, /area/space/nearstation) -"SE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable/multilayer/connected, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) "SX" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 1 }, -/obj/machinery/meter, -/turf/open/floor/iron/dark, +/turf/open/floor/plating, /area/station/engineering/supermatter/room) "Td" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible, -/turf/open/space/basic, -/area/space/nearstation) -"Tm" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ - dir = 4 +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "eng_brn"; + name = "Burn Chamber Radiation Shutters" }, -/turf/open/floor/iron/dark, +/turf/open/floor/plating, /area/station/engineering/supermatter/room) -"Tv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump/layer2{ - name = "Ports to Cold Loop" - }, -/obj/machinery/atmospherics/components/binary/pump/layer4{ - name = "Ports to Cold Loop" - }, +"Tm" = ( +/obj/structure/rack, +/obj/item/crowbar/red, /turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) -"Tw" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Hot Loop to Waste" +/area/station/engineering/main) +"Tv" = ( +/obj/structure/chair{ + dir = 1 }, /turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/area/station/engineering/main) "TI" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -2016,6 +2261,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "TM" = ( +/obj/structure/cable, /obj/machinery/atmospherics/components/binary/circulator/cold{ dir = 8 }, @@ -2025,41 +2271,44 @@ /turf/closed/wall/r_wall, /area/station/engineering/main) "TS" = ( -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ - dir = 10 +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "TX" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/floor/plating, /area/station/engineering/main) "Ud" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/west, /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 9 }, -/turf/closed/wall/r_wall, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/turf/open/floor/engine, /area/station/engineering/supermatter) "Uf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Uo" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) -"Ur" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/brown/visible{ - dir = 8 +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Director"; + dir = 1 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -2067,9 +2316,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/components/binary/valve/digital/on{ - name = "Waste Release"; - dir = 4 +/obj/machinery/light/small/directional/west, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Burn to Byproducts"; + dir = 1 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -2078,17 +2329,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/engineering/main) -"UC" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, -/turf/open/space/basic, -/area/space/nearstation) "UD" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Burn to Byproducts"; - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "US" = ( @@ -2102,20 +2347,36 @@ c_tag = "Engineering - Engine Room, Northeast"; name = "engineering camera" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/firealarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) "UX" = ( /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"Va" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/violet/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "Vf" = ( -/obj/effect/turf_decal/stripes/end, -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "sm_airlock" + }, +/turf/open/floor/engine, /area/station/engineering/supermatter) "Vg" = ( /obj/effect/turf_decal/stripes/line{ @@ -2134,48 +2395,64 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/space_heater, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Vv" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 +/obj/machinery/light/directional/east, +/obj/machinery/button/door/directional/east{ + id = "emitter_room"; + name = "Emitter Room Shutters Control"; + req_access = list("engineering") }, /turf/open/floor/iron, /area/station/engineering/main) +"Vw" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "Vy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 8 }, -/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"VG" = ( -/obj/structure/chair, -/turf/open/floor/iron/dark, -/area/station/engineering/main) -"VL" = ( +"VD" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Space to Cold Loop"; - dir = 8 +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"VG" = ( +/obj/machinery/light/directional/north, +/obj/machinery/airalarm/directional/north, +/obj/structure/rack, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"VL" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) "VM" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "VQ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 10 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -2183,65 +2460,48 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/space_heater, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"Wn" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ +"WB" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, -/turf/open/space/basic, -/area/space/nearstation) -"Wr" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/structure/sign/warning/directional/south, -/obj/machinery/button/door/directional/west{ - id = "emitter_room"; - name = "Emitter Room Shutters Control"; - req_access = list("engineering") - }, -/obj/structure/closet/radiation, -/turf/open/floor/iron, -/area/station/engineering/main) -"WB" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "WR" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/obj/machinery/meter, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/multilayer/connected, +/turf/open/floor/iron/dark/textured, /area/station/engineering/supermatter/room) -"WT" = ( +"WU" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"Xb" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2{ - dir = 4 +"Xf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/space/basic, -/area/space/nearstation) -"Xf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "eng_sm"; + name = "Radiation Chamber Shutters" }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/turf/open/floor/plating, +/area/station/engineering/supermatter) "XF" = ( /obj/structure/cable/layer1, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -2253,29 +2513,25 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "XM" = ( -/obj/machinery/light/small/directional/east, -/obj/structure/closet/radiation, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/main) -"Yh" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ - dir = 10 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 }, -/turf/open/space/basic, -/area/space/nearstation) +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) "Yo" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/structure/closet/radiation, -/turf/open/floor/iron, -/area/station/engineering/main) -"Yq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, -/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/layer_manifold/purple/visible, /turf/open/floor/iron/dark, -/area/station/engineering/main) +/area/station/engineering/supermatter/room) +"Yq" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/turf/open/floor/engine/vacuum, +/area/station/engineering/supermatter/room) "Yr" = ( /obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ dir = 4 @@ -2283,24 +2539,25 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Yt" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) -"Yy" = ( -/obj/effect/turf_decal/delivery/red, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/supermatter/room) +/turf/open/floor/plating/airless, +/area/space/nearstation) "YE" = ( +/obj/effect/turf_decal/stripes/line, /obj/structure/reflector/box/anchored, /turf/open/floor/plating, /area/station/engineering/main) +"YK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "YR" = ( /obj/effect/turf_decal/delivery/red, /turf/open/floor/iron/dark/smooth_large, @@ -2309,62 +2566,34 @@ /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"YW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) "Zk" = ( -/obj/machinery/firealarm/directional/north{ - pixel_x = 5 - }, +/obj/machinery/light/small/directional/west, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/closet/radiation, /turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/main) -"Zl" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/violet/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Zo" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light/directional/south, -/obj/machinery/button/door/directional/south{ - id = "sm_vent"; - name = "Supermatter Vent Control"; - req_access = list("engineering"); - pixel_x = 6 - }, -/obj/machinery/button/door/directional/south{ - id = "eng_sm"; - name = "Radiation Shutters Control"; - req_access = list("engineering"); - pixel_x = -6 - }, +/obj/structure/sign/warning/fire/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"Zv" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "eng_burn"; - name = "Burn Chamber Radiation Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ +"Zp" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "ZK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ZO" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -2372,272 +2601,282 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible, -/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "ZX" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Mix to SM Loop"; +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ZZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) (1,1,1) = {" +jO +qm +Bx +dp +El TQ -Bc -Bc -Bc -TQ -TQ -tU -tU +Oc +iC +VL +oZ +oZ +oZ +oZ +sr +sr +sr +oZ +oZ +oZ +oZ +vj vj -tU -tU -tU -tU -tU -tU -tU vj -tU -tU -tU -tU -tU -tU ON -tU -tU +ON +ON "} (2,1,1) = {" -mF -Gj -Yq Hj -DP +Bc +Rn +Bc +Hj TQ -tU +yg +xw +yg +oZ +gK +Ju +VM +VQ +VM +VM +mN +Ds +nt +oZ tU vj tU -tU -tU -tU -tU -tU -tU vj tU -tU -tU -tU -tU -tU ON -tU -tU "} (3,1,1) = {" -TQ -Ic yi -Bc -jO +yi +uI +Jr +Hj TQ -vj -vj +yg xw -wG -NA -wG -NA -wG -NA -wG -NA -wG -yR -Td -UC -UC -UC -ID -tU +bC +SX +Jn +hQ +UX +gW +MO +US +vh +jj +Bs +oZ +oZ +PM +oZ +oZ tU +ON "} (4,1,1) = {" -TQ -Jr +Ic +Bc yi -TX -in -kc -tU -vj +Bc +Bc +TQ yg +xw +xw +sr +TI +BE +ky wG -NA -wG -NA -wG -NA -wG -NA -wG -oV +kg +eU +nr +KZ +kn +oZ +Yq +Mw +KS +oZ vj -tU -tU -tU -Wn -tU -tU +ON "} (5,1,1) = {" -TQ -qm +Vw +Bc yi -Rn -Bx -kc -vj -vj -ON -vj -ON -vj -ON -vj -ON -vj -ON -vj +Bc +ND +TQ +yg +xw +Oc +SX +sA +hQ +WB +kn +Eu +TI +vh +jj gu -vj -vj -vj -vj -Wn -tU +Td +Kp +GI +Cw +QT tU +ON "} (6,1,1) = {" TQ hU -BA -uI -bC -kc -tU -vj +xQ +hU +TQ +TQ +yg xw -wG -NA -wG -NA -wG -NA -wG +yg +oZ +TI +zX +rF +eZ +TM +oV NA -wG -xQ -vj -tU -tU -tU -Wn -tU -tU +wi +kn +IB +io +pN +AV +LC +hT +Fj "} (7,1,1) = {" TQ -VG +Tm BA Bc -jO +Tv TQ -vj -vj yg -wG -NA -wG -NA -wG -NA -wG -NA -wG +xw +yg +oZ +Hu +hQ +WB +Gk +xK +xs +UX +jj yR Td -Am -Am -Am -Og -tx -ON +KS +AB +Cw +QT +tU +nq "} (8,1,1) = {" TQ VG BA -Hj +Bc su TQ -tU -tU -tU -tU -tU -tU -tU -tU -tU -tU -tU -tU -tU -tU -tU +bC +iC +vn +oZ +Mk +QM +rJ +VD +uU +yv +Uf +ev +lq +oZ +of Mw -tU +Kp +oZ vj -Xb -tU +tw "} (9,1,1) = {" TQ -VG +HK BA Bc -TQ -TQ -TQ +Tv oZ oZ oZ oZ -sr -sr oZ -sr -sr oZ -sr -sr oZ oZ -bX +sm +WR +Qv +oZ +oZ +oZ +oZ +oZ +oZ oZ oZ -Xb tU +tw "} (10,1,1) = {" TQ @@ -2645,194 +2884,194 @@ kc kV kc TQ -lm -TQ +oZ +lA mO sn Dq xj -tw -tw -tK -fw -Rw +TS +ZV +pc +nu +Iv BJ -Io -YW -rf +IA +oj +ZV ry Us -Vr -oZ -Xb -tU +gf +Nr +ui +Ag "} (11,1,1) = {" ce Ux GE -RM -TQ -Zk -TQ +As +As +oZ +XM TI xu UX -UX -XG XG -zj -eL -sA -hQ -tV -eq -eq -eq -SX -kn -sr -Xb -vj +PO +rj +Ga +rj +KB +rj +rj +HX +Io +Qf +Io +lX +pT +qC +AQ "} (12,1,1) = {" As As GE wQ +wQ Ca -dL Ol tb XF -aU -aU +rj +lg iV -Kb -Tm -zd -Go -Fr -Tm +uh +xy YV +cH YV YV +tK +hK +ci eT -kn -sr -Xb -tU +es +eL +Yt +vj "} (13,1,1) = {" As -As +zh AH Vv -TQ -lb -TQ +AU +oZ oB +TI UX -wR -aU -mw -Dj -Zl -ix -sA -hQ -LC -gW -MO -MO +UX +sT +qL +Gg +WU +tV +sj +tV +tV +oG +fy +Xf PC Xf -oZ -Xb +fy +tU tU "} (14,1,1) = {" -AA -rJ -AH -Mt TQ -XM TQ +gQ +TQ +TQ +oZ +lm Vu US UX -aU -mw -qa -dp -vD -Kp +rf +or +UX +vh +UX +mE +rN wS -lq ya fy -fy +Gm sW +ll fy -fy -Xb +vj vj "} (15,1,1) = {" TQ -TQ -gQ -TQ -TQ -TQ -TQ -TQ +ru +Ee +TX +Rw +oZ +oZ +oZ db -KS -aU -mw -Bq -vn +UX +vp +rj +UX +sO Iu +MU Kg Uo -KB AE fy +Fz +sW ll -Bs -li fy -Xb +tU tU "} (16,1,1) = {" TQ -ru -Ee +Np +lE HL uW hD uz -ev +sr lJ UX -aU vp -LC +rj +UX UX Zo fy -hT -hT -hT +fy +fy +fy fy HY mB xR fy -Xb +tU tU "} (17,1,1) = {" @@ -2843,52 +3082,52 @@ Jc Jc Jc HM -ev +sr Hi MO Pb -FF -Ni -sG +LY +MO +MO DV -fy -EY -iR -it +Vf +EY +FZ +ll Vf Ln xB Gn fy -Xb +vj vj "} (18,1,1) = {" TQ zf lE -YE +Jc +Jc Jc YE -HM -ev +sr vR -YR +Fr yx -Yy -vh -HG -In -uh -Gg -Gg -Gm +Oo +YR +YR +YR +Jp +Ew +Ew +Ew Jp kv Aj zR DL -Xb +tU tU "} (19,1,1) = {" @@ -2899,164 +3138,164 @@ Jc Jc Jc HM -ev +sr RP ZV KF -FY -Tw -BE -Gv -fy -EY +nu +ZV +ZV +Vr +Vf +QR iR -it -eZ +ll +Vf Ae Ef Pa fy -Xb +vj vj "} (20,1,1) = {" TQ mL -jz -Oc +lE +HL bQ jY Vg -ev +sr ZX UX -aU -FZ -ZK -pN -uU +vp +rj +UX +UX +Zo +fy +fy +fy fy -hT -hT -hT fy Sb Rx Ud fy -Xb +tU tU "} (21,1,1) = {" TQ -TQ -sg -TQ -TQ -TQ -TQ -TQ +bX +jz +ML +DP +oZ +oZ +oZ oO -wR -aU -mg -lQ -ci +UX +qY +eq +ZK +ZZ nT -Rz -Rz -Rz -Rz -Ew -HK -sm -io -oZ -Xb +li +li +ov +Gv +fy +Fz +sW +ll +fy +tU tU "} (22,1,1) = {" -Yo -eG -jc -Wr TQ -Np TQ +sg +TQ +TQ +oZ +Zk Wc IW UX -gK -UX -VQ -kg -xs -UX -UX -UX -UX -Jn -Cw -IB -AB -PM -Xb +mw +kj +qa +Bo +HG +HG +yD +Mn +it +fy +ll +sW +ll +fy +vj vj "} (23,1,1) = {" As -As +zh jc -Vv -TQ -lb -TQ +FY +dX +oZ UW +TI Yr -KS -SE -xu -VM -Eu -fX -UX -UX -UX UX -gf -OL -eU -ML -oZ -Xb +mw +Ni +Dj +DX +sG +sG +Va +AO +vG +fy +Xf +PC +Xf +fy +tU tU "} (24,1,1) = {" As As -rg +jc mR +LT bg -Gk gm xD DQ -Ur -zh +UX +aU Vy -Yt -TM -Mk -WR -WB -WB +zd +ZO +YV +YV +Go +mg rB hG UD ot -nr -oZ -Xb +Vr +sr +tU tU "} (25,1,1) = {" @@ -3064,27 +3303,27 @@ Jq Ux rg sC -TQ -ky -TQ +As +oZ +dL TI UX -TS -Ju -hK -vG -mN -bi -Fc -Ga -Ga -WT -Uf -Gd -QM -AB -PM -Xb +UX +XG +PO +rj +IK +rj +rj +df +oA +Zp +eq +eq +dV +wR +eL +Yt vj "} (26,1,1) = {" @@ -3093,26 +3332,26 @@ kN Ev NQ RD -dX -TQ +RD +LE og lf NZ Qy -VL +YK MO -oA -AU -iC -rj -Tv -Ij +sV yo -FJ -Zv -nr -oZ -Xb +pj +GX +pR +Yo +tt +ec +ny +lt +sr +tU tU "} (27,1,1) = {" @@ -3120,27 +3359,27 @@ tU tU tU tU -RD +tU RD RD oZ oZ oZ oZ -of -sr +oZ oZ sr sr -oZ sr -of oZ oZ oZ oZ oZ -Xb +oZ +oZ +oZ +tU tU "} (28,1,1) = {" @@ -3155,20 +3394,20 @@ Sr Sr Sr jQ -Yh -UC -UC -UC -UC -Eo vj -lS -eI -MM -MM -MM -MM -RR +vj +vj +vj +vj +vj +vj +vj +vj +vj +vj +vj +vj +tU tU "} (29,1,1) = {" @@ -3188,10 +3427,10 @@ tU tU tU vj -Yh -UC -UC -wC +vj +vj +vj +vj vj tU tU diff --git a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm index 6ec1d38b9ecb..ef45726f6dc0 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm @@ -74,9 +74,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "bM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/engineering/main) "co" = ( @@ -145,7 +143,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/machinery/button/door/directional/south{ - id = "engsm"; + id = "eng_sm"; name = "Radiation Shutters Control"; req_access = list("engineering") }, @@ -192,7 +190,12 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"fm" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "fp" = ( +/obj/machinery/light/small/directional/south, /obj/structure/cable, /obj/machinery/power/smes/engineering, /turf/open/floor/iron/dark, @@ -307,6 +310,10 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"iV" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "iZ" = ( /obj/structure/rack, /obj/item/crowbar/red, @@ -347,12 +354,8 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "kx" = ( -/obj/structure/table, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - SMES, Engine"; - name = "engineering camera" - }, -/turf/open/floor/iron/dark, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, /area/station/engineering/main) "kz" = ( /obj/machinery/meter, @@ -448,14 +451,9 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"oi" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, -/area/station/engineering/main) "ou" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/cable, -/obj/item/kirbyplants/random, +/obj/structure/rack, +/obj/item/crowbar/red, /turf/open/floor/iron/dark, /area/station/engineering/main) "oO" = ( @@ -693,6 +691,9 @@ /area/station/engineering/supermatter) "yK" = ( /obj/structure/cable/layer1, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/main) "ze" = ( @@ -745,6 +746,7 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "Ao" = ( +/obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, @@ -809,7 +811,7 @@ }, /obj/structure/cable/multilayer/connected, /obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; + id = "eng_sm"; name = "Radiation Chamber Shutters" }, /turf/open/floor/plating, @@ -941,8 +943,13 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "FD" = ( -/obj/structure/table, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/cable/layer1, +/obj/machinery/holopad, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) "FF" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -978,7 +985,7 @@ dir = 4 }, /obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; + id = "eng_sm"; name = "Radiation Chamber Shutters" }, /turf/open/floor/plating, @@ -999,13 +1006,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"HF" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/cable, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "HQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -1031,7 +1031,11 @@ /turf/open/floor/plating, /area/station/engineering/supermatter/room) "Ik" = ( -/obj/structure/chair, +/obj/structure/rack, +/obj/item/storage/toolbox/electrical{ + pixel_y = 7 + }, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/iron/dark, /area/station/engineering/main) "Iz" = ( @@ -1068,6 +1072,12 @@ /obj/structure/table, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"JB" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/cable, +/obj/machinery/power/smes/engineering, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "JK" = ( /obj/structure/cable, /obj/structure/cable/layer1, @@ -1128,9 +1138,15 @@ /area/station/engineering/supermatter/room) "Lk" = ( /obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 8 +/obj/machinery/power/terminal, +/obj/structure/table, +/obj/item/stock_parts/cell/upgraded{ + pixel_y = 10 + }, +/obj/item/stock_parts/cell/upgraded{ + pixel_y = 5 }, +/obj/item/stock_parts/cell/upgraded, /turf/open/floor/iron/dark, /area/station/engineering/main) "Lm" = ( @@ -1149,25 +1165,9 @@ /turf/open/floor/engine, /area/station/engineering/supermatter) "Mu" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/chair{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engine SMES Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) -"MB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, -/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/main) "MM" = ( @@ -1318,11 +1318,17 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "QO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/power/terminal{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark/textured, /area/station/engineering/main) "QS" = ( /obj/structure/cable, @@ -1383,7 +1389,7 @@ "Tg" = ( /obj/machinery/light/directional/north, /obj/machinery/airalarm/directional/north, -/obj/structure/table, +/obj/structure/rack, /turf/open/floor/iron/dark, /area/station/engineering/main) "Tk" = ( @@ -1479,13 +1485,24 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "VI" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +/obj/structure/cable, +/obj/machinery/power/terminal{ dir = 1 }, +/obj/structure/table, +/obj/machinery/cell_charger, /turf/open/floor/iron/dark, /area/station/engineering/main) "Wh" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - SMES, Engine"; + name = "engineering camera" + }, +/obj/structure/noticeboard/directional/west, /obj/structure/cable/multilayer/connected, +/obj/structure/table, +/obj/item/paper/fluff/stations/boxstation/station_engine_smes, +/obj/item/paper/fluff/stations/boxstation/station_pa_wiring, /turf/open/floor/iron/dark, /area/station/engineering/main) "Wi" = ( @@ -1578,11 +1595,11 @@ /area/station/engineering/supermatter/room) (1,1,1) = {" -GP -oO -oO -oO -GP +JB +VI +Wh +Lk +fp GP xP hE @@ -1606,11 +1623,11 @@ xP xP "} (2,1,1) = {" -Mu -bM -MB gO -HF +oO +yK +oO +gO GP Kd TK @@ -1634,12 +1651,12 @@ xP xP "} (3,1,1) = {" -GP -EU tm -oO -fp -GP +tm +FD +Ao +gO +kX xP TK DM @@ -1662,12 +1679,12 @@ xP xP "} (4,1,1) = {" -GP -FD +EU +oO tm -VI -Lk -kX +oO +oO +GP Kd TK DM @@ -1690,12 +1707,12 @@ oW xP "} (5,1,1) = {" -GP -Tg +iV +oO tm -yK -Wh -kX +oO +fm +GP xP TK DM @@ -1720,10 +1737,10 @@ xP (6,1,1) = {" GP kx -uh -Ao QO -kX +kx +GP +GP Kd TK DM @@ -1747,12 +1764,12 @@ xP "} (7,1,1) = {" GP -Ik +ou uh -oO -fp +Mu GP xP +xP TK DM TK @@ -1775,11 +1792,11 @@ oW "} (8,1,1) = {" GP -Ik +Tg uh -gO -ou -GP +bM +kX +Kd Kd TK DM @@ -1805,10 +1822,10 @@ xP GP Ik uh -oO -FD +Mu GP xP +xP TK NW fB @@ -1831,12 +1848,12 @@ xP "} (10,1,1) = {" GP -oi +kX Iz -oi -GP +kX GP BL +BL ny BL cs diff --git a/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm b/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm index e9df1f5b187e..bd1ce3a59054 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm @@ -30,7 +30,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "bc" = ( -/obj/machinery/light/small/directional/east, +/obj/machinery/light/directional/east, /obj/machinery/status_display/evac/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -45,11 +45,11 @@ /turf/open/space/basic, /area/space/nearstation) "bl" = ( -/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer4{ dir = 4 }, -/obj/machinery/igniter{ - id = "teg_igniter" +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ + dir = 8 }, /turf/open/floor/engine/vacuum, /area/station/engineering/atmospherics_engine) @@ -57,6 +57,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "bU" = ( @@ -65,7 +68,9 @@ /turf/open/floor/plating, /area/station/engineering/atmospherics_engine) "cj" = ( -/obj/structure/table, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/main) "cn" = ( @@ -97,10 +102,8 @@ /obj/structure/cable/layer1, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) -"dy" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, +"dA" = ( +/obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/main) "dB" = ( @@ -122,14 +125,8 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "eH" = ( -/obj/structure/chair, -/turf/open/floor/iron/dark, -/area/station/engineering/main) -"eK" = ( -/obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 8 - }, +/obj/structure/rack, +/obj/item/crowbar/red, /turf/open/floor/iron/dark, /area/station/engineering/main) "eQ" = ( @@ -162,9 +159,16 @@ /obj/effect/spawner/random/vending/colavend, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) +"fK" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "fS" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 1 }, /turf/open/floor/engine/vacuum, /area/station/engineering/atmospherics_engine) @@ -211,7 +215,6 @@ /area/space/nearstation) "gZ" = ( /obj/machinery/light/small/directional/south, -/obj/structure/cable, /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/engineering/main) @@ -232,8 +235,17 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "hM" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark/textured, /area/station/engineering/main) "if" = ( /obj/effect/turf_decal/stripes/corner{ @@ -253,9 +265,12 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "iy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/cell_charger, /turf/open/floor/iron/dark, /area/station/engineering/main) "iI" = ( @@ -423,8 +438,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ - dir = 6 + dir = 4 }, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "os" = ( @@ -460,6 +476,10 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ + dir = 6 + }, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "pg" = ( @@ -475,17 +495,13 @@ /obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) -"qj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/brown/visible{ +"qJ" = ( +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmospherics_engine) -"qJ" = ( -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/manifold/brown/visible{ + dir = 1 }, -/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "qO" = ( @@ -518,13 +534,17 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "rK" = ( +/obj/machinery/light/small/directional/north, /obj/structure/cable, /obj/machinery/power/smes/engineering, /turf/open/floor/iron/dark, /area/station/engineering/main) "rZ" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer4{ dir = 4 }, /turf/open/floor/engine/vacuum, @@ -577,28 +597,34 @@ /turf/open/floor/plating, /area/station/maintenance/department/engineering/central) "tP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/door/airlock/engineering/glass{ + name = "Engine SMES Room" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/cable/layer1, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engine SMES Room" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/layer1, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) "tU" = ( /obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 4 +/obj/machinery/power/terminal, +/obj/structure/table, +/obj/item/stock_parts/cell/upgraded{ + pixel_y = 10 }, +/obj/item/stock_parts/cell/upgraded{ + pixel_y = 5 + }, +/obj/item/stock_parts/cell/upgraded, /turf/open/floor/iron/dark, /area/station/engineering/main) "ug" = ( @@ -664,10 +690,13 @@ /obj/structure/cable/layer1, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "vW" = ( -/obj/machinery/light/small/directional/west, +/obj/machinery/light/directional/west, /obj/machinery/status_display/ai/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -734,8 +763,8 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "wU" = ( -/obj/machinery/igniter{ - id = "teg_igniter" +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer4{ + dir = 8 }, /turf/open/floor/engine/vacuum, /area/station/engineering/atmospherics_engine) @@ -746,19 +775,16 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "xS" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/cable, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/item/kirbyplants/random, +/obj/structure/rack, +/obj/item/storage/toolbox/electrical{ + pixel_y = 7 + }, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/iron/dark, /area/station/engineering/main) "yc" = ( -/obj/structure/table, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - SMES, Engine"; - name = "engineering camera" - }, -/turf/open/floor/iron/dark, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, /area/station/engineering/main) "yF" = ( /obj/effect/turf_decal/bot, @@ -779,10 +805,10 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "zy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/main) "zB" = ( @@ -830,10 +856,13 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "AP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/cable/layer1, +/obj/machinery/holopad, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) "Bf" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, @@ -898,15 +927,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) -"EF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable/layer1, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmospherics_engine) "EV" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -970,21 +990,6 @@ /obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) -"Hk" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engine SMES Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "HM" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 @@ -1042,6 +1047,15 @@ }, /turf/open/floor/plating, /area/station/engineering/atmospherics_engine) +"Kc" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/layer_manifold/brown/hidden, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "eng_burn"; + name = "Burn Chamber Radiation Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/atmospherics_engine) "Kd" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Mix to Hot Loop" @@ -1055,8 +1069,9 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "KF" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/brown/hidden, +/obj/machinery/igniter{ + id = "teg_igniter" }, /turf/open/floor/engine/vacuum, /area/station/engineering/atmospherics_engine) @@ -1092,7 +1107,7 @@ "LD" = ( /obj/machinery/light/directional/north, /obj/machinery/airalarm/directional/north, -/obj/structure/table, +/obj/structure/rack, /turf/open/floor/iron/dark, /area/station/engineering/main) "LQ" = ( @@ -1145,6 +1160,9 @@ /area/station/engineering/atmospherics_engine) "MW" = ( /obj/structure/cable/layer1, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/main) "Nj" = ( @@ -1178,6 +1196,12 @@ }, /turf/open/floor/plating, /area/station/engineering/atmospherics_engine) +"NT" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/cable, +/obj/machinery/power/smes/engineering, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "Ot" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -1234,7 +1258,15 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "QH" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - SMES, Engine"; + name = "engineering camera" + }, +/obj/structure/noticeboard/directional/west, /obj/structure/cable/multilayer/connected, +/obj/structure/table, +/obj/item/paper/fluff/stations/boxstation/station_engine_smes, +/obj/item/paper/fluff/stations/boxstation/station_pa_wiring, /turf/open/floor/iron/dark, /area/station/engineering/main) "QU" = ( @@ -1415,11 +1447,12 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/atmospherics_engine) "WP" = ( -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ - dir = 6 +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/brown/visible{ + dir = 1 }, -/obj/machinery/meter, -/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Xz" = ( @@ -1499,11 +1532,11 @@ /area/station/engineering/main) (1,1,1) = {" -Wg -cp -cp -cp -Wg +rK +iy +QH +tU +NT Wg ml ml @@ -1527,11 +1560,11 @@ ml ml "} (2,1,1) = {" -Hk -iy -zy nw -xS +cp +MW +cp +nw Wg dh dh @@ -1555,12 +1588,12 @@ ml ml "} (3,1,1) = {" -Wg -XD ZT -cp -rK -Wg +ZT +AP +zy +nw +gl ml ml ml @@ -1583,12 +1616,12 @@ ml ml "} (4,1,1) = {" -Wg -cj +XD +cp ZT -dy -eK -gl +cp +cp +Wg dh dh dh @@ -1611,12 +1644,12 @@ ml ml "} (5,1,1) = {" -Wg -LD +dA +cp ZT -MW -QH -gl +cp +fK +Wg ml ml ml @@ -1641,10 +1674,10 @@ ml (6,1,1) = {" Wg yc -To -AP -tU -gl +hM +yc +Wg +Wg dh rh Vj @@ -1671,7 +1704,7 @@ Wg eH To cp -rK +cj Wg Vv JE @@ -1696,9 +1729,9 @@ mW "} (8,1,1) = {" Wg -eH +LD To -nw +cp gZ Wg zB @@ -1724,7 +1757,7 @@ ml "} (9,1,1) = {" Wg -eH +xS To cp cj @@ -1752,9 +1785,9 @@ ml "} (10,1,1) = {" Wg -hM +gl tP -hM +gl Wg Wg Vv @@ -1766,7 +1799,7 @@ so Pv YM gd -YM +Kc KF fS mh @@ -1811,7 +1844,7 @@ Vv Df Gh oT -WP +yS yS yS yS @@ -1839,7 +1872,7 @@ ax dX lp bp -dU +lb lb lb lb @@ -1867,7 +1900,7 @@ ax dX jg bp -dU +lb fq fq hg @@ -1895,7 +1928,7 @@ Im dX lp bp -dU +lb MH QE hg @@ -1923,7 +1956,7 @@ Vv gD Sd bp -dU +lb lb vW lb @@ -1950,8 +1983,8 @@ ml Wr QA ds -TT -qj +qJ +Zi Zi Rr Kd @@ -1979,7 +2012,7 @@ Vv km wu vP -EF +vs vs vs vs @@ -2006,8 +2039,8 @@ ml Wr Jo ot -ja -qj +WP +Zi Zi Rl aD @@ -2035,7 +2068,7 @@ Vv wL Ui bp -dU +lb lb bc lb @@ -2063,7 +2096,7 @@ Vv yF CH bp -dU +lb MH QE hg @@ -2091,7 +2124,7 @@ ax mx vr bp -dU +lb wx wx hg @@ -2119,7 +2152,7 @@ ax mx mJ bp -dU +lb lb lb lb @@ -2147,7 +2180,7 @@ Vv wK pg nx -qJ +lb lb lb lb diff --git a/monkestation/code/modules/_paperwork/paper_premade.dm b/monkestation/code/modules/_paperwork/paper_premade.dm index dec7f2f5e94c..b08ba91ee42c 100644 --- a/monkestation/code/modules/_paperwork/paper_premade.dm +++ b/monkestation/code/modules/_paperwork/paper_premade.dm @@ -68,3 +68,18 @@ from where you sent them off from in several minutes time. Don't worry, we give you a cut of what we get paid. We pay this into whatever ID card you have equipped, on top of the TC payment we give.

Good luck agent. You can burn this document with the supplied lighter.

"} + +/obj/item/paper/fluff/stations/boxstation/station_engine_smes + name = "Subject: Station-side Engine SMES Units" + default_raw_text = "
From: CentCom Engineering, Station Design Division

To: Station Engineers

The SMES units in this room are NOT to be used like the main SMES units.
Do NOT connect these SMES units to the main power grid.
These SMES units provide power ONLY to the ENGINE AREA and/or ENGINE EQUIPMENT.
" + +/obj/item/paper/fluff/stations/boxstation/station_pa_wiring + name = "Subject: Station-side PA Wiring" + default_raw_text = "
From: CentCom Engineering, Station Design Division

To: Station Engineers

The cables in the station-side Particle Accelerator and pre-built engine area are to NOT be hardwired to the station power grid.
Likewise, do NOT hardwire any part of this setup into itself.
The red cables FEED power to the station-side Engine and Main SMES units.
The yellow cables TRANSFER power to the machinery, with the exception of the ones beneath the collectors.
" +/obj/item/paper/fluff/stations/boxstation/external_engine_smes + name = "Subject: External Engine SMES Units" + default_raw_text = "
From: CentCom Engineering, Station Design Division

To: Station Engineers

The SMES units on the platform are NOT to be used like the main SMES units.
Do NOT connect those SMES units to the main power grid.
Those SMES units are to provide power ONLY to the ENGINE AREA and/or ENGINE EQUIPMENT.
" + +/obj/item/paper/fluff/stations/boxstation/external_pa_wiring + name = "Subject: External PA Wiring" + default_raw_text = "
From: CentCom Engineering, Station Design Division

To: Station Engineers

The cables in the external Particle Accelerator and pre-built engine area are to NOT be hardwired to the station power grid.
Likewise, do NOT hardwire any part of this setup into itself.
The red cables FEED power to the external Engine and Main SMES units.
The yellow cables TRANSFER power to the machinery, with the exception of the ones beneath the collectors.
" From 623d9f3785b126148666461525541faa244e7a14 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Sun, 1 Dec 2024 02:21:22 -0600 Subject: [PATCH 2/2] Fix 1 Oops, missed a thing. --- _maps/map_files/BoxStation/BoxStation.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 3adba1e4507d..0024ede7ff0d 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -59924,7 +59924,6 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "tBq" = ( -/obj/effect/mapping_helpers/requests_console/assistance, /turf/open/floor/iron/dark/side{ dir = 8 },