diff --git a/modular_chomp/maps/cetus/cetus-1.dmm b/modular_chomp/maps/cetus/cetus-1.dmm index bb0365d2ad..d0c02d9719 100644 --- a/modular_chomp/maps/cetus/cetus-1.dmm +++ b/modular_chomp/maps/cetus/cetus-1.dmm @@ -1369,6 +1369,27 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor, /area/engineering/cetus/meteor/shieldgen) +"acz" = ( +/obj/item/stool/padded{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/crew_quarters/cetus/meteor/cafeteriaf1) +"acA" = ( +/obj/structure/table/hardwoodtable, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "bar"; + layer = 3.1; + name = "Bar Shutters" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/lino, +/area/crew_quarters/cetus/meteor/bar) "acC" = ( /obj/structure/sink{ dir = 4; @@ -1597,6 +1618,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/disposal/wall{ + pixel_y = 35 + }, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/lino, /area/crew_quarters/cetus/meteor/bar) "aiQ" = ( @@ -7183,6 +7208,10 @@ name = "Bar"; req_access = list(25) }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/lino, /area/crew_quarters/cetus/meteor/bar) "dhU" = ( @@ -13813,10 +13842,10 @@ /turf/simulated/floor/plating, /area/maintenance/cetus/engine) "gYu" = ( -/obj/machinery/computer/arcade/clawmachine, /obj/effect/floor_decal/spline/plain/cee{ dir = 4 }, +/obj/machinery/vending/loadout/costume, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/cetus/meteor/hallway2) "gYy" = ( @@ -19835,6 +19864,10 @@ c_tag = "CIV - Bar"; dir = 8 }, +/obj/machinery/bunsen_burner{ + pixel_y = 19; + pixel_x = -4 + }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/cetus/meteor/bar) "jPG" = ( @@ -21762,6 +21795,11 @@ }, /obj/item/smes_coil, /obj/item/smes_coil, +/obj/item/paper{ + info = "The big blue box recently installed in here is a 'grid checker' which will shut off the power if a dangerous power spike from the engine erupts into the powernet. Shutting everything down protects everything from electrical damage, however the outages can be disruptive to colony operations, so it is designed to restore power after a somewhat significant delay, up to ten minutes or so. The grid checker can be manually hacked in order to end the outage sooner. To do that, you must cut three specific wires which do not cause a red light to shine, then pulse a fourth wire. Electrical protection is highly recommended when doing maintenance on the grid checker."; + name = "grid checker info"; + pixel_y = 7 + }, /turf/simulated/floor/plating, /area/engineering/cetus/starsubstation) "kLN" = ( @@ -21904,6 +21942,7 @@ /obj/machinery/door/airlock/maintenance/rnd{ req_one_access = list(7,29) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/rnd/cetus/meteor/toxtest) "kPB" = ( @@ -32502,6 +32541,10 @@ /area/maintenance/cetus/ripperdock) "qpA" = ( /obj/structure/table/bench/wooden, +/obj/machinery/computer/guestpass{ + pixel_y = -25; + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/cetus/meteor/cafeteriaf1) "qpT" = ( @@ -41533,6 +41576,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/cetus/meteor/toxins) "uRa" = ( @@ -41670,11 +41714,11 @@ /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/meteor/showers) "uUc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/railing, /obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/cetus/meteor/cafeteriaf1) "uUe" = ( @@ -46886,11 +46930,11 @@ /turf/simulated/wall, /area/medical/Surgery_Room_1) "xxP" = ( -/obj/machinery/vending/loadout/costume, /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/floor_decal/corner/white/diagonal{ dir = 4 }, +/obj/machinery/vending/event/overwear, /turf/simulated/floor/tiled/white, /area/crew_quarters/cetus/meteor/laundry) "xxR" = ( @@ -86466,8 +86510,8 @@ xCr hWC lwj tSA -aZL -wNG +acA +acz uUc aML cbV diff --git a/modular_chomp/maps/cetus/cetus-2.dmm b/modular_chomp/maps/cetus/cetus-2.dmm index 363f0fd076..9f5bdeb9d6 100644 --- a/modular_chomp/maps/cetus/cetus-2.dmm +++ b/modular_chomp/maps/cetus/cetus-2.dmm @@ -2081,6 +2081,22 @@ /obj/random/maintenance/engineering, /turf/simulated/floor/plating, /area/maintenance/cetus/twosec) +"adK" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/obj/machinery/computer/guestpass{ + pixel_y = -25; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_four) +"adL" = ( +/obj/effect/wingrille_spawn/reinforced, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/sc/chief) "adR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -5213,6 +5229,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/sc/chief) "bha" = ( @@ -6786,6 +6806,10 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/bunsen_burner{ + pixel_y = 24; + pixel_x = 1 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bIa" = ( @@ -7773,6 +7797,7 @@ }, /obj/effect/floor_decal/spline/plain/three_quarters, /obj/machinery/hologram/holopad, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/milspec/raised, /area/crew_quarters/cetus/atrium/primary) "caA" = ( @@ -11423,6 +11448,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/old_cargo/white, /area/rnd/Research_Lab) "dje" = ( @@ -15126,7 +15154,6 @@ /turf/simulated/floor/bluegrid, /area/medical/Genetics_Lab) "eBb" = ( -/obj/structure/disposalpipe/segment, /obj/effect/floor_decal/industrial/warning/corner, /obj/structure/cable/green{ icon_state = "1-2" @@ -15137,6 +15164,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/sc/chief) "eBh" = ( @@ -27732,6 +27763,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/rnd/Research_Lab) "iQg" = ( @@ -40417,6 +40449,10 @@ dir = 4; pixel_x = -23 }, +/obj/machinery/bunsen_burner{ + pixel_y = 24; + pixel_x = 1 + }, /turf/simulated/floor/tiled/dark, /area/medical/Chemistry) "nmk" = ( @@ -42744,6 +42780,10 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/computer/guestpass{ + pixel_y = -25; + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/servicecloset) "ofP" = ( @@ -42931,6 +42971,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/old_cargo/white, /area/medical/Chemistry) "ojh" = ( @@ -45691,11 +45732,6 @@ /turf/simulated/wall, /area/medical/Genetics_Lab) "pcY" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "CE Office"; - sortType = "CE Office" - }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, /obj/effect/floor_decal/industrial/warning{ @@ -45706,6 +45742,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/sc/chief) "pdd" = ( @@ -51303,6 +51343,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techfloor, /area/engineering/Engineering_Workshop) "qPe" = ( @@ -51632,6 +51673,7 @@ }, /obj/machinery/hologram/holopad, /obj/effect/floor_decal/spline/fancy/wood/three_quarters, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/milspec/raised, /area/crew_quarters/cetus/cafeteriaf2) "qWa" = ( @@ -57385,6 +57427,7 @@ /obj/effect/landmark{ name = "Observer-Start" }, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/milspec/raised, /area/hallway/primary/seconddeck/dockhallway) "sTm" = ( @@ -58460,6 +58503,7 @@ icon_state = "6-9" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/rnd/Research_Lab) "tkE" = ( @@ -65106,14 +65150,11 @@ /area/teleporter/arrivals) "vxY" = ( /obj/structure/closet/secure_closet/engineering_welding, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled/techfloor, /area/engineering/Engineering_Workshop) "vyk" = ( @@ -65282,6 +65323,8 @@ dir = 8 }, /obj/structure/railing/overhang/hazard, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/heads/sc/chief) "vBW" = ( @@ -102627,7 +102670,7 @@ alH taE abg wgI -jKZ +adK bfy qZA bfy @@ -127627,7 +127670,7 @@ iyN sOg bgW vBK -kdt +adL qOq vxY tdr diff --git a/modular_chomp/maps/cetus/cetus-3.dmm b/modular_chomp/maps/cetus/cetus-3.dmm index 5bf1e70342..e8496cffa1 100644 --- a/modular_chomp/maps/cetus/cetus-3.dmm +++ b/modular_chomp/maps/cetus/cetus-3.dmm @@ -589,6 +589,16 @@ }, /turf/simulated/floor/carpet/graycarpet, /area/bridge/Deck3_Corridor) +"abr" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/threecp) "abs" = ( /obj/machinery/conveyor{ id = "maintdelivery"; @@ -8941,6 +8951,10 @@ /area/bridge/sleep/Captain_Quarters) "fiI" = ( /obj/structure/table/marble, +/obj/machinery/bunsen_burner{ + pixel_y = 24; + pixel_x = 5 + }, /obj/machinery/chemical_dispenser/bar_coffee/full{ dir = 4 }, @@ -19212,6 +19226,7 @@ dir = 4 }, /obj/effect/floor_decal/spline/plain/three_quarters, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/milspec/raised, /area/bridge) "liF" = ( @@ -33491,13 +33506,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/graycarpet, /area/maintenance/cetus/shallow/fp) -"ttz" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 22 - }, -/turf/simulated/floor/plating, -/area/maintenance/cetus/threecp) "ttH" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/glass, @@ -38589,6 +38597,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/neutral, /area/maintenance/cetus/shallow/derelict/bridge) "wqw" = ( @@ -71359,7 +71368,7 @@ upy aal mjH yiP -qff +abr etf ooY ooY @@ -71614,7 +71623,7 @@ nBA bMz bMz lkd -ttz +bMz bJf ilJ alA