diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index cf7a97c1e47..7c2ac91c1b1 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -10420,17 +10420,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/main) -"czA" = ( -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "czB" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 @@ -15889,14 +15878,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) -"dSz" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/service/bar) "dSA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white/smooth_large, @@ -33725,6 +33706,13 @@ dir = 1 }, /area/station/medical/medbay/lobby) +"iss" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/service/bar) "isy" = ( /obj/structure/chair/office{ dir = 4 @@ -52457,6 +52445,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"neT" = ( +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/coroner/surgery, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "nfd" = ( /obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/engine/plasma, @@ -64169,13 +64168,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port) -"qcO" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron/dark, -/area/station/service/bar) "qdc" = ( /obj/effect/landmark/start/hangover, /obj/structure/chair/sofa/bench{ @@ -87345,6 +87337,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +"vQB" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/service/bar) "vRn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/structure/railing/corner, @@ -133820,7 +133820,7 @@ pqv uGR qdl ewV -qcO +iss jhH vnU vnU @@ -134077,7 +134077,7 @@ pOV eqM ask dep -dSz +vQB bwh vnU tOs @@ -137770,7 +137770,7 @@ uue jdf qYL qpU -czA +neT aNV hvf vid diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 8e09ab52925..21cdb98b59e 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -25556,6 +25556,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/mine/eva/lower) +"igs" = ( +/obj/structure/closet, +/obj/item/clothing/under/suit/black, +/obj/item/clothing/under/suit/black/skirt, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) "igx" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 5 @@ -43849,15 +43858,6 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/wood/parquet, /area/station/commons/lounge) -"nWB" = ( -/obj/structure/closet, -/obj/item/clothing/under/suit/black, -/obj/item/clothing/under/suit/black/skirt, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/commons/dorms/laundry) "nWH" = ( /turf/closed/wall, /area/station/maintenance/department/cargo) @@ -44502,6 +44502,12 @@ /obj/structure/sign/warning/electric_shock, /turf/open/floor/plating, /area/station/science/xenobiology) +"oiv" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/coroner/surgery, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "oiy" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat/service) @@ -46518,12 +46524,6 @@ "oMT" = ( /turf/open/floor/iron, /area/station/command/heads_quarters/rd) -"oNj" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table/reinforced, -/obj/item/storage/backpack/duffelbag/med/surgery, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "oNp" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 9 @@ -160516,7 +160516,7 @@ iwS iqT tDG tDG -nWB +igs iwS tKI wkj @@ -181339,7 +181339,7 @@ fwB btU cJa fDp -oNj +oiv vAO jUB oXs diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 00085e8a48c..5671add4846 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2047,6 +2047,12 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/bridge) +"aMG" = ( +/obj/structure/table, +/obj/item/clothing/under/costume/buttondown/slacks/service, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "aMW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19397,21 +19403,6 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron/white, /area/station/medical/pharmacy) -"hoQ" = ( -/obj/structure/table, -/obj/item/clothing/under/suit/black_really, -/obj/machinery/light/small/directional/north, -/obj/item/radio/intercom/directional/north, -/obj/item/clothing/accessory/waistcoat, -/obj/item/clothing/suit/toggle/lawyer/black, -/obj/item/clothing/under/suit/red, -/obj/item/clothing/neck/tie/black, -/obj/item/clothing/under/costume/buttondown/slacks/service, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/commons/dorms) "hoY" = ( /obj/structure/chair/office{ dir = 4 @@ -27696,6 +27687,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) +"kch" = ( +/obj/structure/table, +/obj/item/clothing/under/suit/black_really, +/obj/machinery/light/small/directional/north, +/obj/item/radio/intercom/directional/north, +/obj/item/clothing/accessory/waistcoat, +/obj/item/clothing/suit/toggle/lawyer/black, +/obj/item/clothing/under/suit/red, +/obj/item/clothing/neck/tie/black, +/obj/item/clothing/under/costume/buttondown/slacks/service, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms) "kcn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, @@ -28016,12 +28022,6 @@ /obj/effect/mapping_helpers/mail_sorting/science/rd_office, /turf/open/floor/iron/white, /area/station/science/research) -"kjL" = ( -/obj/structure/table, -/obj/item/clothing/under/costume/buttondown/slacks/service, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "kjO" = ( /obj/structure/table, /obj/item/restraints/handcuffs/cable/white, @@ -28386,6 +28386,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"kqP" = ( +/obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/coroner/surgery, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "kqZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -36010,11 +36015,6 @@ "ndS" = ( /turf/closed/wall/r_wall, /area/station/hallway/secondary/command) -"ndZ" = ( -/obj/structure/table/reinforced, -/obj/item/storage/backpack/duffelbag/med/surgery, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "ned" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -93860,7 +93860,7 @@ joj dWI hZV eyy -ndZ +kqP hjF kOM pTx @@ -102774,7 +102774,7 @@ lnc cqp wvF lnc -hoQ +kch wcr ikb urK @@ -103017,7 +103017,7 @@ jlJ eZN ewf ewf -kjL +aMG lhk rwE tgo diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index c020f9a3997..8c9acad2a3e 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -7144,6 +7144,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/floor3/fore) +"bLN" = ( +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer4{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/engine_access, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/waste) "bMa" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/siding/thinplating_new, @@ -10128,6 +10136,16 @@ /obj/item/clothing/head/costume/festive, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor3/starboard/fore) +"czf" = ( +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer4{ + dir = 4 + }, +/obj/item/paper{ + default_raw_text = "Once you have gas coming in from the SM to the containment chamber, you'll need to cool it.-
To set up the waste gas cooling loop, follow these steps:
  1. Wrench in the plasma can.
  2. Turn on the waste Cooling Gas pump and set the thermomachines to cold.
  3. Set up the scrubbers in the chamber using the air alarm.
  4. Turn on the filter to the canisters or replace it.
  5. Turn on the Supermatter Waste To Port pump.

Once everything on that list is complete, make sure that gas isn't building up inside the chamber or the pipes and you are done."; + name = "HOW TO SET UP THE SM WASTE" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/pumproom) "czj" = ( /obj/structure/sign/poster/random/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -12142,13 +12160,6 @@ /obj/item/stack/rods/fifty, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"dbx" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/engine/air, -/area/station/engineering/supermatter/waste) "dby" = ( /turf/open/floor/iron/dark/side{ dir = 4 @@ -13773,6 +13784,16 @@ /obj/structure/cable, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) +"dzI" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ + dir = 4 + }, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/engine/airless, +/area/station/engineering/supermatter/waste) "dzL" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Entrance" @@ -15267,15 +15288,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/security/checkpoint) -"dTZ" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ - dir = 6 - }, -/turf/open/floor/engine/airless, -/area/station/engineering/supermatter/waste) "dUh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19007,19 +19019,6 @@ /obj/effect/landmark/start/chemist, /turf/open/floor/iron/white/small, /area/station/medical/chemistry) -"eVY" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 8; - volume_rate = 200 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer4{ - dir = 8 - }, -/turf/open/floor/engine/airless, -/area/station/engineering/supermatter/waste) "eWb" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/structure/barricade/wooden/crude, @@ -21156,9 +21155,6 @@ /obj/structure/rack, /turf/open/floor/pod/dark, /area/station/maintenance/floor2/starboard) -"fCy" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter/waste) "fCz" = ( /obj/structure/rack, /obj/item/storage/box/firingpins{ @@ -22548,15 +22544,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"fUC" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ - dir = 5 - }, -/turf/open/floor/engine/airless, -/area/station/engineering/supermatter/waste) "fUD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23506,6 +23493,16 @@ }, /turf/open/floor/pod/dark, /area/station/cargo/miningdock) +"ghk" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ + dir = 4 + }, +/obj/effect/baseturf_helper/reinforced_plating/ceiling, +/turf/open/floor/engine/airless, +/area/station/engineering/supermatter/waste) "gho" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/structure/tank_holder, @@ -26117,15 +26114,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/green, /area/station/service/abandoned_gambling_den) -"gRJ" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{ - dir = 8 - }, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter/waste) "gRQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/broken/directional/west, @@ -27330,6 +27318,9 @@ dir = 8 }, /area/station/hallway/floor4/aft) +"hin" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/waste) "hio" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 @@ -32977,15 +32968,6 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/wood/parquet, /area/station/medical/break_room) -"iHa" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ - dir = 4 - }, -/turf/open/floor/engine/airless, -/area/station/engineering/supermatter/waste) "iHk" = ( /turf/open/floor/catwalk_floor, /area/station/hallway/floor1/fore) @@ -35056,6 +35038,11 @@ /obj/item/restraints/handcuffs/fake, /turf/open/floor/iron/dark, /area/station/maintenance/floor2/starboard/aft) +"jjv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/engine/air, +/area/station/engineering/supermatter/waste) "jjA" = ( /obj/effect/turf_decal/tile/red/fourcorners, /obj/structure/closet/secure_closet/armory2, @@ -36384,18 +36371,6 @@ /obj/item/bot_assembly/floorbot, /turf/open/floor/pod/dark, /area/station/maintenance/floor2/starboard/aft) -"jBi" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ - dir = 10 - }, -/turf/open/floor/engine/airless, -/area/station/engineering/supermatter/waste) "jBm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38063,6 +38038,21 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) +"jZR" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ + dir = 9 + }, +/obj/machinery/camera/preset/ordnance{ + c_tag = "Supermatter Waste"; + light_range = 0; + network = list("waste","engine") + }, +/turf/open/floor/engine/airless, +/area/station/engineering/supermatter/waste) "jZS" = ( /turf/open/floor/iron/dark/side{ dir = 4 @@ -41091,15 +41081,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/pod, /area/station/maintenance/floor4/port/fore) -"kMh" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer4{ - dir = 8 - }, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter/waste) "kMk" = ( /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /obj/machinery/door/airlock/hatch{ @@ -47049,11 +47030,6 @@ /obj/effect/baseturf_helper/reinforced_plating/ceiling, /turf/open/floor/iron/large, /area/station/command/heads_quarters/rd) -"mlW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/engine/air, -/area/station/engineering/supermatter/waste) "mlX" = ( /obj/structure/chair/comfy/brown, /obj/effect/landmark/start/assistant, @@ -54061,16 +54037,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/science/breakroom) -"nWK" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ - dir = 4 - }, -/obj/effect/baseturf_helper/reinforced_plating/ceiling, -/turf/open/floor/engine/airless, -/area/station/engineering/supermatter/waste) "nWM" = ( /obj/structure/table, /obj/item/stack/medical/suture/emergency, @@ -54406,14 +54372,6 @@ }, /turf/open/floor/iron, /area/station/hallway/floor1/fore) -"obS" = ( -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer4{ - dir = 4 - }, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/engine_access, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/waste) "obT" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/turf_decal/stripes/line{ @@ -56110,6 +56068,15 @@ /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/pod/dark, /area/station/maintenance/floor3/port/aft) +"ozU" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{ + dir = 8 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/waste) "oAc" = ( /obj/effect/turf_decal/trimline/purple/line, /obj/machinery/door/firedoor/border_only{ @@ -57018,6 +56985,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +"oMY" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/turf/open/floor/engine/air, +/area/station/engineering/supermatter/waste) "oMZ" = ( /obj/effect/turf_decal/trimline/green/line{ dir = 1 @@ -59195,16 +59169,6 @@ }, /turf/open/floor/carpet/red, /area/station/service/theater) -"prX" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ - dir = 4 - }, -/obj/machinery/light/cold/directional/north, -/turf/open/floor/engine/airless, -/area/station/engineering/supermatter/waste) "prZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -66089,6 +66053,19 @@ dir = 1 }, /area/station/hallway/floor2/fore) +"rhU" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 8; + volume_rate = 200 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer4{ + dir = 8 + }, +/turf/open/floor/engine/airless, +/area/station/engineering/supermatter/waste) "rhY" = ( /obj/item/storage/box/donkpockets{ pixel_y = 5 @@ -66122,6 +66099,15 @@ /obj/structure/cable, /turf/open/floor/iron/dark/side, /area/station/hallway/floor1/fore) +"riA" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ + dir = 4 + }, +/turf/open/floor/engine/airless, +/area/station/engineering/supermatter/waste) "riC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -69746,6 +69732,15 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"sni" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer4{ + dir = 8 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/waste) "snp" = ( /turf/open/floor/iron/dark/side{ dir = 8 @@ -70826,6 +70821,18 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"sDj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 10 + }, +/turf/open/floor/engine/airless, +/area/station/engineering/supermatter/waste) "sDo" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -72478,6 +72485,18 @@ }, /turf/open/floor/wood/parquet, /area/station/medical/psychology) +"sYo" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer4{ + dir = 4 + }, +/turf/open/floor/engine/airless, +/area/station/engineering/supermatter/waste) "sYw" = ( /obj/structure/railing/corner{ dir = 1 @@ -74920,16 +74939,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lower) -"tEU" = ( -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer4{ - dir = 4 - }, -/obj/item/paper{ - default_raw_text = "Once you have gas coming in from the SM to the containment chamber, you'll need to cool it.-
To set up the waste gas cooling loop, follow these steps:
  1. Wrench in the plasma can.
  2. Turn on the waste Cooling Gas pump and set the thermomachines to cold.
  3. Set up the scrubbers in the chamber using the air alarm.
  4. Turn on the filter to the canisters or replace it.
  5. Turn on the Supermatter Waste To Port pump.

Once everything on that list is complete, make sure that gas isn't building up inside the chamber or the pipes and you are done."; - name = "HOW TO SET UP THE SM WASTE" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/pumproom) "tEW" = ( /obj/machinery/camera/autoname/directional/west, /obj/machinery/light/floor, @@ -75510,6 +75519,15 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/locker) +"tMs" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ + dir = 6 + }, +/turf/open/floor/engine/airless, +/area/station/engineering/supermatter/waste) "tMB" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 @@ -76368,6 +76386,15 @@ dir = 8 }, /area/station/hallway/floor4/fore) +"tZe" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ + dir = 5 + }, +/turf/open/floor/engine/airless, +/area/station/engineering/supermatter/waste) "tZh" = ( /obj/machinery/door/airlock/science{ name = "Monkey Pen" @@ -77513,18 +77540,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood/tile, /area/station/service/library/printer) -"uoW" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer4{ - dir = 4 - }, -/turf/open/floor/engine/airless, -/area/station/engineering/supermatter/waste) "uph" = ( /obj/machinery/door/airlock/hatch{ name = "Elevator Shaft Access" @@ -77736,21 +77751,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) -"usH" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ - dir = 9 - }, -/obj/machinery/camera/preset/ordnance{ - c_tag = "Supermatter Waste"; - light_range = 0; - network = list("waste","engine") - }, -/turf/open/floor/engine/airless, -/area/station/engineering/supermatter/waste) "usI" = ( /obj/structure/chair/pew/right{ dir = 4 @@ -84526,6 +84526,16 @@ }, /turf/open/floor/iron, /area/station/hallway/floor3/aft) +"wey" = ( +/obj/machinery/camera/autoname/directional/north, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/structure/table/reinforced/rglass, +/obj/item/storage/backpack/duffelbag/coroner/surgery, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "weO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured, @@ -90207,16 +90217,6 @@ /obj/structure/closet/l3closet/scientist, /turf/open/floor/iron/dark, /area/station/command/gateway) -"xBA" = ( -/obj/machinery/camera/autoname/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/table/reinforced/rglass, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "xBB" = ( /obj/machinery/door/airlock/public{ id_tag = "theater_toilets"; @@ -139126,11 +139126,11 @@ aof tZD iMe xIL -fCy -fCy -dbx -fCy -fCy +hin +hin +oMY +hin +hin mOT jSD iyT @@ -139383,11 +139383,11 @@ itP gnx nnb bZE -fCy -dTZ -eVY -fUC -fCy +hin +tMs +rhU +tZe +hin xgW jSD fcp @@ -139640,11 +139640,11 @@ rkf tZD jHQ kTc -fCy -iHa -iHa -iHa -fCy +hin +riA +riA +riA +hin xgW kfo iyT @@ -139897,11 +139897,11 @@ vmr vmr skj kFk -fCy -prX -nWK -iHa -fCy +hin +dzI +ghk +riA +hin isp jSD iMV @@ -140154,11 +140154,11 @@ eIt vmr jsZ fLn -fCy -jBi -uoW -usH -fCy +hin +sDj +sYo +jZR +hin bQz uCe iyT @@ -140411,11 +140411,11 @@ eQe vmr wul fKH -fCy -kMh -mlW -gRJ -fCy +hin +sni +jjv +ozU +hin oIy hsG hOR @@ -140669,7 +140669,7 @@ vmr ykP npP tZD -obS +bLN iLF xiO fKL @@ -140926,7 +140926,7 @@ vmr obH npP fJw -tEU +czf qyN mPE cYF @@ -197489,7 +197489,7 @@ jSW nrX mkE gQx -xBA +wey xWy pfd fQH diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 01ca76a8994..b40d8093fb1 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -48572,7 +48572,7 @@ pixel_y = 8 }, /obj/structure/window/reinforced/spawner/directional/north, -/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/item/storage/backpack/duffelbag/coroner/surgery, /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/iron/dark, /area/station/medical/morgue) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 696a5891fe5..c1ce4cce7f3 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -512,12 +512,41 @@ name = "surgical duffel bag" desc = "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools." +/obj/item/storage/backpack/duffelbag/med/surgery/PopulateContents() + new /obj/item/scalpel(src) + new /obj/item/hemostat(src) + new /obj/item/retractor(src) + new /obj/item/circular_saw(src) + new /obj/item/surgicaldrill(src) + new /obj/item/cautery(src) + new /obj/item/bonesetter(src) + new /obj/item/surgical_drapes(src) + new /obj/item/clothing/mask/surgical(src) + new /obj/item/razor(src) + new /obj/item/blood_filter(src) + /obj/item/storage/backpack/duffelbag/coroner name = "coroner duffel bag" desc = "A large duffel bag for holding large amounts of organs at once." icon_state = "duffel-coroner" inhand_icon_state = "duffel-coroner" +/obj/item/storage/backpack/duffelbag/coroner/surgery + name = "surgical coroner bag" + desc = "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding morbid surgical tools." + +/obj/item/storage/backpack/duffelbag/coroner/surgery/PopulateContents() + new /obj/item/scalpel/cruel(src) + new /obj/item/hemostat/cruel(src) + new /obj/item/retractor/cruel(src) + new /obj/item/circular_saw(src) + new /obj/item/surgicaldrill(src) + new /obj/item/cautery/cruel(src) + new /obj/item/bonesetter(src) + new /obj/item/surgical_drapes(src) + new /obj/item/razor(src) + new /obj/item/blood_filter(src) + /obj/item/storage/backpack/duffelbag/explorer name = "explorer duffel bag" desc = "A large duffel bag for holding extra exotic treasures." @@ -554,21 +583,6 @@ icon_state = "duffel-virology" inhand_icon_state = "duffel-virology" - - -/obj/item/storage/backpack/duffelbag/med/surgery/PopulateContents() - new /obj/item/scalpel(src) - new /obj/item/hemostat(src) - new /obj/item/retractor(src) - new /obj/item/circular_saw(src) - new /obj/item/surgicaldrill(src) - new /obj/item/cautery(src) - new /obj/item/bonesetter(src) - new /obj/item/surgical_drapes(src) - new /obj/item/clothing/mask/surgical(src) - new /obj/item/razor(src) - new /obj/item/blood_filter(src) - /obj/item/storage/backpack/duffelbag/sec name = "security duffel bag" desc = "A large duffel bag for holding extra security supplies and ammunition." diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm index fcb6bc7e752..d60ecf78cbf 100644 --- a/code/game/objects/items/storage/medkit.dm +++ b/code/game/objects/items/storage/medkit.dm @@ -345,19 +345,15 @@ icon = 'icons/obj/storage/medkit.dmi' icon_state = "compact_coronerkit" inhand_icon_state = "coronerkit" - var/max_slots = 6 - var/max_total_storage = 6 - var/max_object_size = WEIGHT_CLASS_SMALL //so it cannot fit an autopsy scanner /obj/item/storage/medkit/coroner/Initialize(mapload) . = ..() - atom_storage.max_specific_storage = max_object_size - atom_storage.max_slots = max_slots - atom_storage.max_total_storage = max_total_storage + atom_storage.max_specific_storage = 24 + atom_storage.max_slots = 14 + atom_storage.max_total_storage = WEIGHT_CLASS_NORMAL atom_storage.set_holdable(list( /obj/item/reagent_containers, /obj/item/bodybag, - /obj/item/folder/white, /obj/item/toy/crayon, /obj/item/pen, /obj/item/paper, @@ -381,35 +377,6 @@ ) generate_items_inside(items_inside,src) -/obj/item/storage/medkit/coroner/large - name = "coroner's medkit" - desc = "A medical kit designed primarily for assisting in dissecting the deceased, rather than treating the living." - icon = 'icons/obj/storage/medkit.dmi' - icon_state = "coronerkit" - inhand_icon_state = "coronerkit" - max_slots = 14 - max_total_storage = 24 - max_object_size = WEIGHT_CLASS_NORMAL - -/obj/item/storage/medkit/coroner/large/PopulateContents() - if(empty) - return - var/static/items_inside = list( - /obj/item/reagent_containers/cup/bottle/formaldehyde = 1, - /obj/item/reagent_containers/medigel/sterilizine = 1, - /obj/item/toy/crayon/white = 1, - /obj/item/reagent_containers/blood = 1, - /obj/item/bodybag = 2, - /obj/item/reagent_containers/syringe = 1, - /obj/item/folder/white = 1,//for storing autopsy reports from the scanner - /obj/item/surgical_drapes = 1, - /obj/item/scalpel/cruel = 1, - /obj/item/retractor/cruel = 1, - /obj/item/hemostat/cruel = 1, - /obj/item/cautery/cruel = 1, - ) - generate_items_inside(items_inside,src) - //medibot assembly /obj/item/storage/medkit/attackby(obj/item/bodypart/bodypart, mob/user, params) if((!istype(bodypart, /obj/item/bodypart/arm/left/robot)) && (!istype(bodypart, /obj/item/bodypart/arm/right/robot))) diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm index 41dee0cbcea..04ff558605e 100644 --- a/code/modules/cargo/packs/medical.dm +++ b/code/modules/cargo/packs/medical.dm @@ -126,10 +126,11 @@ shmancy degrees? Just get started with this crate containing a medical duffelbag, \ Sterilizine spray and collapsible roller bed." cost = CARGO_CRATE_VALUE * 6 - contains = list(/obj/item/storage/backpack/duffelbag/med/surgery, - /obj/item/reagent_containers/medigel/sterilizine, - /obj/item/roller, - ) + contains = list( + /obj/item/storage/backpack/duffelbag/med/surgery, + /obj/item/reagent_containers/medigel/sterilizine, + /obj/item/roller, + ) crate_name = "surgical supplies crate" /datum/supply_pack/medical/salglucanister diff --git a/code/modules/jobs/job_types/coroner.dm b/code/modules/jobs/job_types/coroner.dm index 41a2024c97a..14928b76dc5 100644 --- a/code/modules/jobs/job_types/coroner.dm +++ b/code/modules/jobs/job_types/coroner.dm @@ -52,7 +52,7 @@ backpack_contents = list( /obj/item/storage/box/bodybags = 1, /obj/item/autopsy_scanner = 1, - /obj/item/storage/medkit/coroner/large = 1, + /obj/item/storage/medkit/coroner = 1, ) belt = /obj/item/modular_computer/pda/coroner diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 2cce1ec2296..df3327c4242 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -314,7 +314,11 @@ /obj/item/storage/backpack/satchel/coroner = 1, /obj/item/storage/backpack/duffelbag/coroner = 1, /obj/item/storage/box/bodybags = 3, - /obj/item/storage/medkit/coroner = 1, + /obj/item/scalpel/cruel = 1, + /obj/item/retractor/cruel = 1, + /obj/item/hemostat/cruel = 1, + /obj/item/cautery/cruel = 1, + /obj/item/toy/crayon/white = 1, /obj/item/radio/headset/headset_srvmed = 2, ) contraband = list( @@ -325,10 +329,7 @@ ) premium = list( /obj/item/autopsy_scanner = 1, - /obj/item/scalpel/cruel = 1, - /obj/item/retractor/cruel = 1, - /obj/item/hemostat/cruel = 1, - /obj/item/cautery/cruel = 1, + /obj/item/storage/medkit/coroner = 1, ) refill_canister = /obj/item/vending_refill/wardrobe/coroner_wardrobe payment_department = ACCOUNT_MED