From 676963a824e4b45f5cd796eed30beecb2be265d3 Mon Sep 17 00:00:00 2001 From: Olive <49600480+zeskorion@users.noreply.github.com> Date: Wed, 1 Apr 2026 14:13:34 -0700 Subject: [PATCH] Cetus fixes 03/26 (#12619) --- modular_chomp/maps/cetus/cetus-1.dmm | 160 +- modular_chomp/maps/cetus/cetus-2.dmm | 3494 ++++++++++++++++---------- modular_chomp/maps/cetus/cetus-3.dmm | 181 +- 3 files changed, 2470 insertions(+), 1365 deletions(-) diff --git a/modular_chomp/maps/cetus/cetus-1.dmm b/modular_chomp/maps/cetus/cetus-1.dmm index 3d0f6a95f8..bb0365d2ad 100644 --- a/modular_chomp/maps/cetus/cetus-1.dmm +++ b/modular_chomp/maps/cetus/cetus-1.dmm @@ -228,6 +228,14 @@ /obj/random/mob/mouse, /turf/simulated/floor/tiled/freezer, /area/maintenance/ab_Kitchen) +"aaD" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/shield_capacitor, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/cetus/meteor/shieldgen) "aaE" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/maintenance_panel{ @@ -1107,7 +1115,7 @@ }, /obj/machinery/door/airlock/glass_research{ name = "Anomaly Testing"; - req_access = list(65) + req_access = list(7) }, /obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment, @@ -1339,6 +1347,28 @@ }, /turf/simulated/floor/tiled/neutral, /area/maintenance/cetus/hallway) +"acw" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/shield_gen/external, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/cetus/meteor/shieldgen) +"acx" = ( +/obj/structure/sign/department/shield{ + pixel_y = 30 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/cetus/meteor/shieldgen) +"acy" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/cetus/meteor/shieldgen) "acC" = ( /obj/structure/sink{ dir = 4; @@ -1788,8 +1818,6 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/machinery/shield_gen/external, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light/small{ dir = 1 }, @@ -7213,12 +7241,6 @@ /obj/structure/cable/orange{ icon_state = "0-6" }, -/obj/structure/sign/department/shield{ - pixel_y = 30 - }, -/obj/machinery/light/small{ - dir = 1 - }, /turf/simulated/floor/plating, /area/engineering/cetus/meteor/shieldgen) "dmb" = ( @@ -7663,12 +7685,14 @@ /turf/simulated/floor/tiled/white, /area/rnd/cetus/meteor/carbonresearch) "dym" = ( -/obj/structure/disposalpipe/junction{ - dir = 8 - }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + sortType = "Bar"; + name = "Bar" + }, /turf/simulated/floor/tiled, /area/crew_quarters/cetus/meteor/cafeteriaf1) "dyp" = ( @@ -10766,7 +10790,6 @@ anchored = 1; dir = 4; icon_state = "emitter2"; - id = "EngineEmitter"; state = 2 }, /turf/simulated/floor/plating, @@ -11645,10 +11668,6 @@ /obj/effect/floor_decal/spline/fancy{ dir = 1 }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 25 - }, /obj/machinery/light/fluorescent{ dir = 4 }, @@ -15839,6 +15858,11 @@ /obj/effect/floor_decal/spline/fancy{ dir = 10 }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 25; + pixel_y = 27 + }, /turf/simulated/floor/plating, /area/security/cetus/meteor/brig) "hUm" = ( @@ -18658,13 +18682,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/cetus/meteor/hallway2) "jpg" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - sortType = "Bar"; - name = "Bar" - }, /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/railing, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/cetus/meteor/cafeteriaf1) "jpp" = ( @@ -19827,7 +19849,9 @@ /area/crew_quarters/sleep/cetus/meteor/dorm2) "jPT" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/rnd, +/obj/machinery/door/airlock/maintenance/rnd{ + req_access = list(7) + }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/blast/regular{ density = 0; @@ -23467,8 +23491,6 @@ /turf/simulated/floor/plating, /area/maintenance/cetus/aftmed) "lHH" = ( -/obj/machinery/shield_capacitor, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -24616,10 +24638,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/cetus/meteor/techstorage) -"mrH" = ( -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/maintenance/cetus/meteor/aftstar) "mrI" = ( /obj/structure/window/reinforced{ dir = 1 @@ -36052,8 +36070,6 @@ /turf/simulated/floor/tiled, /area/engineering/cetus/meteor/atriumdeck1) "siy" = ( -/obj/machinery/shield_capacitor, -/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/engineering/cetus/meteor/shieldgen) "siC" = ( @@ -96221,14 +96237,14 @@ hhG kBV ojJ kKC -jNq uAV +kzW uQv uQv uQv uQv uQv -eOO +vOz knr knr eOO @@ -96479,14 +96495,14 @@ dgo lVf ogE aPd -jNq uAV -uQv +kzW +acw hWI rbs hWI -uQv -eOO +aaD +vOz eOO knr eOO @@ -96737,14 +96753,14 @@ hhG hHR ojJ kKC -jNq uAV -uQv +kzW +acx dlt sFb oWU -uQv -slB +aaD +kzW eOO knr knr @@ -96995,14 +97011,14 @@ ojJ lVf ogE aPd -jNq uAV -uQv +kzW +acy hWI uAz hWI -uQv -slB +aaD +kzW eOO eOO knr @@ -97253,14 +97269,14 @@ ogE hHR ojJ kKC -jNq uAV +kzW uQv eNT kRK lHH uQv -slB +kzW slB eOO eOO @@ -97542,11 +97558,11 @@ iUX hGJ hBX eXe -lZX eXe -lZX eXe -lZX +eXe +eXe +eXe eXe slB slB @@ -97800,14 +97816,14 @@ fvl vPG hRu wKr -slB -slB -slB -slB -slB iQm iQm iQm +tiw +tiw +tiw +tiw +iQm slB slB iQm @@ -98058,11 +98074,11 @@ rXy lcp voG fbs -slB iQm iQm -aam -iQm +tiw +tiw +tiw tiw tiw fnG @@ -98319,7 +98335,7 @@ wKr iQm iQm tiw -mrH +tiw tiw tiw iPN @@ -98577,7 +98593,7 @@ fbs iQm tiw tiw -aam +tiw tiw tiw hzd @@ -98836,8 +98852,8 @@ iQm tiw tiw iQm -iQm -iQm +tiw +tiw tiw sRw iQm @@ -99091,18 +99107,18 @@ kdm oDL fbs iQm -iQm +tiw hzd tiw +tiw +tiw iQm iQm iQm +slB iQm -slB -slB -slB -uAV -uAV +bSB +bSB uAV suH suH @@ -99349,7 +99365,9 @@ fDI sIp wKr iQm -iQm +tiw +tiw +tiw tiw tiw tiw @@ -99357,8 +99375,6 @@ iQm slB slB slB -slB -slB uAV uAV qFw @@ -99868,7 +99884,7 @@ tiw tiw fVH iQm -tiw +iQm tiw jkO iQm diff --git a/modular_chomp/maps/cetus/cetus-2.dmm b/modular_chomp/maps/cetus/cetus-2.dmm index e42b841e2d..363f0fd076 100644 --- a/modular_chomp/maps/cetus/cetus-2.dmm +++ b/modular_chomp/maps/cetus/cetus-2.dmm @@ -583,10 +583,15 @@ /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/cetus/atrium/primary) "abe" = ( -/obj/structure/closet/emcloset, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -30 +/obj/machinery/vending/wallmed1{ + dir = 4; + name = "NanoMed Wall"; + pixel_x = -24 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/structure/disposalpipe/junction{ + dir = 1 }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) @@ -662,11 +667,34 @@ /turf/simulated/wall/r_wall, /area/crew_quarters/sleep/cetus/jrdorm2) "abm" = ( -/obj/structure/railing/overhang/hazard, -/obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/effect/landmark/start{ + name = "Cargo Technician" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/obj/machinery/light_switch{ + pixel_x = -27; + pixel_y = 11; + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "0-5" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/disposal_sort) "abn" = ( /obj/machinery/rnd/destructive_analyzer, /obj/item/radio/intercom{ @@ -853,6 +881,128 @@ }, /turf/simulated/floor/plating, /area/rnd/Research_Lab) +"aby" = ( +/turf/simulated/mineral/cetus, +/area/quartermaster/warehouse) +"abz" = ( +/turf/simulated/wall/r_wall, +/area/quartermaster/warehouse) +"abA" = ( +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +/obj/effect/floor_decal/steeldecal/steel_decals_central5{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -28 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abB" = ( +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/cell{ + maxcharge = 2000 + }, +/obj/item/module/power_control, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abC" = ( +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/cell{ + maxcharge = 2000 + }, +/obj/item/module/power_control, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abD" = ( +/obj/structure/closet/crate, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abE" = ( +/obj/structure/closet/crate, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -27 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abF" = ( +/obj/structure/closet/crate, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abG" = ( +/obj/structure/closet/crate, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abH" = ( +/obj/structure/closet/crate, +/obj/machinery/button/remote/blast_door{ + id = "Cargo Storage"; + name = "Warehouse Door Control"; + pixel_x = 26; + req_access = list(50); + dir = 8; + pixel_y = 1 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abI" = ( +/turf/simulated/wall, +/area/quartermaster/warehouse) +"abJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) +"abK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) +"abL" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "crglockdown"; + name = "Cargo Lockdown"; + opacity = 0 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/maintenance/cargo, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/quartermaster/warehouse) +"abM" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) "abN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -871,6 +1021,301 @@ }, /turf/simulated/floor/tiled/dark, /area/security/Brig) +"abO" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abP" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abQ" = ( +/obj/machinery/hologram/holopad, +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/bordercorner, +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 1 + }, +/obj/effect/floor_decal/spline/plain/three_quarters, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec/raised, +/area/quartermaster/warehouse) +"abR" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abS" = ( +/obj/effect/floor_decal/spline/plain/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abT" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abU" = ( +/obj/machinery/door/blast/regular{ + id = "Cargo Storage"; + name = "Storage Warehouse" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/warehouse) +"abV" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/industrial/danger, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) +"abW" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/industrial/danger, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) +"abX" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central5{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/camera/network/cargo{ + c_tag = "CRG - Warehouse"; + name = "security camera"; + dir = 5 + }, +/obj/item/radio/intercom{ + dir = 8; + name = "Station Intercom (General)"; + pixel_x = -21 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abY" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"abZ" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/warehouse) +"aca" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass/hidden{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/warehouse) +"acb" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/warehouse) +"acc" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"acd" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 6 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) +"ace" = ( +/obj/machinery/door/blast/regular{ + id = "Cargo Storage"; + name = "Storage Warehouse" + }, +/obj/structure/cable/green{ + icon_state = "5-9" + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/warehouse) +"acf" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) +"acg" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/asteroid/cetus/d2) +"ach" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/warehouse) +"aci" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+006 + }, +/obj/machinery/door/firedoor/glass/hidden{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/warehouse) +"acj" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass/hidden{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/warehouse) +"ack" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/warehouse) +"acl" = ( +/obj/structure/cable/green{ + icon_state = "1-6" + }, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/warehouse) +"acm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/table/steel_reinforced, +/obj/item/clothing/accessory/armband/cargo, +/obj/item/clothing/accessory/armband/cargo, +/obj/item/clothing/accessory/armband/cargo, +/obj/item/retail_scanner/cargo, +/obj/machinery/requests_console{ + department = "Cargo Bay"; + departmentType = 2; + pixel_y = 22 + }, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 8; + name = "Cargo"; + sortType = "Cargo" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) "acn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -894,6 +1339,27 @@ /obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/plating, /area/engineering/cetus/jointsubstation) +"aco" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/table/steel_reinforced, +/obj/machinery/cell_charger, +/obj/machinery/alarm{ + pixel_y = 23 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/storage/bag/sheetsnatcher, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) "acp" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ @@ -901,6 +1367,74 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/research_restroom_sc) +"acq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/item/form_printer{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) +"acr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/photocopier, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) +"acs" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/asteroid/cetus/d2) +"act" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central5{ + dir = 8 + }, +/obj/machinery/disposal/deliveryChute{ + dir = 1 + }, +/obj/structure/plasticflaps/mining, +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+006 + }, +/obj/structure/window/reinforced, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/warehouse) +"acu" = ( +/obj/machinery/door/window/southright{ + dir = 1; + name = "Recycling Maintenance"; + req_access = list(50) + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+006 + }, +/obj/machinery/door/firedoor/glass/hidden{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/warehouse) "acv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -913,6 +1447,215 @@ }, /turf/simulated/floor/tiled, /area/engineering/cetus/atriumdeck2) +"acw" = ( +/obj/machinery/door/window/southright{ + dir = 1; + name = "Recycling Maintenance"; + req_access = list(50) + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass/hidden{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/warehouse) +"acx" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass/hidden{ + dir = 1 + }, +/obj/machinery/conveyor_switch{ + id = "disposalsorter"; + name = "recycling" + }, +/obj/effect/floor_decal/industrial/bot_outline/yellow, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/obj/machinery/light_switch{ + pixel_y = -12; + pixel_x = 26; + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/effect/floor_decal/industrial/warning{ + layer = 3; + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/warehouse) +"acy" = ( +/obj/structure/table/steel, +/obj/item/pizzabox/old, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/asteroid/cetus/d2) +"acz" = ( +/obj/machinery/door/window/southleft{ + name = "Recycling Chute"; + req_access = list(50) + }, +/obj/machinery/conveyor{ + id = "disposalsorter" + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) +"acA" = ( +/obj/structure/catwalk, +/obj/structure/lattice, +/turf/simulated/open, +/area/maintenance/cetus/twocargo) +"acB" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/maintenance/cetus/twocargo) +"acC" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/maintenance/cetus/twocargo) +"acD" = ( +/obj/effect/floor_decal/industrial/warning/cee, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) +"acE" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/random/vendorfood{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/Breakroom) +"acF" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/random/vendordrink{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/Breakroom) +"acG" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/structure/table/steel_reinforced, +/obj/item/storage/box/glasses/coffeecup_venti{ + pixel_y = 3; + pixel_x = 5 + }, +/obj/random/donkpocketbox, +/obj/random/donkpocketbox, +/obj/machinery/computer/security/telescreen/entertainment{ + layer = 4; + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/Breakroom) +"acH" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/chemical_dispenser/bar_coffee/full{ + dir = 1; + pixel_y = -3 + }, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled, +/area/quartermaster/Breakroom) +"acI" = ( +/obj/random/trash, +/turf/simulated/floor/plating, +/area/asteroid/cetus/d2) +"acJ" = ( +/obj/machinery/recycling/stamper, +/obj/machinery/conveyor{ + id = "disposalsorter" + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) +"acK" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/maintenance/cetus/twocargo) +"acL" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/maintenance/cetus/twocargo) +"acM" = ( +/obj/machinery/status_display/supply_display, +/turf/simulated/wall, +/area/quartermaster/Breakroom) +"acN" = ( +/turf/simulated/floor/plating, +/area/asteroid/cetus/d2) +"acO" = ( +/obj/machinery/conveyor{ + id = "disposalsorter" + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) +"acP" = ( +/obj/structure/catwalk, +/obj/structure/lattice, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/open, +/area/maintenance/cetus/twocargo) +"acQ" = ( +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/asteroid/cetus/d2) +"acR" = ( +/obj/machinery/conveyor{ + id = "disposalsorter"; + dir = 10 + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) +"acS" = ( +/obj/machinery/conveyor{ + id = "disposalsorter"; + dir = 8 + }, +/obj/machinery/recycling/sorter{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) +"acT" = ( +/obj/machinery/conveyor{ + id = "disposalsorter"; + dir = 8 + }, +/obj/machinery/light/small/yellowed{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) "acU" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 10 @@ -925,6 +1668,23 @@ }, /turf/simulated/floor/tiled, /area/medical/medsci) +"acV" = ( +/obj/machinery/conveyor{ + id = "disposalsorter"; + dir = 8 + }, +/obj/machinery/recycling/crusher{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) +"acW" = ( +/obj/machinery/conveyor{ + id = "disposalsorter"; + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) "acX" = ( /obj/effect/wingrille_spawn/reinforced, /obj/machinery/door/firedoor/glass, @@ -933,13 +1693,103 @@ }, /turf/simulated/floor/plating, /area/engineering/Reception) +"acY" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/plasticflaps/mining, +/obj/structure/window/reinforced, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) "acZ" = ( /obj/machinery/vending/wardrobe/atmosdrobe, /turf/simulated/floor/tiled/techfloor, /area/engineering/Locker_Room) +"ada" = ( +/obj/random/plushielarge, +/turf/simulated/floor/plating, +/area/asteroid/cetus/d2) +"adb" = ( +/obj/structure/railing/grey, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/maintenance/cetus/twocargo) "adc" = ( /turf/simulated/wall/r_wall, /area/hangar/three) +"add" = ( +/obj/structure/railing/grey, +/turf/simulated/open, +/area/maintenance/cetus/twocargo) +"ade" = ( +/obj/effect/wingrille_spawn/reinforced, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/quartermaster/Breakroom) +"adf" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/Breakroom) +"adg" = ( +/obj/random/obstruction, +/turf/simulated/floor/plating, +/area/asteroid/cetus/d2) +"adh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) +"adi" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) +"adj" = ( +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/obj/structure/cable/green{ + icon_state = "0-9" + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) +"adk" = ( +/turf/simulated/wall, +/area/quartermaster/disposal_sort) +"adl" = ( +/obj/machinery/door/airlock/glass_mining{ + name = "Disposal Sorting"; + req_access = list(50) + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/disposal_sort) "adm" = ( /obj/structure/cable{ icon_state = "2-4" @@ -949,8 +1799,238 @@ }, /obj/structure/catwalk, /obj/random/mob/mouse, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/cetus/twojrstar) +"adn" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-6" + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) +"ado" = ( +/obj/structure/table/steel, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/machinery/photocopier/faxmachine{ + department = "Mail Room" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/camera/network/cargo{ + c_tag = "CRG - Sorting"; + name = "security camera"; + dir = 5 + }, +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/brown/bordercorner, +/turf/simulated/floor/tiled, +/area/quartermaster/disposal_sort) +"adp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/turf/simulated/floor/tiled, +/area/quartermaster/disposal_sort) +"adq" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twocargo) +"adr" = ( +/obj/machinery/door/window/southleft{ + name = "Mail Room"; + req_access = list(31) + }, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "crglockdown"; + name = "Cargo Lockdown"; + opacity = 0 + }, +/obj/item/paper_bin{ + pixel_y = 5 + }, +/obj/item/pen{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/item/packageWrap, +/obj/item/destTagger, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/disposal_sort) +"ads" = ( +/obj/machinery/door/window/southright{ + name = "Mail Room"; + req_access = list(31) + }, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "crglockdown"; + name = "Cargo Lockdown"; + opacity = 0 + }, +/obj/item/mail/envelope, +/obj/item/mail/envelope, +/obj/item/mail/envelope, +/obj/item/mail/envelope, +/obj/item/mail/envelope, +/obj/structure/cable/green{ + icon_state = "1-10" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/disposal_sort) +"adt" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/up{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/medical/medsci) +"adu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/plating, +/area/medical/medsci) +"adv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/hallway/primary/central_two) +"adw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/effect/floor_decal/corner_steel_grid, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_two) +"adx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_two) +"ady" = ( +/obj/structure/disposalpipe/segment, +/obj/random/plushie, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cetus/solars) +"adz" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cetus/solars) +"adA" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cetus/solars) +"adB" = ( +/obj/random/junk, +/obj/structure/disposalpipe/segment, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cetus/solars) +"adC" = ( +/obj/machinery/computer/atmos_alert{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/sc/chief) +"adD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/solars) "adE" = ( /obj/effect/wingrille_spawn/reinforced, /obj/structure/window/reinforced/full, @@ -963,6 +2043,25 @@ }, /turf/simulated/floor/plating, /area/rnd/Xenobiology_Lab) +"adF" = ( +/obj/structure/window/maintenance_panel, +/obj/structure/window/maintenance_panel{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/engineering/cetus/jointsubstation) +"adG" = ( +/obj/random/trash_pile, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twojrstar) +"adH" = ( +/obj/structure/disposalpipe/sortjunction/bodies{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twojrstar) "adI" = ( /turf/simulated/open, /area/rnd/cetus/jrhall) @@ -1527,15 +2626,15 @@ /turf/simulated/floor/tiled/old_cargo/white, /area/medical/EMT_Bay) "amT" = ( -/obj/machinery/conveyor{ - id = "disposalsorter" +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/obj/machinery/door/window/southleft{ - name = "Recycling Chute"; - req_access = list(50) +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/area/quartermaster/Breakroom) "ana" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_medical{ @@ -2021,19 +3120,12 @@ /turf/simulated/floor/plating, /area/maintenance/cetus/twomed) "awF" = ( -/obj/structure/table/steel, -/obj/item/stack/material/cardboard, -/obj/item/stack/material/cardboard, -/obj/item/stack/material/cardboard, -/obj/machinery/firealarm{ +/obj/machinery/light{ dir = 4; - pixel_x = 24 + light_color = "#DDFFD3" }, -/obj/machinery/vending/wallmed1{ - pixel_y = -30 - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/turf/simulated/floor/carpet/brown, +/area/quartermaster/Breakroom) "awG" = ( /obj/machinery/door/firedoor/multi_tile{ dir = 1 @@ -2323,24 +3415,15 @@ /turf/simulated/floor/tiled, /area/crew_quarters/Custodial_Office) "aBC" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/machinery/conveyor_switch/oneway{ - id = "QMDelivery"; - name = "mail"; - pixel_y = 9 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/techfloor{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/industrial/bot_outline/yellow, -/turf/simulated/floor/tiled/techfloor/grid, -/area/quartermaster/Recycling) +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/disposal_sort) "aBH" = ( /obj/structure/table/standard, /obj/item/storage/box/beakers{ @@ -2418,11 +3501,10 @@ /turf/simulated/floor/tiled/hydro, /area/hydroponics) "aCF" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/structure/table/bench/steel, +/obj/item/deck/egy, +/turf/simulated/floor/carpet/brown, +/area/quartermaster/Breakroom) "aDc" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment{ @@ -2448,15 +3530,15 @@ /turf/simulated/floor/plating, /area/maintenance/cetus/twostar) "aDp" = ( -/obj/structure/railing/overhang/grey{ - dir = 1 +/obj/structure/bed/chair/sofa/corp{ + dir = 8 }, /obj/machinery/alarm{ dir = 8; - pixel_x = 22 + pixel_x = 26 }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/turf/simulated/floor/carpet/brown, +/area/quartermaster/Breakroom) "aDq" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -3285,23 +4367,16 @@ /turf/simulated/floor/tiled/white, /area/rnd/cetus/hall) "aSS" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/papershredder, +/obj/machinery/light{ + dir = 4 }, -/obj/effect/floor_decal/industrial/warning/corner{ +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/light_switch{ - pixel_x = 12; - pixel_y = 25 - }, +/obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/area/quartermaster/disposal_sort) "aSU" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -3342,6 +4417,30 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/table/steel_reinforced, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/clipboard, +/obj/item/folder/yellow{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/item/pen/red{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/item/hand_labeler, +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 22 + }, /turf/simulated/floor/tiled, /area/quartermaster/storage) "aTU" = ( @@ -3857,6 +4956,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/cetus/twojrstar) "bcw" = ( @@ -4440,14 +5540,14 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/Libraryf1) "blE" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/extinguisher_cabinet{ dir = 1; pixel_y = -30 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/cetus/atrium/secondaryf2) "bmb" = ( @@ -4527,14 +5627,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/cetus/jrlounge) "bni" = ( -/obj/structure/railing/overhang/hazard{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/dummystairs, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -4542,8 +5634,11 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/structure/disposalpipe/sortjunction/bodies{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/Breakroom) "bnr" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/external{ @@ -5358,6 +6453,9 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "bCX" = ( @@ -5409,6 +6507,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/random/trash, /obj/random/junk, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "bDN" = ( @@ -6401,7 +7500,7 @@ dir = 1; name = "security camera" }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/storage) "bUA" = ( /obj/structure/bed/chair/office/dark, @@ -6522,12 +7621,22 @@ /turf/simulated/floor/tiled/white, /area/medical/Virology) "bWJ" = ( -/obj/machinery/conveyor{ - id = "packageSort1" +/obj/machinery/vending/wallmed1{ + dir = 1; + name = "NanoMed Wall"; + pixel_y = -24 }, -/obj/random/junk, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/disposal_sort) "bXq" = ( /obj/structure/dummystairs/greyledge{ dir = 8 @@ -6707,17 +7816,21 @@ /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/dockhallway) "caI" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/structure/table/steel_reinforced, +/obj/machinery/microwave{ + pixel_y = 7; + pixel_x = -3 + }, +/obj/item/radio/intercom{ dir = 8; - icon_state = "pipe-c" + name = "Station Intercom (General)"; + pixel_x = -21 }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/brown/bordercorner, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/quartermaster/Recycling) +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/Breakroom) "caR" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -7081,6 +8194,13 @@ /area/crew_quarters/cetus/atrium/primary) "cgG" = ( /obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_security{ + id_tag = "BrigFoyer"; + layer = 2.8; + name = "Lower Security"; + req_access = list(63); + req_one_access = null + }, /turf/simulated/floor/tiled/dark, /area/security/Brig) "cgH" = ( @@ -8301,6 +9421,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/table/steel_reinforced, +/obj/item/stamp{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/stamp/cargo, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, /turf/simulated/floor/tiled, /area/quartermaster/storage) "cDs" = ( @@ -8399,12 +9528,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/catwalk, /obj/random/junk, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "cFt" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "cFw" = ( @@ -8757,8 +9888,13 @@ /turf/simulated/floor/tiled, /area/crew_quarters/cetus/jrhallway) "cKR" = ( -/turf/simulated/mineral/cetus, -/area/quartermaster/Recycling) +/obj/effect/wingrille_spawn/reinforced, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/quartermaster/Breakroom) "cKW" = ( /obj/effect/floor_decal/spline/fancy/wood{ color = "#aa5f61"; @@ -9210,18 +10346,21 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /obj/effect/floor_decal/borderfloor/corner{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "cSe" = ( @@ -9507,28 +10646,15 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/cetus/atrium/secondaryf2) -"cWt" = ( -/obj/structure/disposaloutlet{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/plasticflaps/mining, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) "cWx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/structure/ladder, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/engineering/cetus/jointsubstation) "cWy" = ( @@ -9901,13 +11027,51 @@ /turf/simulated/floor/wood, /area/chapel/main) "dcD" = ( -/obj/machinery/v_garbosystem, -/obj/structure/window/reinforced{ - dir = 4; - health = 1e+006 +/obj/structure/table/steel, +/obj/item/storage/bag/mail{ + pixel_x = 5; + pixel_y = 5 }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/item/destTagger{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/mail_scanner{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/wrapping_paper{ + pixel_x = -10; + pixel_y = 10 + }, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/wrapping_paper{ + pixel_x = -10; + pixel_y = 10 + }, +/obj/item/storage/box{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/storage/box{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/storage/box{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/disposal_sort) "dcO" = ( /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ @@ -10578,12 +11742,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_monitored/storage/eva) -"dnB" = ( -/obj/structure/micro_tunnel/random{ - dir = 1 - }, -/turf/simulated/floor/outdoors/rocks/cetus, -/area/maintenance/cetus/twocargo) "dnW" = ( /obj/structure/sign/directions/science/exploration, /turf/simulated/wall, @@ -10604,21 +11762,31 @@ /turf/simulated/floor/tiled/dark, /area/security/briefing_room) "doB" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/hologram/holopad, +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/bordercorner{ dir = 4 }, -/obj/structure/railing/overhang/hazard{ +/obj/effect/floor_decal/corner/brown/bordercorner, +/obj/effect/floor_decal/corner/brown/bordercorner{ dir = 1 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 9; - pixel_y = -8 - }, +/obj/effect/floor_decal/spline/plain/three_quarters, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/floor_decal/spline/plain{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/structure/disposalpipe/tagger{ + name = "Bar"; + sort_tag = "Bar"; + dir = 8 + }, +/turf/simulated/floor/tiled/milspec/raised, +/area/quartermaster/Breakroom) "doD" = ( /obj/structure/table/wooden_reinforced, /obj/item/material/ashtray/bronze{ @@ -10871,19 +12039,13 @@ /turf/simulated/wall/r_wall, /area/medical/cetus/hall) "dth" = ( -/obj/machinery/door/airlock/glass_mining{ - name = "Disposal Sorting"; - req_access = list(50) - }, +/obj/effect/wingrille_spawn/reinforced, +/obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/quartermaster/Recycling) +/turf/simulated/floor/plating, +/area/quartermaster/disposal_sort) "dtj" = ( /obj/machinery/ai_status_display{ pixel_y = 32 @@ -11017,7 +12179,7 @@ /area/maintenance/cetus/twosci) "dvf" = ( /turf/simulated/wall, -/area/quartermaster/Recycling) +/area/quartermaster/Breakroom) "dvi" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -11038,6 +12200,9 @@ /obj/machinery/alarm{ pixel_y = 23 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "dvv" = ( @@ -11162,13 +12327,7 @@ }, /turf/simulated/floor/tiled, /area/engineering/cetus/atriumdeck2) -"dym" = ( -/obj/structure/disposalpipe/segment, -/obj/random/junk, -/turf/simulated/floor/plating, -/area/maintenance/cetus/twocargo) "dyt" = ( -/obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -11178,12 +12337,14 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/catwalk, /obj/machinery/light{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plating, /area/hallway/primary/central_two) "dyH" = ( @@ -11340,6 +12501,12 @@ /obj/machinery/computer/guestpass{ pixel_y = -30 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/quartermaster/storage) "dBK" = ( @@ -11506,7 +12673,9 @@ /turf/simulated/floor/tiled/white, /area/rnd/cetus/hall) "dEY" = ( -/obj/machinery/door/airlock/maintenance, +/obj/machinery/v_garbosystem{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/cetus/twocargo) "dFb" = ( @@ -11532,6 +12701,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/engineering/cetus/jointsubstation) "dFj" = ( @@ -11857,24 +13030,23 @@ /turf/simulated/floor/tiled, /area/crew_quarters/cetus/atrium/primary) "dOc" = ( -/obj/structure/railing/overhang/hazard{ - dir = 4 - }, -/obj/structure/railing/overhang/hazard{ - dir = 8 - }, /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/light_switch{ + pixel_y = -12; + pixel_x = 26; + dir = 4 }, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/structure/cable/green, +/turf/simulated/floor/tiled, +/area/quartermaster/Breakroom) "dOB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12498,23 +13670,9 @@ /turf/simulated/floor/tiled/techmaint, /area/security/checkpoint2) "ebj" = ( -/obj/structure/railing/overhang/grey{ - dir = 8 - }, -/obj/structure/railing/overhang/grey{ - dir = 4 - }, -/obj/structure/dummystairs{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/Recycling) +/obj/structure/bed/chair/sofa/corp, +/turf/simulated/floor/carpet/brown, +/area/quartermaster/Breakroom) "ebn" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -12699,10 +13857,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/cetus/twojrport) -"edp" = ( -/obj/random/plushielarge, -/turf/simulated/floor/plating, -/area/maintenance/cetus/twocargo) "edJ" = ( /obj/structure/closet/emcloset, /obj/item/tool/crowbar/red, @@ -12978,6 +14132,10 @@ dir = 5 }, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "eiv" = ( @@ -13449,7 +14607,7 @@ /obj/machinery/light{ layer = 3 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/storage) "erp" = ( /obj/effect/floor_decal/corner/paleblue/diagonal{ @@ -13555,22 +14713,8 @@ dir = 8; icon_state = "pipe-c" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8; - pixel_y = 24 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - pixel_y = -8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/turf/simulated/floor/carpet/brown, +/area/quartermaster/Breakroom) "eud" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -14270,8 +15414,14 @@ /turf/simulated/floor/tiled/kafel_full, /area/medical/medical_restroom) "eHA" = ( -/turf/simulated/wall/r_wall, -/area/quartermaster/Recycling) +/obj/machinery/door/airlock/glass_mining{ + name = "Recycling"; + req_access = list(50); + req_one_access = null + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/Breakroom) "eHI" = ( /obj/structure/bed/chair, /obj/structure/window/basic{ @@ -14605,7 +15755,7 @@ /obj/effect/floor_decal/industrial/loading{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/storage) "eNC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15216,12 +16366,15 @@ /turf/simulated/floor/tiled, /area/crew_quarters/cetus/jrhallway) "eYp" = ( -/obj/machinery/conveyor{ - id = "disposalsorter"; - dir = 10 +/obj/machinery/disposal/wall{ + dir = 4; + pixel_x = -35 }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/disposal_sort) "eYq" = ( /obj/structure/transit_tube{ icon_state = "W-SE" @@ -15502,25 +16655,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/engineering/storage) -"fds" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "crglockdown"; - name = "Cargo Lockdown"; - opacity = 0 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/airlock/maintenance/cargo, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/quartermaster/Recycling) "fdy" = ( /obj/structure/table/rack{ dir = 8; @@ -15841,10 +16975,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass{ name = "Utility Atrium" }, @@ -16882,22 +18016,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/dockhallway) -"fAX" = ( -/obj/structure/railing/overhang/hazard{ - dir = 8 - }, -/obj/structure/railing/overhang/grey{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) "fBf" = ( /obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker{ @@ -18253,18 +19371,21 @@ /area/storage/primary) "fWF" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_mining{ name = "Disposal Sorting"; req_access = list(50) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/poster{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/quartermaster/Recycling) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/Breakroom) "fXu" = ( /obj/machinery/firealarm{ layer = 3.3; @@ -19371,10 +20492,6 @@ /area/security/Reception) "gnD" = ( /obj/structure/table/woodentable, -/obj/machinery/chemical_dispenser/bar_coffee/full{ - dir = 8; - pixel_x = 4 - }, /obj/structure/disposalpipe/junction/yjunction{ dir = 4 }, @@ -19382,6 +20499,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/chemical_dispenser/bar_soft/full{ + dir = 8; + pixel_x = 5 + }, /turf/simulated/floor/tiled, /area/engineering/Breakroom) "gnE" = ( @@ -19818,6 +20939,7 @@ /obj/machinery/light/small/yellowed{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/engineering/cetus/jointsubstation) "gvZ" = ( @@ -19832,9 +20954,42 @@ /turf/simulated/floor/wood, /area/crew_quarters/cetus/Libraryf1) "gwl" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central5{ +/obj/effect/floor_decal/borderfloor{ dir = 8 }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/industrial/danger, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/quartermaster/storage) "gwq" = ( @@ -20251,33 +21406,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) -"gCY" = ( -/obj/structure/table/steel_reinforced, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/clipboard, -/obj/item/folder/yellow{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/item/pen/red{ - pixel_x = 2; - pixel_y = 6 - }, -/obj/item/pen{ - pixel_x = 3; - pixel_y = 6 - }, -/obj/item/hand_labeler, -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 22 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/storage) "gDa" = ( /obj/structure/railing/grey, /turf/simulated/open, @@ -20341,24 +21469,11 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "gDF" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/disposal/deliveryChute{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4; - health = 1e+006 - }, +/obj/machinery/disposal/deliveryChute, +/obj/structure/plasticflaps/mining, /obj/structure/disposalpipe/trunk, -/obj/machinery/conveyor{ - dir = 4; - id = "QMDelivery" - }, -/turf/simulated/floor/tiled, -/area/quartermaster/Recycling) +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/disposal_sort) "gDM" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/rnd{ @@ -20384,21 +21499,18 @@ /turf/simulated/floor/tiled/hydro, /area/rnd/Xenobotany_Lab) "gEI" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/machinery/conveyor{ + id = "packageSort1"; + dir = 5 }, -/obj/effect/floor_decal/borderfloor{ +/obj/random/junk, +/obj/random/junk, +/obj/random/junk, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/quartermaster/Recycling) +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/disposal_sort) "gFf" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/purple/bordercorner, @@ -20500,7 +21612,7 @@ id = "QMLoad"; dir = 10 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/storage) "gHp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -21290,6 +22402,9 @@ /obj/effect/floor_decal/corner_steel_grid{ dir = 5 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "gYE" = ( @@ -21798,6 +22913,17 @@ /turf/simulated/floor/tiled/milspec/raised, /area/engineering/cetus/atriumdeck2) "hgF" = ( +/obj/machinery/camera/network/civilian{ + c_tag = "CIV - Utility Stairwell"; + dir = 10 + }, +/obj/machinery/disposal/wall/mail_reciever{ + dir = 1; + pixel_y = -34 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "hgI" = ( @@ -21868,12 +22994,6 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/maintenance/cetus/auxsupport) -"him" = ( -/obj/structure/table/steel, -/obj/item/pizzabox/old, -/obj/random/junk, -/turf/simulated/floor/plating, -/area/maintenance/cetus/twocargo) "hiy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -21923,14 +23043,6 @@ /obj/machinery/light/small/yellowed, /turf/simulated/floor/wood/broken, /area/maintenance/cetus/twojrport) -"hiQ" = ( -/obj/machinery/conveyor{ - id = "packageSort1" - }, -/obj/random/junk, -/obj/random/junk, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) "hiS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22510,12 +23622,6 @@ }, /turf/simulated/floor/tiled, /area/medical/Autoresleeving) -"htp" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) "htr" = ( /obj/structure/railing/overhang/grey, /obj/effect/floor_decal/corner_steel_grid{ @@ -23008,18 +24114,16 @@ /area/crew_quarters/sleep/cetus/quartermaster) "hBn" = ( /obj/effect/floor_decal/borderfloor{ - dir = 4 + dir = 6 }, /obj/effect/floor_decal/corner/brown/border{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/camera/network/civilian{ - c_tag = "CIV - Utility Stairwell"; - dir = 10 - }, -/obj/machinery/vending/wallmed1{ - dir = 1; - pixel_y = -27 +/obj/structure/cable/green{ + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) @@ -23373,37 +24477,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/hallway/primary/seconddeck/dockhallway) -"hHw" = ( -/obj/structure/table/steel, -/obj/item/folder/yellow{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/item/paper_bin{ - pixel_y = 5 - }, -/obj/item/pen/fountain{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = 3; - pixel_y = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/Recycling) "hHH" = ( /obj/structure/lattice, /obj/structure/catwalk, @@ -23583,11 +24656,11 @@ /turf/simulated/floor/tiled/dark, /area/medical/Chemistry) "hJQ" = ( +/obj/structure/sign/poster, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/structure/sign/poster, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/cetus/atrium/secondaryf2) "hJU" = ( @@ -24127,6 +25200,7 @@ "hVk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "hVl" = ( @@ -24708,6 +25782,10 @@ dir = 10 }, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "idS" = ( @@ -25372,6 +26450,7 @@ /obj/effect/floor_decal/corner/brown/bordercorner{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "iqN" = ( @@ -26017,9 +27096,14 @@ /turf/simulated/floor/plating/turfpack/airless, /area/maintenance/cetus/tech) "iEi" = ( -/obj/effect/floor_decal/asteroid, -/turf/simulated/floor/outdoors/rocks/cetus, -/area/maintenance/cetus/twocargo) +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/warehouse) "iEB" = ( /obj/structure/window/reinforced{ dir = 1 @@ -26350,29 +27434,22 @@ /turf/simulated/floor/plating, /area/maintenance/cetus/twosec) "iJM" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/structure/disposalpipe/tagger/partial{ - dir = 8; - name = "Sorting Office"; - sort_tag = "Disposal Sorting" - }, -/obj/effect/floor_decal/techfloor{ +/obj/machinery/conveyor{ + id = "packageSort1"; dir = 4 }, -/obj/effect/floor_decal/industrial/bot_outline/yellow, -/obj/machinery/conveyor_switch/oneway{ - id = "packageSort1"; - name = "sorting"; - pixel_y = 12 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/quartermaster/Recycling) +/obj/random/junk, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/disposal_sort) "iJO" = ( /obj/machinery/light/small/emergency, -/obj/random/plushie, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/disposaloutlet{ + dir = 1 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "iKi" = ( @@ -26596,10 +27673,23 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_three) "iPC" = ( -/obj/structure/railing/overhang/hazard, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/effect/landmark/start{ + name = "Cargo Technician" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/disposal_sort) "iPF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -27166,6 +28256,7 @@ /obj/effect/floor_decal/corner_steel_grid{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "iZw" = ( @@ -27795,30 +28886,11 @@ /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/cetus/atrium/primary) "jlz" = ( -/obj/structure/table/rack{ - dir = 1 +/obj/structure/bed/chair/sofa/corp/left{ + dir = 8 }, -/obj/item/storage/bag/trash, -/obj/item/storage/bag/trash{ - pixel_y = 4; - pixel_x = -3 - }, -/obj/item/storage/bag/trash{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/clothing/gloves/brown, -/obj/item/reagent_containers/spray/sterilizine{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 21 - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/turf/simulated/floor/carpet/brown, +/area/quartermaster/Breakroom) "jlD" = ( /obj/structure/cable{ icon_state = "6-9" @@ -29928,18 +31000,38 @@ /turf/simulated/floor/plating, /area/maintenance/cetus/twobar) "jXO" = ( -/obj/structure/railing/overhang/hazard, -/obj/structure/railing/overhang/hazard, -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/light/small{ +/obj/structure/closet/secure_closet/cargotech{ + name = "mailman's locker" + }, +/obj/item/mail_scanner{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/mail_scanner{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/mail_scanner{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/clothing/under/rank/mailman, +/obj/item/clothing/head/mailman, +/obj/item/storage/bag/mail, +/obj/item/destTagger, +/obj/effect/floor_decal/borderfloor/corner{ dir = 1 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30; - pixel_x = -25 +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/disposal_sort) "jXQ" = ( /obj/structure/closet/secure_closet/medical1, /obj/random/medical, @@ -30189,6 +31281,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/engineering/cetus/jointsubstation) "kdc" = ( @@ -30763,6 +31856,7 @@ /obj/structure/disposalpipe/down{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/open, /area/engineering/cetus/jointsubstation) "koZ" = ( @@ -30784,16 +31878,16 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "kpV" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, /obj/effect/floor_decal/corner/brown/bordercorner{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/crew_quarters/cetus/atrium/secondaryf2) "kqm" = ( @@ -30940,9 +32034,6 @@ /area/medical/medsci) "kta" = ( /obj/machinery/autolathe, -/obj/machinery/status_display/supply_display{ - pixel_x = -32 - }, /turf/simulated/floor/tiled, /area/quartermaster/storage) "ktb" = ( @@ -31520,6 +32611,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -31532,9 +32626,6 @@ /obj/effect/floor_decal/corner/yellow/bordercorner2{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, @@ -31685,6 +32776,11 @@ name = "NanoMed Wall"; pixel_x = -24 }, +/obj/machinery/photocopier/faxmachine{ + department = "Docking Lounge"; + req_one_access = newlist() + }, +/obj/structure/table/reinforced, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/docking_lounge) "kGd" = ( @@ -31742,12 +32838,6 @@ }, /turf/simulated/floor/plating, /area/security/Brig) -"kGk" = ( -/obj/machinery/conveyor{ - id = "packageSort1" - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) "kGl" = ( /obj/machinery/atmospherics/pipe/zpipe/up/supply{ dir = 8 @@ -31838,15 +32928,6 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled/techmaint, /area/medical/Distillery) -"kIw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/quartermaster/Recycling) "kJo" = ( /turf/simulated/floor/outdoors/rocks/cetus, /area/maintenance/cetus/twobar) @@ -31999,18 +33080,18 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, /obj/effect/floor_decal/corner/brown/bordercorner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/quartermaster/storage) "kNK" = ( @@ -32695,6 +33776,9 @@ icon_state = "0-9" }, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "laC" = ( @@ -33540,24 +34624,26 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/seconddeck/dockhallway) "lpA" = ( -/obj/structure/railing/overhang/hazard{ +/obj/structure/disposalpipe/junction{ dir = 1 }, -/obj/structure/railing/overhang/hazard{ +/obj/machinery/hologram/holopad, +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/bordercorner, +/obj/effect/floor_decal/corner/brown/bordercorner{ dir = 8 }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/industrial/warning{ - layer = 3; - dir = 1; - pixel_y = -8 +/obj/effect/floor_decal/spline/plain/three_quarters, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/turf/simulated/floor/tiled/milspec/raised, +/area/quartermaster/disposal_sort) "lpM" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/glass_external{ @@ -33949,23 +35035,21 @@ /turf/simulated/floor/tiled/hydro, /area/rnd/Xenobotany_Lab) "lxh" = ( -/obj/structure/railing/overhang/hazard{ - dir = 8 +/obj/machinery/camera/network/cargo{ + c_tag = "CRG - Break Room"; + name = "security camera"; + dir = 5 }, -/obj/structure/railing/overhang/grey{ - dir = 4 +/obj/random/pottedplant, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/newscaster{ + pixel_y = 30 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/turf/simulated/floor/carpet/brown, +/area/quartermaster/Breakroom) "lxo" = ( /obj/machinery/alarm{ dir = 1; @@ -34391,7 +35475,7 @@ dir = 9; id = "QMLoad2" }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/storage) "lET" = ( /obj/structure/table/bench/glass, @@ -35448,19 +36532,12 @@ /turf/simulated/floor/tiled/hydro, /area/rnd/Xenobotany_Lab) "lXG" = ( -/obj/structure/railing/overhang/hazard{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/turf/simulated/floor/carpet/brown, +/area/quartermaster/Breakroom) "lXK" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/int{ @@ -37025,28 +38102,22 @@ /turf/simulated/floor/glass/reinforced, /area/security/Wardens_Office) "muM" = ( -/obj/structure/railing/overhang/hazard{ - dir = 8 +/obj/structure/disposaloutlet{ + dir = 4; + layer = 3.3; + pixel_y = -3; + pixel_x = -5; + throw_speed = 1 }, -/obj/structure/railing/overhang/grey{ - dir = 4 - }, -/obj/structure/disposalpipe/sortjunction/wildcard{ +/obj/structure/plasticflaps/mining, +/obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/camera/network/cargo{ - c_tag = "CRG - Delivery Office"; - dir = 8; - name = "security camera" - }, /turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/area/quartermaster/disposal_sort) "muP" = ( /obj/effect/floor_decal/industrial/stand_clear/yellow, /obj/effect/floor_decal/industrial/outline/yellow, @@ -37363,6 +38434,7 @@ /obj/structure/cable/green{ icon_state = "16-0" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/engineering/cetus/jointsubstation) "mBb" = ( @@ -37764,6 +38836,9 @@ /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "mKu" = ( @@ -38480,22 +39555,6 @@ }, /turf/simulated/floor/tiled/milspec/raised, /area/medical/psych) -"mWv" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/machinery/conveyor_switch{ - id = "disposalsorter"; - name = "recycling"; - pixel_y = 11 - }, -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/bot_outline/yellow, -/turf/simulated/floor/tiled/techfloor/grid, -/area/quartermaster/Recycling) "mWy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -38682,17 +39741,9 @@ /turf/simulated/floor/tiled/dark, /area/security/briefing_room) "mZK" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/structure/window/reinforced, -/obj/machinery/papershredder, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/Recycling) +/obj/structure/bed/chair/sofa/corp/right, +/turf/simulated/floor/carpet/brown, +/area/quartermaster/Breakroom) "mZW" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, @@ -39004,14 +40055,24 @@ /turf/simulated/floor/tiled/techmaint, /area/teleporter/arrivals) "nhf" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 +/obj/machinery/button/remote/blast_door{ + id = "Cargo Storage"; + name = "Warehouse Door Control"; + pixel_x = -26; + req_access = list(50); + dir = 4 }, -/obj/random/maintenance/cargo, -/obj/random/maintenance/cargo, -/obj/random/maintenance/cargo, -/turf/simulated/floor/tiled, +/obj/structure/disposaloutlet{ + dir = 4; + layer = 3.3; + pixel_y = -3; + pixel_x = -5; + throw_speed = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/storage) "nhk" = ( /obj/structure/cable/green{ @@ -39339,6 +40400,7 @@ }, /obj/item/smes_coil, /obj/item/smes_coil, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/engineering/cetus/jointsubstation) "nlJ" = ( @@ -40359,6 +41421,7 @@ /obj/item/reagent_containers/spray/cleaner, /obj/item/pipe_dispenser, /obj/item/pipe_dispenser, +/obj/machinery/recharger, /turf/simulated/floor/tiled, /area/engineering/Engineering_Workshop) "nHz" = ( @@ -40501,17 +41564,18 @@ /turf/simulated/floor/plating, /area/hallway/secondary/entry/D3) "nLp" = ( -/obj/structure/railing/overhang/hazard{ +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/spline/plain{ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-2" + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/area/quartermaster/disposal_sort) "nMh" = ( /obj/machinery/computer/timeclock/premade/east, /turf/simulated/floor/tiled/techmaint, @@ -41107,24 +42171,14 @@ /turf/simulated/floor/tiled/dark, /area/security/checkpoint2) "nWl" = ( -/obj/structure/railing/overhang/hazard{ - dir = 4 - }, -/obj/structure/railing/overhang/hazard{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/structure/disposalpipe/sortjunction/wildcard{ + dir = 1 }, /obj/structure/cable/green{ - icon_state = "2-5" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/turf/simulated/floor/tiled, +/area/quartermaster/disposal_sort) "nWo" = ( /obj/structure/cable/green{ icon_state = "1-10" @@ -41289,34 +42343,24 @@ /turf/simulated/open, /area/maintenance/cetus/twosci) "nZx" = ( -/obj/structure/closet/crate/mail, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/item/mail/blank, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/structure/railing/grey{ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + dir = 4 }, -/turf/simulated/floor/tiled, -/area/quartermaster/Recycling) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/disposal_sort) "nZK" = ( /obj/structure/railing/overhang/grey{ dir = 4 @@ -41519,11 +42563,6 @@ "oco" = ( /turf/simulated/open, /area/crew_quarters/cetus/atrium/secondaryf2) -"ocF" = ( -/obj/structure/disposalpipe/segment, -/obj/random/trash, -/turf/simulated/floor/plating, -/area/maintenance/cetus/twocargo) "ocK" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -42470,18 +43509,27 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "otz" = ( -/obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/structure/railing/overhang/hazard{ +/obj/machinery/disposal/wall{ + dir = 1; + pixel_y = -35 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/machinery/light{ + layer = 3 + }, +/obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/corner/brown/bordercorner{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/turf/simulated/floor/tiled, +/area/quartermaster/Breakroom) "otF" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor/glass, @@ -43119,6 +44167,7 @@ /obj/machinery/power/breakerbox/activated{ RCon_tag = "Asteroid Substation Bypass" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/engineering/cetus/jointsubstation) "oEI" = ( @@ -44246,6 +45295,7 @@ dir = 4 }, /obj/machinery/door/firedoor/glass, +/obj/effect/wingrille_spawn/reinforced, /turf/simulated/floor/tiled/red, /area/security/Brig) "oXA" = ( @@ -45456,14 +46506,14 @@ /turf/simulated/floor/tiled, /area/hangar/cetus/explofoyer) "pqa" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/alarm{ dir = 1; pixel_y = -22 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/cetus/atrium/secondaryf2) "pqi" = ( @@ -45591,6 +46641,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "prE" = ( @@ -45607,22 +46658,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/medical/medsci) -"prH" = ( -/obj/structure/railing/overhang/hazard{ - dir = 1 - }, -/obj/structure/railing/overhang/hazard, -/obj/effect/floor_decal/industrial/warning{ - layer = 3; - dir = 1; - pixel_y = -8 - }, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/cable/green{ - icon_state = "6-10" - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) "prK" = ( /obj/effect/floor_decal/corner/black/diagonal, /obj/structure/cable/green{ @@ -45941,36 +46976,23 @@ /turf/simulated/floor/tiled/kafel_full, /area/medical/medical_restroom) "pyl" = ( -/obj/structure/closet/secure_closet/cargotech{ - name = "mailman's locker" - }, -/obj/item/mail_scanner{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/mail_scanner{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/mail_scanner{ - pixel_x = -5; - pixel_y = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/brown/bordercorner, -/obj/machinery/light{ +/obj/machinery/conveyor{ + id = "packageSort1"; + dir = 1 + }, +/obj/random/junk, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment, -/obj/item/clothing/under/rank/mailman, -/obj/item/clothing/head/mailman, -/obj/item/storage/bag/mail, -/obj/item/destTagger, -/turf/simulated/floor/tiled, -/area/quartermaster/Recycling) +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/disposal_sort) "pyy" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -46458,22 +47480,32 @@ icon_state = "1-2" }, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "pGt" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/structure/window/reinforced{ +/obj/structure/railing/grey{ dir = 1 }, -/obj/machinery/conveyor{ - dir = 4; - id = "QMDelivery" +/obj/machinery/conveyor_switch/oneway{ + id = "QMDelivery"; + name = "mail" }, -/turf/simulated/floor/tiled, -/area/quartermaster/Recycling) +/obj/effect/floor_decal/industrial/bot_outline/yellow, +/obj/structure/disposalpipe/sortjunction/flipped{ + name = "Disposals Sorting"; + sortType = "Disposal Sorting"; + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + layer = 3; + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/disposal_sort) "pGu" = ( /obj/structure/cable{ icon_state = "5-9" @@ -46702,6 +47734,9 @@ /obj/effect/floor_decal/corner_steel_grid{ dir = 5 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "pJG" = ( @@ -47323,6 +48358,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/catwalk, /obj/random/trash, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "pRs" = ( @@ -47626,22 +48662,18 @@ /turf/simulated/floor/tiled, /area/crew_quarters/cetus/jrhallway) "pWd" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8; - pixel_y = 24 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - pixel_y = -8 - }, -/obj/effect/floor_decal/industrial/warning/corner{ +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/area/quartermaster/disposal_sort) "pWS" = ( /obj/structure/disposalpipe/segment, /obj/machinery/librarycomp, @@ -47718,11 +48750,29 @@ /turf/simulated/open, /area/maintenance/cetus/twostar) "pYl" = ( -/obj/machinery/conveyor{ - id = "disposalsorter" +/obj/structure/table/rack{ + dir = 1 + }, +/obj/item/storage/bag/trash, +/obj/item/storage/bag/trash{ + pixel_y = 4; + pixel_x = -3 + }, +/obj/item/storage/bag/trash{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/clothing/gloves/brown, +/obj/item/reagent_containers/spray/sterilizine{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/area/quartermaster/Breakroom) "pYq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -48226,6 +49276,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/catwalk, /obj/random/mob/mouse, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "qfD" = ( @@ -48458,6 +49509,7 @@ dir = 4; pixel_y = -12 }, +/obj/machinery/recharger, /turf/simulated/floor/tiled/techfloor, /area/engineering/Locker_Room) "qjw" = ( @@ -48706,22 +49758,18 @@ /turf/simulated/floor/tiled, /area/hangar/three) "qnP" = ( -/obj/machinery/disposal/deliveryChute{ - dir = 1 - }, -/obj/structure/plasticflaps/mining, -/obj/structure/window/reinforced{ +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/light{ + dir = 1 }, -/obj/structure/window/reinforced, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/turf/simulated/floor/tiled, +/area/quartermaster/Breakroom) "qof" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ @@ -48791,6 +49839,9 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "1-10" + }, /turf/simulated/floor/tiled, /area/quartermaster/storage) "qpg" = ( @@ -49147,6 +50198,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/hallway/primary/central_two) "qwJ" = ( @@ -50478,15 +51532,16 @@ /turf/simulated/floor/tiled/old_cargo/white, /area/medical/Patient_3) "qTb" = ( -/obj/machinery/recycling/stamper, -/obj/machinery/conveyor{ - id = "disposalsorter" - }, -/obj/machinery/light/small{ - dir = 8 +/obj/structure/table/steel, +/obj/item/stack/material/cardboard, +/obj/item/stack/material/cardboard, +/obj/item/stack/material/cardboard, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/area/quartermaster/Breakroom) "qTz" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -50713,13 +51768,16 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/Xenobotany_Lab) "qYz" = ( -/obj/effect/wingrille_spawn/reinforced, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/wingrille_spawn/reinforced, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/quartermaster/Recycling) +/area/quartermaster/disposal_sort) "qYF" = ( /obj/structure/table/reinforced, /obj/machinery/button/remote/blast_door{ @@ -52592,14 +53650,13 @@ /area/hallway/primary/central_two) "rFo" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1 + dir = 9 }, /obj/effect/floor_decal/corner/brown/border{ - dir = 1 + dir = 8 }, -/obj/machinery/light{ - dir = 8; - layer = 3 +/obj/effect/floor_decal/corner/brown/border{ + dir = 9 }, /turf/simulated/floor/tiled, /area/quartermaster/storage) @@ -52714,7 +53771,7 @@ id = "QMLoad2" }, /obj/structure/closet/crate, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/storage) "rHe" = ( /obj/structure/stairs/spawner/east, @@ -53014,6 +54071,10 @@ dir = 5 }, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "rNQ" = ( @@ -53533,23 +54594,15 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/D3) "rVR" = ( -/obj/structure/railing/overhang/hazard{ - dir = 4 - }, -/obj/structure/railing/overhang/hazard{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/industrial/warning/cee, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/Breakroom) "rVS" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -54296,6 +55349,10 @@ dir = 8 }, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "siX" = ( @@ -54614,14 +55671,6 @@ }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva/aux) -"snt" = ( -/obj/effect/wingrille_spawn/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/quartermaster/Recycling) "snx" = ( /obj/machinery/hologram/holopad, /obj/effect/floor_decal/corner/purple/bordercorner{ @@ -54976,12 +56025,11 @@ /turf/simulated/wall/r_wall, /area/maintenance/cetus/mainsupport) "stz" = ( -/obj/random/trash, -/obj/machinery/alarm{ - pixel_y = 23 +/obj/effect/floor_decal/spline/plain/corner{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/maintenance/cetus/twocargo) +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) "stW" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -55209,6 +56257,7 @@ dir = 8; pixel_x = 22 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/engineering/cetus/jointsubstation) "sxv" = ( @@ -55440,15 +56489,11 @@ /turf/simulated/floor/tiled/milspec/raised, /area/crew_quarters/heads/sc/hor) "sCZ" = ( -/obj/machinery/recycling/sorter, -/obj/machinery/conveyor{ - id = "disposalsorter" - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/effect/wingrille_spawn/reinforced, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/quartermaster/disposal_sort) "sDf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 8 @@ -55490,11 +56535,9 @@ /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/dockhallway) "sEk" = ( -/obj/structure/railing/overhang/grey{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/structure/table/bench/steel, +/turf/simulated/floor/carpet/brown, +/area/quartermaster/Breakroom) "sEo" = ( /turf/simulated/mineral/cetus, /area/engineering/cetus/atriumdeck2) @@ -55511,18 +56554,6 @@ }, /turf/simulated/floor/tiled/hydro, /area/rnd/Xenobotany_Lab) -"sEX" = ( -/obj/structure/table/steel_reinforced, -/obj/item/stamp{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/stamp/cargo, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/storage) "sFa" = ( /obj/machinery/firealarm{ dir = 8; @@ -56131,10 +57162,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/EMT_Bay) -"sQZ" = ( -/obj/machinery/photocopier, -/turf/simulated/floor/tiled, -/area/quartermaster/storage) "sRa" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -56243,34 +57270,18 @@ /turf/simulated/floor/tiled/dark, /area/security/Brig) "sSA" = ( -/obj/effect/landmark/start{ - name = "Cargo Technician" - }, -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/obj/structure/disposalpipe/sortjunction/flipped{ - name = "Disposals Sorting"; - sortType = "Disposal Sorting"; +/obj/machinery/conveyor{ + id = "packageSort1"; dir = 4 }, -/obj/machinery/hologram/holopad, -/obj/effect/floor_decal/corner/brown/bordercorner, -/obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 8 +/obj/random/junk, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain/three_quarters, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/milspec/raised, -/area/quartermaster/Recycling) +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/disposal_sort) "sSD" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor/corner{ @@ -56401,6 +57412,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/maintenance/cetus/twocargo) "sTX" = ( @@ -56740,13 +57754,13 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled, -/area/quartermaster/Recycling) +/area/quartermaster/Breakroom) "sZY" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -56957,12 +57971,6 @@ /obj/machinery/light/fluorescent, /turf/simulated/floor/tiled, /area/security/checkpoint2) -"tcR" = ( -/obj/structure/table/steel, -/obj/random/maintenance/cargo, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) "tcU" = ( /turf/simulated/mineral/cetus, /area/maintenance/cetus/twostar) @@ -57663,11 +58671,8 @@ /turf/simulated/mineral/cetus, /area/crew_quarters/cetus/Libraryf1) "tob" = ( -/obj/structure/closet/crate, -/obj/random/maintenance/cargo, -/obj/random/maintenance/cargo, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/turf/simulated/floor/carpet/brown, +/area/quartermaster/Breakroom) "toi" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -57941,56 +58946,9 @@ /turf/simulated/open, /area/engineering/cetus/aftsubstation) "tsO" = ( -/obj/structure/window/reinforced, -/obj/structure/table/steel, -/obj/item/storage/bag/mail{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/disposal/wall{ - dir = 8; - pixel_x = 34; - name = "1E-inset disposal unit" - }, -/obj/item/destTagger{ - pixel_x = -5; - pixel_y = -5 - }, -/obj/item/mail_scanner{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/wrapping_paper{ - pixel_x = -10; - pixel_y = 10 - }, -/obj/item/packageWrap, -/obj/item/packageWrap, -/obj/item/packageWrap, -/obj/item/packageWrap, -/obj/item/packageWrap, -/obj/item/packageWrap, -/obj/item/wrapping_paper{ - pixel_x = -10; - pixel_y = 10 - }, -/obj/item/storage/box{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/storage/box{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/storage/box{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/Recycling) +/obj/structure/bed/chair/sofa/corp/corner, +/turf/simulated/floor/carpet/brown, +/area/quartermaster/Breakroom) "tsU" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -58107,6 +59065,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "tuQ" = ( @@ -58157,6 +59116,13 @@ /obj/structure/sign/directions/security/armory{ pixel_x = 32 }, +/obj/machinery/door/airlock/glass_security{ + id_tag = "BrigFoyer"; + layer = 2.8; + name = "Lower Security"; + req_access = list(63); + req_one_access = null + }, /turf/simulated/floor/tiled/dark, /area/security/Brig) "tve" = ( @@ -58706,31 +59672,23 @@ /turf/simulated/floor/plating, /area/maintenance/cetus/twosci) "tGb" = ( -/obj/structure/railing/overhang/hazard{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/tagger/partial{ + dir = 8; + name = "Sorting Office"; + sort_tag = "Disposal Sorting" }, -/obj/structure/railing/overhang/grey{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "2-9" +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/area/quartermaster/disposal_sort) "tGB" = ( /obj/effect/wingrille_spawn/reinforced, /obj/machinery/door/firedoor/glass, @@ -58873,13 +59831,36 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "tKF" = ( -/obj/structure/railing/overhang/grey, -/obj/structure/lattice, -/obj/structure/railing/grey{ - dir = 8 +/obj/structure/closet/crate/mail, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/random/junk, +/obj/machinery/conveyor{ + id = "QMDelivery"; + dir = 6 }, -/turf/simulated/open, -/area/quartermaster/Recycling) +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/disposal_sort) "tKG" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/glass, @@ -59135,18 +60116,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/jrhallway) -"tOA" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/cell_charger, -/obj/machinery/alarm{ - pixel_y = 23 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/storage/bag/sheetsnatcher, -/turf/simulated/floor/tiled, -/area/quartermaster/storage) "tOF" = ( /obj/structure/cable{ icon_state = "4-8" @@ -59350,6 +60319,7 @@ icon_state = "1-6" }, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "tSr" = ( @@ -59745,21 +60715,11 @@ /turf/simulated/floor/tiled/dark, /area/rnd/cetus/jrhall) "tYk" = ( -/obj/machinery/disposal/deliveryChute{ - dir = 1 +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/obj/structure/plasticflaps/mining, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 1e+006 - }, -/obj/structure/disposalpipe/trunk, -/obj/structure/window/reinforced, /turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/area/quartermaster/Breakroom) "tYw" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor/corner{ @@ -60543,8 +61503,13 @@ /turf/simulated/wall, /area/crew_quarters/cetus/Libraryf1) "unt" = ( -/obj/structure/girder, -/turf/simulated/floor/plating, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, /area/maintenance/cetus/twocargo) "unv" = ( /turf/simulated/wall/r_wall, @@ -60634,12 +61599,29 @@ /turf/simulated/floor/plating, /area/engineering/cetus/jointsubstation) "upg" = ( -/obj/structure/lattice, -/obj/structure/railing/grey{ - dir = 8 +/obj/structure/closet/crate/mail, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/item/mail/blank, +/obj/machinery/conveyor{ + id = "QMDelivery" }, -/turf/simulated/open, -/area/quartermaster/Recycling) +/obj/random/junk, +/obj/random/junk, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/disposal_sort) "upm" = ( /obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/plating, @@ -60899,22 +61881,11 @@ /turf/simulated/floor/tiled, /area/medical/medsci) "utU" = ( -/obj/structure/disposaloutlet, -/obj/structure/plasticflaps/mining, -/obj/structure/window/reinforced{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/turf/simulated/floor/tiled, +/area/quartermaster/disposal_sort) "uug" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -61852,11 +62823,9 @@ /turf/simulated/floor/tiled/dark, /area/rnd/Xenobiology_Lab) "uIq" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 1 }, -/obj/random/obstruction, /turf/simulated/floor/plating, /area/maintenance/cetus/twocargo) "uIC" = ( @@ -62573,16 +63542,15 @@ /turf/simulated/floor/tiled/white, /area/rnd/Xenobiology_Lab) "uUI" = ( -/obj/machinery/conveyor{ - id = "disposalsorter"; - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/disposal_sort) "uVC" = ( /obj/random/mob/mouse, /turf/simulated/floor/plating, @@ -63023,15 +63991,26 @@ /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/cetus/atrium/primary) "vec" = ( -/obj/structure/window/reinforced{ +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey{ dir = 1 }, -/obj/machinery/conveyor{ - dir = 4; - id = "QMDelivery" +/obj/machinery/conveyor_switch/oneway{ + id = "packageSort1"; + name = "sorting" }, -/turf/simulated/floor/tiled, -/area/quartermaster/Recycling) +/obj/effect/floor_decal/industrial/bot_outline/yellow, +/obj/structure/disposalpipe/junction, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/disposal_sort) "veK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -63265,7 +64244,7 @@ dir = 1; name = "security camera" }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/storage) "vjn" = ( /obj/machinery/ai_status_display, @@ -63420,15 +64399,9 @@ /turf/simulated/floor/tiled/milspec/raised, /area/medical/cetus/sleevelobby) "vmg" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/cell{ - maxcharge = 2000 - }, -/obj/item/module/power_control, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/stand_clear/yellow, +/turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/storage) "vms" = ( /obj/structure/closet/secure_closet/hos2, @@ -64402,20 +65375,6 @@ "vDq" = ( /turf/simulated/wall, /area/hydroponics) -"vDx" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/light/small/yellowed{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/cetus/twocargo) "vDz" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -66093,7 +67052,7 @@ dir = 8 }, /obj/structure/closet/crate, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/storage) "wjJ" = ( /obj/structure/closet/secure_closet/atmos_personal, @@ -66107,19 +67066,47 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/Locker_Room) "wjM" = ( -/obj/machinery/recycling/crusher, -/obj/machinery/conveyor{ - id = "disposalsorter" +/obj/structure/table/steel, +/obj/item/folder/yellow{ + pixel_x = 3; + pixel_y = 5 }, -/obj/machinery/light/small{ - dir = 8 +/obj/item/paper_bin{ + pixel_y = 5 }, -/obj/machinery/button/garbosystem{ - pixel_x = 10; - pixel_y = 17 +/obj/item/pen/fountain{ + pixel_x = 7; + pixel_y = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/item/pen{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -28 + }, +/obj/item/mail/envelope, +/obj/item/mail/envelope, +/obj/item/mail/envelope, +/obj/item/mail/envelope, +/obj/item/mail/envelope, +/obj/item/mail/envelope, +/obj/item/mail/envelope, +/obj/item/mail/envelope, +/obj/item/mail/envelope, +/obj/item/mail/envelope, +/turf/simulated/floor/tiled, +/area/quartermaster/disposal_sort) "wjY" = ( /obj/machinery/vending/wardrobe/secdrobe, /obj/item/storage/toolbox/mechanical{ @@ -67143,11 +68130,14 @@ /turf/simulated/floor/tiled/dark, /area/security/checkpoint2) "wBA" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/table/bench/steel, +/obj/item/deck/cards{ + pixel_y = 3; + pixel_x = -4 }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/obj/item/storage/dicecup/loaded, +/turf/simulated/floor/carpet/brown, +/area/quartermaster/Breakroom) "wBX" = ( /obj/structure/table/reinforced, /obj/machinery/computer/skills{ @@ -67164,6 +68154,10 @@ /obj/machinery/alarm{ pixel_y = 23 }, +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -28 + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "wCo" = ( @@ -67424,13 +68418,13 @@ /turf/simulated/floor/plating, /area/medical/cetus/sleevelobby) "wGU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/railing/grey{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/structure/railing/grey{ + dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/open, /area/maintenance/cetus/twocargo) "wGY" = ( /obj/structure/cable/green{ @@ -67960,14 +68954,6 @@ /obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled/white, /area/medical/reception) -"wPC" = ( -/obj/item/form_printer{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/tiled, -/area/quartermaster/storage) "wPS" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -68475,13 +69461,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/Brig) -"wYV" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 26 - }, -/turf/simulated/floor/outdoors/rocks/cetus, -/area/maintenance/cetus/twocargo) "wYX" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -68525,6 +69504,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 8 }, +/obj/machinery/light{ + dir = 8; + layer = 3 + }, +/obj/structure/cable/green{ + icon_state = "5-10" + }, /turf/simulated/floor/tiled, /area/quartermaster/storage) "xag" = ( @@ -69643,10 +70629,13 @@ /turf/simulated/open, /area/security/Brig) "xur" = ( -/obj/structure/railing/overhang/grey, -/obj/structure/lattice, -/turf/simulated/open, -/area/quartermaster/Recycling) +/obj/structure/plasticflaps/mining, +/obj/machinery/disposal/deliveryChute{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/disposal_sort) "xut" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -69753,6 +70742,7 @@ "xve" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "xvh" = ( @@ -69966,6 +70956,7 @@ dir = 8; pixel_x = 26 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/cetus/twojrstar) "xxJ" = ( @@ -70042,6 +71033,9 @@ /area/security/briefing_room) "xzv" = ( /obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/cetus/solars) "xzw" = ( @@ -70946,23 +71940,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/cetus/docklock) "xVM" = ( -/obj/structure/table/steel_reinforced, -/obj/item/clothing/accessory/armband/cargo, -/obj/item/clothing/accessory/armband/cargo, -/obj/item/clothing/accessory/armband/cargo, -/obj/item/retail_scanner/cargo, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 1 - }, -/obj/machinery/requests_console{ - department = "Cargo Bay"; - departmentType = 2; - pixel_y = 22 - }, -/turf/simulated/floor/tiled, +/turf/simulated/wall, /area/quartermaster/storage) "xVN" = ( /obj/structure/cable/green{ @@ -71116,23 +72094,19 @@ /turf/simulated/floor/tiled/techmaint, /area/medical/EMT_Bay) "xYW" = ( -/obj/structure/railing/overhang/hazard{ - dir = 8 - }, -/obj/structure/railing/overhang/grey{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 1 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/techfloor, -/area/quartermaster/Recycling) +/area/quartermaster/disposal_sort) "xYZ" = ( /obj/structure/catwalk, /obj/structure/lattice, @@ -90225,13 +91199,13 @@ woF ahU hyj mFa -xZJ +adH adm bcg bcg xxF -fKI -tso +adG +adF koN mAW nlu @@ -90273,10 +91247,10 @@ krs oAE oic siO -avz -aCy -oic -oic +adB +adA +adz +ady iJO fwD eiH @@ -90500,7 +91474,7 @@ tso tso iMO qao -uqU +adD fwD oJw fwD @@ -91016,7 +91990,7 @@ iMO iMO iMO qao -uqU +adD fwD fwD fwD @@ -95718,8 +96692,8 @@ mRQ oTY aAD cQG -qcc -oeK +adu +adt nPa gcK aMR @@ -119722,18 +120696,18 @@ qGI gcP gcP gcP -gcP -gcP -gcP -gcP -gcP -gcP -gcP -gcP -gcP +adg +acQ +ada +acQ +acN +acI +acy +acs +aaK vAf xdC -oqx +xdC vAf gcP gcP @@ -119979,19 +120953,19 @@ hYN vav gcP gcP -gcP -vAf -vAf -vAf -gcP -gcP -gcP -gcP -gcP -gcP -aaz +aaK +adh +lFh +lFh +acg +acg +acg +acg +acg +acg +lFh +abJ xdC -oqx aaz gcP yeT @@ -120238,18 +121212,18 @@ hYN gcP gcP vAf +abK +uER +aaz vAf -oow -vAf -vAf +aaK gcP +aaK gcP -gcP -gcP -gcP -vAf +aaK +xdC +abK xdC -hwh vAf gcP yeT @@ -120495,20 +121469,20 @@ luB vav gcP gcP -vAf -dnB -iEi -oow -vAf -vAf -vAf -vAf -vAf -vAf -aaz -xdC -jwB aaz +abK +tRA +vAf +cmK +vAf +cmK +aby +abz +aby +abz +abL +abz +aby gcP yeT yeT @@ -120754,19 +121728,19 @@ hYN vav gcP vAf -oow -oow -oow -vAf -oow -oow -oow -oow -vAf -vAf -xdC +abK jwB -vAf +bhV +acR +acO +acJ +acz +act +ach +abX +abM +abA +abz yeT yeT kmJ @@ -121009,22 +121983,22 @@ uNS oUW xcX tUH -vav +hYN gcP -vAf -vAf -oow -vAf -vAf -oow -iEi -oow -oow -iEi aaz +abK +oqx +bhV +acS +acA +acA +acA +acu +iEi +abY stz -sBO -aaz +abB +aby yeT yeT oJw @@ -121268,21 +122242,21 @@ txN ouZ hYN vav -gcP -vAf -vAf -oow -oow -oow -oow -oow +aaK +hwh +abK +jwB +bhV +acT +acA +acK +acB bMR -bMR -oow -vAf -xdC -oqx -vAf +aci +abZ +abO +abC +abz yeT yeT oJw @@ -121527,20 +122501,20 @@ luB vav gcP gcP -gcP -vAf -vAf -oow -oow -wYV +acQ +abK +oqx +adb +acV +acA +acL bMR bMR bMR -bMR -aaz -xdC -uER -cmK +aca +abP +abD +abz yeT yeT kmJ @@ -121785,20 +122759,20 @@ ppX hYN vAf aaz -vAf -aaz -vAf -aaz +jwB +abK +acK +add dEY -bhV -bhV -bhV +acP +acL bMR -vAf -vAf -xdC -tRA -cmK +bMR +bMR +aca +abQ +abE +abz yeT oJw oJw @@ -122042,21 +123016,21 @@ uNS hYN vav aaz -oqx -jwB -edp -jwB -xdC -dxp -him -unt -bhV -bMR vAf -aaz -xdC -jwB -cmK +sBO +abK +acL +add +acW +acA +unt +acC +bMR +acj +acb +abR +abF +abz yeT oJw oJw @@ -122295,26 +123269,26 @@ mKq qwH gYs sTU -lFh -lFh -lFh -ocF -dym -lFh -lFh -lFh -lFh -dym -lFh -lFh +adq +adq +adq +adq +adq +adq +adn +adi +acL +add +acW +acA uIq -aaz -vAf -aaz -vAf -xdC -oqx -cmK +acD +acw +ack +acc +abS +abG +abz oJw oJw oJw @@ -122559,20 +123533,20 @@ jwB vkf upm ghb -aaz -vAf -aaz -vAf -aaz -vDx +xdC +adj +acL +add +acY +acA wGU -xdC -xdC -xdC -sBO -xdC -jwB -cmK +acB +acx +acl +acd +abT +abH +abz oJw oJw oJw @@ -122812,25 +123786,25 @@ sMJ aZW mfj lvh -dvf -dvf -eHA -dvf -eHA +adk +adk +adk +adk +adk +adk +adk +ade +ade cKR eHA -cKR -eHA -cKR -eHA -fds dvf -bhV -bhV -bhV -bhV -bhV -cmK +abI +abI +abI +ace +abU +abI +abz oJw oJw oJw @@ -123065,17 +124039,17 @@ gcP lvh wCe dOI -rFl +adw dyt iZo iqH abe -dvf +adr abm eYp dcD wjM -pYl +ado sCZ pYl qTb @@ -123324,18 +124298,18 @@ lvh czA eTw cSd -efF +adv pJA bCR hBn -dvf +ads iPC uUI lpA nWl -dOc -dOc -dOc +adp +adl +adf dOc rVR bni @@ -123343,8 +124317,8 @@ sZR fWF qoS kNx -vFV -cXj +acf +abV vmg rlV kmJ @@ -123582,27 +124556,27 @@ lvh pak pOw kDJ -efF +ewr kts gHL hgF -dvf +adk jXO -cWt -prH +utU +utU utU bWJ -hiQ -hiQ -kGk +adk +dvf +dvf qnP doB otz dvf xVM -nuq -cXj -cXj +acm +qRV +abW vmg rlV oJw @@ -123839,28 +124813,28 @@ gcP lvh pak pOw -qlb +adx cSy gqW rHe puo -dvf +adk aSS nLp pWd tGb xYW muM -fAX +dvf lxh lXG euc tob -dvf -sEX +acE +xVM cCT xeV -cXj +kEI dBq rlV oJw @@ -124098,25 +125072,25 @@ lvh lvh lvh fhM -sMJ +dUH lWL fTY lvh -dvf -dvf +adk +adk upg tKF pGt aBC iJM -mWv +dvf mZK sEk -htp tob -dvf -tOA -nuq +tob +acF +xVM +aco dGv cXj tHM @@ -124361,19 +125335,19 @@ qER dWL pZN blE -dvf -dvf +adk +adk xur vec nZx sSA -kIw +dvf ebj wBA aCF -tcR -dvf -gCY +tob +acG +xVM aTQ oKR suB @@ -124620,19 +125594,19 @@ cfB oan kpV pqa -dvf -dvf +adk +adk gDF pyl gEI -hHw +dvf tsO aDp jlz awF -dvf -wPC -nuq +acH +xVM +acq cXj suB vjc @@ -124879,18 +125853,18 @@ sQA oan kpV hJQ -dvf -dvf +adk +adk qYz dth -snt dvf dvf dvf dvf +acM dvf -sQZ -nuq +xVM +acr cXj cPI rHb @@ -125616,7 +126590,7 @@ feA qUg uMy fpI -eUW +adC eUW kCX kYt @@ -131361,7 +132335,7 @@ oJw oJw oJw oJw -eQQ +oJw oJw oJw oJw diff --git a/modular_chomp/maps/cetus/cetus-3.dmm b/modular_chomp/maps/cetus/cetus-3.dmm index 3fa696ff71..5bf1e70342 100644 --- a/modular_chomp/maps/cetus/cetus-3.dmm +++ b/modular_chomp/maps/cetus/cetus-3.dmm @@ -541,12 +541,54 @@ }, /turf/simulated/floor/carpet/graycarpet, /area/bridge/Deck3_Corridor) +"abk" = ( +/obj/machinery/alarm{ + pixel_y = 25 + }, +/turf/simulated/floor/carpet/graycarpet, +/area/maintenance/cetus/shallow/starboard) +"abl" = ( +/obj/structure/lattice, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/open, +/area/maintenance/cetus/threecp) +"abm" = ( +/obj/structure/lattice, +/obj/structure/catwalk, +/obj/structure/disposalpipe/down{ + dir = 8 + }, +/turf/simulated/open, +/area/maintenance/cetus/threecp) "abn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/cetus/d3bar) +"abo" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/crew_quarters/cetus/Galleryf2) +"abp" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/cetus/Galleryf2) +"abq" = ( +/obj/machinery/alarm{ + pixel_y = 25; + name = "N-alarm" + }, +/turf/simulated/floor/carpet/graycarpet, +/area/bridge/Deck3_Corridor) "abs" = ( /obj/machinery/conveyor{ id = "maintdelivery"; @@ -1252,6 +1294,9 @@ }, /obj/structure/lattice, /obj/machinery/light/small, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/open, /area/crew_quarters/cetus/Galleryf2) "awu" = ( @@ -6436,13 +6481,13 @@ /turf/simulated/floor/plating, /area/maintenance/cetus/threeap) "dMT" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled, /area/engineering/Atmospherics_Chamber) "dNh" = ( @@ -9585,6 +9630,7 @@ "fzM" = ( /obj/structure/table/woodentable, /obj/fiftyspawner/cardboard, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/Galleryf2) "fAf" = ( @@ -10454,6 +10500,10 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/lino, /area/crew_quarters/cetus/Galleryf2) "gez" = ( @@ -12400,12 +12450,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/crew_quarters/cetus/Galleryf2) -"hiC" = ( -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 19 - }, -/turf/simulated/floor/carpet/graycarpet, -/area/maintenance/cetus/shallow/starboard) "hiN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 @@ -13392,6 +13436,9 @@ /obj/structure/window/maintenance_panel{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/crew_quarters/cetus/Galleryf2) "hQj" = ( @@ -14872,6 +14919,10 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/Galleryf2) "iLd" = ( @@ -15897,6 +15948,9 @@ /obj/structure/cable/green{ icon_state = "2-9" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/Galleryf2) "jow" = ( @@ -16533,6 +16587,9 @@ req_one_access = list(25,28,37) }, /obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/cetus/Galleryf2) "jLF" = ( @@ -17259,8 +17316,8 @@ /obj/structure/transit_tube{ icon_state = "D-SW" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/sortjunction/bodies/flipped{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/Galleryf2) @@ -17429,6 +17486,10 @@ /obj/structure/cable/green{ icon_state = "5-8" }, +/obj/machinery/photocopier/faxmachine{ + anchored = 0; + department = "Bridge" + }, /turf/simulated/floor/tiled/dark, /area/bridge) "kkT" = ( @@ -17837,6 +17898,10 @@ /obj/structure/bed/chair/wood{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/crew_quarters/cetus/Galleryf2) "kxA" = ( @@ -18379,6 +18444,7 @@ /obj/structure/transit_tube{ icon_state = "S-NW" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/Galleryf2) "kOI" = ( @@ -18735,6 +18801,10 @@ dir = 4; icon_state = "pipe-c" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/crew_quarters/cetus/Galleryf2) "kVR" = ( @@ -21622,6 +21692,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/Galleryf2) "mxW" = ( @@ -26687,6 +26758,10 @@ /area/security/nuke_storage) "pvF" = ( /obj/structure/lattice, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/open, /area/crew_quarters/cetus/Galleryf2) "pvY" = ( @@ -26994,9 +27069,6 @@ icon_state = "4-10" }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 19 - }, /turf/simulated/floor/carpet/graycarpet, /area/bridge/Deck3_Corridor) "pFp" = ( @@ -27007,6 +27079,10 @@ /obj/structure/sign/painting/public{ pixel_x = 31 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/open, /area/crew_quarters/cetus/Galleryf2) "pGO" = ( @@ -29094,6 +29170,10 @@ /obj/structure/table/woodentable, /obj/item/threadneedle, /obj/item/threadneedle, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/Galleryf2) "qQI" = ( @@ -30435,6 +30515,9 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/Galleryf2) "rCB" = ( @@ -30560,6 +30643,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/cetus/Galleryf2) "rHE" = ( @@ -30573,6 +30657,10 @@ /obj/structure/sign/painting/public{ pixel_y = -32 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/Galleryf2) "rIn" = ( @@ -31565,8 +31653,8 @@ /turf/simulated/floor/plating/turfpack/airless, /area/solar/cetus/joint) "snX" = ( -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 19 +/obj/machinery/alarm{ + pixel_y = 25 }, /turf/simulated/floor/tiled, /area/maintenance/cetus/shallow/flooded) @@ -31843,8 +31931,8 @@ }, /area/ai) "szq" = ( -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 19 +/obj/machinery/alarm{ + pixel_y = 25 }, /turf/simulated/floor/carpet/graycarpet, /area/maintenance/cetus/shallow/fp) @@ -32628,9 +32716,9 @@ /turf/simulated/shuttle/floor/purple, /area/shuttle/large_escape_pod1/centcom) "taM" = ( -/obj/machinery/alarm/alarms_hidden{ +/obj/machinery/alarm{ dir = 4; - pixel_x = -20 + pixel_x = -22 }, /turf/simulated/floor/carpet/graycarpet, /area/maintenance/cetus/shallow/ap) @@ -35726,6 +35814,10 @@ pixel_y = 11 }, /obj/item/radio/subspace, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/crew_quarters/cetus/Galleryf2) "uIE" = ( @@ -35819,6 +35911,9 @@ "uLg" = ( /obj/structure/lattice, /obj/machinery/light/small, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/open, /area/crew_quarters/cetus/Galleryf2) "uLs" = ( @@ -36896,6 +36991,9 @@ /obj/structure/sign/painting/public{ pixel_y = -32 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/open, /area/crew_quarters/cetus/Galleryf2) "vtK" = ( @@ -36944,7 +37042,7 @@ /obj/structure/table/wooden_reinforced, /obj/machinery/photocopier/faxmachine{ anchored = 0; - department = "Internal Affairs" + department = "Secretary's Office" }, /turf/simulated/floor/wood, /area/bridge/secretaryoffice) @@ -37416,7 +37514,7 @@ /obj/structure/table/wooden_reinforced, /obj/machinery/photocopier/faxmachine{ anchored = 0; - department = "Internal Affairs" + department = "Conference Room" }, /obj/machinery/light{ dir = 4; @@ -38687,6 +38785,7 @@ /obj/structure/cable/green{ icon_state = "6-9" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/Galleryf2) "wwk" = ( @@ -39314,6 +39413,10 @@ pixel_x = -22 }, /obj/structure/transit_tube_pod, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/Galleryf2) "wMC" = ( @@ -39792,6 +39895,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 26 + }, /turf/simulated/floor/wood, /area/bridge/secretaryoffice) "xdG" = ( @@ -40303,6 +40410,7 @@ /obj/machinery/light/small/fairylights{ pixel_y = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/lino, /area/crew_quarters/cetus/Galleryf2) "xtp" = ( @@ -41287,6 +41395,10 @@ }, /obj/structure/table/woodentable, /obj/item/tape_roll, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/Galleryf2) "xYU" = ( @@ -41542,6 +41654,9 @@ /obj/structure/bed/chair/wood{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/cetus/Galleryf2) "ygJ" = ( @@ -61434,7 +61549,7 @@ cjF wsQ xcU kxn -bdj +abo rGM xsU gek @@ -61691,7 +61806,7 @@ pEq haF hZB hZB -hZB +abp ldJ vED mmb @@ -61949,7 +62064,7 @@ qTS cjF kKq oCe -bdj +dvB wfN iWC gQh @@ -64790,7 +64905,7 @@ hrV jnk hrV ryI -hrV +abl uow pUM pjz @@ -65048,7 +65163,7 @@ oPg mkH bTE jMe -hrV +abl uow uow oci @@ -65306,7 +65421,7 @@ aMA mkH mTD jMe -hrV +abl uow uQQ xWw @@ -65564,7 +65679,7 @@ aMA mkH hrV jMe -hrV +abm uow mhO vwJ @@ -81048,7 +81163,7 @@ cky etf rRw uYA -iRe +abk lGM uYA iRe @@ -81281,7 +81396,7 @@ rRw rRw rRw mrP -dhV +abq apg dzi dhV @@ -81306,7 +81421,7 @@ etf oYg rRw uYA -hiC +iRe uYA uYA hCr