diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 4a5088ee975e8..fb47d68082a3d 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -7258,7 +7258,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 10 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "bcb" = ( /obj/machinery/button/blast_door{ @@ -8664,7 +8664,7 @@ "boo" = ( /obj/structure/railing/mapped, /obj/floor_decal/spline/fancy/black, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "bop" = ( /obj/floor_decal/corner/black/full, @@ -14065,7 +14065,7 @@ dir = 8 }, /obj/structure/railing/mapped, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/hallway/primary/bridgedeck/center) "ceI" = ( /obj/floor_decal/corner/darkblue/half{ @@ -15060,7 +15060,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 4 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "cmr" = ( /obj/wallframe_spawn/reinforced/no_grille, @@ -16079,7 +16079,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 4 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "cvN" = ( /turf/simulated/wall/prepainted, @@ -17102,7 +17102,7 @@ /area/engineering/engine_room) "cCy" = ( /obj/machinery/power/breakerbox/activated{ - RCon_tag = "Third Deck Substation Bypass" + RCon_tag = "Fourth Deck Substation Bypass" }, /obj/structure/railing/mapped{ dir = 4 @@ -22427,7 +22427,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 4 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "dpG" = ( /obj/floor_decal/industrial/hatch/yellow, @@ -23102,7 +23102,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 9 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "duB" = ( /obj/structure/disposalpipe/segment{ @@ -24297,7 +24297,7 @@ /obj/machinery/camera/network/second_deck{ c_tag = "Second Deck - Garden - Straboard" }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "dCc" = ( /obj/structure/cable{ @@ -24835,7 +24835,7 @@ /area/medical/locker) "dGG" = ( /obj/floor_decal/spline/fancy/black, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "dGJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -27381,7 +27381,7 @@ dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "dZK" = ( /obj/structure/fitness/weightlifter, @@ -33942,7 +33942,7 @@ /obj/machinery/light/spot{ dir = 8 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/hallway/primary/bridgedeck/center) "eYo" = ( /obj/floor_decal/corner/blue{ @@ -39783,7 +39783,7 @@ /obj/machinery/light/spot{ dir = 4 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "fQz" = ( /obj/structure/cable/green{ @@ -42979,7 +42979,7 @@ /obj/floor_decal/spline/fancy/black/corner{ dir = 8 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "gqV" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -49386,7 +49386,7 @@ dir = 10 }, /obj/machinery/light/spot, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "hpT" = ( /obj/floor_decal/borderfloorblack{ @@ -58196,7 +58196,7 @@ /turf/simulated/floor/reinforced, /area/exploration_shuttle/airlock) "iKj" = ( -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "iKp" = ( /obj/machinery/atmospherics/pipe/simple/visible, @@ -59217,7 +59217,7 @@ /obj/floor_decal/spline/fancy/black/corner{ dir = 1 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "iQG" = ( /obj/floor_decal/corner/paleblue/border, @@ -64667,7 +64667,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 8 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "jKE" = ( /obj/structure/railing/mapped{ @@ -67009,7 +67009,7 @@ }, /obj/structure/railing/mapped, /obj/structure/flora/ausbushes/leafybush, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/hallway/primary/bridgedeck/center) "kbn" = ( /obj/structure/railing/mapped, @@ -67472,7 +67472,7 @@ dir = 4 }, /obj/structure/flora/ausbushes/reedbush, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/hallway/primary/bridgedeck/center) "kek" = ( /obj/machinery/door/airlock/highsecurity{ @@ -69859,7 +69859,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/hallway/primary/bridgedeck/center) "kwI" = ( /turf/simulated/wall/r_wall/prepainted, @@ -72882,7 +72882,7 @@ /area/security/sierra/brig) "kSu" = ( /obj/item/stool/padded, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "kSw" = ( /obj/floor_decal/corner/black/mono, @@ -81479,7 +81479,7 @@ "mib" = ( /obj/structure/table/woodentable/maple, /obj/item/reagent_containers/food/drinks/cans/speer, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "mih" = ( /obj/structure/hygiene/shower, @@ -85040,7 +85040,7 @@ /obj/structure/railing/mapped, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "mKo" = ( /obj/structure/sign/poster{ @@ -88499,7 +88499,7 @@ "nlQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "nlS" = ( /obj/floor_decal/industrial/outline/grey, @@ -93415,7 +93415,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "oaY" = ( /turf/simulated/floor/tiled/dark, @@ -96052,7 +96052,7 @@ "out" = ( /obj/structure/flora/ausbushes/genericbush, /obj/structure/railing/mapped, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/hallway/primary/bridgedeck/center) "ouu" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -103152,7 +103152,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 1 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "puK" = ( /obj/structure/railing/mapped{ @@ -103764,7 +103764,7 @@ name = "Lounge Window Blast Doors"; pixel_x = 25 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "pAw" = ( /obj/structure/disposalpipe/segment{ @@ -104710,7 +104710,7 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "pIb" = ( /obj/machinery/atmospherics/binary/pump{ @@ -106545,6 +106545,9 @@ c_tag = "Engineering - Substation - Third Deck"; dir = 1 }, +/obj/machinery/power/terminal{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/substation/thirddeck) "pXh" = ( @@ -110877,7 +110880,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 8 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "qGQ" = ( /obj/structure/cable/yellow{ @@ -115622,7 +115625,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/hallway/primary/bridgedeck/center) "rqd" = ( /obj/structure/table/rack, @@ -115972,7 +115975,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 10 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "rsG" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -117240,7 +117243,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 1 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "rBT" = ( /obj/machinery/alarm{ @@ -117790,7 +117793,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 4 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "rGu" = ( /obj/floor_decal/corner/paleblue/border{ @@ -119923,7 +119926,7 @@ /area/engineering/engine_room) "rWX" = ( /obj/floor_decal/spline/fancy/black/corner, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "rWZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -120396,7 +120399,7 @@ "saJ" = ( /obj/structure/table/woodentable/maple, /obj/item/pizzabox/margherita, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "saO" = ( /obj/random/obstruction, @@ -121514,7 +121517,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 4 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "siD" = ( /obj/structure/railing/mapped, @@ -123102,7 +123105,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 8 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "svl" = ( /obj/structure/bed/chair/comfy/brown{ @@ -126816,7 +126819,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 1 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "sVc" = ( /obj/machinery/hologram/holopad/longrange, @@ -127187,7 +127190,7 @@ /obj/machinery/light/spot{ dir = 8 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "sXy" = ( /obj/structure/table/steel_reinforced, @@ -127833,7 +127836,7 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "tcS" = ( /obj/floor_decal/borderfloor{ @@ -128087,7 +128090,7 @@ dir = 10 }, /obj/structure/railing/mapped, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "tfk" = ( /obj/machinery/navbeacon/sierra/SD_afthallway2, @@ -129947,7 +129950,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "tvZ" = ( /obj/structure/table/rack, @@ -131869,7 +131872,7 @@ icon_state = "1-8" }, /obj/machinery/light/spot, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "tJs" = ( /obj/floor_decal/corner/black/full, @@ -139729,7 +139732,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "uVb" = ( /obj/structure/table/marble, @@ -140916,7 +140919,7 @@ /obj/floor_decal/spline/fancy/black/corner{ dir = 8 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "vdz" = ( /obj/paint_stripe/red, @@ -144246,7 +144249,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 8 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "vCG" = ( /obj/floor_decal/borderfloorblack{ @@ -145392,7 +145395,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/hallway/primary/bridgedeck/center) "vMm" = ( /obj/floor_decal/corner/green/bordercorner{ @@ -147383,7 +147386,7 @@ /obj/machinery/light/spot{ dir = 1 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "vZO" = ( /obj/structure/table/rack, @@ -149498,7 +149501,7 @@ /obj/floor_decal/spline/fancy/black{ dir = 1 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "wqA" = ( /obj/structure/disposalpipe/segment{ @@ -149903,7 +149906,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "wug" = ( /obj/machinery/porta_turret{ @@ -154977,7 +154980,7 @@ "xlV" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/railing/mapped, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/hallway/primary/bridgedeck/center) "xmj" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ @@ -157599,7 +157602,7 @@ /obj/machinery/light/spot{ dir = 1 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "xGX" = ( /obj/structure/cable{ @@ -160928,7 +160931,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "yfi" = ( /obj/structure/cable/green{ @@ -161361,7 +161364,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/cut, /area/crew_quarters/garden_room) "yid" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -312676,11 +312679,11 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -312842,11 +312845,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -312878,11 +312876,16 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -313044,11 +313047,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -313080,11 +313078,16 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -313246,11 +313249,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -313282,11 +313280,16 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -313448,11 +313451,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -313484,11 +313482,16 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -313650,11 +313653,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -313686,11 +313684,16 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -313852,11 +313855,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -313888,11 +313886,16 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -314054,11 +314057,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -314090,11 +314088,16 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -314256,11 +314259,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -314292,11 +314290,16 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -314458,11 +314461,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -314494,11 +314492,16 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -314660,11 +314663,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -314696,11 +314694,16 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -314862,11 +314865,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -314898,11 +314896,16 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -315064,11 +315067,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -315100,11 +315098,16 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -315266,11 +315269,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -315302,11 +315300,16 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -315468,11 +315471,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -315504,11 +315502,16 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -315670,12 +315673,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -315704,13 +315701,19 @@ rtT rtT rtT rtT -wJN +rtT +rtT +rtT +rtT +rtT rtT wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -315872,18 +315875,6 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN rtT rtT rtT @@ -315906,13 +315897,25 @@ rtT rtT rtT rtT -wJN -wJN -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT wJN wJN wJN @@ -316093,18 +316096,18 @@ wJN wJN wJN wJN +rtT +rtT +rtT +rtT +rtT wJN wJN wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN -wJN +rtT wJN wJN wJN @@ -316295,11 +316298,11 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN +rtT +rtT +rtT +rtT +rtT wJN wJN wJN diff --git a/mods/_maps/farfleet/maps/farfleet-1.dmm b/mods/_maps/farfleet/maps/farfleet-1.dmm index 99bbfc9c38766..2f2661ab3e1cb 100644 --- a/mods/_maps/farfleet/maps/farfleet-1.dmm +++ b/mods/_maps/farfleet/maps/farfleet-1.dmm @@ -197,9 +197,6 @@ /area/ship/farfleet/crew/hallway/lower) "aI" = ( /obj/floor_decal/industrial/outline/yellow, -/obj/machinery/firealarm{ - pixel_y = 24 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -24; dir = 4 @@ -207,6 +204,10 @@ /obj/structure/closet/crate/secure/phoron, /obj/item/stack/material/phoron/ten, /obj/item/stack/material/phoron/ten, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/monotile, /area/ship/farfleet/engineering/equipment) "aK" = ( @@ -575,11 +576,11 @@ /area/ship/farfleet/engineering/fussion/control) "bO" = ( /obj/machinery/power/fusion_core/mapped{ - id_tag = "fusion_core_farfleet"; initial_id_tag = "fusion_core_farfleet" }, /obj/structure/cable/yellow{ - dir = 1 + d2 = 2; + icon_state = "0-2" }, /turf/simulated/floor/reinforced{ map_airless = 1 @@ -830,6 +831,10 @@ /obj/machinery/power/terminal{ dir = 8 }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, /turf/simulated/floor/plating, /area/ship/farfleet/engineering/fussion/control) "cK" = ( @@ -1428,7 +1433,7 @@ /area/ship/farfleet/engineering/shield) "eL" = ( /obj/machinery/mech_recharger, -/mob/living/exosuit/premade/powerloader/old, +/mob/living/exosuit/premade/powerloader, /turf/simulated/floor/tiled/techfloor, /area/ship/farfleet/command/launcher) "eN" = ( @@ -1585,9 +1590,8 @@ dir = 8 }, /obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8"; - dir = 4 + d2 = 2; + icon_state = "0-2" }, /turf/simulated/floor/tiled, /area/ship/farfleet/engineering/fussion/control) @@ -2451,7 +2455,6 @@ "jR" = ( /obj/machinery/computer/fusion/core_control{ dir = 8; - id_tag = "fusion_core_farfleet"; initial_id_tag = "fusion_core_farfleet" }, /obj/floor_decal/corner/yellow{ @@ -2987,6 +2990,16 @@ /obj/machinery/door/window{ dir = 8 }, +/obj/item/clothing/head/helmet/space/emergency{ + pixel_x = 7 + }, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency{ + pixel_x = -7 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/dock) "mf" = ( @@ -3434,7 +3447,8 @@ }, /obj/floor_decal/industrial/hatch/yellow, /obj/structure/sign/warning/secure_area{ - pixel_y = 32 + pixel_y = -32; + dir = 1 }, /obj/structure/table/standard, /turf/simulated/floor/tiled, @@ -3660,7 +3674,7 @@ "pl" = ( /obj/machinery/computer/telecomms/server{ dir = 4; - network = "senttcommsat"; + network = "pioneertcommsat"; req_access = list("ACCESS_ICCGN") }, /obj/floor_decal/industrial/outline/blue, @@ -3850,6 +3864,13 @@ }, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/crew/brig/emergency_armory) +"qN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/ship/farfleet/dock) "qQ" = ( /obj/machinery/computer/ship/navigation{ dir = 1 @@ -3913,11 +3934,12 @@ /turf/simulated/floor/plating, /area/ship/farfleet/maintenance/engine) "rn" = ( -/obj/structure/table/steel_reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window/brigdoor/northright{ dir = 2 }, +/obj/structure/wall_frame/hull, +/obj/structure/table/wallf/steel, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/crew/brig/emergency_armory) "ru" = ( @@ -5242,8 +5264,11 @@ /turf/simulated/wall/r_wall, /area/ship/farfleet/command/launcher) "Du" = ( -/obj/structure/dispenser/oxygen, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/dock) "Dv" = ( @@ -5684,7 +5709,6 @@ /area/ship/farfleet/crew/hallway/lower) "Hh" = ( /obj/machinery/door/airlock/hatch{ - icon_state = "door_locked"; id_tag = "prototype_access_hatch"; locked = 1; req_access = list("ACCESS_ICCGN") @@ -5978,20 +6002,7 @@ dir = 4 }, /obj/floor_decal/industrial/outline/yellow, -/obj/structure/table/rack, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/item/clothing/head/helmet/space/emergency{ - pixel_x = 7 - }, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency{ - pixel_x = -7 - }, -/obj/machinery/door/window/northright{ - dir = 8 - }, +/obj/structure/dispenser/oxygen, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/dock) "JY" = ( @@ -6075,6 +6086,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/farfleet/engineering/atmospherics) +"KO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/ship/farfleet/dock) "KX" = ( /obj/structure/cable{ d1 = 4; @@ -6324,6 +6341,19 @@ map_airless = 1 }, /area/ship/farfleet/engineering/atmospherics) +"NF" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/ship/farfleet/dock) "NH" = ( /obj/structure/cable{ d1 = 1; @@ -7209,7 +7239,9 @@ /area/ship/farfleet/engineering/atmospherics) "Ut" = ( /obj/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/unary/tank/air, +/obj/machinery/atmospherics/unary/tank/air{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/farfleet/engineering/atmospherics) "UA" = ( @@ -16348,7 +16380,7 @@ aZ cP sw oM -kF +qN kF Zh mk @@ -16470,7 +16502,7 @@ sY xR ay Hu -kF +KO kF hC MJ @@ -16592,7 +16624,7 @@ lD EJ gt ew -xW +NF xW BT Yi diff --git a/mods/_maps/farfleet/maps/farfleet-2.dmm b/mods/_maps/farfleet/maps/farfleet-2.dmm index 68d598d57b8b7..b27c5cc817ecb 100644 --- a/mods/_maps/farfleet/maps/farfleet-2.dmm +++ b/mods/_maps/farfleet/maps/farfleet-2.dmm @@ -757,18 +757,7 @@ /area/ship/farfleet/crew/canteen) "hJ" = ( /obj/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24; - req_access = list("ACCESS_ICCGN") - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" + dir = 4 }, /obj/submap_landmark/spawnpoint/away_iccgn_farfleet/iccgn_pawn, /turf/simulated/floor/tiled/white, @@ -1126,14 +1115,12 @@ /turf/simulated/floor/tiled/white, /area/ship/snz) "lp" = ( -/obj/floor_decal/industrial/outline/red, -/obj/structure/closet/secure_closet/farfleet, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark/monotile, +/turf/simulated/floor/tiled/dark, /area/ship/farfleet/barracks) "lz" = ( /obj/structure/bed/chair/shuttle/blue, @@ -1287,10 +1274,8 @@ /turf/simulated/floor/tiled/white, /area/ship/farfleet/crew/canteen) "mQ" = ( -/obj/submap_landmark/spawnpoint/away_iccgn_farfleet, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 +/obj/structure/bed/chair/padded/red{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/ship/farfleet/barracks) @@ -1499,11 +1484,7 @@ /area/ship/snz) "pf" = ( /obj/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" - }, -/obj/machinery/computer/cryopod{ - pixel_y = 32 + dir = 8 }, /obj/submap_landmark/spawnpoint/away_iccgn_farfleet/medic, /obj/structure/cable{ @@ -1511,11 +1492,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /turf/simulated/floor/tiled/white, /area/ship/farfleet/crew/cryo) "pg" = ( @@ -1694,15 +1670,15 @@ /turf/simulated/floor/tiled/white/monotile, /area/ship/farfleet/crew/cryo) "qx" = ( -/obj/floor_decal/industrial/outline/yellow, -/obj/machinery/cryopod, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - req_access = list("ACCESS_ICCGN") +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 }, -/turf/simulated/floor/tiled/white, -/area/ship/farfleet/crew/cryo) +/obj/structure/bed/chair/padded/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/farfleet/barracks) "qA" = ( /obj/machinery/body_scanconsole{ dir = 4 @@ -1767,21 +1743,21 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ship/snz) "rb" = ( -/obj/submap_landmark/spawnpoint/away_iccgn_farfleet, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/industrial/outline/red, +/obj/structure/closet/secure_closet/farfleet, +/turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/barracks) "rg" = ( /obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" + d1 = 1; + d2 = 4; + icon_state = "1-4" }, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/ship/farfleet/barracks) "rh" = ( @@ -1869,6 +1845,13 @@ }, /turf/simulated/wall, /area/ship/farfleet/crew/toilet) +"rV" = ( +/obj/floor_decal/corner_steel_grid/diagonal, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/ship/farfleet/crew/hydroponics) "sa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/railing/mapped, @@ -2076,6 +2059,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/submap_landmark/spawnpoint/away_iccgn_farfleet, /turf/simulated/floor/tiled/white, /area/ship/farfleet/crew/cryo) "uq" = ( @@ -2284,13 +2268,13 @@ /turf/simulated/floor/tiled/white, /area/ship/snz) "wi" = ( -/obj/machinery/cryopod{ - dir = 4 - }, /obj/machinery/light{ dir = 8; icon_state = "tube_map" }, +/obj/structure/bed/chair/padded/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/farfleet/barracks) "wj" = ( @@ -2305,13 +2289,15 @@ /obj/floor_decal/industrial/warning{ dir = 6 }, +/obj/submap_landmark/spawnpoint/away_iccgn_farfleet, /turf/simulated/floor/tiled/white, /area/ship/farfleet/crew/cryo) "wt" = ( -/obj/floor_decal/industrial/outline/green, +/obj/floor_decal/industrial/outline/red, /obj/machinery/light{ dir = 1 }, +/obj/structure/closet/secure_closet/farfleet, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/barracks) "wA" = ( @@ -2335,7 +2321,8 @@ /turf/simulated/floor/tiled, /area/ship/farfleet/crew/hydroponics) "wD" = ( -/obj/floor_decal/industrial/outline/green, +/obj/structure/closet/secure_closet/farfleet/sergeant, +/obj/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/barracks) "wG" = ( @@ -2654,9 +2641,8 @@ /turf/simulated/floor/tiled/dark, /area/ship/farfleet/barracks/armory) "zi" = ( -/obj/floor_decal/industrial/outline/red, -/obj/structure/closet/secure_closet/farfleet/sergeant, -/turf/simulated/floor/tiled/dark/monotile, +/obj/structure/reagent_dispensers/water_cooler, +/turf/simulated/floor/tiled/dark, /area/ship/farfleet/barracks) "zk" = ( /obj/machinery/recharge_station, @@ -2982,8 +2968,7 @@ /area/ship/farfleet/crew/freezer) "CI" = ( /obj/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/submap_landmark/spawnpoint/away_iccgn_farfleet/captain, @@ -3034,8 +3019,13 @@ /turf/simulated/wall/r_wall, /area/ship/farfleet/barracks) "Db" = ( -/obj/machinery/cryopod{ - dir = 4 +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25; + req_access = list("ACCESS_ICCGN") + }, +/obj/structure/bed/chair/padded/red{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/ship/farfleet/barracks) @@ -3371,6 +3361,7 @@ pixel_y = 24; req_access = list("ACCESS_ICCGN") }, +/obj/structure/bed/chair/comfy/red, /turf/simulated/floor/tiled/dark, /area/ship/farfleet/barracks) "Fw" = ( @@ -4074,10 +4065,22 @@ /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/barracks/armory) "NV" = ( -/obj/paint/dark_gunmetal, -/obj/paint/dark_gunmetal, -/turf/simulated/wall/r_wall, -/area/ship/farfleet/crew/brig/css) +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24; + req_access = list("ACCESS_ICCGN") + }, +/obj/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/submap_landmark/spawnpoint/away_iccgn_farfleet/sergeant, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/white, +/area/ship/farfleet/crew/cryo) "NW" = ( /obj/structure/closet/fridge/meat, /obj/machinery/light/small{ @@ -4305,12 +4308,11 @@ /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/barracks/armory) "QU" = ( -/obj/floor_decal/industrial/outline/red, -/obj/structure/closet/secure_closet/farfleet, /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/dark/monotile, +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled/dark, /area/ship/farfleet/barracks) "QZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4382,9 +4384,28 @@ /turf/simulated/floor/tiled/freezer, /area/ship/farfleet/crew/freezer) "RC" = ( -/obj/submap_landmark/spawnpoint/away_iccgn_farfleet/sergeant, -/turf/simulated/floor/tiled/dark, -/area/ship/farfleet/barracks) +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/computer/cryopod{ + pixel_x = -32 + }, +/obj/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/alarm{ + pixel_y = 24; + req_access = list("ACCESS_ICCGN") + }, +/turf/simulated/floor/tiled/white, +/area/ship/farfleet/crew/cryo) "RH" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/portables_connector{ @@ -4429,14 +4450,12 @@ /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/barracks/armory) "RW" = ( -/obj/structure/reagent_dispensers/water_cooler{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25; - req_access = list("ACCESS_ICCGN") +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/ship/farfleet/barracks) "RX" = ( @@ -4711,8 +4730,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plating, /area/ship/farfleet/command/snz_hangar) "Uu" = ( @@ -4777,8 +4796,7 @@ /area/ship/farfleet/command/snz_hangar) "UU" = ( /obj/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/submap_landmark/spawnpoint/away_iccgn_farfleet/gunner, @@ -12149,7 +12167,7 @@ ab HA SD Cm -Cm +RC pf CI uo @@ -12271,7 +12289,7 @@ ab Hj Hj uf -uf +NV hJ UU wr @@ -12393,10 +12411,10 @@ ab Hj uf uf -uf +Ui Ui DX -qx +Ui uf LT pT @@ -13628,7 +13646,7 @@ dI Su bn wG -eD +rV eD bn Su @@ -13979,7 +13997,7 @@ DT DT DT DT -NV +DT ME ns ns @@ -14096,8 +14114,8 @@ wb Ab Ll Ll +Uu uA -Db wi Db Ll @@ -14219,8 +14237,8 @@ Ab Ll Ll Fr -RC -rb +uA +mQ mQ Ll VP @@ -14341,11 +14359,11 @@ CZ gL lp rg -mm -Qb -Qb -vp -Um +uA +mQ +qx +Ll +VP ve ns Sz @@ -14462,12 +14480,12 @@ ab Ab Ll QU -aj -nD -Uu -Uu -wJ -ME +RW +mm +Qb +Qb +vp +Um ns LH ec @@ -14584,11 +14602,11 @@ ab Ab Ll zi +aj +nD Uu -ju Uu -RW -Ll +wJ ME Ms aW @@ -14827,7 +14845,7 @@ ab ab Ab Ll -wD +rb Uu ju Uu diff --git a/mods/_maps/liberia/maps/liberia.dmm b/mods/_maps/liberia/maps/liberia.dmm index d972340e1e05b..e1d7ce40c4cc7 100644 --- a/mods/_maps/liberia/maps/liberia.dmm +++ b/mods/_maps/liberia/maps/liberia.dmm @@ -5318,7 +5318,9 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/power/port_gen/pacman/mrs, +/obj/machinery/power/port_gen/pacman/mrs{ + sheets = 5 + }, /obj/floor_decal/industrial/warning/full, /obj/structure/cable/blue{ d2 = 4;