diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm index 2abd196024d5..8a7e21de185a 100644 --- a/_maps/_basemap.dm +++ b/_maps/_basemap.dm @@ -1,5 +1,5 @@ //#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it. -//#define ABSOLUTE_MINIMUM //uncomment this to load a smaller centcomm and smaller runtime station, only works together with LOWMEMORYMODE +//#define ABSOLUTE_MINIMUM //uncomment this to load a smaller centcom and smaller runtime station, only works together with LOWMEMORYMODE #ifdef ABSOLUTE_MINIMUM #define LOWMEMORYMODE diff --git a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm index 3f019e5842cc..108f84c6ad6f 100644 --- a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm +++ b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm @@ -216,6 +216,12 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/station/science/research) +"adc" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/tcommsat/computer) "adj" = ( /obj/structure/chair{ dir = 4 @@ -651,6 +657,14 @@ /obj/effect/turf_decal/tile/dark_blue, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"ajK" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "SM_shutters"; + name = "Supermatter Radiation Shutters" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "ajU" = ( /obj/effect/turf_decal/trimline/blue/warning{ dir = 1 @@ -740,6 +754,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"akz" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "CO2 to Mix" + }, +/obj/effect/turf_decal/tile/dark/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "akC" = ( /obj/machinery/firealarm/directional/east, /obj/machinery/vending/wardrobe/chap_wardrobe, @@ -988,13 +1009,6 @@ /obj/machinery/holopad/secure, /turf/open/floor/iron/dark/textured_large, /area/station/ai/satellite/chamber) -"anx" = ( -/obj/machinery/telecomms/hub/preset, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/turf/open/floor/iron/dark/telecomms, -/area/station/tcommsat/server) "anG" = ( /obj/structure/window/reinforced/spawner/directional/west, /turf/open/openspace, @@ -1346,6 +1360,13 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/meeting_room/council) +"asE" = ( +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Plasma to Mix" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "asI" = ( /obj/structure/railing/corner{ dir = 4 @@ -1896,6 +1917,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) +"azV" = ( +/obj/machinery/meter{ + name = "Plasma meter" + }, +/obj/machinery/atmospherics/pipe/multiz/yellow/visible{ + name = "Plasma Multideck Adapter" + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/effect/turf_decal/box/white, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "aAb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1924,10 +1956,6 @@ /obj/effect/spawner/random/engineering/material_cheap, /turf/open/floor/plating, /area/station/construction/storage_wing) -"aAt" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "aAI" = ( /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ @@ -2220,6 +2248,15 @@ "aEZ" = ( /turf/open/floor/iron, /area/station/science/breakroom) +"aFd" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/turf_decal/siding/red/corner{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "aFe" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -2300,6 +2337,12 @@ /obj/structure/lattice/catwalk, /turf/open/openspace, /area/station/hallway/secondary/entry) +"aGg" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/tcommsat/computer) "aGu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3053,6 +3096,16 @@ /obj/structure/railing, /turf/open/floor/iron, /area/station/cargo/storage) +"aPi" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/engineering/glass/critical{ + name = "Supermatter Chamber" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "aPq" = ( /obj/structure/table/wood, /obj/item/gavelblock, @@ -3456,15 +3509,6 @@ }, /turf/closed/wall/r_wall, /area/station/maintenance/port) -"aVG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/turf_decal/siding/red/corner{ - dir = 8 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "aVI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3584,6 +3628,15 @@ }, /turf/open/floor/iron/textured_large, /area/station/medical/virology) +"aWK" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "SM_shutters"; + name = "Supermatter Radiation Shutters" + }, +/obj/effect/turf_decal/trimline/brown, +/obj/machinery/atmospherics/components/binary/pump/off/orange/visible, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "aWM" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 8 @@ -3700,6 +3753,13 @@ /obj/structure/reagent_dispensers/wall/peppertank/directional/west, /turf/open/openspace, /area/station/security/checkpoint/customs) +"aXX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/tcommsat/computer) "aXY" = ( /obj/structure/railing{ dir = 10 @@ -3875,13 +3935,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood, /area/station/security/courtroom) -"aZY" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/effect/turf_decal/siding/red/corner{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "bab" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -3967,10 +4020,6 @@ /obj/structure/lattice/catwalk, /turf/open/openspace, /area/station/hallway/primary/fore) -"bbC" = ( -/obj/effect/spawner/random/gizmo, -/turf/open/floor/engine, -/area/station/science/auxlab/firing_range) "bbV" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc/auto_name/directional/west, @@ -4071,6 +4120,12 @@ dir = 1 }, /area/station/service/chapel/office) +"bcN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/stripes, +/turf/open/floor/iron/textured, +/area/station/command/eva) "bcQ" = ( /obj/structure/sign/warning/vacuum/directional/north, /obj/effect/turf_decal/stripes/line{ @@ -4168,14 +4223,6 @@ /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/carpet/executive, /area/station/ai/satellite/interior) -"bdM" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "SM_shutters"; - name = "Supermatter Radiation Shutters" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "bdT" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -4270,17 +4317,6 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/starboard/central) -"beX" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/table/glass, -/obj/machinery/computer/records/medical/laptop{ - dir = 1; - pixel_x = 0; - pixel_y = 5 - }, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/medical) "bfh" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 @@ -4490,11 +4526,6 @@ /obj/structure/cable, /turf/open/floor/plating/airless, /area/station/solars/starboard/aft) -"bhi" = ( -/obj/machinery/light/directional/north, -/obj/machinery/telecomms/hub/preset, -/turf/open/floor/iron/dark, -/area/station/tcommsat/server) "bhn" = ( /obj/machinery/air_sensor/carbon_tank, /obj/structure/window/reinforced/plasma/spawner/directional/south, @@ -4526,6 +4557,11 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/glass/reinforced, /area/station/hallway/secondary/construction) +"bhH" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/tcommsat/computer) "bhJ" = ( /obj/structure/easel, /turf/open/floor/plating, @@ -5765,13 +5801,6 @@ /obj/machinery/computer/mech_bay_power_console, /turf/open/floor/iron/smooth, /area/station/science/robotics) -"byX" = ( -/obj/structure/sign/warning/cold_temp/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/ai/satellite/maintenance/storage) "byY" = ( /turf/open/floor/wood, /area/station/hallway/primary/central) @@ -6495,6 +6524,11 @@ dir = 1 }, /area/station/maintenance/starboard) +"bHG" = ( +/obj/structure/cable, +/obj/machinery/power/smes/full, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) "bHJ" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance/two, @@ -6592,6 +6626,17 @@ }, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"bIN" = ( +/obj/machinery/door/airlock/hatch{ + name = "Telecomms Control Room" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/tcomms, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_large, +/area/station/tcommsat/computer) "bIR" = ( /obj/machinery/holopad/secure, /obj/structure/cable, @@ -7046,16 +7091,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"bPN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1 - }, -/obj/effect/mapping_helpers/mail_sorting/science/xenobiology, -/obj/machinery/gizmo/toggle/tucker_tubes, -/turf/open/floor/iron/dark/smooth_large, -/area/station/science/explab) "bPO" = ( /obj/machinery/light/directional/west, /obj/structure/cable, @@ -7800,14 +7835,6 @@ /obj/machinery/light/directional/south, /turf/open/openspace, /area/station/science/xenobiology) -"bZW" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/telecomms/message_server/preset, -/turf/open/floor/iron/dark/telecomms, -/area/station/tcommsat/server) "cai" = ( /obj/effect/turf_decal/siding/purple/corner{ dir = 1 @@ -8278,6 +8305,13 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/command) +"cfE" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/turf_decal/siding/red{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "cfS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -8936,6 +8970,12 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/wood/large, /area/station/medical/break_room) +"cpt" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/ai/satellite/maintenance/storage) "cpy" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -8981,20 +9021,6 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"cpY" = ( -/obj/effect/turf_decal/siding/dark/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 8 - }, -/area/station/tcommsat/server) "cqa" = ( /obj/structure/disposalpipe/trunk/multiz/down{ dir = 1 @@ -9028,20 +9054,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/primary/central) -"cqk" = ( -/obj/effect/turf_decal/trimline/green/filled/line, -/obj/structure/table/reinforced, -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/stack/sheet/iron/ten{ - pixel_x = 2; - pixel_y = 0 - }, -/turf/open/floor/iron/dark, -/area/station/commons/vacant_room/office) "cqt" = ( /obj/docking_port/stationary/laborcamp_home{ dir = 8 @@ -9403,6 +9415,9 @@ dir = 4 }, /area/station/hallway/primary/central) +"cvc" = ( +/turf/open/floor/iron/dark/smooth_large, +/area/station/tcommsat/computer) "cvj" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod One" @@ -9573,9 +9588,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"cxE" = ( -/turf/open/floor/glass, -/area/station/tcommsat/server) "cxK" = ( /obj/structure/sign/poster/contraband/missing_gloves, /turf/closed/wall, @@ -9611,6 +9623,21 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/pharmacy) +"cyA" = ( +/obj/structure/table/reinforced/rglass, +/obj/item/storage/box/evidence{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/item/storage/box/deputy{ + pixel_x = 6; + pixel_y = 12 + }, +/obj/item/implanter{ + pixel_x = -1 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "cyD" = ( /obj/structure/sign/poster/official/random/directional/north, /obj/effect/turf_decal/tile/dark_green/half/contrasted{ @@ -9894,6 +9921,14 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room/upper) +"cBy" = ( +/obj/structure/cable, +/obj/machinery/power/terminal, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/tcommsat/computer) "cBB" = ( /obj/structure/table, /obj/item/storage/crayons{ @@ -10340,17 +10375,6 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/station/science/breakroom) -"cHH" = ( -/obj/structure/table, -/obj/item/storage/toolbox/electrical{ - pixel_y = 10 - }, -/obj/item/healthanalyzer{ - pixel_x = -4; - pixel_y = 3 - }, -/turf/open/floor/iron/dark, -/area/station/tcommsat/server) "cHI" = ( /obj/structure/closet/toolcloset, /turf/open/floor/wood, @@ -10817,6 +10841,13 @@ /obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/station/maintenance/starboard/central) +"cOh" = ( +/obj/machinery/ntnet_relay, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/turf/open/floor/circuit/telecomms, +/area/station/tcommsat/server) "cOj" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma{ dir = 8 @@ -11278,6 +11309,13 @@ /obj/effect/turf_decal/tile/brown/fourcorners, /turf/open/floor/iron, /area/station/cargo/storage) +"cTI" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "cTJ" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/maintenance/two, @@ -11775,13 +11813,6 @@ /obj/structure/lattice/catwalk, /turf/open/openspace, /area/station/maintenance/port) -"cZr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "cZz" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -11791,6 +11822,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard) +"cZA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes, +/turf/open/floor/iron/textured, +/area/station/command/eva) "cZD" = ( /obj/machinery/door/airlock{ name = "Emergency Storage" @@ -11817,6 +11853,11 @@ }, /turf/open/floor/iron/stairs/right, /area/station/engineering/lobby) +"cZO" = ( +/obj/structure/stairs/north, +/obj/structure/sign/departments/botany/alt2/directional/west, +/turf/open/floor/iron/stairs/medium, +/area/station/hallway/primary/central) "cZP" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -12378,6 +12419,13 @@ }, /turf/open/floor/iron/dark/textured, /area/station/cargo/warehouse) +"diZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/turf_decal/siding/red, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "djc" = ( /obj/item/radio/intercom/directional/east, /obj/machinery/disposal/bin, @@ -13072,6 +13120,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/central) +"dtB" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "dtL" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/computer/security{ @@ -13539,6 +13596,16 @@ }, /turf/open/floor/iron/white/side, /area/station/hallway/secondary/entry) +"dAt" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/structure/table, +/obj/machinery/coffeemaker{ + pixel_y = 9 + }, +/turf/open/floor/iron/dark, +/area/station/security/brig) "dAR" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -14312,6 +14379,19 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain/private) +"dNe" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/machinery/camera/autoname/directional/south, +/obj/structure/table, +/obj/machinery/syndicatebomb/training{ + pixel_y = 3 + }, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/obj/item/wirecutters, +/turf/open/floor/iron/dark, +/area/station/security/office) "dNh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14390,11 +14470,6 @@ /obj/machinery/modular_computer/preset/civilian, /turf/open/floor/iron/dark/smooth_large, /area/station/science/explab) -"dNX" = ( -/obj/machinery/power/supermatter_crystal/engine, -/obj/effect/turf_decal/stripes/box, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "dNZ" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -14408,15 +14483,6 @@ }, /turf/open/openspace, /area/station/maintenance/port/aft) -"dOb" = ( -/obj/item/radio/intercom/directional/west, -/obj/machinery/modular_computer/preset/cargochat/security, -/obj/item/clothing/head/soft/sec{ - pixel_x = 0; - pixel_y = 11 - }, -/turf/open/floor/iron/dark, -/area/station/security/office) "dOg" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/machinery/camera/directional/south, @@ -14677,6 +14743,10 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/iron/dark, /area/station/science/ordnance) +"dSi" = ( +/obj/structure/cable, +/turf/open/floor/circuit/telecomms, +/area/station/tcommsat/server) "dSq" = ( /obj/structure/railing/corner/end/flip{ dir = 8 @@ -15339,6 +15409,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"eca" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/structure/sign/warning/radiation/rad_area/directional/south, +/obj/machinery/light/small/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "ecd" = ( /obj/effect/turf_decal/weather/snow, /obj/effect/turf_decal/weather/snow/corner{ @@ -15450,26 +15531,20 @@ /obj/structure/railing/corner/end, /turf/open/floor/iron, /area/station/science/robotics) -"ecK" = ( -/obj/structure/table/reinforced/rglass, -/obj/item/storage/box/evidence{ - pixel_x = -7; - pixel_y = 12 - }, -/obj/item/storage/box/deputy{ - pixel_x = 6; - pixel_y = 12 - }, -/obj/item/implanter{ - pixel_x = -1; - pixel_y = 0 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "ecL" = ( /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"ecQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/science/xenobiology, +/obj/machinery/gizmo/toggle/tucker_tubes, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/explab) "ecS" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -15624,13 +15699,6 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"eeN" = ( -/obj/machinery/ntnet_relay, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/turf/open/floor/iron/dark/telecomms, -/area/station/tcommsat/server) "eeO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/white/line{ @@ -16968,6 +17036,19 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/construction) +"eyl" = ( +/obj/machinery/camera/autoname/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/button/door/directional/east{ + id = "SM_shutters"; + name = "Radiation Shutters"; + req_access = list("engineering") + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "eyC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -17347,6 +17428,20 @@ /obj/effect/landmark/start/chief_engineer, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/ce) +"eDZ" = ( +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/machinery/meter{ + name = "N2O meter" + }, +/obj/machinery/atmospherics/pipe/multiz/yellow/visible{ + name = "N2O Multideck Adapter" + }, +/obj/effect/turf_decal/box/white, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "eEf" = ( /obj/structure/railing, /obj/structure/table/wood, @@ -17760,15 +17855,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/upper) -"eJz" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark/smooth_half{ - dir = 8 - }, -/area/station/tcommsat/server) "eJN" = ( /obj/item/radio/intercom/chapel/directional/north, /obj/machinery/light/small/directional/south, @@ -17868,13 +17954,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain/private) -"eLK" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/turf_decal/siding/red, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "eLM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/button/door/directional/west{ @@ -17984,6 +18063,64 @@ }, /turf/open/openspace, /area/station/commons/dorms) +"eNv" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/clothing/shoes/magboots{ + desc = "Magnetic boots, for the solar enthusiasts. Idential to a regular magboot in everything but soul."; + name = "Solars' Magboots"; + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/item/crowbar, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/gloves/color/yellow{ + pixel_y = 3 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/yellow, +/obj/machinery/camera/autoname/directional/west, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/tank/jetpack{ + pixel_y = 4 + }, +/obj/machinery/light/directional/west, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) +"eNy" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/table/glass, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -15 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -3 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = -7; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 8 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/medical) "eNE" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 10 @@ -18079,6 +18216,13 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/security/detectives_office/private_investigators_office) +"eOP" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/turf_decal/siding/red/corner, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "eOS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/random/directional/south, @@ -18418,20 +18562,13 @@ }, /turf/open/floor/iron/dark/textured, /area/station/science/xenobiology) -"eUq" = ( -/obj/machinery/telecomms/receiver/preset_left, -/obj/effect/turf_decal/trimline/dark_green/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_green/mid_joiner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 9 +"eUg" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/turf_decal/siding/red/corner{ + dir = 4 }, -/obj/structure/sign/warning/cold_temp/directional/south, -/turf/open/floor/iron/dark/textured_large, -/area/station/tcommsat/server) +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "eUB" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -18932,47 +19069,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"eZU" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/structure/table, -/obj/item/clothing/shoes/magboots{ - desc = "Magnetic boots, for the solar enthusiasts. Idential to a regular magboot in everything but soul."; - name = "Solars' Magboots"; - pixel_x = -1; - pixel_y = 4 - }, -/obj/item/grenade/chem_grenade/smart_metal_foam{ - pixel_x = 4; - pixel_y = 0 - }, -/obj/item/grenade/chem_grenade/smart_metal_foam, -/obj/item/crowbar, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/gloves/color/yellow{ - pixel_x = 0; - pixel_y = 3 - }, -/obj/item/clothing/ears/earmuffs{ - pixel_x = -3; - pixel_y = -2 - }, -/obj/item/clothing/gloves/color/yellow, -/obj/item/clothing/gloves/color/yellow, -/obj/machinery/camera/autoname/directional/west, -/obj/item/clothing/ears/earmuffs{ - pixel_x = -5; - pixel_y = 6 - }, -/obj/item/tank/jetpack{ - pixel_y = 4 - }, -/obj/machinery/light/directional/west, -/obj/machinery/newscaster/directional/west, -/turf/open/floor/iron/dark, -/area/station/engineering/engine_smes) "fav" = ( /obj/machinery/button/door/directional/north{ id = "SM_Outside_shutters"; @@ -19041,11 +19137,6 @@ "fbC" = ( /turf/closed/wall, /area/station/medical/morgue) -"fbD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/station/tcommsat/server) "fbI" = ( /obj/structure/stairs/east, /turf/open/floor/iron/stairs/medium{ @@ -19757,21 +19848,6 @@ /obj/structure/table, /turf/open/floor/iron/dark, /area/station/engineering/circuit_workshop) -"flA" = ( -/obj/effect/turf_decal/siding/dark, -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 4 - }, -/area/station/tcommsat/server) "flD" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, @@ -19868,6 +19944,11 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"fmJ" = ( +/obj/structure/closet/crate/bin, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/ai/satellite/maintenance/storage) "fmM" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/south, @@ -20283,15 +20364,6 @@ dir = 4 }, /area/station/service/chapel) -"fry" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/stripes{ - dir = 2 - }, -/turf/open/floor/iron/textured, -/area/station/command/eva) "frB" = ( /obj/structure/railing/corner{ dir = 1 @@ -20688,6 +20760,14 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/vault, /turf/open/floor/iron/dark, /area/station/command/vault) +"fxC" = ( +/obj/effect/turf_decal/trimline/red/filled/corner, +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) "fxH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/siding/purple{ @@ -20927,6 +21007,13 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/construction) +"fAY" = ( +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/structure/table/reinforced/rglass, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "fBd" = ( /obj/effect/spawner/random/entertainment/deck{ pixel_x = -7; @@ -21185,6 +21272,13 @@ /obj/structure/sign/poster/random/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"fEZ" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/telecomms/hub/preset, +/turf/open/floor/circuit/telecomms, +/area/station/tcommsat/server) "fFe" = ( /obj/structure/chair{ dir = 1; @@ -21559,6 +21653,15 @@ /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"fKj" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "fKk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21623,19 +21726,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/meeting_room/council) -"fLv" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/dark_blue/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{ - dir = 1 - }, -/obj/machinery/telecomms/broadcaster/preset_right, -/turf/open/floor/iron/dark/textured_large, -/area/station/tcommsat/server) "fLB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22258,6 +22348,13 @@ "fTu" = ( /turf/open/floor/engine/hull/air, /area/station/maintenance/aft/upper) +"fTv" = ( +/obj/machinery/atmospherics/components/binary/pump/off{ + name = "Mix to Port" + }, +/obj/effect/turf_decal/trimline/dark_green, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "fTw" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room" @@ -23693,6 +23790,11 @@ dir = 1 }, /area/station/service/chapel) +"glB" = ( +/obj/machinery/power/supermatter_crystal/engine, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "glC" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron, @@ -24192,10 +24294,6 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/ai/satellite/interior) -"grb" = ( -/obj/machinery/light/small/directional/west, -/turf/open/floor/plating, -/area/station/ai/satellite/maintenance/storage) "grc" = ( /obj/effect/turf_decal/siding/blue{ dir = 8 @@ -24261,13 +24359,6 @@ }, /turf/open/floor/iron, /area/station/engineering/lobby) -"gtj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/station/tcommsat/server) "gtk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing{ @@ -24533,6 +24624,26 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/plating, /area/station/maintenance/hallway/abandoned_recreation) +"gxx" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 6 + }, +/obj/structure/rack, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 1 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 4 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 8 + }, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -3 + }, +/turf/open/floor/iron, +/area/station/science/research) "gxO" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -24904,18 +25015,6 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) -"gBC" = ( -/obj/machinery/atmospherics/pipe/multiz/yellow/visible{ - name = "O2 Multideck Adapter"; - dir = 2 - }, -/obj/machinery/meter{ - name = "O2 meter" - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/effect/turf_decal/box/white, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "gBE" = ( /obj/structure/chair/sofa/right/brown{ dir = 8 @@ -25313,11 +25412,6 @@ /obj/effect/spawner/random/engineering/tank, /turf/open/floor/plating, /area/station/construction/storage_wing) -"gHQ" = ( -/obj/effect/turf_decal/siding/dark/corner, -/obj/structure/cable, -/turf/open/floor/iron/dark/telecomms, -/area/station/tcommsat/server) "gHU" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -25571,6 +25665,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft) +"gMn" = ( +/obj/machinery/computer/atmos_control/mix_tank, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "gMB" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -25878,14 +25978,6 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/dark, /area/station/command/bridge) -"gPS" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 2; - name = "N2 to Mix" - }, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "gPW" = ( /turf/closed/wall, /area/station/maintenance/hallway/abandoned_recreation) @@ -26092,6 +26184,13 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating/airless, /area/station/maintenance/aft) +"gSI" = ( +/obj/machinery/air_sensor/engine_chamber, +/obj/effect/turf_decal/siding/red{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "gSK" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 4 @@ -26839,6 +26938,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/supermatter/room/upper) +"heY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "hfb" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/siding/dark_blue{ @@ -27054,17 +27160,6 @@ /obj/item/surgicaldrill, /turf/open/floor/iron/white, /area/station/maintenance/department/medical) -"hhJ" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/obj/structure/sign/warning/radiation/rad_area/directional/south, -/obj/machinery/light/small/directional/west, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "hhN" = ( /obj/structure/chair/sofa/corner/brown{ dir = 4 @@ -27338,6 +27433,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/textured_large, /area/station/medical/abandoned) +"hnh" = ( +/obj/effect/turf_decal/siding/red{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "hni" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -27591,6 +27692,14 @@ "hqz" = ( /turf/closed/wall, /area/station/medical/abandoned) +"hqC" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/obj/structure/plasticflaps/kitchen, +/obj/machinery/door/airlock/hatch{ + name = "Telecomms Server Room" + }, +/turf/open/floor/plating, +/area/station/tcommsat/server) "hqD" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, @@ -27908,6 +28017,13 @@ }, /turf/open/floor/plating, /area/station/construction/storage_wing) +"huT" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/atmospherics/pipe/multiz/purple/visible{ + name = "mix to recycle multi-deck adapter" + }, +/turf/open/floor/iron/smooth, +/area/station/engineering/atmos) "hvc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -28525,6 +28641,13 @@ /obj/structure/cable, /turf/open/openspace, /area/station/ai/satellite/chamber) +"hDc" = ( +/obj/machinery/telecomms/receiver/preset_right, +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/tcommsat/server) "hDd" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -28554,10 +28677,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/wood/large, /area/station/service/bar) -"hDq" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "hDt" = ( /obj/effect/turf_decal/delivery, /obj/item/radio/intercom/directional/north, @@ -28611,14 +28730,6 @@ /obj/structure/lattice/catwalk, /turf/open/openspace, /area/station/maintenance/starboard/fore/upper) -"hEE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/stripes{ - dir = 2 - }, -/turf/open/floor/iron/textured, -/area/station/command/eva) "hEF" = ( /obj/machinery/button/door/directional/south{ id = "AuxToilet2"; @@ -28920,21 +29031,6 @@ }, /turf/open/openspace, /area/station/ai/satellite/chamber) -"hIw" = ( -/obj/machinery/light/directional/west, -/obj/structure/rack, -/obj/effect/spawner/random/armory/riot_armor{ - pixel_x = 1; - pixel_y = 0 - }, -/obj/effect/spawner/random/armory/riot_helmet{ - pixel_x = 7; - pixel_y = 1 - }, -/obj/effect/turf_decal/bot_white, -/obj/machinery/status_display/evac/directional/west, -/turf/open/floor/iron/dark/textured_large, -/area/station/security/armory) "hIA" = ( /turf/closed/wall, /area/station/cargo/miningoffice) @@ -30145,6 +30241,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/smooth_large, /area/station/science/lab) +"hYQ" = ( +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = 32 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "hYW" = ( /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, @@ -30517,6 +30619,13 @@ dir = 4 }, /area/station/medical/abandoned) +"ieI" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/turf_decal/siding/red/corner{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "ieZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -30789,12 +30898,6 @@ dir = 8 }, /area/station/command/gateway) -"iiS" = ( -/obj/structure/ladder, -/obj/structure/cable, -/obj/structure/sign/warning/cold_temp/directional/west, -/turf/open/floor/iron/dark/telecomms, -/area/station/tcommsat/server) "iiV" = ( /obj/structure/table/wood/poker, /obj/effect/spawner/random/entertainment/cigarette_pack, @@ -30876,6 +30979,12 @@ /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/fore) +"ijX" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 + }, +/area/station/tcommsat/computer) "ikc" = ( /obj/structure/railing, /turf/open/openspace, @@ -32031,15 +32140,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/command/heads_quarters/ce) -"iyh" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/north, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 5 - }, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "iym" = ( /obj/structure/railing/corner{ dir = 8 @@ -32199,13 +32299,6 @@ }, /turf/open/floor/eighties, /area/station/maintenance/department/crew_quarters/dorms) -"izV" = ( -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = 32; - pixel_y = 0 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "izW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -32361,16 +32454,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"iCN" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 9 - }, -/obj/machinery/computer/telecomms/server{ - dir = 1; - network = "tcommsat" - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/tcommsat/server) "iCV" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4, /obj/machinery/portable_atmospherics/canister/air, @@ -32388,15 +32471,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/station/commons/vacant_room/office) -"iDo" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "iDq" = ( /obj/item/reagent_containers/syringe, /turf/open/floor/plating, @@ -32585,6 +32659,9 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/science/ordnance/storage) +"iFj" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "iFn" = ( /obj/structure/railing/corner/end/flip{ dir = 8 @@ -32757,6 +32834,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet/black, /area/station/service/library/private) +"iGW" = ( +/obj/structure/table/reinforced/rglass, +/obj/item/mod/module/plasma_stabilizer{ + pixel_y = -1 + }, +/obj/item/mod/module/thermal_regulator{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/item/mod/module/signlang_radio{ + pixel_y = -1 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "iHi" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, @@ -33139,14 +33230,6 @@ /obj/effect/landmark/firealarm_sanity, /turf/open/openspace, /area/station/hallway/primary/starboard) -"iMH" = ( -/obj/structure/stairs/north{ - pixel_x = 0; - pixel_y = 0 - }, -/obj/structure/sign/departments/botany/alt2/directional/west, -/turf/open/floor/iron/stairs/medium, -/area/station/hallway/primary/central) "iMO" = ( /obj/machinery/computer/security/telescreen/entertainment/directional/east, /obj/structure/dresser, @@ -33174,15 +33257,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/science/lab) -"iND" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "SM_shutters"; - name = "Supermatter Radiation Shutters"; - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "iNI" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -33198,6 +33272,17 @@ /obj/machinery/light/directional/west, /turf/open/openspace, /area/station/service/chapel) +"iOi" = ( +/obj/machinery/atmospherics/pipe/multiz/yellow/visible{ + name = "O2 Multideck Adapter" + }, +/obj/machinery/meter{ + name = "O2 meter" + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/effect/turf_decal/box/white, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "iOE" = ( /obj/machinery/ore_silo, /turf/open/floor/circuit/green{ @@ -33952,6 +34037,15 @@ luminosity = 2 }, /area/station/command/vault) +"iZY" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 5 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "jad" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -34085,14 +34179,6 @@ /obj/structure/flora/bush/jungle/b/style_3, /turf/open/floor/grass/fairy, /area/station/maintenance/hallway/abandoned_recreation) -"jcw" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/atmospherics/components/binary/pump/off{ - dir = 2; - name = "O2 to Mix" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "jcy" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -34190,6 +34276,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"jdu" = ( +/obj/machinery/atmospherics/pipe/multiz/cyan/visible{ + name = "Air Mix Multideck Adapter" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/meter{ + name = "Mix Meter" + }, +/obj/effect/turf_decal/box/white, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "jdB" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{ dir = 1 @@ -34339,6 +34436,13 @@ }, /turf/open/floor/circuit/green, /area/station/ai/upload/chamber) +"jfl" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/atmospherics/components/binary/pump/off{ + name = "O2 to Mix" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "jfs" = ( /obj/structure/flora/bush/sparsegrass/style_random, /mob/living/carbon/human/species/monkey, @@ -34889,6 +34993,9 @@ }, /turf/open/floor/iron/dark/textured_half, /area/station/security/execution/education) +"jnw" = ( +/turf/closed/wall/r_wall, +/area/station/tcommsat/computer) "jnC" = ( /obj/effect/turf_decal/siding/wood/end{ dir = 4 @@ -35045,15 +35152,6 @@ }, /turf/open/space/openspace, /area/space/nearstation) -"jqy" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/north, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "jqz" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -35187,18 +35285,6 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/ai/satellite/interior) -"jrY" = ( -/obj/machinery/meter{ - name = "Plasma meter" - }, -/obj/machinery/atmospherics/pipe/multiz/yellow/visible{ - name = "Plasma Multideck Adapter"; - dir = 2 - }, -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/effect/turf_decal/box/white, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "jsh" = ( /obj/effect/turf_decal/tile/dark_blue/opposingcorners, /obj/machinery/light/floor, @@ -35343,13 +35429,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"jur" = ( -/obj/structure/table, -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/tcommsat/server) "juB" = ( /obj/effect/turf_decal/siding/dark_blue{ dir = 4 @@ -36234,14 +36313,6 @@ }, /turf/open/floor/wood/large, /area/station/command/heads_quarters/captain/private) -"jFr" = ( -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 2; - name = "Plasma to Mix" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "jFw" = ( /obj/structure/stairs/east, /obj/structure/railing, @@ -36496,17 +36567,6 @@ }, /turf/open/floor/wood, /area/station/service/library) -"jJA" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/hatch{ - name = "Telecomms Maintenance" - }, -/obj/structure/plasticflaps/kitchen, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/tcommsat/server) "jJC" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -36578,17 +36638,6 @@ "jKp" = ( /turf/closed/wall, /area/station/medical/patients_rooms/room_a) -"jKx" = ( -/obj/machinery/door/airlock/hatch{ - name = "Telecomms Maintenance" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/command/minisat, -/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/ai/satellite/maintenance/storage) "jKF" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 8 @@ -36663,6 +36712,15 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/security/prison) +"jLq" = ( +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -5 + }, +/turf/open/floor/engine/hull, +/area/space/nearstation) "jLs" = ( /obj/structure/table/reinforced, /obj/structure/lattice/catwalk, @@ -36994,19 +37052,6 @@ dir = 4 }, /area/station/service/chapel) -"jPC" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 5 - }, -/obj/machinery/telecomms/receiver/preset_right, -/obj/effect/turf_decal/trimline/dark_green/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_green/mid_joiner{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/tcommsat/server) "jPR" = ( /obj/structure/chair/office, /turf/open/floor/iron/dark/textured_large, @@ -37523,6 +37568,12 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron, /area/station/hallway/primary/central) +"jXd" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) "jXe" = ( /obj/structure/table/wood, /obj/item/folder/blue, @@ -37558,6 +37609,14 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall, /area/station/cargo/storage) +"jXv" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/structure/ladder, +/obj/structure/cable/multilayer/multiz, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) "jXC" = ( /obj/structure/table, /obj/item/instrument/eguitar{ @@ -37693,18 +37752,6 @@ }, /turf/open/floor/iron, /area/station/construction/storage_wing) -"jYR" = ( -/obj/machinery/atmospherics/pipe/multiz/yellow/visible{ - name = "N2 Multideck Adapter"; - dir = 2 - }, -/obj/machinery/meter{ - name = "N2 meter" - }, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/effect/turf_decal/box/white, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "jYS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37861,6 +37908,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos/upper) +"kbA" = ( +/obj/machinery/atmospherics/components/binary/pump/off{ + name = "Chamber to Mix" + }, +/obj/effect/turf_decal/trimline/purple, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "kbB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue/full, @@ -38668,30 +38722,6 @@ /obj/structure/rack, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"kny" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 6 - }, -/obj/structure/rack, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 1; - pixel_y = 0 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 4; - pixel_y = 0 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 8; - pixel_y = 0 - }, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -3; - pixel_y = 0 - }, -/turf/open/floor/iron, -/area/station/science/research) "knB" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -39443,6 +39473,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/science/lab) +"kxq" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/plating, +/area/station/ai/satellite/maintenance/storage) "kxx" = ( /obj/machinery/computer/cargo/request{ dir = 8 @@ -39900,13 +39935,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"kDN" = ( -/obj/machinery/air_sensor/engine_chamber, -/obj/effect/turf_decal/siding/red{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "kDP" = ( /obj/effect/turf_decal/trimline/blue/warning{ dir = 6 @@ -40010,6 +40038,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/lobby) +"kEG" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = -7 + }, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = 7 + }, +/obj/item/reagent_containers/cup/glass/coffee, +/turf/open/floor/iron/dark, +/area/station/security/brig) "kEY" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41202,15 +41244,6 @@ "kUO" = ( /turf/open/openspace, /area/station/security/courtroom) -"kUV" = ( -/obj/effect/turf_decal/siding/dark/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark/telecomms, -/area/station/tcommsat/server) "kVf" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -41670,6 +41703,10 @@ /obj/structure/stairs/north, /turf/open/floor/plating, /area/station/maintenance/aft) +"lbM" = ( +/obj/effect/spawner/random/gizmo, +/turf/open/floor/engine, +/area/station/science/auxlab/firing_range) "lbR" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -41926,6 +41963,10 @@ /obj/machinery/airalarm/directional/south, /turf/open/openspace, /area/station/security/checkpoint/supply) +"lga" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "lgb" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, @@ -42336,21 +42377,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"llG" = ( -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/obj/machinery/meter{ - name = "N2O meter" - }, -/obj/machinery/atmospherics/pipe/multiz/yellow/visible{ - name = "N2O Multideck Adapter"; - dir = 2 - }, -/obj/effect/turf_decal/box/white, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "llK" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -42552,6 +42578,13 @@ }, /turf/open/floor/iron/checker, /area/station/ai/satellite/maintenance/storage) +"lnX" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "N2 to Mix" + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "lnY" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -42979,14 +43012,6 @@ }, /turf/closed/wall, /area/station/command/heads_quarters/hop) -"lts" = ( -/obj/effect/spawner/random/maintenance, -/obj/effect/mapping_helpers/burnt_floor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/ai/satellite/maintenance/storage) "ltE" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -43396,6 +43421,9 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/ai/upload/chamber) +"lzs" = ( +/turf/open/floor/glass/reinforced/plasma, +/area/station/engineering/supermatter/engine) "lzO" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 1 @@ -44015,6 +44043,16 @@ }, /turf/open/floor/iron/dark, /area/station/science/lobby) +"lHR" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/structure/table, +/obj/item/storage/fancy/donut_box{ + pixel_y = 6 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) "lIi" = ( /obj/item/cigbutt{ pixel_x = -12; @@ -44123,6 +44161,15 @@ /obj/structure/cable, /turf/open/floor/iron/dark/smooth_large, /area/station/commons/lounge) +"lJO" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "SM_shutters"; + name = "Supermatter Radiation Shutters"; + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "lKb" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -44464,27 +44511,6 @@ /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/maintenance/hallway/abandoned_recreation) -"lOz" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/table/glass, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -15 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = -3; - pixel_y = 0 - }, -/obj/item/reagent_containers/syringe{ - pixel_x = -7; - pixel_y = 10 - }, -/obj/item/reagent_containers/cup/bottle/multiver{ - pixel_x = 8; - pixel_y = 0 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/medical) "lOY" = ( /obj/machinery/door/airlock/virology{ name = "Genetics Lab" @@ -44597,6 +44623,13 @@ /obj/effect/turf_decal/tile/dark_green/fourcorners, /turf/open/floor/iron/dark, /area/station/science/cytology) +"lQI" = ( +/obj/machinery/announcement_system, +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/tcommsat/server) "lQL" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/iron/chapel{ @@ -44793,6 +44826,15 @@ }, /turf/open/floor/glass/reinforced, /area/station/security/brig) +"lTr" = ( +/obj/structure/showcase/cyborg/old{ + dir = 4; + pixel_x = -9; + pixel_y = 2 + }, +/obj/structure/sign/departments/telecomms/directional/west, +/turf/open/floor/iron/white/smooth_large, +/area/station/ai/satellite/interior) "lTx" = ( /obj/structure/closet/crate/wooden{ desc = "Used for storing props for a stage play!."; @@ -44823,6 +44865,13 @@ /obj/structure/lattice/catwalk, /turf/open/openspace, /area/station/security/courtroom) +"lTW" = ( +/obj/machinery/telecomms/message_server/preset, +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/tcommsat/server) "lTY" = ( /obj/structure/chair, /turf/open/floor/iron/white/side, @@ -44920,13 +44969,6 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/security/prison) -"lVa" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/station/tcommsat/server) "lVb" = ( /obj/structure/railing, /turf/open/floor/plating, @@ -45041,12 +45083,6 @@ }, /turf/open/openspace, /area/station/maintenance/port/fore) -"lWD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ - dir = 2 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "lWS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -45554,10 +45590,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/textured, /area/station/cargo/warehouse) -"mdj" = ( -/obj/structure/sign/poster/official/safety_report/directional/north, -/turf/open/floor/iron/dark/smooth_large, -/area/station/tcommsat/server) "mdp" = ( /obj/structure/closet, /obj/effect/turf_decal/tile/purple/opposingcorners, @@ -45876,14 +45908,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/glass/reinforced, /area/station/construction/storage_wing) -"mht" = ( -/obj/machinery/computer/atmos_control/mix_tank{ - dir = 2 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "mhI" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -46291,6 +46315,21 @@ /obj/structure/flora/bush/fullgrass/style_random, /turf/open/floor/grass, /area/station/hallway/secondary/entry) +"moo" = ( +/obj/structure/table, +/obj/item/radio{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/radio{ + pixel_y = 2 + }, +/obj/item/radio{ + pixel_x = 6; + pixel_y = 2 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) "moq" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/structure/closet/secure_closet/miner, @@ -46316,6 +46355,22 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/fore) +"mpa" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 5 + }, +/obj/structure/table, +/obj/item/book/manual/wiki/ordnance{ + pixel_x = 4; + pixel_y = 1 + }, +/obj/item/holosign_creator/atmos, +/obj/item/holosign_creator/atmos{ + pixel_y = 3 + }, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "mpd" = ( /obj/machinery/vatgrower{ dir = 4 @@ -46991,13 +47046,6 @@ /obj/effect/turf_decal/tile/brown/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"mwY" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/effect/turf_decal/siding/red/corner{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "mxj" = ( /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/stripes/line, @@ -47955,6 +48003,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_large, /area/station/service/hydroponics) +"mLb" = ( +/obj/effect/turf_decal/trimline/dark_blue/corner{ + dir = 1 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white/smooth_large, +/area/station/ai/satellite/interior) "mLd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48825,14 +48880,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/engine, /area/station/engineering/supermatter/room/upper) -"mXE" = ( -/obj/machinery/recharger{ - pixel_y = 4; - pixel_x = 0 - }, -/obj/structure/table/reinforced/rglass, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "mXL" = ( /obj/effect/turf_decal/weather/snow, /turf/open/floor/plating, @@ -48932,20 +48979,6 @@ /obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/science/cytology) -"mYX" = ( -/obj/effect/turf_decal/trimline/dark_blue/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{ - dir = 1 - }, -/obj/machinery/telecomms/broadcaster/preset_left, -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, -/obj/structure/sign/warning/cold_temp/directional/north, -/turf/open/floor/iron/dark/textured_large, -/area/station/tcommsat/server) "mYZ" = ( /obj/machinery/chem_heater/withbuffer, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -48966,18 +48999,6 @@ }, /turf/open/floor/eighties, /area/station/maintenance/hallway/abandoned_recreation) -"mZm" = ( -/obj/effect/turf_decal/siding/dark/corner{ - dir = 1 - }, -/obj/machinery/computer/message_monitor{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark/smooth_half{ - dir = 8 - }, -/area/station/tcommsat/server) "mZo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49265,6 +49286,29 @@ /obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron/dark, /area/station/command/corporate_showroom) +"nen" = ( +/obj/item/transfer_valve{ + pixel_x = -5 + }, +/obj/item/transfer_valve{ + pixel_x = -9 + }, +/obj/item/transfer_valve{ + pixel_x = -7 + }, +/obj/item/transfer_valve{ + pixel_x = -1 + }, +/obj/item/transfer_valve{ + pixel_x = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/machinery/newscaster/directional/west, +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "nev" = ( /obj/structure/lattice/catwalk, /obj/effect/turf_decal/stripes/corner{ @@ -49623,14 +49667,6 @@ }, /turf/open/floor/iron/dark/textured_corner, /area/station/security/execution/education) -"nkn" = ( -/obj/structure/sign/departments/telecomms/directional/west, -/obj/effect/turf_decal/trimline/dark_blue/corner{ - dir = 1 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/white/smooth_large, -/area/station/ai/satellite/interior) "nkD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, @@ -49648,6 +49684,15 @@ dir = 8 }, /area/station/hallway/primary/central) +"nkG" = ( +/obj/machinery/camera/autoname/directional/west, +/obj/structure/table, +/obj/item/storage/toolbox/electrical{ + pixel_y = 10 + }, +/obj/item/healthanalyzer, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) "nkW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/crate, @@ -49682,20 +49727,19 @@ "nlt" = ( /turf/open/floor/iron/dark/textured, /area/station/engineering/supermatter/room) -"nlD" = ( -/turf/closed/wall/r_wall, -/area/station/medical/abandoned) -"nlO" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ +"nlu" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/structure/table, -/obj/machinery/coffeemaker{ - pixel_x = 0; - pixel_y = 9 +/obj/machinery/door/airlock/engineering/glass/critical{ + name = "Supermatter Chamber" }, -/turf/open/floor/iron/dark, -/area/station/security/brig) +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) +"nlD" = ( +/turf/closed/wall/r_wall, +/area/station/medical/abandoned) "nlP" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/effect/turf_decal/weather/dirt{ @@ -49760,6 +49804,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard) +"nmL" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/tcommsat/computer) "nmQ" = ( /obj/effect/turf_decal/trimline/brown/filled/warning{ dir = 1 @@ -49944,13 +49998,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/science/lab) -"noU" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/effect/turf_decal/siding/red{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "npb" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, @@ -50900,6 +50947,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/science/research) +"nAi" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) "nAm" = ( /obj/structure/closet/crate/trashcart/filled, /turf/open/floor/plating, @@ -51532,14 +51586,6 @@ dir = 8 }, /area/station/security/interrogation) -"nJN" = ( -/obj/structure/showcase/cyborg/old{ - dir = 4; - pixel_x = -9; - pixel_y = 2 - }, -/turf/open/floor/iron/white/smooth_large, -/area/station/ai/satellite/interior) "nJS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/disposal/bin, @@ -51565,12 +51611,6 @@ }, /turf/open/floor/engine, /area/station/medical/chemistry) -"nKd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark/smooth_large, -/area/station/tcommsat/server) "nKe" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -52704,13 +52744,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) -"nYD" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "SM_shutters"; - name = "Supermatter Radiation Shutters" - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "nYQ" = ( /turf/open/floor/iron/smooth_half, /area/station/ai/satellite/foyer) @@ -53236,13 +53269,6 @@ dir = 4 }, /area/station/science/robotics) -"ofQ" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/north, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "ofY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -54267,6 +54293,16 @@ /obj/structure/sign/departments/medbay/alt/directional/south, /turf/open/openspace, /area/station/medical/medbay/central) +"ouD" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "N2O to Mix" + }, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "ouE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -54303,14 +54339,6 @@ }, /turf/open/floor/iron/stairs/right, /area/station/service/library) -"ouY" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark/telecomms, -/area/station/tcommsat/server) "ovh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -54561,6 +54589,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/eighties, /area/station/maintenance/hallway/abandoned_recreation) +"oyg" = ( +/obj/item/clothing/head/cone{ + pixel_x = -5 + }, +/turf/open/floor/engine/hull, +/area/space/nearstation) "oym" = ( /obj/item/tank/internals/emergency_oxygen/engi{ pixel_x = 5; @@ -54650,18 +54684,6 @@ /obj/effect/mapping_helpers/mail_sorting/science/research, /turf/open/floor/iron, /area/station/science/research) -"ozJ" = ( -/obj/effect/turf_decal/siding/dark/corner{ - dir = 8 - }, -/obj/machinery/computer/telecomms/monitor{ - network = "tcommsat" - }, -/obj/structure/cable, -/turf/open/floor/iron/dark/smooth_half{ - dir = 8 - }, -/area/station/tcommsat/server) "ozK" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -55519,15 +55541,6 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"oKr" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 6 - }, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "oKt" = ( /obj/structure/falsewall, /obj/effect/decal/cleanable/blood/tracks{ @@ -55562,12 +55575,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/science/explab) -"oKF" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/tcommsat/server) "oKS" = ( /obj/machinery/vending/clothing, /obj/effect/turf_decal/tile/dark_green/half/contrasted{ @@ -55651,6 +55658,11 @@ /obj/structure/railing, /turf/open/openspace, /area/station/command/meeting_room/council) +"oLI" = ( +/obj/structure/ladder, +/obj/structure/cable/multilayer/multiz, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) "oLJ" = ( /obj/effect/turf_decal/siding/purple/corner{ dir = 4 @@ -55688,22 +55700,20 @@ }, /turf/open/floor/engine/hull/air, /area/station/maintenance/port) -"oMc" = ( -/obj/structure/table/reinforced/rglass, -/obj/item/mod/module/plasma_stabilizer{ - pixel_x = 0; - pixel_y = -1 - }, -/obj/item/mod/module/thermal_regulator{ - pixel_x = 3; - pixel_y = 5 +"oMe" = ( +/obj/machinery/light/directional/west, +/obj/structure/rack, +/obj/effect/spawner/random/armory/riot_armor{ + pixel_x = 1 }, -/obj/item/mod/module/signlang_radio{ - pixel_x = 0; - pixel_y = -1 +/obj/effect/spawner/random/armory/riot_helmet{ + pixel_x = 7; + pixel_y = 1 }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) +/obj/effect/turf_decal/bot_white, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/dark/textured_large, +/area/station/security/armory) "oMr" = ( /obj/structure/plasticflaps/kitchen, /obj/machinery/door/airlock/medical{ @@ -55972,11 +55982,6 @@ /obj/effect/landmark/firealarm_sanity, /turf/open/openspace, /area/station/hallway/secondary/construction) -"oQq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/station/tcommsat/server) "oQV" = ( /obj/structure/sign/poster/contraband/missing_gloves/directional/west, /obj/effect/decal/cleanable/dirt/dust, @@ -56178,13 +56183,6 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/grass, /area/station/hallway/secondary/entry) -"oTz" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/machinery/light_switch/directional/east, -/turf/open/floor/iron/dark/smooth_large, -/area/station/tcommsat/server) "oTH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -56272,16 +56270,6 @@ }, /turf/open/floor/iron/kitchen, /area/station/maintenance/port/aft) -"oUa" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/engineering/glass/critical{ - name = "Supermatter Chamber" - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "oUd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -56386,6 +56374,10 @@ /obj/effect/turf_decal/siding/yellow, /turf/open/floor/engine, /area/station/command/heads_quarters/ce) +"oWf" = ( +/obj/effect/turf_decal/siding/dark/corner, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) "oWt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, @@ -56429,16 +56421,6 @@ /obj/item/wrench, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"oWZ" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/engineering/glass/critical{ - name = "Supermatter Chamber" - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "oXn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing/corner{ @@ -57048,14 +57030,6 @@ /obj/structure/lattice/catwalk, /turf/open/openspace, /area/station/maintenance/port/fore) -"peL" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 2; - name = "Air to Mix" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "peQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57776,6 +57750,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/dorms) +"ppt" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "SM_shutters"; + name = "Supermatter Radiation Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "ppu" = ( /obj/structure/railing, /obj/structure/flora/bush/fullgrass/style_random, @@ -58390,6 +58371,11 @@ }, /turf/open/floor/wood/large, /area/station/service/chapel) +"pzI" = ( +/obj/effect/turf_decal/siding/dark/corner, +/obj/machinery/telecomms/broadcaster/preset_left, +/turf/open/floor/iron/dark/textured_large, +/area/station/tcommsat/server) "pzQ" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58665,31 +58651,6 @@ /obj/structure/punching_bag, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) -"pEG" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) -"pEI" = ( -/obj/structure/table, -/obj/item/radio{ - pixel_x = -6; - pixel_y = 2 - }, -/obj/item/radio{ - pixel_x = 0; - pixel_y = 2 - }, -/obj/item/radio{ - pixel_x = 6; - pixel_y = 2 - }, -/turf/open/floor/iron/dark, -/area/station/security/office) "pEK" = ( /turf/open/floor/engine, /area/station/service/hydroponics) @@ -59638,24 +59599,6 @@ }, /turf/open/floor/iron/textured, /area/station/cargo/storage) -"pQt" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = -7 - }, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = 7; - pixel_y = 0 - }, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = 0; - pixel_y = 0 - }, -/turf/open/floor/iron/dark, -/area/station/security/brig) "pQF" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /obj/machinery/light/directional/west, @@ -60182,6 +60125,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/hallway/secondary/service) +"pXw" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "SM_shutters"; + name = "Supermatter Radiation Shutters"; + dir = 1 + }, +/obj/machinery/atmospherics/components/binary/pump/off/cyan/visible, +/obj/effect/turf_decal/trimline/blue, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "pXE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60442,6 +60395,11 @@ dir = 8 }, /area/station/service/chapel) +"qbG" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) "qbI" = ( /obj/machinery/washing_machine, /obj/machinery/airalarm/directional/north, @@ -60547,6 +60505,11 @@ }, /turf/open/floor/iron/airless, /area/station/maintenance/starboard/aft) +"qdN" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/iron/dark, +/area/station/tcommsat/server) "qdP" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -60887,14 +60850,6 @@ /obj/effect/mapping_helpers/airlock/access/any/science/xenobio, /turf/open/floor/iron, /area/station/science/xenobiology/hallway) -"qie" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "SM_shutters"; - name = "Supermatter Radiation Shutters"; - dir = 1 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "qih" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/griddle, @@ -61040,14 +60995,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"qkn" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/machinery/atmospherics/pipe/multiz/green/visible{ - dir = 2; - name = "mix to space multi-deck adaper" - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "qkv" = ( /obj/structure/railing{ dir = 4 @@ -61083,22 +61030,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/service/library) -"qle" = ( -/obj/structure/table, -/obj/item/clothing/head/cone{ - pixel_x = 1; - pixel_y = 11 - }, -/obj/item/toy/basketball{ - pixel_x = 10; - pixel_y = 5 - }, -/obj/effect/spawner/random/maintenance{ - pixel_x = -6; - pixel_y = 0 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/science/central) "qlg" = ( /obj/machinery/mech_bay_recharge_port, /turf/open/floor/iron/smooth, @@ -61122,6 +61053,19 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"qlp" = ( +/obj/structure/rack, +/obj/effect/spawner/random/armory/bulletproof_helmet{ + pixel_x = 8 + }, +/obj/effect/spawner/random/armory/bulletproof_armor{ + pixel_y = 2; + pixel_x = -4 + }, +/obj/effect/turf_decal/bot_white, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark/textured_large, +/area/station/security/armory) "qlu" = ( /obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer2{ dir = 1 @@ -61184,6 +61128,16 @@ }, /turf/open/floor/engine/hull/reinforced, /area/space/nearstation) +"qmt" = ( +/obj/machinery/door/airlock/hatch{ + name = "Telecomms Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/ai/satellite/maintenance/storage) "qmy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/vending/colavend, @@ -61575,6 +61529,15 @@ }, /turf/open/floor/iron/white/side, /area/station/hallway/secondary/entry) +"qrI" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 6 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "qrJ" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/reagent_dispensers/watertank/high, @@ -62344,6 +62307,11 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/atmos/upper) +"qCy" = ( +/obj/effect/spawner/random/maintenance/three, +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/ai/satellite/maintenance/storage) "qCN" = ( /obj/structure/railing{ dir = 1 @@ -62526,6 +62494,15 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/gravity_generator) +"qFU" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "qGe" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -63464,6 +63441,21 @@ }, /turf/open/floor/iron/dark/textured_edge, /area/station/science/ordnance/storage) +"qRz" = ( +/obj/structure/table, +/obj/item/clothing/head/cone{ + pixel_x = 1; + pixel_y = 11 + }, +/obj/item/toy/basketball{ + pixel_x = 10; + pixel_y = 5 + }, +/obj/effect/spawner/random/maintenance{ + pixel_x = -6 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/science/central) "qRA" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -63511,6 +63503,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"qSC" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/table/glass, +/obj/machinery/computer/records/medical/laptop{ + dir = 1; + pixel_y = 5 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/medical) "qSG" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/atmospherics/components/trinary/mixer/flipped{ @@ -63871,15 +63873,6 @@ /obj/structure/chair/sofa/corp/left, /turf/open/floor/carpet/executive, /area/station/ai/satellite/interior) -"qXr" = ( -/obj/structure/sign/departments/telecomms/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/smooth_edge{ - dir = 4 - }, -/area/station/ai/satellite/foyer) "qXI" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -63922,13 +63915,6 @@ /obj/item/wrench, /turf/open/floor/iron/dark, /area/station/commons/vacant_room/office) -"qYk" = ( -/obj/effect/spawner/random/structure/crate, -/obj/effect/spawner/random/maintenance, -/obj/effect/mapping_helpers/burnt_floor, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/plating, -/area/station/ai/satellite/maintenance/storage) "qYq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -64132,14 +64118,6 @@ /obj/effect/turf_decal/trimline/red/corner, /turf/open/floor/iron/dark, /area/station/security/brig) -"rcA" = ( -/obj/machinery/atmospherics/components/binary/pump/off{ - dir = 2; - name = "Chamber to Mix" - }, -/obj/effect/turf_decal/trimline/purple, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "rcF" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -64625,6 +64603,14 @@ /obj/structure/table, /turf/open/floor/wood, /area/station/service/library) +"rkh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/smooth_edge{ + dir = 4 + }, +/area/station/ai/satellite/foyer) "rki" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/engine, @@ -64926,11 +64912,6 @@ }, /turf/open/floor/iron, /area/station/science/research) -"rmX" = ( -/obj/machinery/light/directional/south, -/obj/machinery/announcement_system, -/turf/open/floor/iron/dark, -/area/station/tcommsat/server) "rnd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65171,6 +65152,14 @@ /obj/effect/turf_decal/trimline/yellow/mid_joiner, /turf/open/floor/engine/hull/reinforced, /area/space/nearstation) +"rqy" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "SM_shutters"; + name = "Supermatter Radiation Shutters"; + dir = 1 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "rqM" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -65605,17 +65594,6 @@ "rwh" = ( /turf/closed/wall/r_wall, /area/station/security/medical) -"rwn" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/obj/structure/sign/warning/radiation/rad_area/directional/north, -/obj/machinery/light/small/directional/west, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "rwA" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -65825,23 +65803,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/smooth, /area/station/engineering/atmos/office) -"rzm" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 5 - }, -/obj/structure/table, -/obj/item/book/manual/wiki/ordnance{ - pixel_x = 4; - pixel_y = 1 - }, -/obj/item/holosign_creator/atmos, -/obj/item/holosign_creator/atmos{ - pixel_x = 0; - pixel_y = 3 - }, -/obj/machinery/light_switch/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "rzp" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/effect/turf_decal/trimline/green/filled/mid_joiner, @@ -66307,6 +66268,19 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/glass/reinforced, /area/station/solars/starboard/fore) +"rGs" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" + }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "rGK" = ( /obj/structure/fake_stairs/directional/east, /turf/open/floor/plating, @@ -66898,6 +66872,17 @@ }, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain/private) +"rPR" = ( +/obj/machinery/atmospherics/pipe/multiz/yellow/visible{ + name = "N2 Multideck Adapter" + }, +/obj/machinery/meter{ + name = "N2 meter" + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/effect/turf_decal/box/white, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "rQg" = ( /obj/structure/tank_holder/extinguisher, /obj/machinery/light/directional/east, @@ -67923,6 +67908,13 @@ /mob/living/basic/pet/cat/jerry, /turf/open/openspace, /area/station/hallway/primary/central) +"seg" = ( +/obj/machinery/telecomms/receiver/preset_left, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/tcommsat/server) "sel" = ( /obj/machinery/disposal/bin, /obj/machinery/camera/autoname/directional/north, @@ -68143,12 +68135,6 @@ /obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/maintenance/disposal) -"shb" = ( -/obj/effect/turf_decal/siding/red{ - dir = 8 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "shi" = ( /turf/closed/wall/r_wall, /area/station/engineering/storage_shared) @@ -68438,17 +68424,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine/hull/air, /area/station/maintenance/port) -"slu" = ( -/obj/machinery/door/airlock/hatch{ - name = "Telecomms Server Room" - }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination/tcomms, -/obj/structure/cable, -/turf/open/floor/iron/dark/smooth_large, -/area/station/tcommsat/server) "slA" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -68750,6 +68725,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/lobby) +"spp" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) "spr" = ( /obj/structure/cable, /turf/open/floor/iron/dark/textured, @@ -68779,13 +68758,6 @@ }, /turf/open/floor/wood/large, /area/station/service/library) -"sql" = ( -/obj/effect/mapping_helpers/burnt_floor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/ai/satellite/maintenance/storage) "sqp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue{ @@ -69171,18 +69143,6 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/dark, /area/station/command/bridge) -"suV" = ( -/obj/machinery/meter{ - name = "C02 meter" - }, -/obj/machinery/atmospherics/pipe/multiz/yellow/visible{ - name = "CO2 Multideck Adapter"; - dir = 2 - }, -/obj/effect/turf_decal/tile/dark/fourcorners, -/obj/effect/turf_decal/box/white, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "svh" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/access/all/engineering/external, @@ -69685,6 +69645,13 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) +"sCv" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/obj/machinery/telecomms/broadcaster/preset_right, +/turf/open/floor/iron/dark/textured_large, +/area/station/tcommsat/server) "sCx" = ( /turf/open/openspace, /area/station/command/meeting_room/council) @@ -69900,13 +69867,6 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/iron/dark, /area/station/science/cytology) -"sFE" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/tcommsat/server) "sFI" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -69947,23 +69907,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"sGc" = ( -/obj/effect/turf_decal/siding/dark/end{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/power/smes/full, -/obj/structure/cable, -/turf/open/floor/circuit, -/area/station/tcommsat/server) -"sGj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/stripes{ - dir = 2 - }, -/turf/open/floor/iron/textured, -/area/station/command/eva) "sGn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70380,6 +70323,11 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/security/prison/mess) +"sMW" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/station/ai/satellite/maintenance/storage) "sNa" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -71035,18 +70983,6 @@ }, /turf/open/openspace, /area/station/engineering/lobby) -"sUY" = ( -/obj/machinery/atmospherics/pipe/multiz/cyan/visible{ - dir = 2; - name = "Air Mix Multideck Adapter" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/meter{ - name = "Mix Meter" - }, -/obj/effect/turf_decal/box/white, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "sVc" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment{ @@ -71525,15 +71461,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"tbd" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "SM_shutters"; - name = "Supermatter Radiation Shutters" - }, -/obj/effect/turf_decal/trimline/brown, -/obj/machinery/atmospherics/components/binary/pump/off/orange/visible, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "tbg" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine/hull/air, @@ -71925,6 +71852,9 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/warden) +"tgS" = ( +/turf/open/floor/circuit/green/telecomms/mainframe, +/area/station/tcommsat/server) "tgT" = ( /obj/machinery/holopad, /obj/effect/turf_decal/stripes{ @@ -71943,6 +71873,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/smooth_large, /area/station/security/armory) +"tha" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/ai/satellite/maintenance/storage) "thb" = ( /obj/effect/turf_decal/trimline/yellow/line{ dir = 4 @@ -72315,6 +72251,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/storage) +"tmQ" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "tmS" = ( /obj/machinery/newscaster/directional/north, /obj/structure/table, @@ -72354,19 +72294,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) -"tmZ" = ( -/obj/machinery/airalarm/directional/east, -/obj/effect/mapping_helpers/airalarm/engine_access, -/obj/effect/mapping_helpers/airalarm/link{ - chamber_id = "engine" - }, -/obj/effect/mapping_helpers/airalarm/tlv_no_checks, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "tna" = ( /obj/structure/fermenting_barrel/gunpowder, /obj/effect/decal/cleanable/greenglow, @@ -72459,6 +72386,11 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"tnW" = ( +/obj/structure/sign/poster/official/safety_report/directional/north, +/obj/machinery/computer/telecomms/server, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) "toa" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/trimline/red/warning, @@ -72602,15 +72534,6 @@ /obj/structure/cable, /turf/open/openspace, /area/station/security/checkpoint/supply) -"tpO" = ( -/obj/effect/turf_decal/trimline/red/filled/corner, -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4; - pixel_x = 0 - }, -/turf/open/floor/iron/dark, -/area/station/security/office) "tpR" = ( /obj/effect/landmark/blobstart, /obj/effect/landmark/generic_maintenance_landmark, @@ -72817,6 +72740,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"tsw" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/obj/machinery/light/small/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "tsA" = ( /obj/structure/chair/sofa/corner/brown, /obj/item/instrument/eguitar, @@ -73252,16 +73186,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/port) -"tzv" = ( -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = -5; - pixel_y = 0 - }, -/turf/open/floor/engine/hull, -/area/space/nearstation) "tzK" = ( /obj/structure/rack, /obj/item/storage/toolbox/emergency, @@ -73273,33 +73197,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/pharmacy) -"tzU" = ( -/obj/item/transfer_valve{ - pixel_x = -5 - }, -/obj/item/transfer_valve{ - pixel_x = -9; - pixel_y = 0 - }, -/obj/item/transfer_valve{ - pixel_x = -7; - pixel_y = 0 - }, -/obj/item/transfer_valve{ - pixel_x = -1; - pixel_y = 0 - }, -/obj/item/transfer_valve{ - pixel_x = 4; - pixel_y = 0 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/machinery/newscaster/directional/west, -/obj/structure/table/reinforced, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "tzZ" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -73365,13 +73262,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/evidence) -"tAX" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "tBb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -74019,13 +73909,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth, /area/station/engineering/main) -"tIm" = ( -/obj/item/clothing/head/cone{ - pixel_x = -5; - pixel_y = 0 - }, -/turf/open/floor/engine/hull, -/area/space/nearstation) "tIo" = ( /obj/structure/transport/linear{ radial_travel = 0 @@ -74336,19 +74219,6 @@ }, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) -"tND" = ( -/obj/machinery/camera/autoname/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/button/door/directional/east{ - id = "SM_shutters"; - name = "Radiation Shutters"; - req_access = list("engineering") - }, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "tNP" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -74451,9 +74321,6 @@ }, /turf/open/floor/iron/smooth, /area/station/engineering/atmos) -"tPe" = ( -/turf/open/floor/glass/reinforced/plasma, -/area/station/engineering/supermatter) "tPl" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/structure/cable, @@ -74916,13 +74783,6 @@ /obj/item/kirbyplants/random/fullysynthetic, /turf/open/floor/wood, /area/station/maintenance/hallway/abandoned_recreation) -"tWe" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible/layer2{ - dir = 2 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "tWl" = ( /obj/machinery/light/warm/dim/directional/north, /turf/open/openspace, @@ -75954,6 +75814,11 @@ }, /turf/open/floor/iron/checker, /area/station/ai/satellite/maintenance/storage) +"ukG" = ( +/obj/machinery/computer/message_monitor, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) "ukO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -77114,11 +76979,6 @@ /obj/machinery/light/floor, /turf/open/floor/grass, /area/station/hallway/secondary/entry) -"uxR" = ( -/obj/effect/spawner/random/structure/closet_maintenance, -/obj/effect/spawner/random/maintenance/three, -/turf/open/floor/plating, -/area/station/ai/satellite/maintenance/storage) "uxW" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -77333,11 +77193,6 @@ /obj/structure/railing, /turf/open/openspace, /area/station/cargo/storage) -"uAT" = ( -/obj/machinery/airalarm/directional/west, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron/dark, -/area/station/tcommsat/server) "uAX" = ( /turf/open/floor/wood/large, /area/station/commons/dorms) @@ -78262,10 +78117,6 @@ /obj/effect/spawner/random/trash/crushed_can, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"uLc" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/dark, -/area/station/tcommsat/server) "uLd" = ( /obj/structure/railing{ dir = 4 @@ -78441,6 +78292,12 @@ /obj/effect/turf_decal/tile/brown/full, /turf/open/floor/iron/large, /area/station/maintenance/starboard) +"uNj" = ( +/obj/structure/cable, +/obj/machinery/camera/autoname/directional/south, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) "uNq" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -78621,10 +78478,6 @@ /obj/effect/turf_decal/trimline/blue/filled/mid_joiner, /turf/open/floor/iron/white/textured_large, /area/station/medical/medbay/central) -"uQy" = ( -/obj/structure/closet/crate/bin, -/turf/open/floor/plating, -/area/station/ai/satellite/maintenance/storage) "uQX" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -78685,16 +78538,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"uRD" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "SM_shutters"; - name = "Supermatter Radiation Shutters"; - dir = 1 - }, -/obj/machinery/atmospherics/components/binary/pump/off/cyan/visible, -/obj/effect/turf_decal/trimline/blue, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "uRM" = ( /obj/structure/table, /obj/effect/spawner/random/trash/janitor_supplies{ @@ -79295,6 +79138,14 @@ dir = 4 }, /area/station/hallway/primary/fore) +"uZa" = ( +/obj/item/radio/intercom/directional/west, +/obj/machinery/modular_computer/preset/cargochat/security, +/obj/item/clothing/head/soft/sec{ + pixel_y = 11 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) "uZn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/machinery/light/cold/directional/south, @@ -79463,14 +79314,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless, /area/station/maintenance/starboard/aft) -"vcp" = ( -/obj/machinery/atmospherics/components/binary/pump/off{ - dir = 2; - name = "Mix to Port" - }, -/obj/effect/turf_decal/trimline/dark_green, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "vcz" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -80445,20 +80288,6 @@ /obj/structure/transport/linear, /turf/open/openspace, /area/station/science/robotics/lab) -"vpS" = ( -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/machinery/camera/autoname/directional/south, -/obj/structure/table, -/obj/machinery/syndicatebomb/training{ - pixel_x = 0; - pixel_y = 3 - }, -/obj/item/screwdriver{ - pixel_y = 10 - }, -/obj/item/wirecutters, -/turf/open/floor/iron/dark, -/area/station/security/office) "vpX" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -80706,15 +80535,6 @@ /obj/effect/spawner/round_default_module, /turf/open/floor/iron/dark/smooth_large, /area/station/ai/upload/chamber) -"vta" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark/telecomms, -/area/station/tcommsat/server) "vtm" = ( /obj/effect/turf_decal/siding/blue/corner, /obj/structure/railing{ @@ -80833,6 +80653,13 @@ }, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/ce) +"vuX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/smooth_edge{ + dir = 8 + }, +/area/station/ai/satellite/foyer) "vvc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -80967,6 +80794,13 @@ /obj/structure/cable, /turf/open/floor/iron/cafeteria, /area/station/maintenance/starboard/upper) +"vwR" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/atmospherics/pipe/multiz/green/visible{ + name = "mix to space multi-deck adaper" + }, +/turf/open/floor/iron/smooth, +/area/station/engineering/atmos) "vxc" = ( /obj/machinery/door/airlock/security{ name = "Courtroom Cell" @@ -80977,12 +80811,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/security/courtroom) -"vxe" = ( -/obj/machinery/computer/security/telescreen/tcomms/directional/north{ - name = "Telecommunications Monitor" - }, -/turf/open/floor/glass, -/area/station/tcommsat/server) "vxh" = ( /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 @@ -81142,6 +80970,12 @@ /obj/item/pen, /turf/open/floor/iron, /area/station/cargo/storage) +"vzu" = ( +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) "vzv" = ( /obj/structure/bed, /turf/open/floor/iron/dark/textured_large, @@ -81290,6 +81124,19 @@ /obj/item/reagent_containers/syringe, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"vBB" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/structure/table/reinforced, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/stack/sheet/iron/ten{ + pixel_x = 2 + }, +/turf/open/floor/iron/dark, +/area/station/commons/vacant_room/office) "vBM" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -81466,6 +81313,14 @@ }, /turf/open/floor/iron/checker, /area/station/ai/satellite/maintenance/storage) +"vDh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/tcommsat/computer) "vDi" = ( /turf/open/floor/iron/smooth_edge{ dir = 8 @@ -81497,14 +81352,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/service/kitchen/abandoned) -"vEp" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 2; - name = "CO2 to Mix" - }, -/obj/effect/turf_decal/tile/dark/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "vEv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -82133,12 +81980,26 @@ /obj/effect/spawner/random/structure/crate_abandoned, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"vNX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/stripes, +/turf/open/floor/iron/textured, +/area/station/command/eva) "vOg" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port) +"vOh" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "vOs" = ( /obj/machinery/light/directional/east, /obj/structure/disposalpipe/segment{ @@ -83456,20 +83317,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/smooth_large, /area/station/service/hydroponics) -"wfH" = ( -/obj/structure/rack, -/obj/effect/spawner/random/armory/bulletproof_helmet{ - pixel_x = 8; - pixel_y = 0 - }, -/obj/effect/spawner/random/armory/bulletproof_armor{ - pixel_y = 2; - pixel_x = -4 - }, -/obj/effect/turf_decal/bot_white, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/dark/textured_large, -/area/station/security/armory) "wfN" = ( /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ dir = 1 @@ -84650,6 +84497,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/maintenance/starboard) +"wuX" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/bush/large/style_2{ + pixel_x = -29 + }, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/grass, +/area/station/science/genetics) "wvc" = ( /obj/structure/table/wood/poker, /obj/item/storage/dice, @@ -84976,6 +84835,17 @@ }, /turf/open/floor/iron/dark, /area/station/medical/chemistry) +"wyz" = ( +/obj/machinery/meter{ + name = "C02 meter" + }, +/obj/machinery/atmospherics/pipe/multiz/yellow/visible{ + name = "CO2 Multideck Adapter" + }, +/obj/effect/turf_decal/tile/dark/fourcorners, +/obj/effect/turf_decal/box/white, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "wyA" = ( /obj/structure/table, /obj/item/flashlight/lamp{ @@ -85135,13 +85005,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/department/medical) -"wAU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/turf_decal/siding/red/corner, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "wAV" = ( /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/plating, @@ -86458,17 +86321,6 @@ /obj/structure/closet/secure_closet/medical3, /turf/open/floor/iron/dark/textured_large, /area/station/medical/storage) -"wTR" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/obj/structure/table, -/obj/item/storage/fancy/donut_box{ - pixel_x = 0; - pixel_y = 6 - }, -/turf/open/floor/iron/dark, -/area/station/security/office) "wTU" = ( /obj/structure/chair/comfy/brown, /obj/effect/turf_decal/siding/wood, @@ -87074,19 +86926,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured_large, /area/station/medical/virology) -"xbx" = ( -/obj/effect/turf_decal/weather/dirt, -/obj/structure/flora/bush/large/style_2{ - pixel_x = -29; - pixel_y = -12 - }, -/obj/structure/flora/bush/flowers_pp/style_random, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/grass, -/area/station/science/genetics) "xbF" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment{ @@ -87291,9 +87130,6 @@ /obj/structure/cable, /turf/open/openspace, /area/station/maintenance/starboard/aft/upper) -"xez" = ( -/turf/open/floor/iron/dark/smooth_large, -/area/station/tcommsat/server) "xeD" = ( /obj/machinery/airalarm/directional/west, /obj/structure/bed/dogbed/runtime, @@ -87331,10 +87167,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/port) -"xeW" = ( -/obj/structure/chair/office, -/turf/open/floor/iron/dark/smooth_large, -/area/station/tcommsat/server) "xeY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -87619,6 +87451,13 @@ "xjz" = ( /turf/open/floor/plating/elevatorshaft, /area/station/science/robotics) +"xjD" = ( +/obj/machinery/computer/telecomms/monitor{ + network = "tcommsat" + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_edge, +/area/station/tcommsat/computer) "xjQ" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/science/genetics, @@ -88319,17 +88158,6 @@ }, /turf/open/floor/iron, /area/station/science/explab) -"xsK" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 2; - name = "N2O to Mix" - }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/upper) "xsS" = ( /turf/closed/wall/r_wall, /area/station/engineering/transit_tube) @@ -88483,21 +88311,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"xvh" = ( -/obj/structure/table, -/obj/item/pen/blue{ - pixel_x = -1 - }, -/obj/item/folder/blue{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 10 - }, -/turf/open/floor/iron/dark, -/area/station/tcommsat/server) "xvl" = ( /obj/structure/railing{ dir = 4 @@ -88936,9 +88749,6 @@ /obj/item/storage/fancy/pickles_jar, /turf/open/floor/plating, /area/station/maintenance/starboard) -"xBE" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "xBP" = ( /obj/item/trash/can{ pixel_x = -8 @@ -90036,15 +89846,6 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"xOO" = ( -/obj/machinery/camera/autoname/directional/west, -/obj/structure/ladder, -/obj/machinery/door/window/brigdoor/right/directional/east{ - name = "Telecomms Access"; - req_access = list("tcomms") - }, -/turf/open/floor/iron/dark, -/area/station/tcommsat/server) "xOU" = ( /obj/structure/table/wood, /obj/effect/spawner/random/bureaucracy/briefcase, @@ -90123,12 +89924,11 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/station/engineering/atmos/office) -"xQM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, +"xQP" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible/layer2, /turf/open/floor/iron/dark, -/area/station/tcommsat/server) +/area/station/engineering/atmos/upper) "xQR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -90288,14 +90088,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/engine/hull/air, /area/station/hallway/primary/starboard) -"xSA" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/machinery/atmospherics/pipe/multiz/purple/visible{ - dir = 2; - name = "mix to recycle multi-deck adapter" - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "xSB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/vending/cigarette, @@ -90775,6 +90567,13 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/security/detectives_office) +"xYa" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Air to Mix" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/upper) "xYc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, @@ -91763,6 +91562,9 @@ /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/textured_large, /area/station/security/prison) +"ylD" = ( +/turf/open/floor/circuit/telecomms, +/area/station/tcommsat/server) "ylN" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/conveyor{ @@ -120450,7 +120252,7 @@ xdV mSd xdV mSd -iMH +cZO eha dBm vBM @@ -125844,7 +125646,7 @@ uHy qtW jFV tgT -sGj +cZA nRN goK pZX @@ -126101,7 +125903,7 @@ fjt qtW mmS svp -hEE +bcN qKB hJm pZX @@ -126358,7 +126160,7 @@ fjt ewt drX psk -sGj +cZA qKB cbC pZX @@ -126615,7 +126417,7 @@ fjt xQW drX jtU -fry +vNX cuL ckd pZX @@ -127967,7 +127769,7 @@ qYi dSs vBY czt -tzU +nen eIx cFF nIY @@ -128447,7 +128249,7 @@ dLY rXY fzT rOA -qle +qRz dbb fwn jRX @@ -129203,7 +129005,7 @@ qOw osS pUE npb -cqk +vBB shs pkz sLr @@ -132510,7 +132312,7 @@ dqJ cME gpb wkf -eZU +eNv gmd guh dyt @@ -135592,9 +135394,9 @@ umy wGP rKj ptS -tND -cZr -tmZ +eyl +heY +rGs qrY bqd wGP @@ -135836,7 +135638,7 @@ ybM tSB lEl dkb -xSA +huT mPG pZJ pZJ @@ -135848,11 +135650,11 @@ fnY hXi bfY vsD -xBE -xBE -oUa -xBE -xBE +iFj +iFj +aPi +iFj +iFj mOO bfY rxH @@ -136105,11 +135907,11 @@ rxH fmw rKj tQk -xBE -rwn -pEG -hhJ -xBE +iFj +tsw +qFU +eca +iFj uiU bqd rxH @@ -136361,13 +136163,13 @@ bly kwb igb oCp -xBE -xBE -hDq -oWZ -hDq -xBE -xBE +iFj +iFj +lga +nlu +lga +iFj +iFj pjn rxH swa @@ -136618,13 +136420,13 @@ szL rxH okh oCp -iND -oKr -wAU -kDN -aZY -iyh -bdM +lJO +qrI +eOP +gSI +eUg +iZY +ajK fFF rxH uAB @@ -136875,13 +136677,13 @@ hch kwb igb uip -qie -tAX -eLK -dNX -noU -ofQ -nYD +rqy +vOh +diZ +glB +cfE +cTI +ppt cKc rxH rxH @@ -137132,13 +136934,13 @@ cAG rxH lxE nwJ -uRD -iDo -aVG -shb -mwY -jqy -tbd +pXw +fKj +aFd +hnh +ieI +dtB +aWK kDq rvT mmZ @@ -137389,13 +137191,13 @@ fno cZg igb uip -xBE -xBE -aAt -aAt -aAt -xBE -xBE +iFj +iFj +tmQ +tmQ +tmQ +iFj +iFj cKc rxH fYq @@ -139948,7 +139750,7 @@ nTf dkb pDQ dkb -qkn +vwR kct pZJ heR @@ -146395,8 +146197,8 @@ ydY gOE lYC mRQ -qXr -lwi +rkh +vuX nNM veg guD @@ -146653,7 +146455,7 @@ aqG lYC lYC lYC -jKx +qmt lYC lYC lYC @@ -146908,10 +146710,10 @@ lYC wmK vDd lYC -uQy -grb -sql -jGt +fmJ +sMW +tha +cpt mtB lYC jEm @@ -147166,10 +146968,10 @@ uky lnV lYC boj -lts -byX -qYk -uxR +jGt +qCy +kxq +jGt lYC rJH mxG @@ -147423,7 +147225,7 @@ hTN lYC wzj wzj -jJA +wzj wzj wzj wzj @@ -147679,11 +147481,11 @@ tHn pEB ldv wzj -anx -kUV -iiS -gHQ -eeN +fEZ +vzu +qbG +oWf +cOh wzj bOR pVo @@ -147937,9 +147739,9 @@ pEB rAK wzj dle -vta -bZW -ouY +jXd +jXv +nAi oUQ wzj txe @@ -148194,9 +147996,9 @@ hEW wjH wzj mhQ -oQq +tgS knZ -fbD +feh mLO wzj olm @@ -148451,9 +148253,9 @@ pEB wjH wzj ksu -oQq +tgS tsL -fbD +feh uIi wzj jbn @@ -148708,9 +148510,9 @@ gkv jrT wzj qeK -gtj +tgS bvt -lVa +feh ceX wzj rHG @@ -148965,7 +148767,7 @@ yib ehg wzj wEb -feh +tgS jLu feh eDO @@ -149222,7 +149024,7 @@ dQQ aET wzj jiD -feh +tgS xFl feh akL @@ -173662,7 +173464,7 @@ xLE vtQ hOq uiO -hIw +oMe jOY apR vgd @@ -173920,7 +173722,7 @@ nYs tqi tqi nFs -wfH +qlp gRG apR rlY @@ -175207,10 +175009,10 @@ lCA lCA gRG gRG -dOb +uZa rTo wcn -pEI +moo bwH wAs tov @@ -175972,7 +175774,7 @@ rOi eBw eNW lHj -oMc +iGW mkj gYp pes @@ -175981,7 +175783,7 @@ apR xlI rTo rKY -tpO +fxC pWq bdT xpj @@ -176231,7 +176033,7 @@ toa lHj lDM xnl -ecK +cyA pes tHi apR @@ -176495,7 +176297,7 @@ ljy iZr mdx bKK -vpS +dNe oaj hqU jiG @@ -176749,7 +176551,7 @@ mLs mLs fYZ ljy -wTR +lHR rTo ubP jDl @@ -177013,7 +176815,7 @@ vhx jhO wBJ rYT -beX +qSC kUq uJi dwB @@ -177515,7 +177317,7 @@ jSY bmx aGW can -mXE +fAY bnn bnn pZo @@ -177527,7 +177329,7 @@ cbo rwh lHa uNU -lOz +eNy kUq uJi kUq @@ -177777,8 +177579,8 @@ bnn bnn pZo uVY -pQt -nlO +kEG +dAt sNE ohb rwh @@ -193992,18 +193794,18 @@ yhx qSk tuY pKA -kny +gxx qSk amt pON soU -bbC +lbM pOR ezP gfz kci gAd -bPN +ecQ oKD hMs nTe @@ -195041,7 +194843,7 @@ uKt ubs gsm bQe -rzm +mpa iCB tpe kwe @@ -196027,7 +195829,7 @@ hpk shs gad bYm -xbx +wuX sUu oUd pMK @@ -199569,7 +199371,7 @@ wvR xWN wkF qmT -izV +hYQ ufI veh veh @@ -200085,7 +199887,7 @@ kEf qlu cgI kZw -tWe +xQP jQH tiN nWX @@ -200854,11 +200656,11 @@ mDG mDG kbu qWr -jYR -gPS +rPR +lnX hrN tpI -lWD +jkM nWX dPj emd @@ -201642,9 +201444,9 @@ mCa vxS vxS rFg -tPe -tPe -tPe +lzs +lzs +lzs rFg vxS vxS @@ -201882,8 +201684,8 @@ mDG mDG kbu qWr -gBC -jcw +iOi +jfl jkM gfi gfi @@ -201899,9 +201701,9 @@ mCa vxS rFg rul -tPe -tPe -tPe +lzs +lzs +lzs rul rFg vxS @@ -202155,11 +201957,11 @@ ciT mCa vxS rFg -tPe -tPe -tPe -tPe -tPe +lzs +lzs +lzs +lzs +lzs rFg vxS eKA @@ -202412,11 +202214,11 @@ ciT mCa vxS rFg -tPe -tPe -tPe -tPe -tPe +lzs +lzs +lzs +lzs +lzs rFg vxS eKA @@ -202669,11 +202471,11 @@ ciT mCa vxS rFg -tPe -tPe -tPe -tPe -tPe +lzs +lzs +lzs +lzs +lzs rFg vxS nev @@ -202715,11 +202517,11 @@ cjh utG kPd uKP -tIm +oyg hRj wUk hRj -tIm +oyg hRj hRj mJP @@ -202910,8 +202712,8 @@ nYA eOY wVP hPR -sUY -peL +jdu +xYa jkM kHF aJs @@ -203167,8 +202969,8 @@ bxd eTi unl fGn -suV -vEp +wyz +akz jkM kRv bFW @@ -203220,7 +203022,7 @@ shK ksJ dyE hRj -tIm +oyg hRj hRj hRj @@ -203427,7 +203229,7 @@ gfi gfi gfi klh -vcp +fTv awR cQi iuQ @@ -204195,8 +203997,8 @@ mDG mDG unl lyO -jrY -jFr +azV +asE jkM dsZ wXQ @@ -204505,7 +204307,7 @@ hRj hRj hRj hRj -tIm +oyg hRj hRj hRj @@ -204711,7 +204513,7 @@ mnf fHb wIi wkX -lWD +jkM ucy gji unl @@ -205026,14 +204828,14 @@ oCT sON sON sON -tzv +jLq sON sON sON oCT sON sON -tzv +jLq gSK wrT wrT @@ -205221,11 +205023,11 @@ tBB kCh mDG kbu -mht +gMn gfi -llG -xsK -lWD +eDZ +ouD +jkM gfi kHD kbu @@ -205738,7 +205540,7 @@ mnf mnf tbE wIi -rcA +kbA xGS gfi gfi @@ -213215,11 +213017,11 @@ iCi umv laB wzj -cHH -uAT -xOO -oKF -xvh +pzI +lQI +nkG +lTW +seg wzj qXo eBc @@ -213472,11 +213274,11 @@ ugE hDG mWH wzj -mYX -uLc -xQM -sFE -eUq +sCv +ylD +oLI +ylD +hDc wzj fBR aRy @@ -213729,11 +213531,11 @@ mPQ lUk daC rFE -fLv -cxE -xQM -cxE -jPC +spp +dSi +spp +dSi +spp rFE daC xNV @@ -213985,13 +213787,13 @@ tUu fSF lUk daC -rFE -bhi -cxE -sGc -cxE -rmX -rFE +wzj +wzj +hqC +qdN +hqC +wzj +wzj daC xNV odW @@ -214242,13 +214044,13 @@ tUu sQg nxZ gqT -rFE -jur -vxe -flA -cxE -iCN -rFE +jnw +ukG +aGg +aGg +aGg +uNj +jnw gqT hhz qqC @@ -214499,13 +214301,13 @@ tUu oLt umv umv -rFE -ozJ -eJz -cpY -eJz -mZm -rFE +bhH +xjD +cvc +aXX +adc +ijX +bhH nEQ gnk phT @@ -214756,13 +214558,13 @@ tUu tUu nfe aKH -wzj -mdj -oTz -nKd -xeW -xez -wzj +jnw +tnW +nmL +vDh +cBy +bHG +jnw nEQ uqb tUu @@ -215013,13 +214815,13 @@ nlm tUu tUu bOp -wzj -wzj -wzj -slu -wzj -wzj -wzj +jnw +jnw +jnw +bIN +jnw +jnw +jnw pVC tUu tUu @@ -215274,8 +215076,8 @@ dKN uEk dic hif -nkn -nJN +mLb +lTr wau nEQ tUu diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 3407a4c6a567..d45b96d82e92 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -397,6 +397,14 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron, /area/station/security/brig) +"afd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/spawner/random/gizmo, +/turf/open/floor/engine, +/area/station/science/explab) "aff" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, @@ -1191,6 +1199,9 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"aoe" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "aoB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall/r_wall, @@ -1721,13 +1732,6 @@ }, /turf/open/floor/iron, /area/station/cargo/office) -"atG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron, -/area/station/tcommsat/server) "atR" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -3582,18 +3586,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"aSD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/sign/nanotrasen/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) "aSJ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -3686,6 +3678,12 @@ /obj/machinery/atmospherics/components/tank/air/layer4, /turf/open/floor/iron, /area/station/security/processing) +"aTP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer4, +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "aTQ" = ( /obj/structure/frame/computer{ anchored = 1; @@ -5310,6 +5308,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/bridge) +"bol" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "bom" = ( /obj/structure/chair, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -7609,10 +7618,6 @@ /obj/structure/sign/plaques/kiddie, /turf/closed/wall/r_wall, /area/station/ai/satellite/interior) -"bPI" = ( -/obj/machinery/light/small/directional/south, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "bPY" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 1 @@ -8076,6 +8081,9 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/port/aft) +"bVD" = ( +/turf/closed/wall/r_wall, +/area/station/tcommsat/maints) "bVJ" = ( /obj/machinery/camera/directional/north{ c_tag = "Central Hallway - Center"; @@ -9042,18 +9050,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai/satellite/exterior) -"chY" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/item/crowbar, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "cij" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -9616,18 +9612,6 @@ /obj/structure/rack, /turf/open/floor/plating, /area/station/maintenance/fore) -"cnu" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Telecomms - Cooling Room"; - name = "telecomms camera"; - network = list("ss13","tcomms") - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/tcommsat/server) "cnE" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -12170,12 +12154,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) -"cUW" = ( -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/structure/window/reinforced/plasma/spawner/directional/east, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "cUY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -12997,6 +12975,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/command/heads_quarters/qm) +"dgw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/tank_holder/oxygen/red, +/turf/open/floor/iron, +/area/station/tcommsat/maints) "dgH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -13732,17 +13717,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/space/basic, /area/space/nearstation) -"drG" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp{ - pixel_x = 0; - pixel_y = 9 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood/large, -/area/station/service/library/lounge) "drH" = ( /obj/machinery/light/small/dim/directional/west, /obj/item/clothing/suit/caution, @@ -14183,15 +14157,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"dvI" = ( -/obj/effect/landmark/start/hangover, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/green/corner{ - dir = 2 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "dvL" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -14992,10 +14957,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/chapel) -"dHx" = ( -/obj/structure/sign/warning/radiation/directional/north, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "dHy" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4, @@ -15133,6 +15094,17 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/science/lobby) +"dJm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/tcommsat/maints) "dJq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17424,15 +17396,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/station/security/execution/transfer) -"eoC" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron, -/area/station/tcommsat/server) "eoE" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -18049,17 +18012,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) -"ewa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/bouldertech/refinery{ - dir = 4 - }, -/obj/machinery/conveyor{ - dir = 8; - id = "mining" - }, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "ewb" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -18244,6 +18196,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) +"ezf" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "ezl" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/north, @@ -19231,6 +19187,11 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) +"eKP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer4, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "eKQ" = ( /obj/structure/table/reinforced, /obj/item/weldingtool, @@ -19349,6 +19310,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +"eMO" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "eMU" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -19621,25 +19594,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"ePU" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer4, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "ePZ" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/north, @@ -23483,10 +23437,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"fNc" = ( -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "fNm" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -24147,12 +24097,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"fUY" = ( -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/structure/window/reinforced/plasma/spawner/directional/north, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "fVa" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 9 @@ -24239,6 +24183,21 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"fVY" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/item/wrench, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "fWc" = ( /obj/structure/chair/pew/left, /turf/open/floor/iron/chapel{ @@ -24447,17 +24406,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/fore) -"fYp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/light/dim/directional/south, -/turf/open/floor/iron, -/area/station/tcommsat/server) "fYw" = ( /obj/machinery/telecomms/bus/preset_three, /obj/effect/turf_decal/tile/red/anticorner/contrasted, @@ -25921,6 +25869,11 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/station/maintenance/port) +"goH" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/sign/warning/radiation/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "goV" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -28645,13 +28598,6 @@ /obj/item/food/grown/poppy/geranium, /turf/open/floor/wood, /area/station/commons/dorms) -"gUN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/structure/tank_holder/oxygen/red, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron, -/area/station/tcommsat/server) "gUU" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -28904,6 +28850,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/tcommsat/server) +"gYs" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/station/tcommsat/maints) "gYv" = ( /obj/vehicle/ridden/secway, /obj/structure/reagent_dispensers/wall/peppertank/directional/east, @@ -29322,6 +29277,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/cargo/storage) +"hez" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/light/dim/directional/south, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/tcommsat/maints) "heO" = ( /obj/structure/chair{ dir = 8 @@ -30592,6 +30559,18 @@ }, /turf/open/floor/iron, /area/station/engineering/storage_shared) +"hwj" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/item/crowbar, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "hwo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -33416,6 +33395,25 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/station/science/genetics) +"ijb" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "iju" = ( /obj/structure/closet{ name = "evidence closet" @@ -34452,18 +34450,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/wood, /area/station/hallway/secondary/service) -"ivq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/sign/departments/telecomms/directional/north, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) "ivt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -34501,11 +34487,6 @@ "ivA" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/captain/private) -"ivH" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/sign/warning/radiation/directional/south, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "ivK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34724,6 +34705,12 @@ /obj/effect/mapping_helpers/mail_sorting/science/research, /turf/open/floor/iron/white, /area/station/science/research) +"izt" = ( +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "izx" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -35331,12 +35318,6 @@ /obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/station/command/bridge) -"iGF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer4, -/obj/machinery/air_sensor/engine_chamber, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "iGI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance_hatch{ @@ -36150,21 +36131,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"iRx" = ( -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/item/wrench, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "iRy" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -37086,18 +37052,6 @@ /obj/item/toy/figure/assistant, /turf/open/floor/iron/grimy, /area/station/commons/vacant_room/office) -"jcL" = ( -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "jcO" = ( /obj/machinery/smartfridge, /obj/machinery/door/firedoor, @@ -37629,15 +37583,6 @@ /obj/machinery/light/floor, /turf/open/floor/iron, /area/station/science/xenobiology) -"jjw" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Engineering - Supermatter"; - name = "engineering camera"; - network = list("ss13","engine") - }, -/obj/structure/sign/warning/radiation/directional/east, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "jjC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40275,26 +40220,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"jPY" = ( -/obj/structure/table/reinforced, -/obj/item/toy/figure/geneticist, -/obj/machinery/computer/records/medical/laptop{ - dir = 8; - pixel_y = 1 - }, -/obj/item/radio/headset/headset_medsci{ - pixel_x = -7; - pixel_y = 0 - }, -/obj/item/radio/headset/headset_medsci{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "jPZ" = ( /obj/effect/turf_decal/siding/dark_blue{ dir = 4 @@ -42462,17 +42387,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/chapel) -"krF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/generic_maintenance_landmark, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/tcommsat/server) "krL" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/decal/cleanable/cobweb, @@ -43097,6 +43011,12 @@ }, /turf/open/floor/iron/dark, /area/station/science/research) +"kzV" = ( +/obj/machinery/power/supermatter_crystal/engine, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer4, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "kzX" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron/white, @@ -43948,11 +43868,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"kMt" = ( -/obj/machinery/light/small/directional/west, -/obj/structure/sign/warning/radiation/directional/west, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "kMu" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -44459,6 +44374,18 @@ }, /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/hos) +"kTS" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Telecomms - Cooling Room"; + name = "telecomms camera"; + network = list("ss13","tcomms") + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/tcommsat/maints) "kUn" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/brown{ @@ -44733,11 +44660,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"kXR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer4, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "kXV" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/components/unary/passive_vent{ @@ -46388,6 +46310,13 @@ /obj/structure/tank_holder/extinguisher, /turf/open/floor/iron, /area/station/cargo/storage) +"ltm" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/tcommsat/maints) "ltr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48016,14 +47945,6 @@ }, /turf/open/floor/engine/plasma, /area/station/engineering/atmos) -"lLa" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/status_display/ai/directional/north, -/obj/effect/spawner/random/gizmo, -/turf/open/floor/engine, -/area/station/science/explab) "lLy" = ( /obj/effect/turf_decal/siding/white{ dir = 8 @@ -48813,17 +48734,6 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -"lWX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/bouldertech/refinery/smelter{ - dir = 4 - }, -/obj/machinery/conveyor{ - dir = 8; - id = "mining" - }, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "lXm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -49823,18 +49733,6 @@ }, /turf/open/floor/iron, /area/station/command/eva) -"mly" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/item/book/manual/wiki/tcomms, -/obj/item/wrench, -/obj/item/screwdriver{ - pixel_y = 5 - }, -/obj/effect/turf_decal/delivery, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron, -/area/station/tcommsat/server) "mlB" = ( /obj/machinery/atmospherics/components/trinary/filter{ dir = 1 @@ -50280,10 +50178,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/service/electronic_marketing_den) -"msB" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "msF" = ( /obj/effect/landmark/start/hangover, /obj/structure/railing{ @@ -52753,10 +52647,6 @@ /obj/effect/turf_decal/tile/neutral/full, /turf/open/floor/iron/large, /area/station/medical/paramedic) -"mWq" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "mWs" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -52866,6 +52756,10 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) +"mYm" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "mYo" = ( /obj/effect/turf_decal/trimline/yellow/line, /turf/open/floor/iron, @@ -52949,6 +52843,25 @@ /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/iron, /area/station/service/abandoned_gambling_den/gaming) +"mZn" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "mZr" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; @@ -53010,12 +52923,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/service/hydroponics) -"nav" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/tcommsat/server) "naB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/purple{ @@ -54109,6 +54016,19 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"nqc" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/poddoor/preopen{ + id = "sci_experimentor"; + name = "Experimentor Blast Door" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/gizmo/toggle/tucker_tubes, +/turf/open/floor/iron/dark, +/area/station/science/explab) "nqf" = ( /obj/structure/chair/comfy/brown, /obj/structure/cable, @@ -54139,19 +54059,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, /turf/open/floor/iron, /area/station/maintenance/department/medical/morgue) -"nqw" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/poddoor/preopen{ - id = "sci_experimentor"; - name = "Experimentor Blast Door" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/gizmo/toggle/tucker_tubes, -/turf/open/floor/iron/dark, -/area/station/science/explab) "nqD" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -54403,21 +54310,6 @@ "nuG" = ( /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"nuH" = ( -/obj/structure/table/wood, -/obj/item/storage/box/actionfigure{ - pixel_y = 20; - pixel_x = 0 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/spawner/random/bureaucracy/folder{ - pixel_x = 3; - pixel_y = 0 - }, -/turf/open/floor/wood/large, -/area/station/service/library/lounge) "nuI" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -57095,6 +56987,13 @@ }, /turf/open/space/basic, /area/space) +"odf" = ( +/obj/effect/landmark/start/hangover, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/green/corner, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "odk" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/west, @@ -57956,12 +57855,6 @@ dir = 1 }, /area/station/engineering/gravity_generator) -"ood" = ( -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/obj/structure/window/reinforced/plasma/spawner/directional/north, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "ool" = ( /obj/effect/turf_decal/trimline/neutral/warning{ dir = 5 @@ -58501,12 +58394,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/port/fore) -"owf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "owj" = ( /obj/structure/rack, /obj/item/storage/toolbox/emergency, @@ -59326,6 +59213,12 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/station/cargo/lobby) +"oHu" = ( +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "oHw" = ( /obj/effect/decal/cleanable/ash{ pixel_x = 2; @@ -60596,6 +60489,18 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/iron, /area/station/cargo/warehouse) +"oXn" = ( +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 8; + name = "Gas to Chamber" + }, +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 4; + name = "Chamber to Cooling" + }, +/obj/effect/turf_decal/box, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "oXK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61791,6 +61696,12 @@ dir = 1 }, /area/station/hallway/secondary/exit/departure_lounge) +"pmA" = ( +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "pmE" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, @@ -62043,6 +61954,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/department/science) +"prc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "pri" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool/bar/directional/east, @@ -62344,6 +62261,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/maintenance/department/chapel) +"pvk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/bouldertech/refinery{ + dir = 4 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "mining" + }, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "pvu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64363,6 +64291,10 @@ "pRS" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/hop) +"pRY" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "pSa" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/west, @@ -64947,12 +64879,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"pXj" = ( -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/obj/structure/window/reinforced/plasma/spawner/directional/east, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "pXk" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/flora/bush/sparsegrass, @@ -66623,6 +66549,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/service/barber) +"qsd" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp{ + pixel_y = 9 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/large, +/area/station/service/library/lounge) "qsn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -68378,6 +68314,17 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/dark, /area/station/service/bar) +"qOZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) "qPg" = ( /obj/effect/turf_decal/siding/yellow, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -72895,9 +72842,10 @@ /turf/open/floor/iron/white, /area/station/science/research) "rVM" = ( -/obj/effect/spawner/random/structure/massmeta_flags/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/spawner/random/structure/massmeta_flags/directional/east, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "rVX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73176,6 +73124,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai/satellite/exterior) +"rZB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/sign/departments/telecomms/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) "rZF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -74392,6 +74352,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"spv" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/sign/warning/radiation/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "spB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -74649,6 +74614,18 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/virology) +"ssS" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/item/book/manual/wiki/tcomms, +/obj/item/wrench, +/obj/item/screwdriver{ + pixel_y = 5 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron, +/area/station/tcommsat/maints) "ssY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/plumbed{ @@ -75897,9 +75874,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"sHT" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "sIb" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -76993,6 +76967,13 @@ /obj/structure/sign/warning/electric_shock/directional/east, /turf/open/space/basic, /area/space/nearstation) +"sVn" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/tcommsat/maints) "sVC" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 4 @@ -78578,18 +78559,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/circuits) -"tsa" = ( -/obj/machinery/atmospherics/components/binary/pump/layer2{ - dir = 8; - name = "Gas to Chamber" - }, -/obj/machinery/atmospherics/components/binary/pump/layer4{ - dir = 4; - name = "Chamber to Cooling" - }, -/obj/effect/turf_decal/box, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "tsc" = ( /obj/structure/sign/painting/library{ pixel_y = -32 @@ -79810,17 +79779,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/station/science/robotics/mechbay) -"tGr" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "tGt" = ( /turf/closed/wall, /area/station/service/lawoffice) @@ -81353,6 +81311,19 @@ }, /turf/open/floor/iron/large, /area/station/service/hydroponics) +"tZU" = ( +/obj/structure/table/wood, +/obj/item/storage/box/actionfigure{ + pixel_y = 20 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/spawner/random/bureaucracy/folder{ + pixel_x = 3 + }, +/turf/open/floor/wood/large, +/area/station/service/library/lounge) "uai" = ( /obj/machinery/photocopier/prebuilt, /obj/effect/turf_decal/bot_white, @@ -81509,6 +81480,15 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"ubS" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron, +/area/station/tcommsat/maints) "ubV" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -81682,6 +81662,12 @@ /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/iron, /area/station/medical/abandoned) +"udC" = ( +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "udG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, @@ -82110,6 +82096,19 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/station/cargo/office) +"ujE" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "ujK" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -82147,6 +82146,25 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/medical/abandoned) +"ujV" = ( +/obj/structure/table/reinforced, +/obj/item/toy/figure/geneticist, +/obj/machinery/computer/records/medical/laptop{ + dir = 8; + pixel_y = 1 + }, +/obj/item/radio/headset/headset_medsci{ + pixel_x = -7 + }, +/obj/item/radio/headset/headset_medsci{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "ukj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -84917,6 +84935,10 @@ }, /turf/open/floor/iron, /area/station/commons/storage/primary) +"uQB" = ( +/obj/structure/sign/warning/radiation/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "uQF" = ( /obj/machinery/computer/security/telescreen/entertainment/directional/west, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -85336,6 +85358,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/department/science) +"uXi" = ( +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "uXC" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, @@ -85522,6 +85548,17 @@ }, /turf/open/floor/iron, /area/station/science/research) +"uZv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/bouldertech/refinery/smelter{ + dir = 4 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "mining" + }, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "uZy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -85568,13 +85605,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/theater/abandoned) -"vap" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/tcommsat/server) "vat" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -85746,12 +85776,6 @@ /obj/effect/turf_decal/tile/purple/full, /turf/open/floor/iron/large, /area/station/science/research) -"vcO" = ( -/obj/machinery/power/supermatter_crystal/engine, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer4, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "vcU" = ( /obj/machinery/computer/security/mining{ dir = 4 @@ -85984,15 +86008,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"vgg" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/holopad, -/turf/open/floor/iron, -/area/station/tcommsat/server) "vgi" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -87221,6 +87236,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/courtroom) +"vxh" = ( +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "vxi" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ @@ -89847,19 +89865,6 @@ /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/station/hallway/secondary/service) -"wgC" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "wgE" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -92306,25 +92311,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/commons/locker) -"wKu" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer4, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "wKv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -95620,6 +95606,14 @@ /obj/structure/sign/nanotrasen/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"xCA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/airalarm/directional/west, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/tcommsat/maints) "xCC" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -97223,6 +97217,15 @@ /obj/item/folder/red, /turf/open/floor/carpet, /area/station/service/library/abandoned) +"xXk" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Engineering - Supermatter"; + name = "engineering camera"; + network = list("ss13","engine") + }, +/obj/structure/sign/warning/radiation/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "xXn" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -118563,11 +118566,11 @@ wvl gmx xGh cxp -sHT -wgC -iRx -wgC -sHT +aoe +ujE +fVY +ujE +aoe glb dRK wcP @@ -118820,11 +118823,11 @@ oAx gAw jPd ehD -sHT -dHx -fNc -ivH -sHT +aoe +uQB +uXi +spv +aoe vrs vrs qJI @@ -119077,13 +119080,13 @@ rLN pqr cZv tcy -sHT -cUW -pXj -cUW -sHT -sHT -sHT +aoe +udC +izt +udC +aoe +aoe +aoe wuA yeO iKl @@ -119334,13 +119337,13 @@ qvn gAw ilG cwI -sHT -msB -kXR -owf -fUY -kMt -chY +aoe +pRY +eKP +prc +pmA +goH +hwj vUV sst rgw @@ -119591,13 +119594,13 @@ rVD cCY oUZ vqu -mWq -msB -vcO -owf -ood -fNc -jcL +ezf +pRY +kzV +prc +oHu +uXi +eMO vUV ugr xil @@ -119848,13 +119851,13 @@ vog gAw aVW lbl -sHT -msB -iGF -owf -fUY -jjw -tGr +aoe +rVM +aTP +prc +pmA +xXk +bol hCE sst nbZ @@ -120105,13 +120108,13 @@ hQK pqr qJs ehD -sHT -sHT -ePU -sHT -sHT -sHT -sHT +aoe +aoe +mZn +aoe +aoe +aoe +aoe qqQ sLe nzs @@ -120362,11 +120365,11 @@ sTn eHy qJs cxp -sHT -rVM -tsa -bPI -sHT +aoe +vxh +oXn +mYm +aoe agQ enR uxl @@ -120619,11 +120622,11 @@ ubM gAw lJW ehD -sHT -sHT -wKu -sHT -sHT +aoe +aoe +ijb +aoe +aoe pOf pOf sfI @@ -128604,7 +128607,7 @@ pTC kRk uMs aNE -nqw +nqc ffb dBJ sLY @@ -129629,7 +129632,7 @@ pTC qWO duV pTC -lLa +afd fRK txc pZM @@ -135542,7 +135545,7 @@ whK rcW wTT wYH -jPY +ujV jKb vdA bYk @@ -136551,8 +136554,8 @@ wRS lPm hup xkw -xkw -xkw +bVD +bVD vpK mVu nQi @@ -136808,10 +136811,10 @@ oMp oMp oMp atv -eoC -gUN +ubS +xCA vpK -ivq +qOZ xaP duA nuC @@ -137065,8 +137068,8 @@ hup lkL lkL lkL -nav -fYp +dgw +hez vpK jkk xaP @@ -137266,7 +137269,7 @@ mEs eNB eCs tqn -dvI +odf wbe qAV nIg @@ -137322,8 +137325,8 @@ hup ktv rMt eBO -vgg -vap +gYs +sVn wgb mOB pRI @@ -137579,8 +137582,8 @@ hup lkL lkL lkL -krF -atG +dJm +ltm vpK bVJ uJm @@ -137836,10 +137839,10 @@ oMp oMp oMp atv -cnu -mly +kTS +ssS vpK -aSD +rZB uJm duA jVI @@ -138093,8 +138096,8 @@ kfC rSJ hup xkw -xkw -xkw +bVD +bVD vpK dNm xAL @@ -140095,7 +140098,7 @@ ekY azm prl aUS -lWX +uZv vnI lDi hDP @@ -140609,7 +140612,7 @@ pbh iXj oXl fdn -ewa +pvk hGP lDi oKr @@ -147631,8 +147634,8 @@ aaV gDV jMB ogO -drG -nuH +qsd +tZU vtx qMf lrr diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 774138ff3a49..c2482fe215de 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -353,14 +353,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/mine/mechbay) -"agm" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Engineering Supermatter Chamber"; - network = list("engine"); - pixel_x = 23 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "agp" = ( /obj/machinery/requests_console/auto_name/directional/west, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -2260,19 +2252,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/ai/satellite/atmos) -"aFn" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "aFp" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating, @@ -4598,10 +4577,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/carpet, /area/station/commons/dorms) -"bny" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "bnz" = ( /obj/machinery/nuclearbomb/selfdestruct, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -5788,6 +5763,12 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"bCY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch/directional/north, +/obj/machinery/gizmo/toggle/tucker_tubes, +/turf/open/floor/iron, +/area/station/science/explab) "bDi" = ( /obj/machinery/door/window/left/directional/west, /obj/structure/cable, @@ -7252,12 +7233,6 @@ dir = 8 }, /area/station/science/explab) -"bYw" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "bYz" = ( /obj/machinery/conveyor{ dir = 8; @@ -7512,6 +7487,11 @@ "cbk" = ( /turf/open/floor/iron, /area/mine/mechbay) +"cbq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "cbs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -7707,14 +7687,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"cdr" = ( -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/door/airlock/security/glass{ - name = "Security Firing Range"; - security_level = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/range) "cef" = ( /obj/machinery/biogenerator, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -8085,6 +8057,17 @@ /obj/structure/sign/warning/cold_temp/directional/north, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"cjE" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/maintenance{ + name = "Security Maintenance" + }, +/turf/open/floor/plating, +/area/station/security/range) "cjJ" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 8 @@ -8682,16 +8665,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"ctk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "ctl" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -9508,13 +9481,6 @@ /obj/machinery/computer/libraryconsole, /turf/open/floor/wood, /area/station/service/library) -"cDK" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/west, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "cDT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -9650,10 +9616,6 @@ /obj/structure/sign/poster/official/wtf_is_co2/directional/west, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"cGf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "cGl" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10742,10 +10704,6 @@ /obj/machinery/light/floor, /turf/open/floor/wood, /area/station/commons/lounge) -"cXQ" = ( -/obj/effect/spawner/random/gizmo, -/turf/open/floor/engine, -/area/station/science/explab) "cXR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/sign/warning/cold_temp/directional/north, @@ -11397,10 +11355,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/science/xenobiology) -"dfq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "dfw" = ( /obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/machinery/airalarm/directional/north, @@ -12083,6 +12037,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/large, /area/mine/eva/lower) +"doN" = ( +/obj/structure/sign/warning/fire, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "doW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12620,13 +12578,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"dwy" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/east, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "dwE" = ( /obj/structure/railing{ dir = 8 @@ -15040,15 +14991,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/service/hydroponics) -"ein" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Gas to Chamber" - }, -/obj/machinery/light/small/directional/east, -/obj/structure/sign/warning/fire/directional/north, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "eio" = ( /turf/open/floor/iron/smooth, /area/station/security/holding_cell) @@ -15705,9 +15647,6 @@ }, /turf/open/floor/iron/textured, /area/station/medical/chem_storage) -"esE" = ( -/turf/open/floor/engine, -/area/station/engineering/supermatter) "esF" = ( /obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, @@ -16765,6 +16704,11 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) +"eIf" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "eIk" = ( /obj/structure/filingcabinet, /obj/machinery/power/apc/auto_name/directional/north, @@ -17416,6 +17360,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"eTO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "eTP" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18536,6 +18491,19 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) +"fix" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "fiA" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark, @@ -19088,6 +19056,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/lesser) +"frJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "frN" = ( /obj/machinery/power/shieldwallgen, /obj/structure/window/reinforced/spawner/directional/west, @@ -20092,6 +20064,10 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/white, /area/station/maintenance/port/fore) +"fIC" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "fIK" = ( /obj/structure/railing/corner/end/flip{ dir = 4 @@ -20491,10 +20467,6 @@ dir = 1 }, /area/station/hallway/primary/port) -"fNN" = ( -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "fNZ" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -20665,6 +20637,13 @@ dir = 1 }, /area/station/security/prison) +"fQM" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "fRa" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -20693,10 +20672,6 @@ /obj/structure/sign/clock/directional/north, /turf/open/floor/iron, /area/station/commons/fitness) -"fRv" = ( -/obj/machinery/light/small/directional/north, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "fRz" = ( /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 1 @@ -21332,10 +21307,6 @@ }, /turf/open/floor/iron, /area/station/command/gateway) -"gbh" = ( -/obj/machinery/light/small/directional/south, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "gbu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21790,6 +21761,15 @@ /obj/structure/sign/warning/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"gir" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Gas to Filter" + }, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "giv" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -23957,6 +23937,16 @@ /obj/machinery/oven/range, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) +"gNS" = ( +/obj/machinery/bouldertech/refinery{ + dir = 4 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "mining_internal" + }, +/turf/open/floor/iron, +/area/mine/production) "gNT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24247,19 +24237,6 @@ /obj/structure/closet/secure_closet/medical1, /turf/open/floor/iron/white, /area/station/medical/virology) -"gSo" = ( -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance" - }, -/turf/open/floor/plating, -/area/station/security/brig/upper) "gSq" = ( /obj/machinery/rnd/production/circuit_imprinter/department/science, /obj/machinery/button/door/directional/north{ @@ -26206,6 +26183,17 @@ /obj/machinery/vending/autodrobe, /turf/open/floor/iron, /area/station/commons/locker) +"huo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "huB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26285,6 +26273,16 @@ /obj/structure/flora/grass/green/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/less_spawns) +"hvJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "hvQ" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/stone, @@ -26937,6 +26935,13 @@ }, /turf/open/floor/iron/cafeteria, /area/station/security/prison/work) +"hFH" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "hFL" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle{ dir = 4 @@ -27017,17 +27022,6 @@ dir = 1 }, /area/station/hallway/secondary/entry) -"hHp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "hHq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -27251,6 +27245,18 @@ /obj/structure/plasticflaps/opaque, /turf/open/floor/iron/dark, /area/station/maintenance/department/medical/central) +"hLh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "hLw" = ( /obj/structure/flora/grass/both/style_3, /obj/structure/sign/warning/electric_shock/directional/north, @@ -27297,6 +27303,10 @@ /obj/structure/bookcase/random/fiction, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"hMx" = ( +/obj/machinery/power/supermatter_crystal/engine, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "hMz" = ( /obj/structure/marker_beacon/burgundy{ name = "landing marker" @@ -28873,17 +28883,6 @@ dir = 4 }, /area/station/security/brig/entrance) -"iiM" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance" - }, -/turf/open/floor/plating, -/area/station/security/range) "iiR" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -29155,12 +29154,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet/red, /area/station/security/prison/work) -"imd" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "imi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/steam_vent, @@ -30032,6 +30025,14 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/cargo/miningdock) +"iAJ" = ( +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/door/airlock/security/glass{ + name = "Security Firing Range"; + security_level = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/range) "iAK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30792,16 +30793,6 @@ "iMT" = ( /turf/open/floor/iron, /area/station/commons/storage/primary) -"iNa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "iNl" = ( /obj/structure/fence/cut/large{ dir = 1 @@ -31288,19 +31279,6 @@ "iUG" = ( /turf/open/floor/plating, /area/station/maintenance/fore/lesser) -"iUJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "iUM" = ( /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin/tagger, @@ -31797,16 +31775,6 @@ /obj/structure/sign/warning/directional/north, /turf/open/openspace/icemoon/keep_below, /area/icemoon/surface/outdoors/nospawn) -"jbh" = ( -/obj/structure/closet/l3closet/janitor, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/item/restraints/legcuffs/beartrap, -/obj/item/restraints/legcuffs/beartrap, -/turf/open/floor/iron, -/area/station/service/janitor) "jbj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -31821,6 +31789,12 @@ dir = 1 }, /area/station/hallway/primary/central) +"jbp" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "jbq" = ( /obj/structure/flora/bush/flowers_pp/style_random, /obj/structure/flora/bush/flowers_br/style_random, @@ -32823,17 +32797,6 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) -"jsm" = ( -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Mech Bay" - }, -/turf/open/floor/iron/dark, -/area/station/security/mechbay) "jsq" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -33395,6 +33358,18 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) +"jzW" = ( +/obj/machinery/conveyor{ + id = "mining_internal" + }, +/obj/machinery/bouldertech/refinery/smelter{ + dir = 1 + }, +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/turf/open/floor/iron, +/area/mine/production) "jzY" = ( /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/trimline/blue/filled/corner{ @@ -33763,6 +33738,15 @@ /obj/structure/rack, /turf/open/floor/iron, /area/station/command/gateway) +"jFH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Gas to Chamber" + }, +/obj/machinery/light/small/directional/east, +/obj/structure/sign/warning/fire/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "jFJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -34587,15 +34571,6 @@ "jQd" = ( /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) -"jQe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Gas to Filter" - }, -/obj/structure/sign/warning/directional/north, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "jQf" = ( /obj/machinery/computer/crew, /obj/effect/turf_decal/tile/blue/full, @@ -35277,6 +35252,10 @@ }, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +"kbZ" = ( +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "kcc" = ( /obj/machinery/camera/directional/west{ c_tag = "Security - Infirmary" @@ -38277,17 +38256,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"kSM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "kSR" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38753,6 +38721,14 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/tcommsat/computer) +"kYx" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Engineering Supermatter Chamber"; + network = list("engine"); + pixel_x = 23 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "kYF" = ( /mob/living/basic/goose/vomit, /turf/open/floor/wood, @@ -39214,10 +39190,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"lgg" = ( -/obj/machinery/air_sensor/engine_chamber, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "lgj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40914,6 +40886,10 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +"lEy" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "lEz" = ( /obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, @@ -41164,6 +41140,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/textured, /area/station/security/office) +"lIu" = ( +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "lIy" = ( /obj/structure/table, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -42231,6 +42211,13 @@ name = "hyper-reinforced wall" }, /area/station/science/ordnance/bomb/planet) +"lZD" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "lZP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42431,6 +42418,10 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/engineering/storage_shared) +"mce" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "mch" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ @@ -42513,16 +42504,6 @@ /obj/structure/closet/crate/mod, /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"mdx" = ( -/obj/machinery/bouldertech/refinery{ - dir = 4 - }, -/obj/machinery/conveyor{ - dir = 8; - id = "mining_internal" - }, -/turf/open/floor/iron, -/area/mine/production) "mdy" = ( /obj/machinery/camera/directional/south{ c_tag = "Morgue Hallway" @@ -44211,6 +44192,10 @@ dir = 4 }, /area/mine/eva) +"mDv" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "mDw" = ( /obj/structure/table/reinforced, /obj/effect/landmark/event_spawn, @@ -46593,6 +46578,9 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/dark/textured, /area/station/security/prison) +"nmK" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "nmL" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -46636,10 +46624,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"nnw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "nnx" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -52294,6 +52278,12 @@ /obj/item/clothing/head/helmet/skull, /turf/open/floor/plating, /area/station/medical/morgue) +"oJO" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "oJP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/dark_green, @@ -53300,6 +53290,10 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +"oZg" = ( +/obj/structure/sign/warning/electric_shock, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "oZk" = ( /obj/structure/chair{ dir = 1 @@ -54287,12 +54281,6 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/engineering/lobby) -"pnK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light_switch/directional/north, -/obj/machinery/gizmo/toggle/tucker_tubes, -/turf/open/floor/iron, -/area/station/science/explab) "pnR" = ( /turf/closed/wall/r_wall, /area/station/ai/satellite/interior) @@ -56222,6 +56210,17 @@ }, /turf/open/floor/vault, /area/station/security/prison/mess) +"pRh" = ( +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Security Mech Bay" + }, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) "pRj" = ( /turf/closed/wall, /area/station/maintenance/port/aft) @@ -59508,18 +59507,6 @@ /obj/effect/turf_decal/siding/brown, /turf/open/floor/iron/dark, /area/station/commons/storage/mining) -"qMN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "qMT" = ( /turf/closed/wall, /area/station/commons/lounge) @@ -64414,17 +64401,6 @@ /obj/structure/sign/nanotrasen/directional/north, /turf/open/floor/iron/dark/smooth_edge, /area/station/command/eva) -"seR" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "seX" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -65233,13 +65209,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/genetics) -"spv" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/east, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "spy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65310,6 +65279,16 @@ /obj/structure/grille/broken, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"sqV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "sqW" = ( /obj/structure/marker_beacon/burgundy{ name = "landing marker" @@ -67255,6 +67234,10 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/sepia, /area/station/service/library) +"sTG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "sTH" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -67285,6 +67268,10 @@ }, /turf/open/floor/plating, /area/station/commons/storage/mining) +"sUc" = ( +/obj/effect/spawner/random/gizmo, +/turf/open/floor/engine, +/area/station/science/explab) "sUB" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67944,6 +67931,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"teG" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "teH" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/side{ @@ -69897,6 +69891,10 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"tGR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "tHb" = ( /obj/effect/spawner/random/structure/musician/piano/random_piano, /obj/machinery/button/curtain{ @@ -70351,11 +70349,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/ordnance/testlab) -"tLW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "tMa" = ( /obj/structure/sign/directions/engineering{ pixel_y = 10 @@ -70706,6 +70699,9 @@ /obj/structure/sign/flag/mothic/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"tRD" = ( +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "tRP" = ( /obj/machinery/door/airlock/maintenance{ name = "Hydroponics Maintenance" @@ -71454,10 +71450,6 @@ "ucN" = ( /turf/closed/wall/r_wall, /area/station/security/detectives_office) -"ucO" = ( -/obj/structure/sign/warning/electric_shock, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "udo" = ( /obj/structure/closet{ name = "evidence closet 4" @@ -71540,10 +71532,6 @@ /obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) -"uey" = ( -/obj/machinery/power/supermatter_crystal/engine, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "ueD" = ( /obj/machinery/door/airlock/external{ glass = 1; @@ -72595,6 +72583,19 @@ /obj/structure/railing/corner, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"uuG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "uuI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -72613,13 +72614,6 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/service/kitchen) -"uvk" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/west, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "uvt" = ( /turf/closed/wall, /area/station/science/robotics/mechbay) @@ -72790,6 +72784,16 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/engine/vacuum, /area/station/engineering/atmos) +"uxY" = ( +/obj/structure/closet/l3closet/janitor, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/item/restraints/legcuffs/beartrap, +/obj/item/restraints/legcuffs/beartrap, +/turf/open/floor/iron, +/area/station/service/janitor) "uyi" = ( /obj/item/chair/stool{ pixel_y = 0; @@ -73690,10 +73694,6 @@ /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"uLe" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "uLC" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -74340,6 +74340,17 @@ }, /turf/open/floor/iron/textured, /area/mine/laborcamp/security) +"uWi" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "uWo" = ( /obj/structure/cable, /obj/machinery/duct, @@ -75919,10 +75930,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold/dark, /turf/open/floor/plating, /area/station/engineering/atmos) -"vuK" = ( -/obj/structure/sign/warning/fire, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "vuR" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/effect/turf_decal/trimline/yellow/filled/warning{ @@ -77059,6 +77066,19 @@ }, /turf/open/floor/wood, /area/station/commons/lounge) +"vKT" = ( +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/maintenance{ + name = "Security Maintenance" + }, +/turf/open/floor/plating, +/area/station/security/brig/upper) "vKZ" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -79174,9 +79194,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/ordnance) -"wuo" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "wuv" = ( /obj/machinery/iv_drip, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -79395,18 +79412,6 @@ "wxN" = ( /turf/closed/wall/r_wall, /area/station/maintenance/solars/port/fore) -"wxQ" = ( -/obj/machinery/conveyor{ - id = "mining_internal" - }, -/obj/machinery/bouldertech/refinery/smelter{ - dir = 1 - }, -/obj/structure/railing/corner/end/flip{ - dir = 4 - }, -/turf/open/floor/iron, -/area/mine/production) "wxT" = ( /obj/structure/railing{ dir = 1 @@ -83457,11 +83462,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/freezer, /area/station/commons/toilet/locker) -"xBp" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "xBt" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 @@ -170655,7 +170655,7 @@ uQx vQy lgj pXA -wxQ +jzW bxx rOT uvM @@ -171168,7 +171168,7 @@ jCV kZu jrQ iLe -mdx +gNS kzF nWH hFL @@ -244957,11 +244957,11 @@ eEO hTm cks sGJ -cGf -qMN -iUJ -hHp -cGf +tGR +hLh +uuG +huo +tGR atN fpD jFV @@ -245214,11 +245214,11 @@ fab eDC uIV nXl -wuo -agm -fNN -gbh -wuo +nmK +kYx +kbZ +mDv +nmK sRL oyz mLV @@ -245469,13 +245469,13 @@ gka uXC fab fNv -wuo -wuo -nnw -spv -dwy -spv -wuo +nmK +nmK +sTG +lZD +teG +lZD +nmK cSH kUz mLV @@ -245726,13 +245726,13 @@ oSR glc fab ktw -bny -jQe -xBp -bYw -bYw -bYw -ucO +frJ +gir +eIf +oJO +oJO +oJO +oZg kcD ugq njT @@ -245983,13 +245983,13 @@ fDn jQz tNx tfR -iNa -tLW -seR -lgg -uey -esE -uLe +sqV +cbq +uWi +lIu +hMx +tRD +lEy lGp efV iaV @@ -246240,13 +246240,13 @@ ras fkj fab iag -dfq -ein -xBp -imd -imd -imd -vuK +mce +jFH +eIf +jbp +jbp +jbp +doN utA qYQ xUb @@ -246497,13 +246497,13 @@ gka vKy fab fyQ -wuo -wuo -nnw -cDK -uvk -cDK -wuo +nmK +nmK +sTG +fQM +hFH +fQM +nmK cSH kUz mLV @@ -246756,11 +246756,11 @@ fab iag loc hNI -wuo -fRv -fNN -esE -wuo +nmK +fIC +kbZ +tRD +nmK hqE iam mLV @@ -246972,7 +246972,7 @@ dnq iuv yas xVK -jbh +uxY eUW bmu cvS @@ -247013,11 +247013,11 @@ fab iag pQo hNI -wuo -kSM -aFn -ctk -wuo +nmK +eTO +fix +hvJ +nmK cSH kql liI @@ -250252,7 +250252,7 @@ cid htv mpi tDk -jsm +pRh lsl xAa tjX @@ -250504,7 +250504,7 @@ osT iym xEx fbi -cdr +iAJ ksC pbj ctX @@ -250764,7 +250764,7 @@ evG uPk oFD bUx -gSo +vKT bUx bUx oyo @@ -251275,7 +251275,7 @@ osT iym bNJ afZ -iiM +cjE nZZ nZZ gxs @@ -263950,7 +263950,7 @@ tIq tZw bdQ nsZ -pnK +bCY cSw cmx yeC @@ -266779,7 +266779,7 @@ xLq nsZ rDZ rDZ -cXQ +sUc swa rDZ rDZ diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index ccbda1cd3ce5..127115987132 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -2698,7 +2698,7 @@ dir = 8 }, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "aRH" = ( /obj/structure/chair{ dir = 4 @@ -8249,7 +8249,7 @@ }, /obj/structure/cable, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "cPZ" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8788,7 +8788,7 @@ "cYc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/closed/wall/r_wall, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "cYk" = ( /obj/structure/rack, /obj/item/storage/toolbox/mechanical, @@ -10857,7 +10857,7 @@ "dGG" = ( /obj/machinery/power/supermatter_crystal/engine, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "dGP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11420,7 +11420,7 @@ "dPr" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "dPK" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -14658,7 +14658,7 @@ "eVL" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "eVP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/corner{ @@ -16872,7 +16872,7 @@ dir = 8 }, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "fDi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -17435,7 +17435,7 @@ }, /obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/room) "fKJ" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/lavendergrass/style_random, @@ -18192,7 +18192,7 @@ name = "Radiation Chamber Shutters" }, /turf/open/floor/iron/dark, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "fXS" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -24058,7 +24058,7 @@ "hPr" = ( /obj/machinery/air_sensor/engine_chamber, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "hPx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/crate, @@ -25019,7 +25019,7 @@ /turf/open/floor/circuit/green{ luminosity = 2 }, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "idq" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -30028,7 +30028,7 @@ /obj/effect/turf_decal/caution/stand_clear, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "jID" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32233,7 +32233,7 @@ /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/closed/wall/r_wall, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "kvU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, @@ -32549,7 +32549,7 @@ /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "kBF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34302,7 +34302,7 @@ }, /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/iron/dark, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "lcw" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -34599,7 +34599,7 @@ "lhm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/closed/wall/r_wall, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "lhv" = ( /obj/machinery/shower/directional/east, /obj/item/soap/nanotrasen, @@ -36562,7 +36562,7 @@ /area/station/maintenance/port/fore) "lOX" = ( /turf/closed/wall/r_wall, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "lOY" = ( /obj/machinery/camera/directional/east{ c_tag = "Evidence Closet" @@ -37101,7 +37101,7 @@ /turf/open/floor/circuit/green{ luminosity = 2 }, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "lYg" = ( /turf/closed/wall, /area/station/science/robotics/lab) @@ -37387,7 +37387,7 @@ /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "mdl" = ( /obj/effect/turf_decal/box/corners{ dir = 1 @@ -38105,7 +38105,7 @@ /turf/open/floor/circuit/green{ luminosity = 2 }, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "mnE" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 @@ -39493,7 +39493,7 @@ /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/closed/wall/r_wall, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "mME" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/brown{ @@ -39536,7 +39536,7 @@ dir = 4 }, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "mNz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43618,7 +43618,7 @@ /area/space/nearstation) "okp" = ( /turf/closed/wall/r_wall/rust, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "okq" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/atmospherics/components/unary/portables_connector/visible, @@ -46493,7 +46493,7 @@ }, /obj/structure/cable, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "pji" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49847,7 +49847,7 @@ /turf/open/floor/circuit/green{ luminosity = 2 }, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "qnK" = ( /obj/machinery/door/airlock/engineering{ name = "Emergency Storage" @@ -63090,7 +63090,7 @@ dir = 4 }, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "uvO" = ( /turf/closed/wall, /area/station/engineering/gravity_generator) @@ -64440,7 +64440,7 @@ "uWA" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall/rust, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "uWM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66280,7 +66280,7 @@ /area/station/service/janitor) "vyN" = ( /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "vyV" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/effect/turf_decal/tile/neutral{ @@ -66339,7 +66339,7 @@ network = list("engine") }, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "vzV" = ( /obj/structure/sign/poster/official/anniversary_vintage_reprint/directional/north, /obj/machinery/camera/directional/north{ @@ -67267,7 +67267,7 @@ /turf/open/floor/circuit/green{ luminosity = 2 }, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "vMM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -69669,7 +69669,7 @@ /turf/open/floor/circuit/green{ luminosity = 2 }, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "wxF" = ( /obj/structure/table/wood, /obj/effect/spawner/random/maintenance, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 9f0c63c3b032..f24d88e80f5f 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1032,10 +1032,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"auc" = ( -/obj/machinery/light/small/directional/west, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "auh" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -1295,6 +1291,17 @@ /obj/machinery/camera/directional/south, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/paramedic) +"azY" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "azZ" = ( /obj/structure/closet/crate, /obj/item/reagent_containers/cup/bowl, @@ -1896,10 +1903,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) -"aJv" = ( -/obj/structure/sign/warning/fire, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "aJz" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -1977,15 +1980,6 @@ }, /turf/open/floor/wood, /area/station/commons/lounge) -"aKs" = ( -/obj/machinery/bouldertech/refinery{ - dir = 1 - }, -/obj/machinery/conveyor{ - id = "mining" - }, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "aKz" = ( /obj/structure/chair{ dir = 4 @@ -1998,6 +1992,10 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) +"aKK" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "aLk" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -3360,6 +3358,21 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/evidence) +"bhG" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Starboard Primary Hallway - Auxiliary Tool Storage" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "bhM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -4630,14 +4643,6 @@ "bDq" = ( /turf/closed/wall/r_wall, /area/station/engineering/transit_tube) -"bDA" = ( -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "bDK" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -6147,6 +6152,10 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/iron, /area/station/cargo/storage) +"cfW" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "cgi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark/side{ @@ -6340,11 +6349,6 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/station/engineering/break_room) -"cjD" = ( -/obj/machinery/airalarm/directional/north, -/obj/machinery/gizmo/toggle/tucker_tubes, -/turf/open/floor/iron/white, -/area/station/science/explab) "cky" = ( /obj/machinery/power/shieldwallgen, /obj/machinery/light/cold/directional/east, @@ -6650,6 +6654,10 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"cpY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "cqk" = ( /obj/structure/cable, /turf/open/floor/plating/airless, @@ -7347,11 +7355,6 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) -"cAm" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "cAr" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -7406,15 +7409,6 @@ }, /turf/open/floor/plating, /area/station/science/robotics/mechbay) -"cBZ" = ( -/obj/machinery/bouldertech/refinery/smelter{ - dir = 1 - }, -/obj/machinery/conveyor{ - id = "mining" - }, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "cCM" = ( /obj/structure/lattice/catwalk, /obj/item/reagent_containers/cup/glass/bottle/rum{ @@ -7796,6 +7790,16 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +"cJp" = ( +/obj/item/crowbar, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "cJt" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -11662,6 +11666,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/sorting) +"ebn" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "ebr" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=0-SecurityDesk"; @@ -11729,6 +11740,11 @@ /obj/item/stack/sheet/iron/twenty, /turf/open/floor/iron, /area/station/engineering/break_room) +"ebU" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "ebV" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -13150,13 +13166,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/circuit_workshop) -"eyD" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "eyK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -13445,10 +13454,6 @@ /obj/effect/mapping_helpers/airlock/access/any/command/maintenance, /turf/open/floor/plating, /area/station/maintenance/central) -"eEP" = ( -/obj/machinery/light/small/directional/east, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "eFG" = ( /obj/item/storage/medkit/regular{ pixel_x = 3; @@ -14035,6 +14040,9 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron, /area/station/security/brig) +"eOz" = ( +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "eOJ" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -14147,10 +14155,6 @@ dir = 1 }, /area/station/engineering/atmos/pumproom) -"eQL" = ( -/obj/machinery/camera/directional/east, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "eQO" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -14855,10 +14859,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"fec" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "fee" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/trunk{ @@ -15945,6 +15945,15 @@ /obj/structure/marker_beacon/olive, /turf/open/space/basic, /area/space/nearstation) +"fxC" = ( +/obj/machinery/bouldertech/refinery/smelter{ + dir = 1 + }, +/obj/machinery/conveyor{ + id = "mining" + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "fxI" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -16558,21 +16567,6 @@ "fJy" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/engine) -"fJC" = ( -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/engine, -/area/station/engineering/supermatter) -"fJP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "fJW" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -16751,11 +16745,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/ai/satellite/maintenance/storage) -"fNa" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "fNe" = ( /obj/structure/table, /obj/item/clothing/under/costume/buttondown/slacks/service, @@ -17457,6 +17446,10 @@ /obj/machinery/computer/security/telescreen/cmo/directional/west, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +"gbx" = ( +/obj/machinery/power/supermatter_crystal/engine, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "gbz" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -18865,6 +18858,17 @@ "gBD" = ( /turf/closed/wall/r_wall, /area/station/command/teleporter) +"gBU" = ( +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "gBY" = ( /obj/structure/closet/emcloset, /obj/machinery/light/small/directional/west, @@ -19716,13 +19720,6 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/dark, /area/station/ai/satellite/exterior) -"gOy" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/obj/structure/window/reinforced/plasma/spawner/directional/north, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "gOB" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/engine, @@ -20476,6 +20473,10 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"hct" = ( +/obj/structure/sign/warning/fire, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "hcv" = ( /obj/effect/landmark/observer_start, /obj/effect/turf_decal/plaque{ @@ -22659,10 +22660,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"hRl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "hRq" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -23362,6 +23359,10 @@ }, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"ibV" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "ibX" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -24682,6 +24683,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"iyp" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Gas to Filter" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "iyy" = ( /obj/structure/table, /obj/item/folder/white{ @@ -25217,6 +25226,10 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/engine, /area/station/science/xenobiology) +"iHO" = ( +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "iId" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -27280,6 +27293,13 @@ }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"jqf" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "jql" = ( /obj/machinery/door/airlock{ id_tag = "AuxToilet2"; @@ -29303,13 +29323,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"jWE" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/structure/window/reinforced/plasma/spawner/directional/north, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "jWR" = ( /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/siding/wood{ @@ -30300,6 +30313,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"knz" = ( +/obj/structure/sign/warning/electric_shock, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "knB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, /turf/open/floor/iron, @@ -30758,10 +30775,6 @@ }, /turf/open/floor/iron, /area/station/command/gateway) -"kww" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "kwy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32974,18 +32987,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"lje" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Starboard Primary Hallway - Technical Storage" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "ljf" = ( /obj/structure/table, /obj/item/wirecutters, @@ -35729,13 +35730,10 @@ /turf/open/floor/iron/dark, /area/station/ai/satellite/exterior) "mkr" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Gas to Chamber" - }, -/obj/effect/spawner/random/structure/massmeta_flags/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/spawner/random/structure/massmeta_flags/directional/west, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/engine) "mkz" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/item/hand_labeler_refill, @@ -36181,17 +36179,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"msu" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "msC" = ( /obj/machinery/computer/operating{ dir = 8 @@ -36228,21 +36215,6 @@ /obj/item/reagent_containers/cup/beaker/large, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -"mta" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Starboard Primary Hallway - Auxiliary Tool Storage" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/hangover, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "mtb" = ( /obj/structure/table/wood, /obj/structure/extinguisher_cabinet/directional/west, @@ -36345,10 +36317,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"muu" = ( -/obj/structure/sign/warning/electric_shock, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "muw" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -36620,6 +36588,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"mzz" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/gizmo/toggle/tucker_tubes, +/turf/open/floor/iron/white, +/area/station/science/explab) "mzI" = ( /obj/machinery/door/airlock/grunge{ name = "Prison Workshop" @@ -37183,6 +37156,10 @@ /obj/machinery/light/floor, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"mID" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "mIH" = ( /obj/machinery/status_display/ai/directional/north, /obj/structure/disposalpipe/segment{ @@ -38830,6 +38807,12 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) +"nlX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "nmf" = ( /obj/machinery/smartfridge, /obj/machinery/door/poddoor/shutters/preopen{ @@ -40693,10 +40676,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison/garden) -"nQg" = ( -/obj/effect/spawner/random/gizmo, -/turf/open/floor/engine, -/area/station/science/explab) "nQA" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -41388,6 +41367,13 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark, /area/station/medical/paramedic) +"odA" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "odI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -41676,6 +41662,9 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"okU" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "okV" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/spawner/structure/window/reinforced, @@ -42425,10 +42414,6 @@ /obj/item/storage/photo_album/chapel, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) -"oxV" = ( -/obj/machinery/air_sensor/engine_chamber, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "oxW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line{ @@ -43340,9 +43325,6 @@ /obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/iron/dark, /area/station/science/genetics) -"oNs" = ( -/turf/open/floor/engine, -/area/station/engineering/supermatter) "oNy" = ( /obj/machinery/smartfridge/chemistry/preloaded, /obj/machinery/door/poddoor/shutters/preopen{ @@ -46267,6 +46249,10 @@ "pOa" = ( /turf/closed/wall, /area/station/maintenance/port) +"pOc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "pOi" = ( /obj/effect/spawner/random/trash/garbage{ spawn_scatter_radius = 1 @@ -46504,6 +46490,10 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/carpet, /area/station/command/corporate_showroom) +"pRj" = ( +/obj/machinery/camera/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "pRk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4, /turf/closed/wall/r_wall, @@ -47151,6 +47141,15 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/plating, /area/station/maintenance/central) +"qeb" = ( +/obj/machinery/bouldertech/refinery{ + dir = 1 + }, +/obj/machinery/conveyor{ + id = "mining" + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "qeo" = ( /obj/machinery/newscaster/directional/north, /obj/structure/dresser, @@ -47198,6 +47197,10 @@ /mob/living/silicon/robot/shell/cell, /turf/open/floor/iron/dark, /area/station/ai/satellite/chamber) +"qeT" = ( +/obj/effect/spawner/random/gizmo, +/turf/open/floor/engine, +/area/station/science/explab) "qfh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, @@ -47314,10 +47317,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port) -"qgi" = ( -/obj/machinery/power/supermatter_crystal/engine, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "qgl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49916,12 +49915,6 @@ /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/maintenance/port) -"qZB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "qZD" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 @@ -51066,14 +51059,6 @@ /obj/structure/closet/crate/engineering/electrical, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) -"rtQ" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "rtS" = ( /obj/machinery/door/morgue{ name = "Relic Closet"; @@ -51621,14 +51606,6 @@ }, /turf/open/floor/iron, /area/station/science/explab) -"rCW" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Gas to Filter" - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "rDf" = ( /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) @@ -51870,9 +51847,6 @@ /obj/item/disk/computer/medical, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) -"rHn" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "rHz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -51929,6 +51903,11 @@ }, /turf/open/floor/iron, /area/station/command/eva) +"rIW" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "rIZ" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 1 @@ -53494,6 +53473,10 @@ /obj/item/clothing/gloves/color/orange, /turf/open/floor/iron, /area/station/service/janitor) +"sjL" = ( +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "sjM" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -53941,6 +53924,13 @@ }, /turf/open/floor/carpet, /area/station/commons/vacant_room/office) +"stX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "stZ" = ( /obj/structure/table/glass, /obj/machinery/light_switch/directional/west, @@ -54080,6 +54070,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, /turf/open/floor/iron, /area/station/security/brig) +"swg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "swu" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/delivery, @@ -54874,16 +54868,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/circuit_workshop) -"sJL" = ( -/obj/item/crowbar, -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "sKs" = ( /obj/structure/closet/bombcloset/security, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -56178,10 +56162,6 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos) -"tft" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "tfz" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/circuit, @@ -59164,13 +59144,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) -"uga" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "ugd" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock" @@ -59269,6 +59242,13 @@ }, /turf/open/floor/carpet, /area/station/service/theater) +"uie" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "uii" = ( /obj/effect/spawner/structure/window, /obj/structure/disposalpipe/segment{ @@ -59491,6 +59471,14 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"ulX" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "umn" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/firecloset, @@ -61748,6 +61736,13 @@ dir = 8 }, /area/station/medical/morgue) +"uYO" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Gas to Chamber" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "uYP" = ( /obj/structure/cable, /obj/machinery/door/window/left/directional/north{ @@ -62061,10 +62056,6 @@ }, /turf/open/floor/engine, /area/station/science/explab) -"vfk" = ( -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "vfv" = ( /obj/machinery/conveyor{ dir = 4; @@ -66194,6 +66185,18 @@ }, /turf/open/floor/iron, /area/station/security/holding_cell) +"wuE" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Starboard Primary Hallway - Technical Storage" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "wuM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -66598,13 +66601,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"wBE" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "wBF" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -70398,6 +70394,14 @@ }, /turf/open/floor/iron/dark, /area/station/medical/break_room) +"xUg" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "xUh" = ( /obj/structure/closet/wardrobe/pjs, /obj/effect/landmark/start/hangover, @@ -89828,8 +89832,8 @@ jXu hzb xzf mRP -aKs -cBZ +qeb +fxC wyP hKg kyf @@ -104533,7 +104537,7 @@ kMG tUn hKV wXF -cjD +mzz dJo rCx nBj @@ -105785,7 +105789,7 @@ ksk mxt ksk dZm -mta +bhG pxl tUu jKi @@ -106075,7 +106079,7 @@ jgK tUn dQT wXF -nQg +qeT ukF sIW jSk @@ -108100,7 +108104,7 @@ lkW xww aSk tlZ -lje +wuE klZ bqC fqD @@ -113735,11 +113739,11 @@ stl jUx frZ frZ -rHn -kww -fJC -fec -rHn +okU +pOc +gBU +swg +okU mYE mYE uLp @@ -113992,11 +113996,11 @@ xdn jUx aXL aXL -rHn -mkr -oNs -rCW -rHn +okU +uYO +eOz +iyp +okU hko hko uLp @@ -114247,15 +114251,15 @@ nTA cKx fXi uHE -rHn -rHn -kww -fNa -msu -cAm -fec -rHn -fJP +okU +okU +pOc +ebU +azY +rIW +swg +okU +cpY ycw uJL fJy @@ -114504,15 +114508,15 @@ qZI sGC stl jUx -wBE -oNs -eyD -qZB -oxV -hRl -jWE -auc -rtQ +ebn +eOz +stX +nlX +iHO +mkr +uie +mID +xUg uLp lLu fJy @@ -114761,15 +114765,15 @@ tmq sGC stl jUx -bDA -vfk -uga -qZB -qgi -hRl -gOy -vfk -sJL +ulX +sjL +jqf +nlX +gbx +ibV +odA +sjL +cJp uLp suj fKg @@ -115018,15 +115022,15 @@ tmq sGC stl qOz -wBE -eEP -eyD -qZB -oNs -hRl -jWE -eQL -rtQ +ebn +cfW +stX +nlX +eOz +ibV +uie +pRj +xUg mBo hJi fJy @@ -115275,15 +115279,15 @@ pmj bgs pWB lta -rHn -rHn -rHn -aJv -tft -muu -rHn -rHn -fJP +okU +okU +okU +hct +aKK +knz +okU +okU +cpY vBe wBV aUP diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index a2cba02f8290..bc1b618e2a9c 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -2811,6 +2811,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) +"avh" = ( +/obj/structure/sign/warning/electric_shock, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "avl" = ( /obj/machinery/light/directional/north, /obj/structure/chair/sofa/bench/solo, @@ -4542,6 +4546,18 @@ /obj/machinery/holopad, /turf/open/floor/iron/dark/textured, /area/station/engineering/storage/tech) +"aJr" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark, +/obj/machinery/light/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/poster/random/directional/north, +/obj/machinery/gizmo/toggle/tucker_tubes, +/turf/open/floor/iron/dark, +/area/station/science/explab) "aJC" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -7283,9 +7299,6 @@ dir = 1 }, /area/station/commons/dorms) -"bdQ" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "bee" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -10473,18 +10486,6 @@ "bCV" = ( /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs) -"bCW" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ - dir = 8 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "bDg" = ( /obj/effect/turf_decal/siding/purple/corner{ dir = 1 @@ -14223,10 +14224,6 @@ /obj/structure/sign/poster/random/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/main) -"cfF" = ( -/obj/structure/sign/warning/fire, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "cfH" = ( /obj/effect/turf_decal/siding/purple, /obj/effect/turf_decal/trimline/purple/filled/line, @@ -16633,14 +16630,6 @@ /obj/effect/mapping_helpers/airlock/red_alert_access, /turf/open/floor/iron/dark, /area/station/medical/storage) -"cxS" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/siding/thinplating_new/dark/corner, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "cxW" = ( /obj/effect/turf_decal/siding/corner{ dir = 1 @@ -16661,6 +16650,21 @@ /obj/structure/flora/bush/large/style_2, /turf/open/floor/grass, /area/station/medical/lower) +"cyd" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + 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/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "cyg" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -18381,18 +18385,6 @@ dir = 9 }, /area/station/maintenance/starboard/central) -"cLu" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "cLw" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -23367,16 +23359,6 @@ /obj/machinery/disposal/bin/tagger, /turf/open/floor/iron/dark/herringbone, /area/station/commons/locker) -"dws" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/west, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "dwL" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/corner{ dir = 4 @@ -26144,10 +26126,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) -"dSJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "dSN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -31317,13 +31295,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark/herringbone, /area/station/service/hydroponics) -"eFE" = ( -/obj/machinery/light/small/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "eFK" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -34698,10 +34669,6 @@ /obj/structure/cable, /turf/open/floor/wood/large, /area/station/command/heads_quarters/hos) -"ffx" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "ffz" = ( /obj/structure/railing, /obj/effect/turf_decal/siding/thinplating_new, @@ -36468,6 +36435,18 @@ /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"ftD" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "ftG" = ( /obj/effect/turf_decal/trimline/purple/filled/warning, /obj/effect/turf_decal/siding/purple{ @@ -38157,6 +38136,18 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos/project) +"fFw" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "fFy" = ( /obj/structure/transit_tube, /obj/structure/railing{ @@ -40360,6 +40351,15 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"fWg" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "fWh" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/effect/turf_decal/siding/wood/corner{ @@ -41289,6 +41289,9 @@ }, /turf/open/floor/grass, /area/station/cargo/drone_bay) +"gdP" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "gdQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42349,6 +42352,14 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/grass, /area/station/commons/dorms) +"glg" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/siding/thinplating_new/dark/corner, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "glj" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 8 @@ -43315,6 +43326,14 @@ "gsi" = ( /turf/closed/wall, /area/station/medical/morgue) +"gso" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "gsx" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -45113,18 +45132,6 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/grass, /area/station/security/checkpoint/customs) -"gFS" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark, -/obj/machinery/light/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sign/poster/random/directional/north, -/obj/machinery/gizmo/toggle/tucker_tubes, -/turf/open/floor/iron/dark, -/area/station/science/explab) "gFU" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 4 @@ -45604,6 +45611,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/brig) +"gKg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "gKk" = ( /obj/effect/turf_decal/trimline/dark_blue/end{ dir = 8 @@ -46429,6 +46440,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/bridge) +"gPT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "gPZ" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -48715,6 +48730,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/engineering/main) +"hhr" = ( +/obj/structure/sign/warning/fire, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "hhs" = ( /obj/effect/turf_decal/siding/corner{ dir = 8 @@ -50061,10 +50080,6 @@ /obj/structure/flora/grass/jungle/b/style_random, /turf/open/misc/asteroid/airless, /area/space/nearstation) -"hrB" = ( -/obj/structure/sign/warning/electric_shock, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "hrD" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -51229,11 +51244,6 @@ /obj/structure/railing, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"hzX" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "hzZ" = ( /obj/machinery/duct, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -53878,6 +53888,14 @@ dir = 4 }, /area/station/security/brig) +"hUy" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/trimline/blue, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Gas to Chamber" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "hUz" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 5 @@ -59004,10 +59022,6 @@ }, /turf/open/floor/wood/parquet, /area/station/commons/lounge) -"iHt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "iHw" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/dark_green/warning{ @@ -62192,13 +62206,6 @@ /obj/effect/turf_decal/trimline/green, /turf/open/floor/iron/dark/small, /area/station/science/robotics/lab) -"jhk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/multilayer/connected, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "jhA" = ( /obj/machinery/holopad{ pixel_x = 1 @@ -64743,6 +64750,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"jAW" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Gas to Filter" + }, +/obj/effect/turf_decal/trimline/red, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "jAY" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 @@ -67543,15 +67559,6 @@ }, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/cmo) -"jWj" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable/layer1, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "jWn" = ( /obj/machinery/door/poddoor/preopen{ id = "queue_hop"; @@ -69158,21 +69165,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/large, /area/station/commons/lounge) -"kig" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - 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/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "kij" = ( /obj/structure/railing{ dir = 1 @@ -70491,18 +70483,6 @@ }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation/lasertag) -"kqL" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "kqP" = ( /obj/effect/turf_decal/trimline/dark/end{ dir = 2 @@ -71056,10 +71036,6 @@ }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation/lasertag) -"kur" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "kuu" = ( /obj/effect/spawner/random/trash/deluxe_garbage, /obj/machinery/light/small/directional/north, @@ -71882,10 +71858,15 @@ /obj/item/bouquet/rose, /turf/open/floor/iron/dark/textured_large, /area/station/service/chapel/funeral) -"kAw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) +"kAF" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/turf_decal/caution{ + dir = 1 + }, +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "kAG" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 4 @@ -74056,6 +74037,18 @@ }, /turf/open/floor/iron/dark/herringbone, /area/station/service/chapel/funeral) +"kQE" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "kQJ" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 @@ -75618,6 +75611,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +"lfh" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer1, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "lfl" = ( /obj/effect/turf_decal/siding/thinplating_new/dark/corner, /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ @@ -76724,6 +76726,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"lns" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "lnt" = ( /obj/effect/turf_decal/trimline/dark/warning{ dir = 1; @@ -78693,6 +78700,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/misc/asteroid/airless, /area/space/nearstation) +"lCf" = ( +/obj/machinery/conveyor{ + id = "mining" + }, +/obj/machinery/bouldertech/refinery/smelter{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/miningfoundry) "lCq" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -78808,15 +78824,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/hallway/primary/fore) -"lDF" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "lDI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -80877,14 +80884,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"lVf" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "lVw" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/delivery, @@ -81917,6 +81916,18 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) +"mey" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "mez" = ( /obj/machinery/door/airlock/maintenance/glass{ name = "Fish Shop" @@ -84340,19 +84351,6 @@ "mxG" = ( /turf/open/floor/glass/reinforced, /area/station/command) -"mxI" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "mxM" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 @@ -85289,16 +85287,6 @@ /obj/effect/decal/cleanable/confetti, /turf/open/floor/wood, /area/station/maintenance/port/fore) -"mFh" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/east, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "mFj" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -85516,9 +85504,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/command/heads_quarters/qm) -"mHv" = ( -/turf/open/floor/engine, -/area/station/engineering/supermatter) "mHy" = ( /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ dir = 8 @@ -86578,6 +86563,13 @@ dir = 4 }, /area/station/commons/dorms) +"mPa" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "mPc" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 @@ -89415,6 +89407,13 @@ }, /turf/open/floor/iron/white, /area/station/hallway/primary/fore) +"nnF" = ( +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "nnG" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon/fuchsia, @@ -90975,6 +90974,14 @@ /obj/machinery/duct, /turf/open/floor/iron/white/small, /area/station/commons/toilet/restrooms) +"nyw" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "nyA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -91180,6 +91187,19 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/execution/education) +"nzW" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "nAc" = ( /obj/effect/turf_decal/siding/thinplating_new/dark/end{ dir = 4 @@ -94557,6 +94577,15 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/cytology) +"oab" = ( +/obj/machinery/bouldertech/refinery{ + dir = 1 + }, +/obj/machinery/conveyor{ + id = "mining" + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/miningfoundry) "oaf" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 8 @@ -95656,6 +95685,10 @@ name = "Holodeck Projector Floor" }, /area/station/holodeck/rec_center) +"ohn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "ohp" = ( /obj/machinery/modular_computer/preset/id{ dir = 8 @@ -97975,6 +98008,13 @@ dir = 1 }, /area/station/ai/satellite/service) +"oxX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/multilayer/connected, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "oyb" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 @@ -101431,6 +101471,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/textured, /area/station/commons/fitness/recreation/lasertag) +"oXr" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/west, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "oXu" = ( /obj/machinery/door/airlock/public/glass{ name = "Library" @@ -102601,11 +102651,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/maintenance/fore/lesser) -"pfk" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "pfp" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/dark_green/warning{ @@ -107046,6 +107091,16 @@ }, /turf/open/floor/glass/reinforced, /area/station/security/checkpoint/escape) +"pLw" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/east, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "pLA" = ( /obj/structure/chair/pew/right{ dir = 1 @@ -108055,6 +108110,12 @@ }, /turf/open/floor/iron/dark/herringbone, /area/station/commons/locker) +"pSR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "pSV" = ( /obj/effect/mapping_helpers/broken_floor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -108359,16 +108420,6 @@ dir = 1 }, /area/station/security/brig/lower) -"pVJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 1 - }, -/obj/effect/turf_decal/caution, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "pVK" = ( /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ @@ -108542,14 +108593,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white/small, /area/station/medical/treatment_center) -"pXt" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "pXz" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -110681,15 +110724,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/security/courtroom) -"qpa" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/siding/thinplating_new/dark, -/obj/effect/turf_decal/caution{ - dir = 1 - }, -/obj/machinery/air_sensor/engine_chamber, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "qpc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -116515,6 +116549,16 @@ /obj/machinery/light/small/dim/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +"rid" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/west, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "ril" = ( /turf/open/floor/circuit/green, /area/station/science/xenobiology) @@ -118125,18 +118169,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"rtn" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "rty" = ( /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, @@ -118221,18 +118253,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/xenobiology) -"rtW" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "rub" = ( /obj/structure/hedge, /obj/effect/turf_decal/siding/wood{ @@ -118612,15 +118632,6 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/circuit, /area/station/ai/satellite/teleporter) -"rxz" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Gas to Filter" - }, -/obj/effect/turf_decal/trimline/red, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "rxB" = ( /obj/structure/flora/rock/pile/style_random, /obj/structure/flora/bush/lavendergrass/style_random, @@ -118958,16 +118969,6 @@ dir = 1 }, /area/station/security/range) -"rAE" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/east, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "rAJ" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 6 @@ -120980,16 +120981,6 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/circuit_workshop) -"rPe" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/camera/autoname/directional/north{ - dir = 9; - network = list("ss13","engine") - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "rPj" = ( /obj/effect/turf_decal/siding/brown{ dir = 1 @@ -121398,12 +121389,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/service/chapel) -"rSs" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "rSt" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -123405,6 +123390,10 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/iron/dark, /area/station/construction/mining/aux_base) +"shp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "shs" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 5 @@ -123989,6 +123978,18 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, /area/station/science/research) +"sng" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "snn" = ( /obj/effect/turf_decal/siding/dark{ dir = 5 @@ -124975,6 +124976,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/chapel, /area/station/service/chapel) +"suZ" = ( +/obj/machinery/power/supermatter_crystal/engine, +/obj/effect/turf_decal/stripes/red/box, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "svi" = ( /obj/structure/flora/rock/pile/jungle/style_random, /obj/effect/decal/cleanable/dirt, @@ -131567,6 +131573,16 @@ }, /turf/open/misc/asteroid/airless, /area/space/nearstation) +"tuC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/north{ + dir = 9; + network = list("ss13","engine") + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "tuH" = ( /obj/structure/chair/pew/right{ dir = 1 @@ -132066,6 +132082,9 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/central) +"tyl" = ( +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "tym" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -133724,6 +133743,10 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"tIO" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "tIQ" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/north, @@ -136737,6 +136760,16 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark/herringbone, /area/station/ai/satellite/foyer) +"ugM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/effect/turf_decal/caution, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "ugO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/machinery/meter, @@ -137057,13 +137090,6 @@ "uiZ" = ( /turf/open/floor/glass, /area/station/commons/lounge) -"uja" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "ujc" = ( /obj/structure/table/wood/fancy/royalblack, /obj/effect/turf_decal/siding/wood{ @@ -140962,13 +140988,6 @@ }, /turf/open/floor/circuit/green, /area/station/cargo/bitrunning/den) -"uPH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/multilayer/connected, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "uPK" = ( /obj/effect/turf_decal/tile/dark/diagonal_centre, /obj/structure/table/glass, @@ -142210,15 +142229,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) -"uYW" = ( -/obj/machinery/conveyor{ - id = "mining" - }, -/obj/machinery/bouldertech/refinery/smelter{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/cargo/miningfoundry) "uYZ" = ( /obj/effect/turf_decal/siding/thinplating_new/dark/corner, /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ @@ -142490,16 +142500,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/command) -"vaU" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/west, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "vaX" = ( /obj/structure/railing, /obj/effect/turf_decal/siding/wideplating_new/dark, @@ -144698,6 +144698,13 @@ }, /turf/open/floor/wood/large, /area/station/service/library/lounge) +"voJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/multilayer/connected, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "voS" = ( /obj/effect/turf_decal/tile/green/diagonal_centre, /obj/structure/cable, @@ -148902,6 +148909,11 @@ /obj/structure/cable, /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) +"vWH" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "vWI" = ( /obj/item/kirbyplants/random, /obj/structure/cable, @@ -152389,14 +152401,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command) -"wyA" = ( -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/trimline/blue, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Gas to Chamber" - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "wyG" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ @@ -153351,6 +153355,14 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"wGn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/gizmo, +/turf/open/floor/engine, +/area/station/science/explab) "wGr" = ( /obj/structure/rack, /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ @@ -153962,15 +153974,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"wLi" = ( -/obj/machinery/bouldertech/refinery{ - dir = 1 - }, -/obj/machinery/conveyor{ - id = "mining" - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/cargo/miningfoundry) "wLk" = ( /obj/effect/turf_decal/siding/dark, /obj/machinery/chem_dispenser, @@ -156605,6 +156608,16 @@ dir = 8 }, /area/station/engineering/atmos) +"xhx" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/east, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "xhQ" = ( /obj/effect/turf_decal/siding/yellow{ dir = 4 @@ -156860,11 +156873,6 @@ /obj/effect/turf_decal/trimline/green/corner, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) -"xkj" = ( -/obj/machinery/power/supermatter_crystal/engine, -/obj/effect/turf_decal/stripes/red/box, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "xkm" = ( /turf/open/floor/iron/stairs/medium{ color = "#3d3e42"; @@ -160108,14 +160116,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"xIA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/spawner/random/gizmo, -/turf/open/floor/engine, -/area/station/science/explab) "xIE" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/corner, /turf/open/floor/iron/dark/textured_corner, @@ -192548,11 +192548,11 @@ wqS bCK uey ulv -kAw -lVf -jWj -lVf -kAw +gKg +gso +lfh +gso +gKg lxu gQk bnb @@ -192805,11 +192805,11 @@ lcj wYS hgl qsg -bdQ -rPe -jhk -eFE -bdQ +gdP +tuC +voJ +mPa +gdP sEh gpv fEn @@ -193060,13 +193060,13 @@ ukX lxu lcj enK -bdQ -bdQ -iHt -rAE -mFh -rAE -bdQ +gdP +gdP +shp +xhx +pLw +xhx +gdP qEg vAT fEn @@ -193317,13 +193317,13 @@ tOw cQB lcj tTQ -iHt -rxz -pfk -cxS -cLu -rtW -hrB +shp +jAW +vWH +glg +ftD +mey +avh bWZ eHc tRi @@ -193574,13 +193574,13 @@ waK aAr fXN wVg -mxI -mHv -kig -qpa -xkj -pVJ -ffx +nzW +tyl +cyd +kAF +suZ +ugM +tIO ygo iua bVi @@ -193831,13 +193831,13 @@ tOw jAZ lcj cOW -kur -wyA -hzX -bCW -rtn -kqL -cfF +gPT +hUy +lns +kQE +fFw +sng +hhr rmP xUP wxQ @@ -194088,13 +194088,13 @@ ukX pZH lcj ndZ -bdQ -cfF -kur -vaU -dws -vaU -bdQ +gdP +hhr +gPT +rid +oXr +rid +gdP rmd vAT fEn @@ -194347,11 +194347,11 @@ lcj wJr lMi sHI -bdQ -uja -uPH -rSs -bdQ +gdP +nnF +oxX +pSR +gdP sFX xlL fEn @@ -194604,11 +194604,11 @@ cPK tez fEO bqa -dSJ -pXt -lDF -pXt -dSJ +ohn +nyw +fWg +nyw +ohn efA nYT bxm @@ -195785,8 +195785,8 @@ dew rnW nbS pVC -wLi -uYW +oab +lCf uOS kFj tqY @@ -197630,7 +197630,7 @@ wFC cxB cWw ubb -xIA +wGn lgA ejt kbN @@ -199424,7 +199424,7 @@ vCm elB dsE gIQ -gFS +aJr hUG aPh vOa diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index ec89323f494f..ae67e403c83a 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -3243,10 +3243,6 @@ /obj/structure/sign/warning/no_smoking, /turf/closed/wall, /area/station/engineering/atmos) -"asT" = ( -/obj/machinery/air_sensor/engine_chamber, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "asY" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 @@ -7875,9 +7871,6 @@ /obj/item/fuel_pellet, /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) -"bKt" = ( -/turf/open/floor/engine, -/area/station/engineering/supermatter) "bKu" = ( /obj/machinery/light/floor, /turf/open/floor/iron/dark, @@ -8066,6 +8059,12 @@ /obj/structure/bed/dogbed/mcgriff, /turf/open/floor/glass/reinforced, /area/station/security/warden) +"bLZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "bMb" = ( /turf/closed/wall, /area/station/hallway/primary/tram/right) @@ -8835,6 +8834,19 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) +"bYu" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "bYA" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, @@ -9725,6 +9737,16 @@ /obj/item/clothing/mask/breath/muzzle, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +"cmR" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "cmW" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 2 @@ -11232,16 +11254,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/commons/dorms) -"cNU" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - name = "Radiation Chamber Shutters"; - id = "engsm" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "cNX" = ( /obj/structure/window/spawner/directional/north, /obj/effect/turf_decal/trimline/dark_green/filled/line{ @@ -14377,10 +14389,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/armory) -"dQn" = ( -/obj/machinery/power/supermatter_crystal/engine, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "dQs" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -15743,10 +15751,6 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"esc" = ( -/obj/structure/sign/warning/electric_shock, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "esd" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 1 @@ -16636,10 +16640,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"eIk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "eIA" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ @@ -16920,6 +16920,17 @@ /obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) +"eOE" = ( +/obj/machinery/door/airlock/engineering/glass/critical{ + name = "Supermatter Chamber"; + heat_proof = 1 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "eOL" = ( /obj/structure/table/wood, /obj/item/instrument/violin, @@ -18534,10 +18545,6 @@ /obj/machinery/light/warm/directional/east, /turf/open/floor/iron/dark, /area/station/service/chapel) -"frN" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "frT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall, @@ -21179,17 +21186,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"gqf" = ( -/obj/machinery/door/airlock/engineering/glass/critical{ - name = "Supermatter Chamber"; - heat_proof = 1 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "gqp" = ( /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -21335,6 +21331,9 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/dorms) +"gub" = ( +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "gui" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21869,19 +21868,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"gDI" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "gDQ" = ( /obj/machinery/camera/directional/east{ c_tag = "Hallway - Central Tram Platform North-East" @@ -22421,6 +22407,10 @@ }, /turf/open/floor/circuit, /area/station/command/vault) +"gOw" = ( +/obj/effect/baseturf_helper/space, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "gOA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -22830,6 +22820,16 @@ /obj/machinery/light/small/dim/directional/south, /turf/open/floor/iron, /area/station/security/checkpoint/science) +"gWi" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + name = "Radiation Chamber Shutters"; + id = "engsm" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "gWo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -23403,6 +23403,10 @@ /obj/machinery/coffeemaker, /turf/open/floor/iron, /area/station/security/brig) +"hhT" = ( +/obj/machinery/power/supermatter_crystal/engine, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "hic" = ( /obj/structure/railing{ dir = 4 @@ -23457,16 +23461,6 @@ }, /turf/open/floor/wood, /area/station/command/meeting_room) -"hiB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) -"hiD" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Gas to Chamber" - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "hiG" = ( /obj/effect/turf_decal/sand, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -23909,6 +23903,10 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/station/service/theater) +"hrn" = ( +/obj/effect/spawner/random/gizmo, +/turf/open/floor/engine, +/area/station/science/explab) "hrr" = ( /obj/structure/table/reinforced, /obj/machinery/microwave/engineering/cell_included, @@ -24380,9 +24378,6 @@ /obj/machinery/computer/security/telescreen/engine/directional/west, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) -"hDI" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "hDT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/trimline/purple/filled/corner, @@ -26139,6 +26134,19 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) +"ikh" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Gas to Filter"; + dir = 1 + }, +/obj/machinery/camera/emp_proof{ + dir = 10; + network = list("ss13","engine","engineering"); + c_tag = "Engineering - Engine Room Airlock" + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "iko" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -29854,12 +29862,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/courtroom) -"jyF" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "jyH" = ( /turf/closed/wall, /area/station/medical/pharmacy) @@ -30021,15 +30023,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"jBn" = ( -/obj/machinery/door/airlock/engineering/glass/critical{ - name = "Supermatter Chamber"; - heat_proof = 1 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "jBp" = ( /obj/effect/turf_decal/trimline/neutral/line, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -33681,6 +33674,10 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"kIk" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "kIo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36541,10 +36538,6 @@ /obj/structure/sign/clock/directional/east, /turf/open/floor/iron, /area/station/security/prison/work) -"lEf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "lEj" = ( /obj/effect/turf_decal/delivery/white, /obj/structure/holosign/barrier/atmos/tram, @@ -37099,6 +37092,9 @@ }, /turf/open/floor/plating, /area/station/engineering/engine_smes) +"lNz" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "lNF" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -37199,6 +37195,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/courtroom/holding) +"lOZ" = ( +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "lPl" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron, @@ -37515,6 +37515,14 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"lUm" = ( +/obj/effect/turf_decal/trimline/yellow/arrow_ccw, +/obj/effect/turf_decal/trimline/yellow/arrow_cw{ + dir = 1 + }, +/obj/structure/cable/multilayer/connected, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "lUr" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -38540,17 +38548,6 @@ /obj/machinery/meter, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"mng" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/corner, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "mns" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 1 @@ -38733,14 +38730,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"mqT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/bouldertech/refinery/smelter{ - dir = 4 - }, -/obj/structure/railing, -/turf/open/floor/iron, -/area/station/cargo/miningfoundry) "mrf" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -43963,6 +43952,10 @@ /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/open/floor/catwalk_floor, /area/station/science/auxlab/firing_range) +"onE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "onT" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/door/poddoor/shutters/preopen{ @@ -43980,12 +43973,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) -"onW" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "oog" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -44524,6 +44511,12 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) +"oAy" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "oAG" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/effect/turf_decal/stripes{ @@ -44973,10 +44966,6 @@ /obj/machinery/space_heater, /turf/open/floor/iron, /area/station/engineering/atmos) -"oMc" = ( -/obj/structure/sign/warning/fire, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "oMh" = ( /obj/machinery/airalarm/directional/north, /obj/structure/detectiveboard/directional/east, @@ -46056,16 +46045,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/lesser) -"pgV" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - name = "Radiation Chamber Shutters"; - id = "engsm" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "phl" = ( /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) @@ -46545,6 +46524,10 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/dark, /area/station/security/office) +"ppD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "ppK" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -46972,6 +46955,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"pwL" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + name = "Radiation Chamber Shutters"; + id = "engsm" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "pwX" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -47877,6 +47870,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/service/chapel) +"pLh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/bouldertech/refinery/smelter{ + dir = 4 + }, +/obj/structure/railing, +/turf/open/floor/iron, +/area/station/cargo/miningfoundry) "pLs" = ( /obj/structure/transport/linear/tram, /obj/structure/tram/split, @@ -48077,22 +48078,6 @@ /obj/structure/railing, /turf/open/floor/plating/elevatorshaft, /area/station/cargo/miningdock) -"pOy" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - name = "Radiation Chamber Shutters"; - id = "engsm" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable/layer1, -/obj/effect/turf_decal/trimline/yellow/arrow_cw, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "pOE" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -48484,6 +48469,16 @@ /obj/effect/turf_decal/siding/thinplating, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"pWK" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "pWN" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -49143,10 +49138,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) -"qik" = ( -/obj/effect/baseturf_helper/space, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "qiq" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -50656,17 +50647,6 @@ /obj/item/paper/monitorkey, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) -"qLx" = ( -/obj/machinery/bouldertech/refinery{ - dir = 4 - }, -/obj/machinery/conveyor{ - dir = 8; - id = "mining" - }, -/obj/structure/railing, -/turf/open/floor/iron, -/area/station/cargo/miningfoundry) "qLD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -51865,6 +51845,17 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/cargo/warehouse) +"rgo" = ( +/obj/machinery/bouldertech/refinery{ + dir = 4 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "mining" + }, +/obj/structure/railing, +/turf/open/floor/iron, +/area/station/cargo/miningfoundry) "rgK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -52499,6 +52490,21 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/ordnance/office) +"rpT" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + name = "Radiation Chamber Shutters"; + id = "engsm" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/layer1, +/obj/effect/turf_decal/trimline/yellow/arrow_cw{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/arrow_ccw, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "rpY" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 1 @@ -53032,6 +53038,22 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron, /area/station/command/bridge) +"rAl" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + name = "Radiation Chamber Shutters"; + id = "engsm" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer1, +/obj/effect/turf_decal/trimline/yellow/arrow_cw, +/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "rAS" = ( /turf/closed/wall, /area/station/service/library/lounge) @@ -53377,6 +53399,10 @@ /obj/structure/sign/clock/directional/east, /turf/open/floor/iron/grimy, /area/station/hallway/secondary/entry) +"rJr" = ( +/obj/structure/sign/warning/electric_shock, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "rJD" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, @@ -53618,17 +53644,6 @@ /obj/machinery/vending/wardrobe/viro_wardrobe, /turf/open/floor/iron/dark, /area/station/medical/virology) -"rNG" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - name = "Radiation Chamber Shutters"; - id = "engsm" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "rNO" = ( /obj/effect/turf_decal/trimline/white/warning, /turf/open/floor/engine/hull, @@ -54339,19 +54354,6 @@ dir = 1 }, /area/station/command/eva) -"rZx" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Gas to Filter"; - dir = 1 - }, -/obj/machinery/camera/emp_proof{ - dir = 10; - network = list("ss13","engine","engineering"); - c_tag = "Engineering - Engine Room Airlock" - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "rZz" = ( /obj/structure/table/glass, /obj/effect/turf_decal/stripes/corner, @@ -55087,6 +55089,14 @@ }, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) +"smX" = ( +/obj/effect/turf_decal/trimline/yellow/arrow_cw, +/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ + dir = 1 + }, +/obj/structure/cable/multilayer/connected, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "sna" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -55118,14 +55128,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/armory) -"snp" = ( -/obj/effect/turf_decal/trimline/yellow/arrow_cw, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - dir = 1 - }, -/obj/structure/cable/multilayer/connected, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "sns" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58403,6 +58405,10 @@ /obj/machinery/light/dim/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"tuW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "tvP" = ( /obj/structure/rack, /obj/item/storage/box/lights/tubes{ @@ -59278,6 +59284,15 @@ /obj/machinery/wall_healer/directional/north, /turf/open/floor/iron, /area/station/engineering/break_room) +"tJM" = ( +/obj/machinery/door/airlock/engineering/glass/critical{ + name = "Supermatter Chamber"; + heat_proof = 1 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "tJR" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -59888,16 +59903,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/dorms) -"tVK" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 4 - }, -/obj/machinery/gizmo/toggle/tucker_tubes, -/turf/open/floor/iron, -/area/station/science/explab) "tWb" = ( /obj/machinery/camera/directional/east{ c_tag = "Civilian - Theatre Stage" @@ -61791,10 +61796,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"uAs" = ( -/obj/effect/spawner/random/gizmo, -/turf/open/floor/engine, -/area/station/science/explab) "uAx" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -62525,6 +62526,17 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/science/robotics/lab) +"uKF" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/corner, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "uKK" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -62952,16 +62964,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai/satellite/maintenance) -"uTm" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "uTq" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -63614,6 +63616,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"vdV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "vdX" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -64374,6 +64380,12 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/office) +"vrm" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Gas to Chamber" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "vro" = ( /obj/structure/filingcabinet/white, /obj/structure/window/reinforced/spawner/directional/east, @@ -67284,14 +67296,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) -"wtt" = ( -/obj/effect/turf_decal/trimline/yellow/arrow_ccw, -/obj/effect/turf_decal/trimline/yellow/arrow_cw{ - dir = 1 - }, -/obj/structure/cable/multilayer/connected, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "wtw" = ( /obj/effect/turf_decal/trimline/dark_green/filled/corner{ dir = 1 @@ -68073,21 +68077,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/security/checkpoint/medical) -"wGA" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - name = "Radiation Chamber Shutters"; - id = "engsm" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/layer1, -/obj/effect/turf_decal/trimline/yellow/arrow_cw{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "wGE" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 @@ -68891,6 +68880,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/armory) +"wYM" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + name = "Radiation Chamber Shutters"; + id = "engsm" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/supermatter/engine) "wYO" = ( /obj/machinery/rnd/production/protolathe/department/engineering, /obj/effect/turf_decal/trimline/yellow/filled/end{ @@ -69966,6 +69966,16 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"xup" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/machinery/gizmo/toggle/tucker_tubes, +/turf/open/floor/iron, +/area/station/science/explab) "xuq" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -70454,6 +70464,10 @@ }, /turf/open/misc/asteroid/snow/coldroom, /area/station/service/kitchen/coldroom) +"xDh" = ( +/obj/structure/sign/warning/fire, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "xDJ" = ( /obj/machinery/light/cold/directional/south, /turf/open/floor/iron/freezer, @@ -71327,16 +71341,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/science/xenobiology) -"xVG" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "xVJ" = ( /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock" @@ -71409,10 +71413,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison/safe) -"xXC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "xXL" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -101774,11 +101774,11 @@ bWN fQI nKg xXZ -eIk -rNG -pOy -rNG -eIk +tuW +wYM +rAl +wYM +tuW sTg wkg iEG @@ -102031,11 +102031,11 @@ bWN mCO mmH cht -hDI -bKt -snp -bKt -hDI +lNz +gub +smX +gub +lNz qqc cOF iEG @@ -102286,13 +102286,13 @@ qHs asA bWN cQs -qik -hDI -lEf -xVG -gDI -xVG -hDI +gOw +lNz +ppD +cmR +bYu +cmR +lNz nMX gCH hTF @@ -102543,13 +102543,13 @@ lfB ltq bWN qCG -hiB -rZx -lEf -jyF -jyF -jyF -esc +vdV +ikh +ppD +oAy +oAy +oAy +rJr ima oiG mgG @@ -102800,13 +102800,13 @@ cYx iFc pjK svA -jBn -bKt -gqf -asT -dQn -bKt -frN +tJM +gub +eOE +lOZ +hhT +gub +kIk eqN lFz jXN @@ -103057,13 +103057,13 @@ lfB vqH fuj pUZ -xXC -hiD -lEf -onW -onW -onW -oMc +onE +vrm +ppD +bLZ +bLZ +bLZ +xDh tRf aqh gxb @@ -103314,13 +103314,13 @@ qHs bpZ fuj rJD -hDI -oMc -lEf -uTm -mng -uTm -hDI +lNz +xDh +ppD +pWK +uKF +pWK +lNz qqc gCH hTF @@ -103573,11 +103573,11 @@ fuj fnO miU rMZ -hDI -bKt -wtt -bKt -hDI +lNz +gub +lUm +gub +lNz qqc hTX lIZ @@ -103830,11 +103830,11 @@ fuj xEy miU rMZ -hDI -cNU -wGA -pgV -hDI +lNz +pwL +rpT +gWi +lNz qqc qgB vzx @@ -118147,7 +118147,7 @@ aac aaa xdZ qzh -mqT +pLh cqj mgj unl @@ -118918,7 +118918,7 @@ aaa aaa xdZ qzh -qLx +rgo cqj goY njK @@ -119990,7 +119990,7 @@ sQZ owO owO owO -uAs +hrn cJS rKD udg @@ -120251,7 +120251,7 @@ sQZ sQZ wrz hIY -tVK +xup vIF yeZ hTg diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index d098f5e6e4a0..81ca734b8e21 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -266,10 +266,6 @@ /mob/living/basic/sloth/citrus, /turf/open/floor/iron, /area/station/cargo/storage) -"aez" = ( -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "aeC" = ( /obj/effect/turf_decal/trimline/yellow/corner{ dir = 1 @@ -3421,13 +3417,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"bhv" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "bhB" = ( /obj/structure/cable, /obj/machinery/door/airlock/engineering{ @@ -5012,6 +5001,14 @@ /obj/machinery/light/directional/north, /turf/open/openspace, /area/station/engineering/supermatter/room) +"bMk" = ( +/obj/structure/closet/l3closet/janitor, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/autoname/directional/north, +/obj/item/restraints/legcuffs/beartrap, +/obj/item/restraints/legcuffs/beartrap, +/turf/open/floor/iron, +/area/station/service/janitor) "bMl" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -5537,10 +5534,6 @@ }, /turf/open/floor/wood/parquet, /area/station/medical/psychology) -"bWe" = ( -/obj/effect/spawner/random/gizmo, -/turf/open/floor/engine, -/area/station/science/explab) "bWi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -11432,10 +11425,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos/upper) -"dYp" = ( -/obj/structure/sign/warning/fire, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "dYq" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -12770,17 +12759,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/central/lesser) -"ewL" = ( -/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 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "ewM" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -13722,6 +13700,10 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"eOg" = ( +/obj/machinery/gizmo/toggle/tucker_tubes, +/turf/open/floor/iron/white, +/area/station/science/explab) "eOn" = ( /obj/effect/landmark/atmospheric_sanity/ignore_area, /turf/closed/wall/r_wall, @@ -14235,6 +14217,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/exam_room) +"eYC" = ( +/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 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "eYF" = ( /obj/structure/railing/corner{ dir = 8 @@ -15954,6 +15947,11 @@ /obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/central) +"fEP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/meter, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "fEQ" = ( /obj/structure/table/wood, /obj/effect/spawner/random/maintenance/three, @@ -17086,10 +17084,6 @@ /obj/item/pickaxe, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"fXt" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "fXC" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/access/any/service/general, @@ -17262,6 +17256,10 @@ /obj/structure/railing/corner, /turf/open/floor/iron/white, /area/station/science/research) +"gar" = ( +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "gas" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, /obj/effect/turf_decal/stripes{ @@ -17501,6 +17499,13 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/engineering/lobby) +"gev" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "gey" = ( /obj/machinery/disposal/bin, /obj/machinery/light_switch/directional/east, @@ -18099,10 +18104,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/wood, /area/station/service/lawoffice) -"gqN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "gqO" = ( /obj/item/radio/intercom/directional/west, /turf/open/floor/glass/reinforced, @@ -18274,6 +18275,10 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white/textured_large, /area/station/science/xenobiology) +"gtF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "gtK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19662,6 +19667,10 @@ /obj/effect/turf_decal/stripes, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"gRL" = ( +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "gRO" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20361,6 +20370,10 @@ dir = 1 }, /area/station/engineering/atmos) +"hdh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "hdq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20405,6 +20418,12 @@ /obj/structure/sign/poster/contraband/random/directional/south, /turf/open/floor/iron/grimy, /area/station/maintenance/central/lesser) +"hed" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "hef" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -21032,17 +21051,6 @@ /obj/effect/spawner/random/structure/tank_holder, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"hoM" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/engine, -/area/station/engineering/supermatter) -"hoQ" = ( -/obj/machinery/light/small/directional/north, -/obj/machinery/atmospherics/components/binary/valve/digital/on{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "hoX" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, @@ -21698,6 +21706,9 @@ dir = 1 }, /area/station/service/chapel) +"hBf" = ( +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "hBi" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -23344,17 +23355,6 @@ /obj/item/grown/bananapeel, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"iee" = ( -/obj/machinery/bouldertech/refinery/smelter{ - dir = 8 - }, -/obj/machinery/conveyor{ - dir = 6; - id = "brm" - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating, -/area/station/cargo/miningoffice) "ief" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -25513,13 +25513,6 @@ /obj/structure/falsewall, /turf/open/floor/plating, /area/station/commons/storage/art) -"iTU" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/north, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "iTW" = ( /obj/machinery/door/airlock/public/glass{ name = "Locker Room" @@ -26023,6 +26016,10 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/freezer, /area/station/security/prison/shower) +"jeE" = ( +/obj/structure/sign/warning/fire, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "jeL" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -26453,6 +26450,13 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/primary/central) +"jlq" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "jlw" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/machinery/vending/coffee, @@ -26727,6 +26731,17 @@ /obj/item/food/sandwich/philly_cheesesteak, /turf/open/floor/carpet/red, /area/station/command/heads_quarters/hos) +"jqe" = ( +/obj/machinery/bouldertech/refinery{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 4; + id = "brm" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating, +/area/station/cargo/miningoffice) "jqf" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -29253,11 +29268,6 @@ }, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/project) -"kfZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/machinery/meter, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "kgb" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/yellow/fourcorners, @@ -29295,6 +29305,14 @@ }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"kgH" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "soup"; + name = "Radiation Chamber Shutters" + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "kgO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/textured_large, @@ -29883,14 +29901,6 @@ /obj/structure/broken_flooring/pile, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"kpe" = ( -/obj/structure/closet/l3closet/janitor, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/autoname/directional/north, -/obj/item/restraints/legcuffs/beartrap, -/obj/item/restraints/legcuffs/beartrap, -/turf/open/floor/iron, -/area/station/service/janitor) "kpj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29959,6 +29969,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"kpL" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "kpP" = ( /obj/machinery/door/airlock/command{ id_tag = "cmoshower"; @@ -31115,6 +31129,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"kJM" = ( +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","engine") + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "kJN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -32393,10 +32413,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"lfN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "lgh" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -33023,6 +33039,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, /area/station/medical/chemistry) +"lsU" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + dir = 4 + }, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" + }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "lta" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -38256,13 +38284,6 @@ /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"neE" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "soup"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "neT" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/plating/reinforced/airless, @@ -38369,18 +38390,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/lesser) -"ngn" = ( -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/engine_access, -/obj/machinery/atmospherics/components/binary/valve/digital/on{ - dir = 4 - }, -/obj/effect/mapping_helpers/airalarm/link{ - chamber_id = "engine" - }, -/obj/effect/mapping_helpers/airalarm/tlv_no_checks, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "ngp" = ( /obj/effect/turf_decal/siding/white{ dir = 5 @@ -38941,6 +38950,11 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/dark, /area/station/medical/chemistry/minisat) +"nsm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/meter, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "nso" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38956,6 +38970,9 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"nsD" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "nsI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39005,17 +39022,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/carpet, /area/station/commons/dorms) -"nuu" = ( -/obj/machinery/bouldertech/refinery{ - dir = 8 - }, -/obj/machinery/conveyor{ - dir = 4; - id = "brm" - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating, -/area/station/cargo/miningoffice) "nuC" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42073,11 +42079,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) -"oEf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/meter, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "oEo" = ( /obj/machinery/light/directional/north, /obj/item/assembly/mousetrap/armed, @@ -46556,12 +46557,6 @@ /obj/machinery/light/floor, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"qaZ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "qbd" = ( /obj/effect/turf_decal/siding/purple{ dir = 5 @@ -47039,6 +47034,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/break_room) +"qjU" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "soup"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "qjW" = ( /obj/effect/spawner/random/vending/colavend, /obj/effect/turf_decal/siding/brown{ @@ -51048,10 +51050,6 @@ }, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) -"rBr" = ( -/obj/machinery/air_sensor/engine_chamber, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "rBt" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51309,6 +51307,17 @@ /obj/effect/landmark/start/chemist, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"rFN" = ( +/obj/machinery/bouldertech/refinery/smelter{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 6; + id = "brm" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating, +/area/station/cargo/miningoffice) "rFV" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -51338,13 +51347,6 @@ }, /turf/open/misc/asteroid/airless, /area/station/asteroid) -"rGq" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/north, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "rGr" = ( /obj/effect/baseturf_helper/reinforced_plating, /turf/open/floor/glass/reinforced/plasma, @@ -54978,6 +54980,10 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +"sOr" = ( +/obj/effect/spawner/random/gizmo, +/turf/open/floor/engine, +/area/station/science/explab) "sOA" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -54985,13 +54991,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central) -"sOG" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "sPi" = ( /obj/structure/closet/firecloset, /obj/effect/landmark/start/hangover, @@ -56846,14 +56845,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"twf" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "soup"; - name = "Radiation Chamber Shutters" - }, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "tww" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, @@ -59491,6 +59482,13 @@ /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /turf/open/floor/plating, /area/station/commons/vacant_room/commissary) +"uqA" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "uqI" = ( /obj/structure/railing{ dir = 1 @@ -61296,12 +61294,6 @@ }, /turf/open/space/basic, /area/space) -"uXw" = ( -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13","engine") - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "uXD" = ( /turf/closed/wall, /area/station/hallway/secondary/entry) @@ -61391,6 +61383,10 @@ }, /turf/open/floor/iron, /area/station/security/office) +"uYt" = ( +/obj/machinery/power/supermatter_crystal/engine, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "uYG" = ( /turf/closed/wall/r_wall, /area/station/maintenance/aft/upper) @@ -63236,6 +63232,13 @@ }, /turf/open/floor/wood/tile, /area/station/security/courtroom) +"vHm" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "vHA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63901,9 +63904,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/service/janitor) -"vUh" = ( -/turf/open/floor/engine, -/area/station/engineering/supermatter) "vUj" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -64622,10 +64622,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison/safe) -"wid" = ( -/obj/machinery/gizmo/toggle/tucker_tubes, -/turf/open/floor/iron/white, -/area/station/science/explab) "wie" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, @@ -64952,10 +64948,6 @@ }, /turf/open/floor/wood/parquet, /area/station/medical/psychology) -"wnX" = ( -/obj/machinery/power/supermatter_crystal/engine, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "wnY" = ( /turf/open/floor/carpet/executive, /area/station/command/corporate_showroom) @@ -66766,6 +66758,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/service/theater) +"wSs" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "wTc" = ( /obj/machinery/meter/monitored/distro_loop, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, @@ -68547,6 +68546,10 @@ /obj/effect/mapping_helpers/airlock/access/any/admin/general, /turf/open/floor/iron/dark/smooth_large, /area/station/command/corporate_dock) +"xxz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/engine) "xxH" = ( /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/stripes/line{ @@ -69120,6 +69123,17 @@ /obj/structure/railing, /turf/open/floor/iron, /area/station/engineering/atmos) +"xHe" = ( +/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 = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/engine) "xHf" = ( /obj/effect/landmark/firealarm_sanity, /turf/open/openspace, @@ -69191,9 +69205,6 @@ /obj/structure/window/fulltile, /turf/open/misc/asteroid, /area/station/asteroid) -"xIV" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) "xJd" = ( /obj/effect/spawner/random/decoration/glowstick, /obj/effect/mapping_helpers/broken_floor, @@ -70195,17 +70206,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry/minisat) -"ycf" = ( -/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 = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "ycs" = ( /obj/effect/spawner/random/engineering/tank, /obj/effect/decal/cleanable/cobweb, @@ -113675,11 +113675,11 @@ oyV axQ yho yho -dYp -gqN -ycf -lfN -xIV +jeE +hdh +xHe +xxz +nsD khO ueA xwD @@ -113932,11 +113932,11 @@ gea xaP dhn jjO -xIV -hoQ -vUh -ngn -xIV +nsD +wSs +hBf +lsU +nsD khO njX xwD @@ -114187,15 +114187,15 @@ lwv nPW oyV xaP -xIV -xIV -gqN -oEf -ewL -kfZ -lfN -xIV -xIV +nsD +nsD +hdh +fEP +eYC +nsm +xxz +nsD +nsD xwD cvL qqB @@ -114444,15 +114444,15 @@ cUD nPW oyV xaP -neE -uXw -bhv -qaZ -rBr -hoM -rGq -vUh -neE +qjU +kJM +jlq +hed +gar +gtF +vHm +hBf +qjU xwD cvL psF @@ -114701,15 +114701,15 @@ pbD nPW oyV kiT -twf -aez -sOG -qaZ -wnX -hoM -iTU -aez -twf +kgH +gRL +gev +hed +uYt +gtF +uqA +gRL +kgH xwD cvL jWI @@ -114958,15 +114958,15 @@ biG nPW oyV xaP -neE -vUh -bhv -qaZ -vUh -hoM -rGq -vUh -neE +qjU +hBf +jlq +hed +hBf +gtF +vHm +hBf +qjU xwD cvL gRG @@ -115215,15 +115215,15 @@ lCu pxu oyV xaP -xIV -xIV -xIV -xIV -fXt -xIV -xIV -xIV -xIV +nsD +nsD +nsD +nsD +kpL +nsD +nsD +nsD +nsD rLz uei nNN @@ -149346,7 +149346,7 @@ lEj lEj pEH izF -nuu +jqe kVS qXY wds @@ -149860,7 +149860,7 @@ dOG lEj pEH mRE -iee +rFN bPu uKu iaN @@ -160430,7 +160430,7 @@ fZv fZv vbY jGB -kpe +bMk slM feu xWd @@ -176331,7 +176331,7 @@ hOa ukx nas gKt -wid +eOg rHF mHf xfK @@ -177613,7 +177613,7 @@ raz occ fMz obA -bWe +sOr mSY ddZ nXL diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm index cbed6116d05a..1c16e9d8030e 100644 --- a/code/_globalvars/lists/reagents.dm +++ b/code/_globalvars/lists/reagents.dm @@ -81,6 +81,13 @@ GLOBAL_LIST_INIT(stacked_metabolization_effect, init_chemical_side_effects()) return reagent_list +/proc/check_recipe_for_conflicts(datum/chemical_reaction/reaction, list/reaction_lookup) + for(var/x in reaction.required_reagents) + for(var/datum/chemical_reaction/competitor in reaction_lookup[x]) + if(chem_recipes_do_conflict(competitor, reaction)) + return TRUE + return FALSE + /** * Chemical Reactions - Initialises all /datum/chemical_reaction into a list * It is filtered into multiple lists within a list. @@ -108,20 +115,19 @@ GLOBAL_LIST_INIT(stacked_metabolization_effect, init_chemical_side_effects()) var/list/datum/chemical_reaction/reactions = list() for(var/datum/chemical_reaction/reaction as anything in paths) - if(!ispath(reaction, /datum/chemical_reaction/randomized)) + if(ispath(reaction, /datum/chemical_reaction/randomized)) + reaction = new reaction(LAZYACCESS(json, "[reaction]")) + else reaction = new reaction - reactions += reaction - + if(!QDELETED(reaction)) // in case random recipe generation fail + reactions += reaction // Ok so we're gonna do a thingTM here // I want to distribute all our reactions such that each reagent id links to as few as possible // I get the feeling there's a canonical way of doing this, but I don't know it // So instead, we're gonna wing it var/list/reagent_to_react_count = list() - var/list/randomized_reaction_retry_attempts = list() for(var/datum/chemical_reaction/reaction as anything in reactions) - if(ispath(reaction, /datum/chemical_reaction/randomized)) - randomized_reaction_retry_attempts[reaction] = 0 - else + if(!istype(reaction, /datum/chemical_reaction/randomized)) for(var/reagent_id in reaction.required_reagents) reagent_to_react_count[reagent_id] += 1 @@ -131,33 +137,22 @@ GLOBAL_LIST_INIT(stacked_metabolization_effect, init_chemical_side_effects()) // Doing this separately because it relies on the loop above, and this is easier to parse for(var/datum/chemical_reaction/reaction as anything in reactions) //check for collisions - if(ispath(reaction, /datum/chemical_reaction/randomized)) - var/target_path = reaction - var/index = reactions.Find(reaction) - reaction = new target_path(LAZYACCESS(json, "[target_path]")) - - //failed to init + if(istype(reaction, /datum/chemical_reaction/randomized)) + var/datum/chemical_reaction/randomized/random_reaction = reaction + var/retry_attempts = 0 + while(check_recipe_for_conflicts(random_reaction, reaction_lookup)) + if(retry_attempts >= MAX_RANDOMIZED_REACTION_RETRY_ATTEMPTS || !random_reaction.generate_recipe()) + reactions -= reaction + qdel(reaction) + break + retry_attempts++ + + // log results if(QDELETED(reaction)) - reactions -= target_path - continue - - //failed to resolve so retry - outer: - for(var/x in reaction.required_reagents) - for(var/datum/chemical_reaction/R in reaction_lookup[x]) - if(chem_recipes_do_conflict(R, reaction)) - reactions -= target_path - QDEL_NULL(reaction) - if(randomized_reaction_retry_attempts[target_path] < MAX_RANDOMIZED_REACTION_RETRY_ATTEMPTS) - reactions += target_path - randomized_reaction_retry_attempts[target_path] += 1 - break outer - - //add to list - if(!reaction) + log_game("Couldn't regenerate [reaction] due to conflicts in [retry_attempts] attempts.") continue - else - reactions[index] = reaction + else if(retry_attempts > 0) + log_game("Regenerated [reaction] due to conflicts in [retry_attempts] attempts.") var/preferred_id = null for(var/reagent_id in reaction.required_reagents) diff --git a/code/controllers/subsystem/persistence/recipes.dm b/code/controllers/subsystem/persistence/recipes.dm index 828f856b76a8..59b94f4906b3 100644 --- a/code/controllers/subsystem/persistence/recipes.dm +++ b/code/controllers/subsystem/persistence/recipes.dm @@ -22,7 +22,6 @@ determin_ph_range = R.determin_ph_range, H_ion_release = R.H_ion_release, purity_min = R.purity_min, - results = R.results, required_container = R.required_container ) diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm index 0db3642eb60f..afcc8305fb53 100644 --- a/code/datums/components/twohanded.dm +++ b/code/datums/components/twohanded.dm @@ -119,7 +119,7 @@ src.force_multiplier = force_multiplier if(!isnull(force_wielded)) src.force_wielded = force_wielded - if(isnull(force_unwielded)) + if(!isnull(force_unwielded)) src.force_unwielded = force_unwielded if(icon_wielded) src.icon_wielded = icon_wielded diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm index d4154408fa3f..c6dcbc200df2 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm @@ -926,6 +926,15 @@ name = "Gi (Worn)" icon_file = 'icons/mob/clothing/under/costume.dmi' +/datum/greyscale_config/jester_hat + name = "Jester Hat" + icon_file = 'icons/obj/clothing/head/costume.dmi' + json_config = 'code/datums/greyscale/json_configs/jester_hat.json' + +/datum/greyscale_config/jester_hat/worn + name = "Jester Hat (Worn)" + icon_file = 'icons/mob/clothing/head/costume.dmi' + /datum/greyscale_config/jester_suit name = "Jester Suit" icon_file = 'icons/obj/clothing/under/civilian.dmi' @@ -944,15 +953,24 @@ name = "Jester Shoes (Worn)" icon_file = 'icons/mob/clothing/feet.dmi' -/datum/greyscale_config/jester_hat - name = "Jester Hat" +/datum/greyscale_config/jester_hat_alt + name = "Jester Hat (Alt)" icon_file = 'icons/obj/clothing/head/costume.dmi' - json_config = 'code/datums/greyscale/json_configs/jester_hat.json' + json_config = 'code/datums/greyscale/json_configs/jester_hat_alt.json' -/datum/greyscale_config/jester_hat/worn - name = "Jester Hat (Worn)" +/datum/greyscale_config/jester_hat_alt/worn + name = "Jester Hat (Alt, Worn)" icon_file = 'icons/mob/clothing/head/costume.dmi' +/datum/greyscale_config/jester_suit_alt + name = "Jester Suit (Alt)" + icon_file = 'icons/obj/clothing/under/civilian.dmi' + json_config = 'code/datums/greyscale/json_configs/jester_suit_alt.json' + +/datum/greyscale_config/jester_suit_alt/worn + name = "Jester Suit (Alt, Worn)" + icon_file = 'icons/mob/clothing/under/civilian.dmi' + /datum/greyscale_config/lizard_hat name = "Lizardskin Cloche Hat" icon_file = 'icons/obj/clothing/head/costume.dmi' diff --git a/code/datums/greyscale/json_configs/jester_hat_alt.json b/code/datums/greyscale/json_configs/jester_hat_alt.json new file mode 100644 index 000000000000..d791644a6f33 --- /dev/null +++ b/code/datums/greyscale/json_configs/jester_hat_alt.json @@ -0,0 +1,21 @@ +{ + "jester_alt": [ + { + "type": "icon_state", + "icon_state": "jester_alt_a", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "jester_alt_b", + "blend_mode": "overlay", + "color_ids": [2] + }, + { + "type": "icon_state", + "icon_state": "jester_alt_bells", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/jester_suit_alt.json b/code/datums/greyscale/json_configs/jester_suit_alt.json new file mode 100644 index 000000000000..d791644a6f33 --- /dev/null +++ b/code/datums/greyscale/json_configs/jester_suit_alt.json @@ -0,0 +1,21 @@ +{ + "jester_alt": [ + { + "type": "icon_state", + "icon_state": "jester_alt_a", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "jester_alt_b", + "blend_mode": "overlay", + "color_ids": [2] + }, + { + "type": "icon_state", + "icon_state": "jester_alt_bells", + "blend_mode": "overlay" + } + ] +} diff --git a/code/game/area/areas/station/engineering.dm b/code/game/area/areas/station/engineering.dm index 9ad25f233cbc..3f0464453857 100644 --- a/code/game/area/areas/station/engineering.dm +++ b/code/game/area/areas/station/engineering.dm @@ -82,9 +82,13 @@ icon_state = "engi_lobby" /area/station/engineering/supermatter - name = "\improper Supermatter Engine" + name = "\improper Place Somewhere Around the Supermatter" // don't use this type icon_state = "engine_sm" area_flags = BLOBS_ALLOWED | CULT_PERMITTED + +/area/station/engineering/supermatter/engine + name = "\improper Supermatter Engine" + icon_state = "engine_sm" sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/station/engineering/supermatter/Initialize(mapload) diff --git a/code/game/area/areas/station/telecomm.dm b/code/game/area/areas/station/telecomm.dm index 02101c28c1a9..adb4670b44b3 100644 --- a/code/game/area/areas/station/telecomm.dm +++ b/code/game/area/areas/station/telecomm.dm @@ -16,6 +16,9 @@ ) airlock_wires = /datum/wires/airlock/engineering +/area/station/tcommsat/maints + name = "\improper Telecomms Maintenance Room" + /area/station/tcommsat/computer name = "\improper Telecomms Control Room" icon_state = "tcomsatcomp" diff --git a/code/game/objects/effects/decals/cleanable/mess.dm b/code/game/objects/effects/decals/cleanable/mess.dm index 1d250034609b..61cd8f41fe5b 100644 --- a/code/game/objects/effects/decals/cleanable/mess.dm +++ b/code/game/objects/effects/decals/cleanable/mess.dm @@ -289,7 +289,7 @@ GLOBAL_LIST_EMPTY(nebula_vomits) pixel_x = rand(-10, 10) pixel_y = rand(-10, 10) if(!isnull(oldname)) - desc = "The sad remains of what used to be [oldname]" + desc = "The sad remains of what used to be \a [oldname]." . = ..() /obj/effect/decal/cleanable/glitter diff --git a/code/game/objects/effects/landmarks/atmospherics_sanity_landmarks.dm b/code/game/objects/effects/landmarks/atmospherics_sanity_landmarks.dm index 6a9df18bab3b..a021caa1edd4 100644 --- a/code/game/objects/effects/landmarks/atmospherics_sanity_landmarks.dm +++ b/code/game/objects/effects/landmarks/atmospherics_sanity_landmarks.dm @@ -21,12 +21,19 @@ icon_state = "atmos_sanity_start" /** - * Marks an area as a goal for atmospheric connectivity; ignored if the map contains the mark all station areas landmark! + * Marks an area as a goal for atmospheric connectivity; ignored if the map contains the mark all station areas landmark */ /obj/effect/landmark/atmospheric_sanity/goal_area name = "Atmospheric Sanity Goal" icon_state = "atmos_sanity_goal" +/** + * Marks an area as forbidden from atmospheric connectivity; ignored if the map contains the "mark all station areas" landmark + */ +/obj/effect/landmark/atmospheric_sanity/forbidden_area + name = "Atmospheric Sanity Forbidden" + icon_state = "atmos_sanity_forbidden" + /** * Marks an area as ignored for purposes of default station connectivity. */ diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index f181ca6b57b7..ab74022a640c 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -274,6 +274,10 @@ light_color = LIGHT_COLOR_FIRE duration = 10 +/obj/effect/temp_visual/fire/light + icon_state = "light" + color = COLOR_DARK_ORANGE + /obj/effect/temp_visual/revenant name = "spooky lights" icon_state = "purplesparkles" diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 17739a291e26..c0a7c8d19440 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -366,7 +366,7 @@ return TRUE /obj/item/blob_act(obj/structure/blob/B) - if(B && B.loc == loc) + if(B && B.loc == loc && !(resistance_flags & INDESTRUCTIBLE)) atom_destruction(MELEE) /**Makes cool stuff happen when you suicide with an item diff --git a/code/game/objects/structures/crates_lockers/closets/bodybag.dm b/code/game/objects/structures/crates_lockers/closets/bodybag.dm index b911705b0102..3da2b67101e3 100644 --- a/code/game/objects/structures/crates_lockers/closets/bodybag.dm +++ b/code/game/objects/structures/crates_lockers/closets/bodybag.dm @@ -317,15 +317,15 @@ icon_state = "prisonerenvirobag" foldedbag_path = /obj/item/bodybag/environmental/prisoner breakout_time = 4 MINUTES // because it's probably about as hard to get out of this as it is to get out of a straightjacket. - /// How long it takes to sinch the bag. - var/sinch_time = 10 SECONDS - /// Whether or not the bag is sinched. Starts unsinched. - var/sinched = FALSE - /// The sound that plays when the bag is done sinching. - var/sinch_sound = 'sound/items/equip/toolbelt_equip.ogg' + /// How long it takes to cinch the bag. + var/cinch_time = 10 SECONDS + /// Whether or not the bag is cinched. Starts uncinched. + var/cinched = FALSE + /// The sound that plays when the bag is done cinching. + var/cinch_sound = 'sound/items/equip/toolbelt_equip.ogg' /obj/structure/closet/body_bag/environmental/prisoner/attempt_fold(mob/living/carbon/human/the_folder) - if(sinched) + if(cinched) to_chat(the_folder, span_warning("You wrestle with [src], but it won't fold while its straps are fastened.")) return FALSE return ..() @@ -335,23 +335,23 @@ if(!.) return FALSE - if(sinched && !force) - to_chat(user, span_danger("The buckles on [src] are sinched down, preventing it from opening.")) + if(cinched && !force) + to_chat(user, span_danger("The buckles on [src] are cinched down, preventing it from opening.")) return FALSE - sinched = FALSE //in case it was forced open unsinch it + cinched = FALSE //in case it was forced open uncinch it return TRUE /obj/structure/closet/body_bag/environmental/prisoner/update_icon() . = ..() - if(sinched) - icon_state = initial(icon_state) + "_sinched" + if(cinched) + icon_state = initial(icon_state) + "_cinched" else icon_state = initial(icon_state) /obj/structure/closet/body_bag/environmental/prisoner/container_resist_act(mob/living/user, loc_required = TRUE) // copy-pasted with changes because flavor text as well as some other misc stuff - if(opened || ismovable(loc) || !sinched) + if(opened || ismovable(loc) || !cinched) return ..() user.changeNext_move(CLICK_CD_BREAKOUT) @@ -360,7 +360,7 @@ span_notice("You start wriggling, attempting to loosen [src]'s buckles... (this will take about [DisplayTimeText(breakout_time)].)"), \ span_hear("You hear straining cloth from [src].")) if(do_after(user,(breakout_time), target = src)) - if(!user || user.stat != CONSCIOUS || user.loc != src || opened || !sinched ) + if(!user || user.stat != CONSCIOUS || user.loc != src || opened || !cinched ) return //we check after a while whether there is a point of resisting anymore and whether the user is capable of resisting user.visible_message(span_danger("[user] successfully broke out of [src]!"), @@ -374,7 +374,7 @@ /obj/structure/closet/body_bag/environmental/prisoner/bust_open() - sinched = FALSE + cinched = FALSE // We don't break the bag, because the buckles were backed out as opposed to fully broken. open() @@ -393,19 +393,19 @@ return if(iscarbon(user)) add_fingerprint(user) - if(!sinched) + if(!cinched) for(var/mob/living/target in contents) to_chat(target, span_userdanger("You feel the lining of [src] tighten around you! Soon, you won't be able to escape!")) - user.visible_message(span_notice("[user] begins sinching down the buckles on [src].")) - if(!(do_after(user,(sinch_time),target = src))) + user.visible_message(span_notice("[user] begins cinching down the buckles on [src].")) + if(!(do_after(user,(cinch_time),target = src))) return - sinched = !sinched - if(sinched) - playsound(loc, sinch_sound, 15, TRUE, -2) - user.visible_message(span_notice("[user] [sinched ? null : "un"]sinches [src]."), - span_notice("You [sinched ? null : "un"]sinch [src]."), + cinched = !cinched + if(cinched) + playsound(loc, cinch_sound, 15, TRUE, -2) + user.visible_message(span_notice("[user] [cinched ? null : "un"]cinches [src]."), + span_notice("You [cinched ? null : "un"]cinch [src]."), span_hear("You hear stretching followed by metal clicking from [src].")) - user.log_message("[sinched ? "sinched":"unsinched"] secure environmental bag [src]", LOG_GAME) + user.log_message("[cinched ? "cinched":"uncinched"] secure environmental bag [src]", LOG_GAME) update_appearance() /obj/structure/closet/body_bag/environmental/prisoner/syndicate @@ -418,7 +418,7 @@ foldedbag_path = /obj/item/bodybag/environmental/prisoner/syndicate weather_protection = list(TRAIT_WEATHER_IMMUNE) breakout_time = 8 MINUTES - sinch_time = 20 SECONDS + cinch_time = 20 SECONDS /obj/structure/closet/body_bag/environmental/prisoner/pressurized/syndicate/refresh_air() air_contents = null @@ -430,7 +430,7 @@ air_contents.adjust_gas(/datum/gas/nitrous_oxide, (ONE_ATMOSPHERE*50)/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD) /obj/structure/closet/body_bag/environmental/hardlight - name = "hardlight bodybag" + name = "hardlight body bag" desc = "A hardlight bag for storing bodies. Resistant to space." icon_state = "holobag_med" resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF @@ -443,8 +443,8 @@ playsound(src, 'sound/items/weapons/egloves.ogg', 80, TRUE) /obj/structure/closet/body_bag/environmental/prisoner/hardlight - name = "hardlight prisoner bodybag" - desc = "A hardlight bag for storing bodies. Resistant to space, can be sinched to prevent escape." + name = "hardlight prisoner body bag" + desc = "A hardlight bag for storing bodies. Resistant to space, can be cinched to prevent escape." icon_state = "holobag_sec" resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF foldedbag_path = null @@ -456,7 +456,7 @@ playsound(src, 'sound/items/weapons/egloves.ogg', 80, TRUE) /obj/structure/closet/body_bag/environmental/stasis - name = "stasis bodybag" + name = "stasis body bag" desc = "A disposable bodybag designed to keep its contents in stasis, preventing decay and further injury. \ The bag itself cannot maintain stasis for long, and will eventually fall apart." max_integrity = 300 @@ -577,6 +577,7 @@ take_damage(max_integrity * 0.004 * seconds_per_tick, sound_effect = FALSE) /obj/structure/closet/body_bag/environmental/stasis/after_open(mob/living/user, force = FALSE) + . = ..() if(COOLDOWN_FINISHED(src, freeze_sound_cd) && (locate(/mob/living) in loc)) playsound(src, 'sound/effects/spray.ogg', 25, TRUE, MEDIUM_RANGE_SOUND_EXTRARANGE, frequency = 0.4) COOLDOWN_START(src, freeze_sound_cd, 2 SECONDS) @@ -588,6 +589,7 @@ RegisterSignal(target, COMSIG_LIVING_EARLY_UNARMED_ATTACK, PROC_REF(skip_to_attack_hand)) /obj/structure/closet/body_bag/environmental/stasis/after_close(mob/living/user) + . = ..() if(COOLDOWN_FINISHED(src, freeze_sound_cd) && (locate(/mob/living) in src)) playsound(src, 'sound/effects/spray.ogg', 25, TRUE, MEDIUM_RANGE_SOUND_EXTRARANGE, frequency = 0.5) COOLDOWN_START(src, freeze_sound_cd, 2 SECONDS) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 4882007ddbbf..b02b29c2b72a 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -308,7 +308,8 @@ /obj/structure/flora/tree/Initialize(mapload) . = ..() - AddComponent(/datum/component/seethrough, get_seethrough_map()) + if(get_seethrough_map()) + AddComponent(/datum/component/seethrough, get_seethrough_map()) /obj/structure/flora/tree/get_potential_products() return list(/obj/item/grown/log/tree = 1) @@ -345,6 +346,9 @@ to_chat(user, span_notice("You manage to remove [src].")) qdel(src) +/obj/structure/flora/tree/stump/get_seethrough_map() + return FALSE + /obj/structure/flora/tree/dead icon = 'icons/obj/fluff/flora/deadtrees.dmi' desc = "A dead tree. How it died, you know not." diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index 53febcc363f0..d45b0f0a37c7 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -63,7 +63,7 @@ /obj/item/antag_spawner/contract/proc/poll_for_student(mob/living/carbon/human/teacher, apprentice_school) balloon_alert(teacher, "contacting apprentice...") polling = TRUE - var/mob/chosen_one = SSpolling.poll_ghosts_for_target("Do you want to play as [span_danger("[teacher]'s")] [span_notice("[apprentice_school] apprentice")]?", check_jobban = ROLE_WIZARD, role = ROLE_WIZARD, poll_time = 15 SECONDS, checked_target = src, alert_pic = /obj/item/clothing/head/wizard/red, jump_target = src, role_name_text = "wizard apprentice", chat_text_border_icon = /obj/item/clothing/head/wizard/red) + var/mob/chosen_one = SSpolling.poll_ghosts_for_target("Do you want to play as [span_danger("[teacher]'s")] [span_notice("[apprentice_school] apprentice")]?", check_jobban = ROLE_WIZARD_MIDROUND, role = ROLE_WIZARD_MIDROUND, poll_time = 15 SECONDS, checked_target = src, alert_pic = /obj/item/clothing/head/wizard/red, jump_target = src, role_name_text = "wizard apprentice", chat_text_border_icon = /obj/item/clothing/head/wizard/red) polling = FALSE if(isnull(chosen_one)) to_chat(teacher, span_warning("Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later.")) diff --git a/code/modules/antagonists/heretic/knowledge/_heretic_paths.dm b/code/modules/antagonists/heretic/knowledge/_heretic_paths.dm index 6bdda2d115c6..ed4c7b97dd35 100644 --- a/code/modules/antagonists/heretic/knowledge/_heretic_paths.dm +++ b/code/modules/antagonists/heretic/knowledge/_heretic_paths.dm @@ -62,6 +62,8 @@ GLOBAL_LIST_INIT(heretic_path_datums, init_heretic_path_datums()) var/guaranteed_side_tier2 /// Knowledge guaranteed to show up in the third draft var/guaranteed_side_tier3 + /// Discount applied to shop knowledge costs for this path (subtracted from each tier cost, minimum 1) + var/shop_cost_discount = 0 /datum/heretic_knowledge_tree_column/proc/get_ui_data(datum/antagonist/heretic/our_heretic, category) @@ -232,6 +234,10 @@ GLOBAL_LIST_INIT(heretic_path_datums, init_heretic_path_datums()) /// costs by index mapped to depth var/list/shop_costs = list(1, 2, 2, 2, 3) + var/discount = heretic_path.shop_cost_discount + if(discount) + for(var/i in 1 to length(shop_costs)) + shop_costs[i] = max(1, shop_costs[i] - discount) // Relevant variables that we pull from the path var/knowledge_tier1 = heretic_path.knowledge_tier1 diff --git a/code/modules/antagonists/heretic/knowledge/lock_lore.dm b/code/modules/antagonists/heretic/knowledge/lock_lore.dm index 76f2dfd27763..f83bfbdb4b2f 100644 --- a/code/modules/antagonists/heretic/knowledge/lock_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/lock_lore.dm @@ -3,6 +3,7 @@ ui_bgr = "node_lock" complexity = "Medium" complexity_color = COLOR_YELLOW + shop_cost_discount = 1 icon = list( "icon" = 'icons/obj/weapons/khopesh.dmi', "state" = "key_blade", diff --git a/code/modules/antagonists/heretic/moon_lunatic.dm b/code/modules/antagonists/heretic/moon_lunatic.dm index 87609dbf9674..27aaef81f15a 100644 --- a/code/modules/antagonists/heretic/moon_lunatic.dm +++ b/code/modules/antagonists/heretic/moon_lunatic.dm @@ -15,10 +15,14 @@ var/mob/living/carbon/human/ascended_body // Our objective var/datum/objective/lunatic/lunatic_obj + // Actions granted by this datum, tracked for proper cleanup on body transfer + var/datum/action/cooldown/lunatic_track/moon_track + var/datum/action/cooldown/spell/touch/mansus_grasp/mad_touch /datum/antagonist/lunatic/on_gain() owner.current.log_message("has become a Lunatic!", LOG_ATTACK, color="red") // Masters gain an objective before so we dont want duplicates + . = ..() for(var/objective in objectives) if(!istype(objective, /datum/objective/lunatic)) continue @@ -26,6 +30,14 @@ var/datum/objective/lunatic/loony = new() objectives += loony lunatic_obj = loony + moon_track = new(owner) + mad_touch = new(owner) + mad_touch.Grant(owner.current) + moon_track.Grant(owner.current) + +/datum/antagonist/lunatic/on_removal() + QDEL_NULL(moon_track) + QDEL_NULL(mad_touch) return ..() /datum/antagonist/lunatic/on_removal() @@ -49,15 +61,11 @@ add_team_hud(our_mob, /datum/antagonist/lunatic) ADD_TRAIT(our_mob, TRAIT_MADNESS_IMMUNE, REF(src)) - var/datum/action/cooldown/lunatic_track/moon_track = new /datum/action/cooldown/lunatic_track() - var/datum/action/cooldown/spell/touch/mansus_grasp/mad_touch = new /datum/action/cooldown/spell/touch/mansus_grasp() - mad_touch.Grant(our_mob) - moon_track.Grant(our_mob) - /datum/antagonist/lunatic/remove_innate_effects(mob/living/mob_override) var/mob/living/our_mob = mob_override || owner.current handle_clown_mutation(our_mob, removing = FALSE) our_mob.remove_faction(FACTION_HERETIC) + REMOVE_TRAIT(our_mob, TRAIT_MADNESS_IMMUNE, REF(src)) // Mood event given to moon acolytes /datum/mood_event/heretics/lunatic @@ -92,3 +100,6 @@ /datum/antagonist/lunatic/master/apply_innate_effects(mob/living/mob_override) var/mob/living/our_mob = mob_override || owner.current add_team_hud(our_mob, /datum/antagonist/lunatic) + +/datum/antagonist/lunatic/master/remove_innate_effects(mob/living/mob_override) + return diff --git a/code/modules/antagonists/nightmare/nightmare_organs.dm b/code/modules/antagonists/nightmare/nightmare_organs.dm index 6ac1148a2224..03ecc0eeb30d 100644 --- a/code/modules/antagonists/nightmare/nightmare_organs.dm +++ b/code/modules/antagonists/nightmare/nightmare_organs.dm @@ -93,6 +93,10 @@ /// The armblade granted to the host of this heart. var/obj/item/light_eater/blade +/obj/item/organ/heart/nightmare/Destroy() + QDEL_NULL(blade) + return ..() + /obj/item/organ/heart/nightmare/attack(mob/M, mob/living/carbon/user, obj/target) if(M != user) return ..() @@ -111,9 +115,11 @@ /obj/item/organ/heart/nightmare/on_mob_insert(mob/living/carbon/heart_owner, special, movement_flags) . = ..() - if(special != HEART_SPECIAL_SHADOWIFY) - blade = new/obj/item/light_eater - heart_owner.put_in_hands(blade) + if(special == HEART_SPECIAL_SHADOWIFY) + return + blade = new /obj/item/light_eater + heart_owner.put_in_hands(blade) + RegisterSignal(blade, COMSIG_QDELETING, PROC_REF(on_blade_deleted)) /obj/item/organ/heart/nightmare/on_mob_remove(mob/living/carbon/heart_owner, special, movement_flags) . = ..() @@ -125,6 +131,11 @@ /obj/item/organ/heart/nightmare/Stop() return FALSE +// Happens if the blade was deleted before we were during mob destruction +/obj/item/organ/heart/nightmare/proc/on_blade_deleted(datum/source) + SIGNAL_HANDLER + blade = null + /obj/item/organ/heart/nightmare/on_death(seconds_per_tick) if(!owner) return diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm index 61882a88192e..94498df7b153 100644 --- a/code/modules/clothing/head/hat.dm +++ b/code/modules/clothing/head/hat.dm @@ -226,7 +226,13 @@ /obj/item/clothing/head/costume/jesteralt name = "jester hat" desc = "A hat with bells, to add some merriness to the suit." - icon_state = "jester2" + icon = 'icons/map_icons/clothing/head/_head.dmi' + icon_state = "/obj/item/clothing/head/costume/jesteralt" + post_init_icon_state = "jester_alt" + greyscale_config = /datum/greyscale_config/jester_hat_alt + greyscale_config_worn = /datum/greyscale_config/jester_hat_alt/worn + greyscale_colors = "#E10000#E1E100" + flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/head/costume/rice_hat name = "rice hat" diff --git a/code/modules/clothing/shoes/clown.dm b/code/modules/clothing/shoes/clown.dm index 29e635f695b9..cf3317db2bd5 100644 --- a/code/modules/clothing/shoes/clown.dm +++ b/code/modules/clothing/shoes/clown.dm @@ -49,7 +49,13 @@ /obj/item/clothing/shoes/clown_shoes/jester name = "jester shoes" desc = "A court jester's shoes, updated with modern squeaking technology." - icon_state = "jester_shoes" + icon = 'icons/map_icons/clothing/shoes.dmi' + icon_state = "/obj/item/clothing/shoes/clown_shoes/jester" + post_init_icon_state = "jester_map" + greyscale_config = /datum/greyscale_config/jester_shoes + greyscale_config_worn = /datum/greyscale_config/jester_shoes/worn + greyscale_colors = "#E10000#E1E100" + flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/shoes/clown_shoes/meown_shoes name = "meown shoes" diff --git a/code/modules/clothing/under/jobs/civilian/clown_mime.dm b/code/modules/clothing/under/jobs/civilian/clown_mime.dm index a452c6c98e04..1ed0b8608cf8 100644 --- a/code/modules/clothing/under/jobs/civilian/clown_mime.dm +++ b/code/modules/clothing/under/jobs/civilian/clown_mime.dm @@ -88,7 +88,13 @@ /obj/item/clothing/under/rank/civilian/clown/jesteralt name = "jester suit" desc = "A jolly dress, well suited to entertain your master, nuncle." - icon_state = "jester2" + icon = 'icons/map_icons/clothing/under/_under.dmi' + icon_state = "/obj/item/clothing/under/rank/civilian/clown/jesteralt" + post_init_icon_state = "jester_alt" + greyscale_config = /datum/greyscale_config/jester_suit_alt + greyscale_config_worn = /datum/greyscale_config/jester_suit_alt/worn + greyscale_colors = "#E10000#E1E100" + flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/under/rank/civilian/clown/sexy name = "sexy-clown suit" diff --git a/code/modules/food_and_drinks/machinery/smartfridge.dm b/code/modules/food_and_drinks/machinery/smartfridge.dm index 71810d86e547..47cb25a88169 100644 --- a/code/modules/food_and_drinks/machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/machinery/smartfridge.dm @@ -14,6 +14,7 @@ light_range = MINIMUM_USEFUL_LIGHT_RANGE integrity_failure = 0.5 can_atmos_pass = ATMOS_PASS_NO + pass_flags_self = PASSCLOSEDTURF /// Icon state part for contents display var/contents_overlay_icon = "plant" /// What path boards used to construct it should build into when dropped. Needed so we don't accidentally have them build variants with items preloaded in them. @@ -131,8 +132,7 @@ . = ..() if(!anchored && welded_down) //make sure they're keep in sync in case it was forcibly unanchored by badmins or by a megafauna. welded_down = FALSE - can_atmos_pass = anchorvalue ? ATMOS_PASS_NO : ATMOS_PASS_YES - air_update_turf(TRUE, anchorvalue) + recheck_atmos_passing() /obj/machinery/smartfridge/wrench_act(mob/living/user, obj/item/tool) if(default_unfasten_wrench(user, tool) == SUCCESSFUL_UNFASTEN) @@ -189,6 +189,14 @@ . += structure_examine() +/obj/machinery/smartfridge/on_set_machine_stat(old_value) + . = ..() + recheck_atmos_passing() + if(machine_stat & BROKEN) + pass_flags_self = PASSMACHINE + return + pass_flags_self = PASSCLOSEDTURF + /// Returns details related to the fridge structure /obj/machinery/smartfridge/proc/structure_examine() . = list() @@ -422,6 +430,13 @@ return FALSE +/obj/machinery/smartfridge/proc/recheck_atmos_passing() + if(machine_stat & BROKEN) + can_atmos_pass = ATMOS_PASS_YES + else + can_atmos_pass = anchored ? ATMOS_PASS_NO : ATMOS_PASS_YES + air_update_turf(TRUE, anchored) + // ---------------------------- // Drying 'smartfridge' // ---------------------------- diff --git a/code/modules/mining/equipment/kinetic_crusher/trophies_fauna.dm b/code/modules/mining/equipment/kinetic_crusher/trophies_fauna.dm index dfa4cf8e5021..df40bf4f05b3 100644 --- a/code/modules/mining/equipment/kinetic_crusher/trophies_fauna.dm +++ b/code/modules/mining/equipment/kinetic_crusher/trophies_fauna.dm @@ -186,17 +186,31 @@ check_flags = NONE owner_has_control = FALSE cooldown_time = 10 SECONDS - projectile_type = /obj/projectile/bileworm_acid/crusher + projectile_type = /obj/projectile/bileworm_acid projectile_sound = 'sound/mobs/non-humanoids/bileworm/bileworm_spit.ogg' /datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/spewlet/New(Target) firing_directions = GLOB.cardinals.Copy() return ..() -/obj/projectile/bileworm_acid/crusher +/obj/projectile/bileworm_acid // basically only used by the crusher trophy + name = "acidic bile" + damage = 20 + speed = 0.5 + range = 20 + hitsound = 'sound/items/weapons/sear.ogg' + pass_flags = PASSTABLE + icon = 'icons/obj/weapons/guns/projectiles.dmi' + icon_state = "bile_glob" + layer = ABOVE_ALL_MOB_LAYER + mouse_opacity = MOUSE_OPACITY_TRANSPARENT damage_type = BRUTE // Otherwise the mobs take heavily reduced damage -/obj/projectile/bileworm_acid/crusher/prehit_pierce(atom/target) +/obj/projectile/bileworm_acid/Initialize(mapload) + . = ..() + AddComponent(/datum/component/parriable_projectile) + +/obj/projectile/bileworm_acid/prehit_pierce(atom/target) if (!isliving(target)) return ..() var/mob/living/as_living = target diff --git a/code/modules/mining/equipment/monster_organs/brimdust_sac.dm b/code/modules/mining/equipment/monster_organs/brimdust_sac.dm index 5ea9730daca4..9c741ae06808 100644 --- a/code/modules/mining/equipment/monster_organs/brimdust_sac.dm +++ b/code/modules/mining/equipment/monster_organs/brimdust_sac.dm @@ -169,6 +169,7 @@ dust_overlay.alpha = stacks * BRIMDUST_ALPHA_PER_STACK dust_overlay.color = COLOR_RED_LIGHT dust_overlay.blend_mode = BLEND_INSET_OVERLAY + ADD_KEEP_TOGETHER(owner, REF(src)) owner.add_overlay(dust_overlay) var/obj/effect/holder = owner.add_shared_particles(/particles/brimdust, "brimdust_coating-[owner.base_pixel_w]") holder.pixel_w = -owner.base_pixel_w @@ -178,6 +179,7 @@ /datum/status_effect/stacking/brimdust_coating/on_remove() . = ..() owner.cut_overlay(dust_overlay) + REMOVE_KEEP_TOGETHER(owner, REF(src)) owner.remove_shared_particles("brimdust_coating-[owner.base_pixel_w]") UnregisterSignal(owner, list(COMSIG_MOB_APPLY_DAMAGE, COMSIG_COMPONENT_CLEAN_ACT)) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index df31650e2f92..11e61104571b 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -213,27 +213,34 @@ animate(src, alpha = 255, time = duration) /obj/effect/temp_visual/lava_warning/proc/fall(reset_time) - var/turf/T = get_turf(src) - playsound(T,'sound/effects/magic/fleshtostone.ogg', 80, TRUE) + var/turf/our_turf = get_turf(src) + playsound(our_turf,'sound/effects/magic/fleshtostone.ogg', 80, TRUE) sleep(duration) - playsound(T,'sound/effects/magic/fireball.ogg', 200, TRUE) + playsound(our_turf,'sound/effects/magic/fireball.ogg', 200, TRUE) + var/can_transform_turf = !isclosedturf(our_turf) && !islava(our_turf) - for(var/mob/living/L in T.contents - owner) - if(istype(L, /mob/living/simple_animal/hostile/megafauna/dragon)) + for(var/mob/living/victim in our_turf) + if(istype(victim, /mob/living/simple_animal/hostile/megafauna/dragon) || victim == owner) continue - L.adjust_fire_loss(10) - to_chat(L, span_userdanger("You fall directly into the pool of lava!")) + victim.adjust_fire_loss(10) + if(can_transform_turf) + to_chat(victim, span_userdanger("You fall directly into the pool of lava!")) + else + to_chat(victim, span_userdanger("You are set ablaze by a fireball from above!")) // deals damage to mechs - for(var/obj/vehicle/sealed/mecha/M in T.contents) - M.take_damage(45, BRUTE, MELEE, 1) - - // changes turf to lava temporarily - if(!isclosedturf(T) && !islava(T)) - var/lava_turf = /turf/open/lava/smooth - var/reset_turf = T.type - T.TerraformTurf(lava_turf, flags = CHANGETURF_INHERIT_AIR) - addtimer(CALLBACK(T, TYPE_PROC_REF(/turf, ChangeTurf), reset_turf, null, CHANGETURF_INHERIT_AIR), reset_time, TIMER_OVERRIDE|TIMER_UNIQUE) + for(var/obj/vehicle/sealed/mecha/mech in our_turf) + mech.take_damage(45, BRUTE, MELEE, 1) + + // changes turf to lava temporarily if possible, create a fire visual otherwise + if(!can_transform_turf) + new /obj/effect/temp_visual/fire/light(our_turf) + return + + var/lava_turf = /turf/open/lava/smooth + var/reset_turf = our_turf.type + our_turf.TerraformTurf(lava_turf, flags = CHANGETURF_INHERIT_AIR) + addtimer(CALLBACK(our_turf, TYPE_PROC_REF(/turf, ChangeTurf), reset_turf, null, CHANGETURF_INHERIT_AIR), reset_time, TIMER_OVERRIDE|TIMER_UNIQUE) /obj/effect/temp_visual/drakewall desc = "An ash drakes true flame." diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm index bfee3da93850..bbc4d29f6613 100644 --- a/code/modules/modular_computers/file_system/programs/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm @@ -285,7 +285,15 @@ var/turf/T = get_turf(computer) var/datum/supply_order/SO = new(pack, name, rank, ckey, reason, account) - SO.generateRequisition(T) + if(computer.stored_paper >= 1) + SO.generateRequisition(T) + computer.stored_paper -= 1 + if(computer.stored_paper <= 4) + computer.say("Paper's storage has only [computer.stored_paper] papers. Refill please!") + if(computer.stored_paper <= 1) + computer.say("Only 1 paper has left, refill please!") + else + computer.say("Requisition cannot be printed, paper storage is empty. Please insert more paper!") if((requestonly && !self_paid) || !(computer.stored_id?.GetID())) SSshuttle.request_list += SO else diff --git a/code/modules/modular_computers/file_system/programs/techweb.dm b/code/modules/modular_computers/file_system/programs/techweb.dm index c01c865fbf7e..3f9afa610799 100644 --- a/code/modules/modular_computers/file_system/programs/techweb.dm +++ b/code/modules/modular_computers/file_system/programs/techweb.dm @@ -80,7 +80,8 @@ "can_unlock" = stored_research.can_unlock_node(node), "have_experiments_done" = stored_research.have_experiments_for_node(node), "tier" = stored_research.tiers[node.id], - "enqueued_by_user" = enqueued_by_user + "enqueued_by_user" = enqueued_by_user, + "discount_boosted" = node.discount_boosted )) // Get experiments and serialize them @@ -156,6 +157,8 @@ node_cache[compressed_id]["required_experiments"] = node.required_experiments if (LAZYLEN(node.discount_experiments)) node_cache[compressed_id]["discount_experiments"] = node.discount_experiments + if (LAZYLEN(node.discount_boosts)) + node_cache[compressed_id]["discount_boosts"] = node.discount_boosts // Build design cache var/design_cache = list() diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index a694f7a9163e..03ac61f8adb4 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -172,6 +172,7 @@ name = "disabler beam" icon_state = "omnilaser" damage = 30 + speed = 1.6 damage_type = STAMINA armor_flag = ENERGY hitsound = 'sound/items/weapons/sear_disabler.ogg' diff --git a/code/modules/reagents/chemistry/recipes/special.dm b/code/modules/reagents/chemistry/recipes/special.dm index 7a26d8b7a1a7..eb1eee1a2682 100644 --- a/code/modules/reagents/chemistry/recipes/special.dm +++ b/code/modules/reagents/chemistry/recipes/special.dm @@ -41,98 +41,115 @@ /datum/chemical_reaction/randomized/New(recipe_data) . = ..() - //creation time, decides if we are random generating or not - created = recipe_data ? text2num(recipe_data["timestamp"]) : world.realtime - if(daysSince(created) > persistence_period) - created = world.realtime - recipe_data = null - - //all reagents - if(recipe_data) - required_reagents = unwrap_reagent_list(recipe_data["required_reagents"]) - if(!required_reagents) - qdel(src) - return - required_catalysts = unwrap_reagent_list(recipe_data["required_catalysts"]) - if(!required_catalysts) - qdel(src) - return - results = unwrap_reagent_list(recipe_data["results"]) - if(!results) + if(!recipe_data || !load_recipe(recipe_data)) + log_game("Generating recipe for [src]") + if(!generate_recipe()) + log_game("Couldn't generate recipe for [src]") qdel(src) - return - else - var/list/remaining_possible_reagents = GetPossibleReagents(RNGCHEM_INPUT) - var/list/remaining_possible_catalysts = GetPossibleReagents(RNGCHEM_CATALYSTS) - //We're going to assume we're not doing any weird partial reactions for now. - for(var/reagent_type in results) - remaining_possible_catalysts -= reagent_type - remaining_possible_reagents -= reagent_type - - var/in_reagent_count = min(rand(min_input_reagents, max_input_reagents),remaining_possible_reagents.len) - if(in_reagent_count <= 0) - qdel(src) - return - required_reagents = list() - for(var/i in 1 to in_reagent_count) - var/r_id = pick_n_take(remaining_possible_reagents) - required_reagents[r_id] = rand(min_input_reagent_amount,max_input_reagent_amount) - remaining_possible_catalysts -= r_id //Can't have same reagents both as catalyst and reagent. Or can we ? - required_catalysts = list() - var/in_catalyst_count = min(rand(min_catalysts,max_catalysts),remaining_possible_catalysts.len) - for(var/i in 1 to in_catalyst_count) - required_catalysts[pick_n_take(remaining_possible_catalysts)] = rand(min_input_reagent_amount,max_input_reagent_amount) +/datum/chemical_reaction/randomized/proc/load_recipe(recipe_data) + PRIVATE_PROC(TRUE) + // Timestamp + created = text2num(recipe_data["timestamp"]) + if(daysSince(created) > persistence_period) + log_game("Recipe [src] expired.") + return FALSE + //ingredients and catalysts + required_reagents = unwrap_reagent_list(recipe_data["required_reagents"]) + if(!required_reagents) + log_game("Couldn't load reagents for [src]") + return FALSE + required_catalysts = unwrap_reagent_list(recipe_data["required_catalysts"]) + if(!required_catalysts) + log_game("Couldn't load catalysts for [src]") + return FALSE + + //container + if(possible_containers) + var/container = recipe_data["required_container"] ? text2path(recipe_data["required_container"]) : null + if(!container) + log_game("Couldn't load container for [src]") + return FALSE + required_container = container //temperature - if(recipe_data) - is_cold_recipe = recipe_data["is_cold_recipe"] - required_temp = recipe_data["required_temp"] - optimal_temp = recipe_data["optimal_temp"] - overheat_temp = recipe_data["overheat_temp"] - thermic_constant = recipe_data["thermic_constant"] - else - is_cold_recipe = pick(TRUE, FALSE) - if(is_cold_recipe) - required_temp = rand(min_temp + 50, max_temp) - optimal_temp = rand(min_temp + 25, required_temp - 10) - overheat_temp = rand(min_temp, optimal_temp - 10) - if(overheat_temp >= 200) //Otherwise it can disappear when you're mixing and I don't want this to happen here - overheat_temp = 200 - else - required_temp = rand(min_temp, max_temp - 50) - optimal_temp = rand(required_temp + 10, max_temp - 25) - overheat_temp = rand(optimal_temp, max_temp + 50) - if(overheat_temp <= 400) - overheat_temp = 400 - - //ph - if(recipe_data) - optimal_ph_min = recipe_data["optimal_ph_min"] - optimal_ph_max = recipe_data["optimal_ph_max"] - determin_ph_range = recipe_data["determin_ph_range"] - H_ion_release = recipe_data["H_ion_release"] - else - optimal_ph_min = CHEMICAL_MIN_PH + rand(0, suboptimal_range_ph) - optimal_ph_max = max((CHEMICAL_MAX_PH + rand(0, suboptimal_range_ph)), (CHEMICAL_MIN_PH + 1)) //Always ensure we've a window of 1 - determin_ph_range = suboptimal_range_ph - H_ion_release = (rand(0, 25) / 100)// 0 - 0.25 + is_cold_recipe = recipe_data["is_cold_recipe"] + required_temp = recipe_data["required_temp"] + optimal_temp = recipe_data["optimal_temp"] + overheat_temp = recipe_data["overheat_temp"] + thermic_constant = recipe_data["thermic_constant"] + + //pH + optimal_ph_min = recipe_data["optimal_ph_min"] + optimal_ph_max = recipe_data["optimal_ph_max"] + determin_ph_range = recipe_data["determin_ph_range"] + H_ion_release = recipe_data["H_ion_release"] //purity - purity_min = recipe_data ? recipe_data["purity_min"] : (rand(0, 4) / 10) - - //container - if(recipe_data) - var/container = recipe_data["required_container"] - if(container) - container = text2path(container) - if(!container) - qdel(src) - return - required_container = container - else if(length(possible_containers)) + purity_min = recipe_data["purity_min"] + + return TRUE + +/datum/chemical_reaction/randomized/proc/generate_recipe() + // Timestamp + created = world.realtime + + // Reagents and catalysts + var/list/remaining_possible_reagents = GetPossibleReagents(RNGCHEM_INPUT) + var/list/remaining_possible_catalysts = GetPossibleReagents(RNGCHEM_CATALYSTS) + //We're going to assume we're not doing any weird partial reactions for now. + for(var/reagent_type in results) + remaining_possible_catalysts -= reagent_type + remaining_possible_reagents -= reagent_type + + if(remaining_possible_reagents.len < min_input_reagents) + log_game("Couldn't find enough reagents for [src]") + return FALSE + + required_reagents = list() + var/in_reagent_count = min(rand(min_input_reagents, max_input_reagents),remaining_possible_reagents.len) + for(var/i in 1 to in_reagent_count) + var/r_id = pick_n_take(remaining_possible_reagents) + required_reagents[r_id] = rand(min_input_reagent_amount,max_input_reagent_amount) + remaining_possible_catalysts -= r_id //Can't have same reagents both as catalyst and reagent. Or can we ? + + if(remaining_possible_catalysts.len < min_catalysts) + log_game("Couldn't find enough catalysts for [src]") + return FALSE + + required_catalysts = list() + var/in_catalyst_count = min(rand(min_catalysts,max_catalysts),remaining_possible_catalysts.len) + for(var/i in 1 to in_catalyst_count) + required_catalysts[pick_n_take(remaining_possible_catalysts)] = rand(min_input_reagent_amount,max_input_reagent_amount) + + // Container + if(possible_containers) required_container = pick(possible_containers) + // Temperature + is_cold_recipe = pick(TRUE, FALSE) + if(is_cold_recipe) + required_temp = rand(min_temp + 50, max_temp) + optimal_temp = rand(min_temp + 25, required_temp - 10) + overheat_temp = rand(min_temp, optimal_temp - 10) + if(overheat_temp >= 200) //Otherwise it can disappear when you're mixing and I don't want this to happen here + overheat_temp = 200 + else + required_temp = rand(min_temp, max_temp - 50) + optimal_temp = rand(required_temp + 10, max_temp - 25) + overheat_temp = rand(optimal_temp, max_temp + 50) + if(overheat_temp <= 400) + overheat_temp = 400 + + //pH + optimal_ph_min = CHEMICAL_MIN_PH + rand(0, suboptimal_range_ph) + optimal_ph_max = max((CHEMICAL_MAX_PH - rand(0, suboptimal_range_ph)), (optimal_ph_min + 1)) //Always ensure we've a window of 1 + determin_ph_range = suboptimal_range_ph + H_ion_release = (rand(0, 25) / 100)// 0 - 0.25 + + // Purity + purity_min = (rand(0, 4) / 10) + return TRUE /** * Returns the reagents to select for randomizing diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index b46ce8075417..9ff9e638b2de 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -165,7 +165,7 @@ departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/stasis_bag - name = "Stasis Bodybag" + name = "Stasis Body Bag" desc = "A disposal bodybag designed to stabilize patients in the field in critical condition. \ The bag itself cannot maintain stasis for long, and will eventually fall apart." id = "stasis_bodybag" diff --git a/code/modules/research/ordnance/_scipaper.dm b/code/modules/research/ordnance/_scipaper.dm index e5fa3c3c8f04..17cab50c6d2f 100644 --- a/code/modules/research/ordnance/_scipaper.dm +++ b/code/modules/research/ordnance/_scipaper.dm @@ -289,6 +289,14 @@ /// Associative list of which technology the partner might be able to boost and by how much. var/list/boostable_nodes = list() +/datum/scientific_partner/New() + . = ..() + // Convey boosts to their associated nodes so that they can then be passed + // to techweb UIs as static data. + for(var/node_id in boostable_nodes) + var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_id) + node.discount_boosts[TECHWEB_POINT_TYPE_GENERIC] = boostable_nodes[node_id] + /datum/scientific_partner/proc/purchase_boost(datum/techweb/purchasing_techweb, datum/techweb_node/node) var/possible_boost = allowed_to_boost(purchasing_techweb, node.id) if(!possible_boost) @@ -301,9 +309,10 @@ return TRUE /datum/scientific_partner/proc/allowed_to_boost(datum/techweb/purchasing_techweb, node_id) + var/datum/techweb_node/boosting_node = SSresearch.techweb_node_by_id(node_id) if(purchasing_techweb.scientific_cooperation[type] < (boostable_nodes[node_id] * SCIENTIFIC_COOPERATION_PURCHASE_MULTIPLIER)) // Too expensive return FALSE - if((TECHWEB_POINT_TYPE_GENERIC in purchasing_techweb.boosted_nodes[node_id]) && (purchasing_techweb.boosted_nodes[node_id][TECHWEB_POINT_TYPE_GENERIC] >= boostable_nodes[node_id])) // Already bought or we have a bigger discount + if((boosting_node.discount_boosted) && (boosting_node.discount_boosts[TECHWEB_POINT_TYPE_GENERIC] >= boostable_nodes[node_id])) // Already bought or we have a bigger discount return FALSE if(node_id in purchasing_techweb.researched_nodes) return SCIPAPER_ALREADY_BOUGHT diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 36c3a43a6034..60fa59075563 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -243,7 +243,8 @@ Nothing else in the console has ID requirements. "can_unlock" = stored_research.can_unlock_node(n), "have_experiments_done" = stored_research.have_experiments_for_node(n), "tier" = stored_research.tiers[n.id], - "enqueued_by_user" = enqueued_by_user + "enqueued_by_user" = enqueued_by_user, + "discount_boosted" = n.discount_boosted )) // Get experiments and serialize them @@ -305,6 +306,8 @@ Nothing else in the console has ID requirements. node_cache[compressed_id]["required_experiments"] = node.required_experiments if (LAZYLEN(node.discount_experiments)) node_cache[compressed_id]["discount_experiments"] = node.discount_experiments + if (LAZYLEN(node.discount_boosts)) + node_cache[compressed_id]["discount_boosts"] = node.discount_boosts // Build design cache var/design_cache = list() diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm index ade382a02656..8d492aa4af94 100644 --- a/code/modules/research/techweb/_techweb.dm +++ b/code/modules/research/techweb/_techweb.dm @@ -22,8 +22,6 @@ var/list/researched_designs = list() /// Custom inserted designs like from disks that should survive recalculation. var/list/custom_designs = list() - /// Already boosted nodes that can't be boosted again. node id = path of boost object. - var/list/boosted_nodes = list() /// Hidden nodes. id = TRUE. Used for unhiding nodes when requirements are met by removing the entry of the node. var/list/hidden_nodes = list() /// List of items already deconstructed for research points, preventing infinite research point generation. @@ -433,9 +431,10 @@ /datum/techweb/proc/boost_techweb_node(datum/techweb_node/node, list/pointlist) if(!istype(node)) return FALSE - LAZYINITLIST(boosted_nodes[node.id]) - for(var/point_type in pointlist) - boosted_nodes[node.id][point_type] = max(boosted_nodes[node.id][point_type], pointlist[point_type]) + LAZYINITLIST(node.discount_boosts) + for(var/point_type in pointlist) // Essentially applies the greater boost(s) between the newer and any existing. + node.discount_boosts[point_type] = max(node.discount_boosts[point_type], pointlist[point_type]) + node.discount_boosted = TRUE unhide_node(node) update_node_status(node) return TRUE diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm index 104e475b7e58..0eccb61c4ec3 100644 --- a/code/modules/research/techweb/_techweb_node.dm +++ b/code/modules/research/techweb/_techweb_node.dm @@ -36,6 +36,13 @@ var/list/required_experiments = list() /// If completed, these experiments give a specific point amount discount to the node. var/list/discount_experiments = list() + /// Boost quantities from non-experiment sources (i.e., toxins papers). + /// Indexed by point type to boost amount (with only one boost per point type). + var/list/discount_boosts = list() + /// Boolean indicating whether or not this node is boosted by non-experiments. + /// This will need to be changed to a list of point types boosted if boosts + /// should ever need to vary by point type. + var/discount_boosted = FALSE /// When this node is completed, allows these experiments to be performed. var/list/experiments_to_unlock = list() /// Whether or not this node should show on the wiki @@ -92,11 +99,10 @@ if(host.completed_experiments[experiment_type]) //do we have this discount_experiment unlocked? actual_costs[cost_type] -= discount_experiments[experiment_type] - if(host.boosted_nodes[id]) // Boosts should be subservient to experiments. - var/list/boostlist = host.boosted_nodes[id] - for(var/booster in boostlist) + if(discount_boosts && discount_boosted) // Boosts should be subservient to experiments. + for(var/booster in discount_boosts) if(actual_costs[booster]) - actual_costs[booster] = max(actual_costs[booster] - boostlist[booster], 0) + actual_costs[booster] = max(actual_costs[booster] - discount_boosts[booster], 0) return actual_costs diff --git a/code/modules/surgery/organs/internal/ears/_ears.dm b/code/modules/surgery/organs/internal/ears/_ears.dm index 00683906ec66..fbcb9f79da66 100644 --- a/code/modules/surgery/organs/internal/ears/_ears.dm +++ b/code/modules/surgery/organs/internal/ears/_ears.dm @@ -199,6 +199,7 @@ sprite_accessory_override = /datum/sprite_accessory/ears/cat/cybernetic organ_flags = ORGAN_ROBOTIC failing_desc = "seems to be broken." + restyle_flags = NONE /obj/item/organ/ears/cat/cybernetic/upgraded name = "cybernetic cat ears" diff --git a/code/modules/unit_tests/atmospherics_sanity.dm b/code/modules/unit_tests/atmospherics_sanity.dm index 8b1d029ff57e..d7348a096d37 100644 --- a/code/modules/unit_tests/atmospherics_sanity.dm +++ b/code/modules/unit_tests/atmospherics_sanity.dm @@ -1,51 +1,58 @@ /** - * This test checks that all expected areas are connected to a starting area + * This test checks that all areas are connected to their distribution loops */ /datum/unit_test/atmospherics_sanity - // we iterate over all atmospherics devices on the starting networks - priority = TEST_LONGER + priority = TEST_LONGER // we iterate over all atmospherics devices on the starting networks - /// List of areas remaining to be checked - var/list/area/remaining_areas + /// List of areas to start crawling from + var/list/area/starting_areas /// List of areas already crawled, to prevent needless crawling var/list/area/crawled_areas - /// List of areas to start crawling from - var/list/area/starting_areas + /// List of areas remaining to be checked + var/list/area/remaining_areas + + /// List of areas that should absolutely not be encountered + var/list/area/forbidden_areas /// We run this test in parallel, so we need to keep track of how many crawls are running /// This is to prevent stack overflow mostly var/crawls = 0 -/datum/unit_test/atmospherics_sanity/proc/get_areas() +/datum/unit_test/atmospherics_sanity/proc/prepare_crawl() starting_areas = list() + forbidden_areas = list() + crawled_areas = list() + remaining_areas = list() + for(var/obj/effect/landmark/atmospheric_sanity/start_area/start_marker in GLOB.landmarks_list) var/area/starting_area = get_area(start_marker) if(starting_area in starting_areas) TEST_FAIL("Duplicate atmospherics sanity starting marker in '[starting_area]'([starting_area.type]) at ([start_marker.x], [start_marker.y], [start_marker.z])") continue if(starting_area.outdoors) - TEST_FAIL("Atmospherics sanity starting marker in outdoors area '[starting_area]'([starting_area.type]) at ([start_marker.x], [start_marker.y], [start_marker.z])") + TEST_FAIL("Atmospherics sanity starting marker cannot be in outdoors area '[starting_area]'([starting_area.type]) at ([start_marker.x], [start_marker.y], [start_marker.z])") continue starting_areas |= get_area(start_marker) - // If there are no starting areas, default to these - var/static/list/area/default_starting_areas = list( - /area/station/ai/satellite/chamber, - /area/station/engineering/atmos, - /area/station/medical/virology, - /area/station/science/xenobiology, - ) - if(!length(starting_areas)) log_test("No starting areas found, defaulting...") + + var/list/area/default_starting_areas = list( + // These areas have their own air supply + /area/station/ai/satellite/chamber, + /area/station/medical/virology, + /area/station/science/xenobiology, + // Otherwise, this should connect to the rest of the station + /area/station/engineering/atmos, + ) + for(var/area/starting_area as anything in default_starting_areas) var/area/station_area = GLOB.areas_by_type[starting_area] if(!isnull(station_area)) starting_areas += station_area - remaining_areas = list() var/atom/mark_all_station_areas_marker = locate(/obj/effect/landmark/atmospheric_sanity/mark_all_station_areas_as_goal) in GLOB.landmarks_list if(!isnull(mark_all_station_areas_marker)) @@ -61,58 +68,76 @@ if(goal_area.outdoors) TEST_FAIL("Atmospherics sanity goal marker in outdoors area '[goal_area]'([goal_area.type]) at ([goal_marker.x], [goal_marker.y], [goal_marker.z])") continue - if(istype(goal_area, /area/space)) - TEST_FAIL("Atmospherics sanity goal marker in space at ([goal_marker.x], [goal_marker.y], [goal_marker.z])") - continue remaining_areas |= get_area(goal_marker) if(!length(remaining_areas)) log_test("No goal areas found, defaulting...") mark_station_areas_as_goals() + else + for(var/obj/effect/landmark/atmospheric_sanity/forbidden_area/forbidden_marker in GLOB.landmarks_list) + var/area/forbidden_area = get_area(forbidden_marker) + if(forbidden_area in remaining_areas) + var/obj/effect/landmark/atmospheric_sanity/goal_area/goal_marker = locate() in forbidden_area + TEST_FAIL("Area '[forbidden_area]'([forbidden_area.type]) \ + has a goal marker at ([goal_marker.x], [goal_marker.y], [goal_marker.z]) \ + and a forbidden marker at ([forbidden_marker.x], ([forbidden_marker.y], ([forbidden_marker.z])") + continue + if(forbidden_area in forbidden_areas) + TEST_FAIL("Area '[forbidden_area]'([forbidden_area.type]) is so forbidden it has a duplicate marker at at ([forbidden_marker.x], ([forbidden_marker.y], ([forbidden_marker.z])") + continue + + forbidden_areas |= forbidden_area for(var/obj/effect/landmark/atmospheric_sanity/ignore_area/ignore_marker in GLOB.landmarks_list) remaining_areas -= get_area(ignore_marker) /datum/unit_test/atmospherics_sanity/proc/mark_station_areas_as_goals() - // We don't want to check these areas - var/static/list/area/ignored_types = list( + // We don't care if we find these + var/list/area/ignored_types = list( /area/station/asteroid, - /area/station/engineering/supermatter, /area/station/holodeck, /area/station/maintenance, /area/station/science/ordnance/bomb, + /area/station/solars, + + // FIXME, burnchamber is usually mapped with a vent in the buffer airlock + // which causes us to leak into freezer. These two should be forbidden /area/station/science/ordnance/burnchamber, /area/station/science/ordnance/freezerchamber, - /area/station/solars, - /area/station/tcommsat/server, ) for(var/area/ignored as anything in ignored_types) ignored_types |= subtypesof(ignored) - for(var/area/station/station_area_type as anything in subtypesof(/area/station) - ignored_types) + // We should never find these + var/list/area/forbidden_types = list( + /area/station/engineering/supermatter/engine, + /area/station/tcommsat/server, + ) + + for(var/area/forbidden as anything in forbidden_types) + forbidden_types |= subtypesof(forbidden) + + for(var/area/station/station_area_type as anything in subtypesof(/area/station) - ignored_types - forbidden_types) var/area/station_area = GLOB.areas_by_type[station_area_type] if(!isnull(station_area)) remaining_areas += station_area -/datum/unit_test/atmospherics_sanity/Run() - get_areas() - crawl_areas() - UNTIL(crawls == 0) - for(var/area/missed as anything in remaining_areas) - if(missed.has_contained_turfs()) - var/turf/first_turf = missed.get_zlevel_turf_lists()[1][1] - TEST_FAIL("Disconnected Area '[missed]'([missed.type]) at ([first_turf.x], [first_turf.y], [first_turf.z])") - else - TEST_NOTICE(src, "Disconnected Area '[missed]'([missed.type]) with no turfs?") + for(var/area/station/forbidden_area_type as anything in forbidden_types) + var/area/forbidden_area = GLOB.areas_by_type[forbidden_area_type] + if(!isnull(forbidden_area)) + forbidden_areas += forbidden_area -/// Iterates over starting_areas and ensures that all goal areas are connected to atleast one start -/datum/unit_test/atmospherics_sanity/proc/crawl_areas() - crawled_areas = list() +/datum/unit_test/atmospherics_sanity/Run() + prepare_crawl() for(var/area/start_area as anything in starting_areas) ASYNC crawl_area(start_area) - starting_areas = null + UNTIL(crawls == 0) + + for(var/area/missed as anything in remaining_areas) + var/turf/first_turf = missed.get_zlevel_turf_lists()[1][1] + TEST_FAIL("Goal area '[missed]'([missed.type]) is isolated from any distribution loops ([first_turf.x], [first_turf.y], [first_turf.z])") /// Crawls through an area, iterating over all vents/scrubbers and their connected pipelines /datum/unit_test/atmospherics_sanity/proc/crawl_area(area/the_area) @@ -126,12 +151,16 @@ for(var/obj/machinery/atmospherics/components/component as anything in (the_area.air_vents + the_area.air_scrubbers)) for(var/datum/pipeline/parent as anything in component.parents) if(isnull(parent)) - TEST_NOTICE(src, "Found a null parent for [component] in [the_area] at ([component.x], [component.y], [component.z])") + TEST_NOTICE(src, "[component] at ([component.x], [component.y], [component.z]) isn't attached to a pipenet, is this on purpose?") continue pipelines |= parent - for(var/datum/pipeline/pipeline as anything in pipelines) - crawl_pipeline(pipeline) + if((the_area in forbidden_areas) && length(pipelines)) // we don't care if this area is forbidden if it isn't actually connected to the air + var/turf/first_turf = the_area.get_zlevel_turf_lists()[1][1] + TEST_FAIL("Forbidden area '[the_area]'([the_area.type]) is connected to a distribution loop at ([first_turf.x], [first_turf.y], [first_turf.z])") + else + for(var/datum/pipeline/pipeline as anything in pipelines) + crawl_pipeline(pipeline) crawls -= 1 diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index ff465ce53052..a7ba45e2f05f 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -83,6 +83,9 @@ GLOBAL_LIST_INIT(autodrobe_entretainers_items, list( /obj/item/clothing/under/rank/civilian/clown/jester = 3, /obj/item/clothing/head/costume/jester = 3, /obj/item/clothing/shoes/jester_shoes = 3, + /obj/item/clothing/under/rank/civilian/clown/jesteralt = 3, + /obj/item/clothing/head/costume/jesteralt = 3, + /obj/item/clothing/shoes/clown_shoes/jester = 1, /obj/item/clothing/under/costume/villain = 3, /obj/item/clothing/suit/costume/joker = 3, /obj/item/clothing/under/costume/joker = 3, diff --git a/html/changelogs/archive/2026-06.yml b/html/changelogs/archive/2026-06.yml index 9f55dcb45881..576d4d9390e5 100644 --- a/html/changelogs/archive/2026-06.yml +++ b/html/changelogs/archive/2026-06.yml @@ -15,6 +15,11 @@ - balance: The RNG instant kill via organ removal of the mech drill has been removed, and replaced with a very high wounding chance 2026-06-02: + Fghj240: + - bugfix: Cybernetic cat ears can no longer be restyled with flesh reshapers (because + it broke them) + Hatterhat: + - bugfix: Bileworm spewlet trophies no longer spit bullets instead of acidic bile. Iajret: - bugfix: Mending touch works once again Melbert: @@ -49,3 +54,41 @@ - code_imp: Repathed Liberators. This has no bearing on their function. - code_imp: Rechambers Regal Condors in .45 and 10mm Reaper rounds to .45 Reaper rounds. This has no impact on their function. +2026-06-03: + FalloutFalcon: + - bugfix: Stumps aren't see through + Hatterhat: + - bugfix: Stasis body bags are no longer dense when closed. + - spellcheck: Fixed a typo relating to the spelling of "cinched" in body bags with + buckles (prisoner bags, et cetera). + Macaroni: + - qol: The alt jester outfit now has grayscale and is buyable + StrangeWeirdKitten: + - bugfix: Blobs can no longer destroy indestructible items, like the disk. + levels0: + - bugfix: random recipes can no longer have upper pH bound above 14 + timothymtorres: + - spellcheck: Add security misspelling checks to CI +2026-06-04: + Arturlang: + - bugfix: moonatics switching bodies (including slimeperson swap) giving you duplicate + action buttons + - bugfix: lock path not having 1 point discounts + Frfor17: + - bugfix: fixed NT shop printing infiniti papers, now its linked to computer's(laptop, + pda, any) paper storage + QuiteLiterallyAnything: + - bugfix: Made discounts from toxins papers show up in research UIs properly. + - refactor: Refactored research techwebs such that toxins discounts are now stored + per techweb node rather than per techweb. + SmArtKar: + - bugfix: Fixed brimdust overlay on wide mobs leaking onto other objects + - bugfix: Drake swoop no longer misleadingly claims you fall into lava if it fails + to spawn said lava + Wisemonster: + - code_imp: Wizard Apprentices now use the mid-round wizard pref, instead of the + round start wizard pref. + lelandkemble: + - bugfix: Material spears no longer partially avoid the force malus from being unwielded + - balance: Smartfridges no longer block atmos when broken & no longer let creatures + pass until broken diff --git a/icons/effects/landmarks_static.dmi b/icons/effects/landmarks_static.dmi index 53d3d939128e..c02b9e8c694b 100644 Binary files a/icons/effects/landmarks_static.dmi and b/icons/effects/landmarks_static.dmi differ diff --git a/icons/map_icons/clothing/head/_head.dmi b/icons/map_icons/clothing/head/_head.dmi index 67ffccf2c2ae..40a524f88dc4 100644 Binary files a/icons/map_icons/clothing/head/_head.dmi and b/icons/map_icons/clothing/head/_head.dmi differ diff --git a/icons/map_icons/clothing/shoes.dmi b/icons/map_icons/clothing/shoes.dmi index d6c336245fb5..6d790cf92eb1 100644 Binary files a/icons/map_icons/clothing/shoes.dmi and b/icons/map_icons/clothing/shoes.dmi differ diff --git a/icons/map_icons/clothing/under/_under.dmi b/icons/map_icons/clothing/under/_under.dmi index 5d9b9146e864..5fdc8b31664c 100644 Binary files a/icons/map_icons/clothing/under/_under.dmi and b/icons/map_icons/clothing/under/_under.dmi differ diff --git a/icons/mob/clothing/head/costume.dmi b/icons/mob/clothing/head/costume.dmi index ac776302e255..2a745f50f94d 100644 Binary files a/icons/mob/clothing/head/costume.dmi and b/icons/mob/clothing/head/costume.dmi differ diff --git a/icons/mob/clothing/under/civilian.dmi b/icons/mob/clothing/under/civilian.dmi index 0aeebe27c32c..0fe66ae4f42e 100644 Binary files a/icons/mob/clothing/under/civilian.dmi and b/icons/mob/clothing/under/civilian.dmi differ diff --git a/icons/obj/clothing/head/costume.dmi b/icons/obj/clothing/head/costume.dmi index fce68eb8f212..ef9ede6a6f1d 100644 Binary files a/icons/obj/clothing/head/costume.dmi and b/icons/obj/clothing/head/costume.dmi differ diff --git a/icons/obj/clothing/under/civilian.dmi b/icons/obj/clothing/under/civilian.dmi index 572263d90851..0992bbfa88a9 100644 Binary files a/icons/obj/clothing/under/civilian.dmi and b/icons/obj/clothing/under/civilian.dmi differ diff --git a/icons/obj/medical/bodybag.dmi b/icons/obj/medical/bodybag.dmi index 5ea5a2f6e389..66ec86e6074c 100644 Binary files a/icons/obj/medical/bodybag.dmi and b/icons/obj/medical/bodybag.dmi differ diff --git a/tgui/packages/tgui/interfaces/BigManipulator/index.tsx b/tgui/packages/tgui/interfaces/BigManipulator/index.tsx index 23ac8d84c990..144e9d3e94c9 100644 --- a/tgui/packages/tgui/interfaces/BigManipulator/index.tsx +++ b/tgui/packages/tgui/interfaces/BigManipulator/index.tsx @@ -611,7 +611,7 @@ export const BigManipulator = () => { color={!data.disk_inserted && "none"} onClick={() => act('disk_eject')} > - { data.disk_inserted ? "floppy drive (tasks: " + data.disk_task_count + ")" : "No drives inserted" } + { data.disk_inserted ? `floppy drive (tasks: ${data.disk_task_count})` : "No drives inserted" } diff --git a/tgui/packages/tgui/interfaces/Techweb/helpers.ts b/tgui/packages/tgui/interfaces/Techweb/helpers.ts index 12e042963d70..8215572d64f5 100644 --- a/tgui/packages/tgui/interfaces/Techweb/helpers.ts +++ b/tgui/packages/tgui/interfaces/Techweb/helpers.ts @@ -51,6 +51,7 @@ function selectRemappedStaticData(data: TechWebData) { unlock_ids: map(node.unlock_ids || [], remapId), required_experiments: node.required_experiments || [], discount_experiments: node.discount_experiments || [], + discount_boosts: node.discount_boosts || [], }; } diff --git a/tgui/packages/tgui/interfaces/Techweb/nodes/TechNode.tsx b/tgui/packages/tgui/interfaces/Techweb/nodes/TechNode.tsx index 6e4d7aadb403..613fe82708d3 100644 --- a/tgui/packages/tgui/interfaces/Techweb/nodes/TechNode.tsx +++ b/tgui/packages/tgui/interfaces/Techweb/nodes/TechNode.tsx @@ -40,6 +40,7 @@ export function TechNode(props: Props) { tier, enqueued_by_user, is_free, + discount_boosted, } = node; const { name, @@ -49,6 +50,7 @@ export function TechNode(props: Props) { prereq_ids, required_experiments, discount_experiments, + discount_boosts, } = node_cache[id]; const [techwebRoute, setTechwebRoute] = useTechWebRoute(); @@ -86,12 +88,20 @@ export function TechNode(props: Props) { // Notice that this logic will have to be changed if we make the discounts // pool-specific - const nodeDiscount = Object.keys(discount_experiments) + const nodeDiscountExperiments = Object.keys(discount_experiments) .filter((x) => experiments[x]?.completed) .reduce((tot, curr) => { return tot + discount_experiments[curr]; }, 0); + // Will need to be changed (along with some backend/DM code) if boosts should + // ever vary by point type. As is, this simply adds up all discount boosts. + const nodeDiscountBoosts = discount_boosted + ? Object.keys(discount_boosts).reduce((tot, curr) => { + return tot + discount_boosts[curr]; + }, 0) + : 0; + return (
{costs.map((k) => { - const reqPts = Math.max(0, k.value - nodeDiscount); + const reqPts = Math.max( + 0, + k.value - nodeDiscountExperiments - nodeDiscountBoosts, + ); const nodeProg = Math.min(reqPts, points[k.type]) || 0; return ( diff --git a/tgui/packages/tgui/interfaces/Techweb/types.ts b/tgui/packages/tgui/interfaces/Techweb/types.ts index 0c40c46f47d4..9ccfd0d39911 100644 --- a/tgui/packages/tgui/interfaces/Techweb/types.ts +++ b/tgui/packages/tgui/interfaces/Techweb/types.ts @@ -16,6 +16,7 @@ export type NodeCache = { description: string; design_ids: string[]; discount_experiments: Record; + discount_boosts: Record; name: string; prereq_ids: string[]; required_experiments?: string[]; @@ -32,6 +33,7 @@ export type TechwebNode = { can_unlock: BooleanLike; enqueued_by_user: BooleanLike; have_experiments_done: BooleanLike; + discount_boosted: BooleanLike; id: string; is_free: BooleanLike; tier: number; diff --git a/tools/HubMigrator/HubMigrator.dm b/tools/HubMigrator/HubMigrator.dm index fd746f8d6d96..ea13dc6ae5d6 100644 --- a/tools/HubMigrator/HubMigrator.dm +++ b/tools/HubMigrator/HubMigrator.dm @@ -162,3 +162,35 @@ outfile << keyline.Join() i++ outfile << "END" + +#undef MEDAL_METEOR +#undef MEDAL_PULSE +#undef MEDAL_TIMEWASTE +#undef MEDAL_RODSUPLEX +#undef MEDAL_CLOWNCARKING +#undef MEDAL_THANKSALOT +#undef MEDAL_HELBITALJANKEN +#undef MEDAL_MATERIALCRAFT +#undef BOSS_MEDAL_ANY +#undef BOSS_MEDAL_MINER +#undef BOSS_MEDAL_BUBBLEGUM +#undef BOSS_MEDAL_COLOSSUS +#undef BOSS_MEDAL_DRAKE +#undef BOSS_MEDAL_HIEROPHANT +#undef BOSS_MEDAL_LEGION +#undef BOSS_MEDAL_TENDRIL +#undef BOSS_MEDAL_MINER_CRUSHER +#undef BOSS_MEDAL_BUBBLEGUM_CRUSHER +#undef BOSS_MEDAL_COLOSSUS_CRUSHER +#undef BOSS_MEDAL_DRAKE_CRUSHER +#undef BOSS_MEDAL_HIEROPHANT_CRUSHER +#undef BOSS_MEDAL_LEGION_CRUSHER +#undef BOSS_SCORE +#undef MINER_SCORE +#undef BUBBLEGUM_SCORE +#undef COLOSSUS_SCORE +#undef DRAKE_SCORE +#undef HIEROPHANT_SCORE +#undef LEGION_SCORE +#undef SWARMER_BEACON_SCORE +#undef TENDRIL_CLEAR_SCORE diff --git a/tools/SS13SmoothingCutter/Cutter.dm b/tools/SS13SmoothingCutter/Cutter.dm index 696f503c783f..a0a4d620c5d2 100644 --- a/tools/SS13SmoothingCutter/Cutter.dm +++ b/tools/SS13SmoothingCutter/Cutter.dm @@ -1,8 +1,6 @@ - -#define A_BIG_NUMBER 9999999 -#define STATE_COUNT_NORMAL 4 -#define STATE_COUNT_DIAGONAL 7 - +#define A_BIG_NUMBER 9999999 +#define STATE_COUNT_NORMAL 4 +#define STATE_COUNT_DIAGONAL 7 /mob/verb/ChooseDMI(dmi as file) var/dmifile = file(dmi) @@ -38,7 +36,7 @@ fdel(filename) //force refresh for(var/state in states) - var/statename = lowertext(state) + var/statename = LOWER_TEXT(state) outputIcon = icon(filename) //open the icon again each iteration, to work around byond memory limits switch(statename) @@ -224,3 +222,7 @@ fcopy(outputIcon, filename) //Update output icon each iteration world << "Finished [filename]!" + +#undef A_BIG_NUMBER +#undef STATE_COUNT_NORMAL +#undef STATE_COUNT_DIAGONAL diff --git a/tools/ScrollAnimationAssembler/apply.dm b/tools/ScrollAnimationAssembler/apply.dm index f9773c609aa0..198b2dfb4d88 100644 --- a/tools/ScrollAnimationAssembler/apply.dm +++ b/tools/ScrollAnimationAssembler/apply.dm @@ -1,5 +1,5 @@ /// Cut out a piece of the background at a specified frame, and paste it on top of the foreground -/proc/Apply(var/icon/source, var/icon/mask, var/icon/target, frame) +/proc/Apply(icon/source, icon/mask, icon/target, frame) //Temporary copies of source, mask and target var/icon/source_copy = new(source) diff --git a/tools/UpdatePaths/96141_forbidden_areas.txt b/tools/UpdatePaths/96141_forbidden_areas.txt new file mode 100644 index 000000000000..046a11f5c2dc --- /dev/null +++ b/tools/UpdatePaths/96141_forbidden_areas.txt @@ -0,0 +1 @@ +/area/station/engineering/supermatter : /area/station/engineering/supermatter/engine{@OLD} diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index e80af87d5f71..da88e80a98c9 100755 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -19,14 +19,14 @@ if command -v rg >/dev/null 2>&1; then if [ ! rg -P '' >/dev/null 2>&1 ] ; then pcre2_support=0 fi - code_files="code/**/**.dm" + code_files=( . -g '*.dm' -g '!DMCompiler_linux-x64/**' -g '!tools/ci/od_lints.dm' -g '!tools/CatchUnescapedBrackets/**' -g '!html/changelogs/**' ) map_files="_maps/**/**.dmm" shuttle_map_files="_maps/shuttles/**.dmm" code_x_515="code/**/!(__byond_version_compat).dm" else pcre2_support=0 grep=grep - code_files="-r --include=code/**/**.dm" + code_files=( -r --include='*.dm' --exclude-dir='DMCompiler_linux-x64' --exclude='od_lints.dm' --exclude-dir='CatchUnescapedBrackets' --exclude-dir='changelogs' . ) map_files="-r --include=_maps/**/**.dmm" shuttle_map_files="-r --include=_maps/shuttles/**.dmm" code_x_515="-r --include=code/**/!(__byond_version_compat).dm" @@ -51,8 +51,8 @@ section "map issues" part "TGM" if $grep -U '^".+" = \(.+\)' $map_files; then echo - echo -e "${RED}ERROR: Non-TGM formatted map detected. Please convert it using Map Merger!${NC}" - st=1 + echo -e "${RED}ERROR: Non-TGM formatted map detected. Please convert it using Map Merger!${NC}" + st=1 fi; part "comments" if $grep '//' $map_files | $grep -v '//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE' | $grep -v 'name|desc'; then @@ -63,8 +63,8 @@ fi; part "iconstate tags" if $grep '^\ttag = "icon' $map_files; then echo - echo -e "${RED}ERROR: Tag vars from icon state generation detected in maps, please remove them.${NC}" - st=1 + echo -e "${RED}ERROR: Tag vars from icon state generation detected in maps, please remove them.${NC}" + st=1 fi; part "invalid map procs" if $grep '(new|newlist|icon|matrix|sound)\(.+\)' $map_files; then @@ -81,42 +81,47 @@ fi; part "common spelling mistakes" if $grep -i 'nanotransen' $map_files; then echo - echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in maps, please remove the extra N(s).${NC}" - st=1 + echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in maps, please remove the extra N(s).${NC}" + st=1 fi; if $grep 'NanoTrasen' $map_files; then echo - echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in maps, please uncapitalize the T(s).${NC}" - st=1 + echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in maps, please uncapitalize the T(s).${NC}" + st=1 fi; if $grep -i 'centcomm' $map_files; then echo - echo -e "${RED}ERROR: Misspelling(s) of CentCom detected in maps, please remove the extra M(s).${NC}" - st=1 + echo -e "${RED}ERROR: Misspelling(s) of CentCom detected in maps, please remove the extra M(s).${NC}" + st=1 fi; if $grep -i 'eciev' $map_files; then echo - echo -e "${RED}ERROR: Common I-before-E typo detected in maps.${NC}" - st=1 + echo -e "${RED}ERROR: Common I-before-E typo detected in maps.${NC}" + st=1 fi; if $grep -i 'maintainance|maintainence|maintenence' $map_files; then + echo + echo -e "${RED}ERROR: Misspelling(s) of 'maintenance' detected in maps, please fix.${NC}"; + st=1 +fi; +if $grep -i 'securaty|securiy|secuirty' $map_files; then echo - echo -e "${RED}ERROR: Misspelling(s) of 'maintenance' detected in maps, please fix.${NC}"; + echo -e "${RED}ERROR: Misspelling(s) of 'security' detected in maps, please fix.${NC}"; st=1 fi; section "whitespace issues" part "space indentation" -if $grep '(^ {2})|(^ [^ * ])|(^ +)' $code_files; then +if $grep '(^ {2})|(^ [^ * ])|(^ +)' "${code_files[@]}"; then echo - echo -e "${RED}ERROR: Space indentation detected, please use tab indentation.${NC}" - st=1 + echo -e "${RED}ERROR: Space indentation detected, please use tab indentation.${NC}" + st=1 fi; part "mixed indentation" -if $grep '^\t+ [^ *]' $code_files; then +if $grep '^\t+ [^ *]' "${code_files[@]}"; then echo - echo -e "${RED}ERROR: Mixed indentation detected, please stick to tab indentation.${NC}" - st=1 + echo -e "${RED}ERROR: Mixed indentation detected, please stick to tab indentation.${NC}" + st=1 fi; section "unit tests" @@ -132,48 +137,48 @@ fi; section "516 Href Styles" part "byond href styles" -if $grep "href[\s='\"\\\\]*\?" $code_files ; then - echo - echo -e "${RED}ERROR: BYOND requires internal href links to begin with \"byond://\".${NC}" - st=1 +if $grep "href[\s='\"\\\\]*\?" "${code_files[@]}" ; then + echo + echo -e "${RED}ERROR: BYOND requires internal href links to begin with \"byond://\".${NC}" + st=1 fi; section "common mistakes" part "global vars" -if $grep '^/*var/' $code_files; then +if $grep '^/*var/' "${code_files[@]}"; then echo echo -e "${RED}ERROR: Unmanaged global var use detected in code, please use the helpers.${NC}" st=1 fi; part "proc args with var/" -if $grep '^/[\w/]\S+\(.*(var/|, ?var/.*).*\)' $code_files; then +if $grep '^/[\w/]\S+\(.*(var/|, ?var/.*).*\)' "${code_files[@]}"; then echo echo -e "${RED}ERROR: Changed files contains a proc argument starting with 'var'.${NC}" st=1 fi; part "improperly pathed static lists" -if $grep -i 'var/list/static/.*' $code_files; then +if $grep -i 'var/list/static/.*' "${code_files[@]}"; then echo echo -e "${RED}ERROR: Found incorrect static list definition 'var/list/static/', it should be 'var/static/list/' instead.${NC}" st=1 fi; part "can_perform_action argument check" -if $grep 'can_perform_action\(\s*\)' $code_files; then +if $grep 'can_perform_action\(\s*\)' "${code_files[@]}"; then echo echo -e "${RED}ERROR: Found a can_perform_action() proc with improper arguments.${NC}" st=1 fi; part "src as a trait source" # ideally we'd lint / test for ANY datum reference as a trait source, but 'src' is the most common. -if $grep -i '(add_trait|remove_trait)\(.+,\s*.+,\s*src\)' $code_files; then +if $grep -i '(add_trait|remove_trait)\(.+,\s*.+,\s*src\)' "${code_files[@]}"; then echo echo -e "${RED}ERROR: Using 'src' as a trait source. Source must be a string key - dont't use references to datums as a source, perhaps use 'REF(src)'.${NC}" st=1 fi; -if $grep -i '(add_traits|remove_traits)\(.+,\s*src\)' $code_files; then +if $grep -i '(add_traits|remove_traits)\(.+,\s*src\)' "${code_files[@]}"; then echo echo -e "${RED}ERROR: Using 'src' as trait sources. Source must be a string key - dont't use references to datums as sources, perhaps use 'REF(src)'.${NC}" st=1 @@ -183,137 +188,142 @@ part "ensure proper lowertext usage" # lowertext() is a BYOND-level proc, so it can be used in any sort of code... including the TGS DMAPI which we don't manage in this repository. # basically, we filter out any results with "tgs" in it to account for this edgecase without having to enforce this rule in that separate codebase. # grepping the grep results is a bit of a sad solution to this but it's pretty much the only option in our existing linter framework -if $grep -i 'lowertext\(.+\)' $code_files | $grep -v 'UNLINT\(.+\)' | $grep -v '\/modules\/tgs\/'; then +if $grep -i 'lowertext\(.+\)' "${code_files[@]}" | $grep -v 'UNLINT\(.+\)' | $grep -v '\/modules\/tgs\/'; then echo echo -e "${RED}ERROR: Found a lowertext() proc call. Please use the LOWER_TEXT() macro instead. If you know what you are doing, wrap your text (ensure it is a string) in UNLINT().${NC}" st=1 fi; part "balloon_alert sanity" -if $grep 'balloon_alert\(".*"\)' $code_files; then +if $grep 'balloon_alert\(".*"\)' "${code_files[@]}"; then echo echo -e "${RED}ERROR: Found a balloon alert with improper arguments.${NC}" st=1 fi; -if $grep 'balloon_alert(.*span_)' $code_files; then +if $grep 'balloon_alert(.*span_)' "${code_files[@]}"; then echo echo -e "${RED}ERROR: Balloon alerts should never contain spans.${NC}" st=1 fi; part "balloon_alert idiomatic usage" -if $grep 'balloon_alert\(.*?, ?"[A-Z]' $code_files; then +if $grep 'balloon_alert\(.*?, ?"[A-Z]' "${code_files[@]}"; then echo echo -e "${RED}ERROR: Balloon alerts should not start with capital letters. This includes text like 'AI'. If this is a false positive, wrap the text in UNLINT().${NC}" st=1 fi; part "update_icon_updates_onmob element usage" -if $grep 'AddElement\(/datum/element/update_icon_updates_onmob.+ITEM_SLOT_HANDS' $code_files; then +if $grep 'AddElement\(/datum/element/update_icon_updates_onmob.+ITEM_SLOT_HANDS' "${code_files[@]}"; then echo echo -e "${RED}ERROR: update_icon_updates_onmob element automatically updates ITEM_SLOT_HANDS, this is redundant and should be removed.${NC}" st=1 fi; part "forceMove sanity" -if $grep 'forceMove\(\s*(\w+\(\)|\w+)\s*,\s*(\w+\(\)|\w+)\s*\)' $code_files; then +if $grep 'forceMove\(\s*(\w+\(\)|\w+)\s*,\s*(\w+\(\)|\w+)\s*\)' "${code_files[@]}"; then echo echo -e "${RED}ERROR: forceMove() call with two arguments - this is not how forceMove() is invoked! It's x.forceMove(y), not forceMove(x, y).${NC}" st=1 fi; part "as anything on typeless loops" -if $grep 'var/[^/]+ as anything' $code_files; then - echo - echo -e "${RED}ERROR: 'as anything' used in a typeless for loop. This doesn't do anything and should be removed.${NC}" - st=1 +if $grep 'var/[^/]+ as anything' "${code_files[@]}"; then + echo + echo -e "${RED}ERROR: 'as anything' used in a typeless for loop. This doesn't do anything and should be removed.${NC}" + st=1 fi; part "as anything on internal functions" -if $grep 'var\/(turf|mob|obj|atom\/movable).+ as anything in o?(view|range|hearers)\(' $code_files; then - echo - echo -e "${RED}ERROR: 'as anything' typed for loop over an internal function. These functions have some internal optimization that relies on the loop not having 'as anything' in it.${NC}" - st=1 +if $grep 'var\/(turf|mob|obj|atom\/movable).+ as anything in o?(view|range|hearers)\(' "${code_files[@]}"; then + echo + echo -e "${RED}ERROR: 'as anything' typed for loop over an internal function. These functions have some internal optimization that relies on the loop not having 'as anything' in it.${NC}" + st=1 fi; part "common spelling mistakes" -if $grep -i 'centcomm' $code_files; then +if $grep -i 'centcomm' "${code_files[@]}"; then echo - echo -e "${RED}ERROR: Misspelling(s) of CentCom detected in code, please remove the extra M(s).${NC}" - st=1 + echo -e "${RED}ERROR: Misspelling(s) of CentCom detected in code, please remove the extra M(s).${NC}" + st=1 fi; -if $grep -ni 'nanotransen' $code_files; then +if $grep -ni 'nanotransen' "${code_files[@]}"; then echo - echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in code, please remove the extra N(s).${NC}" - st=1 + echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in code, please remove the extra N(s).${NC}" + st=1 fi; -if $grep 'NanoTrasen' $code_files; then +if $grep 'NanoTrasen' "${code_files[@]}"; then echo - echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in code, please uncapitalize the T(s).${NC}" - st=1 + echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in code, please uncapitalize the T(s).${NC}" + st=1 fi; -if $grep -i 'eciev' $code_files; then +if $grep -i 'eciev' "${code_files[@]}"; then echo - echo -e "${RED}ERROR: Common I-before-E typo detected in code.${NC}" - st=1 + echo -e "${RED}ERROR: Common I-before-E typo detected in code.${NC}" + st=1 +fi; +if $grep -i 'maintainance|maintainence|maintenence' "${code_files[@]}"; then + echo + echo -e "${RED}ERROR: Misspelling(s) of 'maintenance' detected in code, please fix.${NC}"; + st=1 fi; -if $grep -i 'maintainance|maintainence|maintenence' $code_files; then +if $grep -i 'securaty|securiy|secuirty' "${code_files[@]}"; then echo - echo -e "${RED}ERROR: Misspelling(s) of 'maintenance' detected in code, please fix.${NC}"; + echo -e "${RED}ERROR: Misspelling(s) of 'security' detected in code, please fix.${NC}"; st=1 fi; part "map json naming" if ls _maps/*.json | $grep "[A-Z]"; then echo - echo -e "${RED}ERROR: Uppercase in a map .JSON file detected, these must be all lowercase.${NC}" - st=1 + echo -e "${RED}ERROR: Uppercase in a map .JSON file detected, these must be all lowercase.${NC}" + st=1 fi; part "Ineffective easing flags in animate()" -if $grep 'easing\w*=\w*(EASE_IN|EASE_OUT|\(EASE_IN\w*\|\w*EASE_OUT\))' $code_files; then - echo - echo -e "${RED}ERROR: 'animate' was called with an easing argument and the default, LINEAR_EASING curve. This doesn't do anything and should be adjusted.${NC}" - st=1 +if $grep 'easing\w*=\w*(EASE_IN|EASE_OUT|\(EASE_IN\w*\|\w*EASE_OUT\))' "${code_files[@]}"; then + echo + echo -e "${RED}ERROR: 'animate' was called with an easing argument and the default, LINEAR_EASING curve. This doesn't do anything and should be adjusted.${NC}" + st=1 fi; part "map json sanity" for json in _maps/*.json do - map_path=$(jq -r '.map_path' $json) - while read map_file; do - filename="_maps/$map_path/$map_file" - if [ ! -f $filename ] - then + map_path=$(jq -r '.map_path' $json) + while read map_file; do + filename="_maps/$map_path/$map_file" + if [ ! -f $filename ] + then echo - echo -e "${RED}ERROR: Found an invalid file reference to $filename in _maps/$json ${NC}" - st=1 - fi - done < <(jq -r '[.map_file] | flatten | .[]' $json) + echo -e "${RED}ERROR: Found an invalid file reference to $filename in _maps/$json ${NC}" + st=1 + fi + done < <(jq -r '[.map_file] | flatten | .[]' $json) done part "updatepaths validity" missing_txt_lines=$(find tools/UpdatePaths/Scripts -type f ! -name "*.txt" | wc -l) if [ $missing_txt_lines -gt 0 ]; then - echo - echo -e "${RED}ERROR: Found an UpdatePaths File that doesn't end in .txt! Please add the proper file extension!${NC}" - st=1 + echo + echo -e "${RED}ERROR: Found an UpdatePaths File that doesn't end in .txt! Please add the proper file extension!${NC}" + st=1 fi; number_prefix_lines=$(find tools/UpdatePaths/Scripts -type f | wc -l) valid_number_prefix_lines=$(find tools/UpdatePaths/Scripts -type f | $grep -P "\d+_(.+)" | wc -l) if [ $valid_number_prefix_lines -ne $number_prefix_lines ]; then - echo - echo -e "${RED}ERROR: Detected an UpdatePaths File that doesn't start with the PR number! Please add the proper number prefix!${NC}" - st=1 + echo + echo -e "${RED}ERROR: Detected an UpdatePaths File that doesn't start with the PR number! Please add the proper number prefix!${NC}" + st=1 fi; section "515 Proc Syntax" part "proc ref syntax" if $grep '\.proc/' $code_x_515 ; then - echo - echo -e "${RED}ERROR: Outdated proc reference use detected in code, please use proc reference helpers.${NC}" - st=1 + echo + echo -e "${RED}ERROR: Outdated proc reference use detected in code, please use proc reference helpers.${NC}" + st=1 fi; if [ "$pcre2_support" -eq 1 ]; then @@ -325,37 +335,37 @@ if [ "$pcre2_support" -eq 1 ]; then st=1 fi; part "to_chat sanity" - if $grep -P 'to_chat\((?!.*,).*\)' $code_files; then + if $grep -P 'to_chat\((?!.*,).*\)' "${code_files[@]}"; then echo echo -e "${RED}ERROR: to_chat() missing arguments.${NC}" st=1 fi; part "timer flag sanity" - if $grep -P 'addtimer\((?=.*TIMER_OVERRIDE)(?!.*TIMER_UNIQUE).*\)' $code_files; then + if $grep -P 'addtimer\((?=.*TIMER_OVERRIDE)(?!.*TIMER_UNIQUE).*\)' "${code_files[@]}"; then echo echo -e "${RED}ERROR: TIMER_OVERRIDE used without TIMER_UNIQUE.${NC}" st=1 fi part "trailing newlines" - if $grep -PU '[^\n]$(?!\n)' $code_files; then + if $grep -PU '[^\n]$(?!\n)' "${code_files[@]}"; then echo echo -e "${RED}ERROR: File(s) with no trailing newline detected, please add one.${NC}" st=1 fi part "datum stockpart sanity" - if $grep -P 'for\b.*/obj/item/stock_parts/(?!power_store)(?![\w_]+ in )' $code_files; then + if $grep -P 'for\b.*/obj/item/stock_parts/(?!power_store)(?![\w_]+ in )' "${code_files[@]}"; then echo echo -e "${RED}ERROR: Should be using datum/stock_part instead" st=1 fi; part "improper atom initialize args" - if $grep -P '^/(obj|mob|turf|area|atom)/.+/Initialize\((?!mapload).*\)' $code_files; then + if $grep -P '^/(obj|mob|turf|area|atom)/.+/Initialize\((?!mapload).*\)' "${code_files[@]}"; then echo echo -e "${RED}ERROR: Initialize override without 'mapload' argument.${NC}" st=1 fi; part "pronoun helper spellcheck" - if $grep -P '%PRONOUN_(?!they|They|their|Their|theirs|Theirs|them|Them|have|are|were|do|theyve|Theyve|theyre|Theyre|s|es)' $code_files; then + if $grep -P '%PRONOUN_(?!they|They|their|Their|theirs|Theirs|them|Them|have|are|were|do|theyve|Theyve|theyre|Theyre|s|es)' "${code_files[@]}"; then echo echo -e "${RED}ERROR: Invalid pronoun helper found.${NC}" st=1 @@ -372,13 +382,13 @@ else fi if [ $st = 0 ]; then - echo - echo -e "${GREEN}No errors found using $grep!${NC}" + echo + echo -e "${GREEN}No errors found using $grep!${NC}" fi; if [ $st = 1 ]; then - echo - echo -e "${RED}Errors found, please fix them and try again.${NC}" + echo + echo -e "${RED}Errors found, please fix them and try again.${NC}" fi; exit $st diff --git a/tools/define_sanity/check.py b/tools/define_sanity/check.py index c8b17d3cce57..6898b33ecc20 100644 --- a/tools/define_sanity/check.py +++ b/tools/define_sanity/check.py @@ -4,7 +4,7 @@ import re import sys -parent_directory = "code/**/*.dm" +parent_directory = "*/**/*.dm" output_file_name = "define_sanity_output.txt" how_to_fix_message = "Please #undef the above defines or remake them as global defines in the code/__DEFINES directory." @@ -36,6 +36,8 @@ def post_error(define_name, file, github_error_style): "code/_globalvars/*.dm", # TGS files come from another repository so lets not worry about them. "code/modules/tgs/**/*.dm", + # Doesn't come with the repo, but is in CI. + "DMCompiler_linux-x64/*.dm", ] define_regex = re.compile(r"(\s+)?#define\s?([A-Z0-9_]+)\(?(.+)\)?") diff --git a/tools/ticked_file_enforcement/schemas/tgstation_dme.json b/tools/ticked_file_enforcement/schemas/tgstation_dme.json index 7fe1840d7534..7a7e378b7741 100644 --- a/tools/ticked_file_enforcement/schemas/tgstation_dme.json +++ b/tools/ticked_file_enforcement/schemas/tgstation_dme.json @@ -1,10 +1,16 @@ { "file": "tgstation.dme", - "scannable_directory": "code/", + "scannable_directory": "*/", "subdirectories": true, "excluded_files": [], "forbidden_includes": [ "code/modules/tgs/**/*.dm", - "code/modules/unit_tests/[!_]*.dm" + "code/modules/unit_tests/[!_]*.dm", + "DMCompiler_linux-x64/*.dm", + "tools/ci/od_lints.dm", + "tools/HubMigrator/HubMigrator.dm", + "tools/CatchUnescapedBrackets/*.dm", + "tools/SS13SmoothingCutter/*.dm", + "tools/ScrollAnimationAssembler/*.dm" ] }