diff --git a/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm b/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm index bfffa01b03b..ee91d2abb1a 100644 --- a/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm @@ -154,7 +154,7 @@ /obj/structure/sign/warning{ pixel_y = -32 }, -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /turf/open/floor/plating, /area/template_noop) "B" = ( @@ -205,7 +205,7 @@ /obj/structure/sign/warning{ pixel_y = -32 }, -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /turf/open/floor/plating, /area/template_noop) "G" = ( @@ -258,7 +258,7 @@ /obj/structure/sign/warning{ pixel_y = -32 }, -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /turf/open/floor/plating, /area/template_noop) "W" = ( diff --git a/_maps/RandomRooms/5x3/sk_rdm068_pubbyclutter7.dmm b/_maps/RandomRooms/5x3/sk_rdm068_pubbyclutter7.dmm index c34770b9a2f..383c06e0052 100644 --- a/_maps/RandomRooms/5x3/sk_rdm068_pubbyclutter7.dmm +++ b/_maps/RandomRooms/5x3/sk_rdm068_pubbyclutter7.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/machinery/shieldwallgen, +/obj/machinery/power/shieldwallgen, /turf/open/floor/plating, /area/template_noop) "b" = ( diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm index d67a69c75c3..3ced8bf317f 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -3,11 +3,7 @@ /turf/template_noop, /area/template_noop) "ab" = ( -/obj/machinery/shieldwallgen{ - active = 2; - anchored = 1; - power = 1 - }, +/obj/machinery/power/shieldwallgen/ruin, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -24,11 +20,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/abandonedzoo) "ad" = ( -/obj/machinery/shieldwallgen{ - active = 2; - anchored = 1; - power = 1 - }, +/obj/machinery/power/shieldwallgen/ruin, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -38,11 +30,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) "ae" = ( -/obj/machinery/shieldwallgen{ - active = 2; - anchored = 1; - power = 1 - }, +/obj/machinery/power/shieldwallgen/ruin, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -52,11 +40,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) "af" = ( -/obj/machinery/shieldwallgen{ - active = 2; - anchored = 1; - power = 1 - }, +/obj/machinery/power/shieldwallgen/ruin, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -197,11 +181,7 @@ /turf/open/floor/plasteel/dark/side, /area/ruin/space/has_grav/abandonedzoo) "aE" = ( -/obj/machinery/shieldwallgen{ - active = 2; - anchored = 1; - power = 1 - }, +/obj/machinery/power/shieldwallgen/ruin, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -224,11 +204,7 @@ /turf/open/floor/plasteel/dark/side, /area/ruin/space/has_grav/abandonedzoo) "aJ" = ( -/obj/machinery/shieldwallgen{ - active = 2; - anchored = 1; - power = 1 - }, +/obj/machinery/power/shieldwallgen/ruin, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -474,11 +450,7 @@ /turf/open/floor/plasteel/dark/side, /area/ruin/space/has_grav/abandonedzoo) "bo" = ( -/obj/machinery/shieldwallgen{ - active = 2; - anchored = 1; - power = 1 - }, +/obj/machinery/power/shieldwallgen/ruin, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -499,7 +471,7 @@ /turf/open/floor/plasteel/dark/side, /area/ruin/space/has_grav/abandonedzoo) "bs" = ( -/obj/machinery/shieldwallgen, +/obj/machinery/power/shieldwallgen/anchored, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -509,7 +481,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/abandonedzoo) "bt" = ( -/obj/machinery/shieldwallgen, +/obj/machinery/power/shieldwallgen/anchored, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -672,7 +644,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/shieldwallgen, +/obj/machinery/power/shieldwallgen/anchored, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -690,7 +662,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) "bV" = ( -/obj/machinery/shieldwallgen, +/obj/machinery/power/shieldwallgen, /turf/template_noop, /area/template_noop) "bW" = ( @@ -726,11 +698,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/abandonedzoo) "jz" = ( -/obj/machinery/shieldwallgen{ - active = 2; - anchored = 1; - power = 1 - }, +/obj/machinery/power/shieldwallgen/ruin, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -764,11 +732,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/abandonedzoo) "nQ" = ( -/obj/machinery/shieldwallgen{ - active = 2; - anchored = 1; - power = 1 - }, +/obj/machinery/power/shieldwallgen/ruin, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -898,11 +862,7 @@ /turf/template_noop, /area/space/nearstation) "Ld" = ( -/obj/machinery/shieldwallgen{ - active = 2; - anchored = 1; - power = 1 - }, +/obj/machinery/power/shieldwallgen/ruin, /obj/structure/cable/yellow{ icon_state = "1-8" }, diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index 071523de40d..eb0cf6aba4c 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -1104,7 +1104,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/awaymission/BMPship/Aft) "zK" = ( -/obj/machinery/shieldwallgen, +/obj/machinery/power/shieldwallgen, /obj/structure/cable{ icon_state = "0-4" }, diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 5eb28e2c9cd..fcd567201dd 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -2183,7 +2183,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ locked = 0; req_access = null }, @@ -3578,7 +3578,7 @@ }, /area/awaymission/moonoutpost19/research) "gZ" = ( -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ locked = 0; req_access = null }, diff --git a/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm b/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm index 3885a475462..01ff4e0d804 100644 --- a/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm +++ b/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm @@ -989,7 +989,6 @@ "ayw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only/directional/north, /turf/open/floor/carpet/ship, /area/crew_quarters/cafeteria) "ayV" = ( @@ -1125,6 +1124,22 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/ship, /area/crew_quarters/cafeteria) +"aAR" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 1 + }, +/turf/open/floor/carpet/ship, +/area/hallway/primary/central/hallway) "aAU" = ( /obj/structure/cable{ icon_state = "1-4" @@ -1197,8 +1212,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ dir = 5 }, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos) "aCw" = ( @@ -1322,14 +1335,16 @@ /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped{ dir = 4 }, -/obj/machinery/light, /obj/structure/window/reinforced{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/dark/visible/layer2{ dir = 4 }, -/obj/machinery/door/firedoor/border_only/directional/east, +/obj/machinery/power/shieldwallgen/atmos/strong{ + dir = 1; + anchored = 1 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos) "aHw" = ( @@ -1456,7 +1471,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/door/firedoor/border_only/directional/south, +/obj/machinery/power/shieldwallgen/atmos/strong{ + anchored = 1; + dir = 4 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos) "aMO" = ( @@ -1746,12 +1764,11 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "aUX" = ( -/obj/structure/chair{ - dir = 8 +/obj/machinery/light{ + dir = 4 }, -/obj/machinery/door/firedoor/border_only/directional/north, -/turf/open/floor/carpet/ship, -/area/crew_quarters/cafeteria) +/turf/open/floor/engine, +/area/engine/engineering/reactor_core) "aVi" = ( /obj/machinery/atmospherics/components/unary/portables_connector, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -3278,6 +3295,11 @@ dir = 4 }, /obj/structure/window/reinforced, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 8; + pixel_x = -7 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/storage) "bQq" = ( @@ -4746,12 +4768,11 @@ /turf/open/floor/carpet/ship, /area/security/execution/education) "cWy" = ( -/obj/machinery/camera/autoname{ +/obj/structure/extinguisher_cabinet/east, +/obj/machinery/power/shieldwallgen/atmos/strong{ + anchored = 1; dir = 8 }, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, -/obj/structure/extinguisher_cabinet/east, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos) "cXI" = ( @@ -5153,7 +5174,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/border_only/directional/north, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 4 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/storage) "djQ" = ( @@ -5806,8 +5830,10 @@ /turf/open/floor/plating, /area/maintenance/department/medical) "dEm" = ( -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/machinery/door/firedoor/border_only/directional/west, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 1 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/storage) "dEx" = ( @@ -5950,10 +5976,10 @@ /area/engine/storage) "dHN" = ( /obj/machinery/firealarm/directional/east, -/obj/machinery/light{ - dir = 4 +/obj/machinery/power/shieldwallgen/atmos/strong{ + anchored = 1; + dir = 8 }, -/obj/machinery/door/firedoor/border_only/directional/north, /turf/open/floor/carpet/ship, /area/crew_quarters/cafeteria) "dIf" = ( @@ -6475,6 +6501,10 @@ /obj/item/clothing/gloves/color/latex, /obj/structure/extinguisher_cabinet/east, /obj/structure/window/reinforced, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 8 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/storage) "eaE" = ( @@ -7113,6 +7143,7 @@ /area/security/warden) "exv" = ( /obj/effect/landmark/event_spawn, +/obj/machinery/light/floor, /turf/open/floor/engine, /area/engine/engine_room) "exW" = ( @@ -7786,11 +7817,10 @@ /obj/structure/cable/white{ icon_state = "6-9" }, -/obj/machinery/camera/autoname{ +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; dir = 4 }, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/break_room) "eWn" = ( @@ -8026,8 +8056,10 @@ /turf/open/floor/carpet/ship, /area/security/brig) "fdV" = ( -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, +/obj/machinery/power/shieldwallgen/atmos/strong{ + anchored = 1; + dir = 8 + }, /turf/open/floor/engine, /area/engine/engineering/reactor_core) "feG" = ( @@ -8566,7 +8598,6 @@ pixel_x = 1; pixel_y = -4 }, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/item/paper{ default_raw_text = "

Reminder that squad equipment vendors are located in the council chamber, tool storage, and that 4-way junction at the primary hallway, Deck 1

" }, @@ -8745,23 +8776,6 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) -"fCu" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/machinery/door/firedoor/border_only/directional/west, -/turf/open/floor/carpet/ship/orange_carpet, -/area/engine/storage) "fCJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -9203,8 +9217,6 @@ "fUp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, @@ -9331,6 +9343,9 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/storage) "fXU" = ( @@ -9849,6 +9864,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1 + }, /turf/open/floor/carpet/ship, /area/hallway/primary/central/hallway) "gqn" = ( @@ -10030,6 +10048,10 @@ dir = 4 }, /obj/structure/window/reinforced, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 4 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/storage) "gwi" = ( @@ -10174,7 +10196,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only/directional/north, /turf/open/floor/carpet/ship, /area/crew_quarters/cafeteria) "gDB" = ( @@ -10477,8 +10498,6 @@ /area/medical/medbay/lobby) "gQQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -10656,6 +10675,9 @@ /obj/structure/closet/firecloset/full, /obj/item/toy/plush/snakeplushie, /obj/structure/extinguisher_cabinet/east, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/carpet/ship, /area/crew_quarters/cafeteria) "gXW" = ( @@ -11542,7 +11564,6 @@ /area/medical/genetics/cloning) "hHa" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/machinery/door/poddoor/shutters/ship/preopen{ id = "kitchen_shutter" }, @@ -11768,15 +11789,14 @@ /turf/open/floor/grass, /area/hydroponics) "hMD" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/power/shieldwallgen/atmos/strong{ + anchored = 1; + dir = 4 + }, /turf/open/floor/engine, /area/engine/engineering/reactor_core) "hMZ" = ( @@ -11988,6 +12008,15 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) +"hUe" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible/layer2{ + dir = 4 + }, +/turf/open/floor/carpet/ship/orange_carpet, +/area/engine/atmos) "hUo" = ( /obj/machinery/power/apc/auto_name/north, /obj/structure/cable{ @@ -13052,8 +13081,6 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/effect/landmark/event_spawn, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /turf/open/floor/engine, /area/engine/engineering/reactor_core) "izJ" = ( @@ -13156,6 +13183,9 @@ /obj/structure/cable/white{ icon_state = "2-9" }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/break_room) "iDq" = ( @@ -13622,14 +13652,6 @@ }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engine_smes) -"iUx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, -/turf/open/floor/carpet/ship/orange_carpet, -/area/engine/atmos) "iUH" = ( /obj/machinery/fax{ fax_name = "Law Office"; @@ -13685,10 +13707,6 @@ }, /area/medical/virology) "iVR" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, /obj/structure/table/reinforced, /obj/machinery/door/poddoor/ship{ id = "maintshop"; @@ -13879,7 +13897,10 @@ sortType = 5 }, /obj/effect/landmark/event_spawn, -/obj/machinery/door/firedoor/border_only/directional/north, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 8 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/storage) "jcr" = ( @@ -14432,11 +14453,10 @@ /turf/open/floor/carpet/ship/blue, /area/medical/apothecary) "jtv" = ( -/obj/machinery/light{ - dir = 4 +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 8 }, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/break_room) "jtP" = ( @@ -14476,13 +14496,11 @@ /turf/open/floor/wood, /area/chapel/main) "jwj" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/camera/autoname{ + dir = 8 }, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/structure/disposalpipe/segment, -/turf/open/floor/carpet/ship, -/area/crew_quarters/cafeteria) +/turf/open/floor/carpet/ship/orange_carpet, +/area/engine/atmos) "jwx" = ( /obj/machinery/firealarm{ pixel_x = 26; @@ -14826,13 +14844,14 @@ /turf/open/floor/plating, /area/hallway/secondary/entry/arrivals) "jJX" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/structure/window/reinforced{ dir = 1 }, /obj/machinery/pipedispenser, +/obj/machinery/power/shieldwallgen/atmos/strong{ + anchored = 1; + dir = 4 + }, /turf/open/floor/carpet/ship, /area/crew_quarters/cafeteria) "jKk" = ( @@ -15865,9 +15884,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/light, -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/machinery/door/firedoor/border_only/directional/west, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 1 + }, /turf/open/floor/engine, /area/engine/engine_room) "kxw" = ( @@ -16076,8 +16096,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -16327,10 +16345,13 @@ /area/engine/engineering/reactor_control) "kOp" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/item/radio/intercom, /obj/item/paper_bin, /obj/item/pen, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 8 + }, /turf/open/floor/plating, /area/medical/medbay/lobby) "kPd" = ( @@ -17104,7 +17125,6 @@ /area/crew_quarters/bar) "lti" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/machinery/firealarm/directional/west, /obj/item/pinpointer/crew, /obj/item/reagent_containers/food/drinks/coffee{ @@ -17112,6 +17132,10 @@ pixel_y = 5 }, /obj/item/reagent_containers/food/drinks/britcup, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 4 + }, /turf/open/floor/plating, /area/medical/medbay/lobby) "ltt" = ( @@ -17165,10 +17189,16 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "luB" = ( -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, -/turf/open/floor/carpet/ship/orange_carpet, -/area/engine/atmos) +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/ship/preopen{ + id = "kitchen_shutter" + }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 8 + }, +/turf/open/floor/plating, +/area/crew_quarters/kitchen) "luW" = ( /obj/structure/cable{ icon_state = "4-8" @@ -17395,9 +17425,11 @@ }, /area/medical/virology) "lCi" = ( -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/power/shieldwallgen/atmos/strong{ + anchored = 1; + dir = 4 + }, /turf/open/floor/engine, /area/engine/engineering/reactor_core) "lCs" = ( @@ -18367,12 +18399,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/machinery/door/firedoor/border_only/directional/west, /obj/machinery/airalarm/directional/north, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1 + }, /turf/open/floor/engine, /area/engine/engine_room) "miQ" = ( @@ -18478,17 +18508,6 @@ }, /turf/closed/wall/ship, /area/security/brig) -"mmp" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, -/turf/open/floor/carpet/ship/orange_carpet, -/area/engine/break_room) "mmr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -19036,8 +19055,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ dir = 10 }, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos) "mDr" = ( @@ -19996,6 +20013,13 @@ }, /turf/open/floor/carpet/ship/blue, /area/medical/storage) +"ngd" = ( +/obj/machinery/atmospherics/components/binary/pump/layer2, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/carpet/ship/orange_carpet, +/area/engine/atmos) "ngn" = ( /obj/structure/cable{ icon_state = "2-8" @@ -20280,10 +20304,6 @@ /turf/open/floor/carpet/ship/red_carpet, /area/security/main/warroom) "npq" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, @@ -20291,6 +20311,10 @@ id = "maintshop"; layer = 3.1 }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) "npu" = ( @@ -20861,12 +20885,6 @@ }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engineering/reactor_control) -"nHb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, -/turf/open/floor/engine, -/area/engine/engineering/reactor_core) "nHC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -21642,14 +21660,6 @@ /obj/machinery/atmospherics/pipe/simple/purple/visible/layer4, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos) -"omD" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible/layer2{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, -/turf/open/floor/carpet/ship/orange_carpet, -/area/engine/atmos) "omQ" = ( /obj/structure/bed/dogbed/cayenne, /mob/living/simple_animal/hostile/carp/cayenne, @@ -21784,7 +21794,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/door/firedoor/border_only/directional/east, +/obj/machinery/power/shieldwallgen/atmos/strong{ + dir = 1; + anchored = 1 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos) "oqm" = ( @@ -22106,9 +22119,10 @@ /turf/open/floor/engine, /area/engine/engine_room) "oAs" = ( -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/machinery/door/firedoor/border_only/directional/west, /obj/machinery/airalarm/directional/north, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1 + }, /turf/open/floor/engine, /area/engine/engine_room) "oAG" = ( @@ -22140,22 +22154,24 @@ /turf/closed/wall/ship, /area/hallway/primary/central/hallway) "oBp" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/portable_atmospherics/canister{ icon_state = "orange"; name = "plasma canister" }, /obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, +/obj/machinery/power/shieldwallgen/atmos/strong{ + anchored = 1; + dir = 8 + }, /turf/open/floor/engine, /area/engine/engineering/reactor_core) "oBw" = ( /obj/structure/extinguisher_cabinet/west, /obj/machinery/pipedispenser/disposal/transit_tube, /obj/structure/window/reinforced, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/carpet/ship, /area/crew_quarters/cafeteria) "oBK" = ( @@ -22512,11 +22528,14 @@ "oME" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/item/reagent_containers/food/snacks/pie/cream, /obj/machinery/door/poddoor/shutters/ship/preopen{ id = "kitchen_shutter" }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 4 + }, /turf/open/floor/plating, /area/crew_quarters/kitchen) "oMJ" = ( @@ -22530,8 +22549,6 @@ dir = 4 }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -23244,7 +23261,6 @@ /area/hydroponics) "piL" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor/border_only/directional/south, /turf/open/floor/plating, /area/medical/medbay/lobby) "pjp" = ( @@ -23329,13 +23345,12 @@ /obj/machinery/computer/atmos_control/tank/nitrogen_tank{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/door/firedoor/border_only/directional/east, +/obj/machinery/power/shieldwallgen/atmos/strong{ + anchored = 1 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos) "pkZ" = ( @@ -23619,8 +23634,6 @@ /obj/machinery/meter{ layer = 2.63 }, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos) "puW" = ( @@ -23693,6 +23706,12 @@ }, /turf/open/floor/carpet/ship, /area/hallway/primary/central/hallway) +"pxi" = ( +/obj/machinery/camera/autoname{ + dir = 4 + }, +/turf/open/floor/carpet/ship/orange_carpet, +/area/engine/break_room) "pxn" = ( /obj/structure/window/reinforced, /obj/machinery/hydroponics/constructable, @@ -23855,6 +23874,12 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) +"pDJ" = ( +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1 + }, +/turf/open/floor/carpet/ship/orange_carpet, +/area/engine/storage) "pEk" = ( /obj/structure/cable{ icon_state = "1-2" @@ -24586,10 +24611,23 @@ /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engine_room) "qck" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only/directional/north, -/turf/open/floor/carpet/ship, -/area/crew_quarters/cafeteria) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1 + }, +/turf/open/floor/carpet/ship/blue, +/area/medical/medbay/central) "qcC" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -24829,8 +24867,6 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 5 }, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos) "qhC" = ( @@ -24923,11 +24959,13 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 }, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/machinery/atmospherics/pipe/simple/dark/visible/layer2{ dir = 4 }, +/obj/machinery/power/shieldwallgen/atmos/strong{ + anchored = 1; + dir = 8 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos) "qjY" = ( @@ -24950,6 +24988,7 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible/layer2{ dir = 4 }, +/obj/machinery/light, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos) "qkx" = ( @@ -25149,14 +25188,6 @@ }, /turf/open/floor/carpet/ship/blue, /area/medical/medbay/lobby) -"qqu" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, -/turf/open/floor/carpet/ship/orange_carpet, -/area/engine/atmos) "qqz" = ( /obj/machinery/atmospherics/pipe/manifold/purple/hidden{ dir = 4 @@ -25168,10 +25199,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/carpet/ship/red_carpet, /area/security/warden) -"qra" = ( -/obj/machinery/door/firedoor/border_only/directional/south, -/turf/closed/wall/r_wall/ship, -/area/maintenance/department/engine) "qrs" = ( /obj/structure/cable{ icon_state = "1-2" @@ -26451,10 +26478,13 @@ pixel_x = -3 }, /obj/item/kitchen/fork, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/machinery/door/poddoor/shutters/ship/preopen{ id = "kitchen_shutter" }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 8 + }, /turf/open/floor/plating, /area/crew_quarters/kitchen) "rmW" = ( @@ -26564,10 +26594,13 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/machinery/door/poddoor/shutters/ship/preopen{ id = "kitchen_shutter" }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 4 + }, /turf/open/floor/plating, /area/crew_quarters/kitchen) "rqW" = ( @@ -27244,8 +27277,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /turf/open/floor/engine, /area/engine/engineering/reactor_core) "rQq" = ( @@ -27839,13 +27870,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/machinery/door/firedoor/border_only/directional/west, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Cafeteria" +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 1 }, /turf/open/floor/carpet/ship, /area/crew_quarters/cafeteria) @@ -27865,6 +27895,9 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/storage) "sjo" = ( @@ -28276,6 +28309,9 @@ /obj/machinery/atmospherics/components/binary/pump/layer4{ dir = 1 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/engine, /area/engine/engineering/reactor_core) "sxO" = ( @@ -28462,11 +28498,6 @@ /obj/item/circuitboard/machine/rad_collector, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/storage) -"sIz" = ( -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, -/turf/open/floor/carpet/ship/orange_carpet, -/area/engine/atmos) "sIC" = ( /obj/structure/cable{ icon_state = "2-4" @@ -28491,14 +28522,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Cafeteria" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1 + }, /turf/open/floor/carpet/ship, /area/crew_quarters/cafeteria) "sJd" = ( @@ -29107,14 +29136,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) -"tey" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, -/turf/open/floor/engine, -/area/engine/engineering/reactor_core) "teN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -29425,14 +29446,6 @@ }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engine_room) -"toT" = ( -/obj/structure/cable{ - icon_state = "5-10" - }, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, -/turf/open/floor/carpet/ship/orange_carpet, -/area/engine/atmos) "tpU" = ( /obj/structure/cable{ icon_state = "1-2" @@ -29653,9 +29666,9 @@ /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engineering/reactor_control) "tuR" = ( -/obj/machinery/door/firedoor/border_only/directional/north, -/turf/open/floor/carpet/ship, -/area/crew_quarters/cafeteria) +/obj/machinery/light/floor, +/turf/open/floor/engine, +/area/engine/engine_room) "tuS" = ( /turf/open/floor/carpet/ship/red_carpet, /area/ai_monitored/security/armory/security) @@ -30043,8 +30056,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, +/obj/machinery/power/shieldwallgen/atmos/strong{ + anchored = 1 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos) "tHQ" = ( @@ -31266,6 +31280,11 @@ dir = 8 }, /obj/structure/window/reinforced, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 4; + pixel_x = 7 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/storage) "uCq" = ( @@ -32221,15 +32240,6 @@ /obj/item/book/manual/wiki/sop/service, /turf/open/floor/wood, /area/crew_quarters/bar) -"vmu" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, -/turf/open/floor/carpet/ship/orange_carpet, -/area/engine/atmos) "vnm" = ( /obj/structure/cable{ icon_state = "1-2" @@ -32661,11 +32671,14 @@ /area/engine/atmos) "vCc" = ( /obj/structure/window/reinforced, -/obj/machinery/door/firedoor/border_only/directional/north, /obj/structure/extinguisher_cabinet/west, /obj/machinery/atmospherics/pipe/multiz{ dir = 1 }, +/obj/machinery/power/shieldwallgen/atmos/strong{ + anchored = 1; + dir = 4 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos) "vCC" = ( @@ -33848,13 +33861,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/medical) -"wzs" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only/directional/north, -/turf/open/floor/carpet/ship, -/area/crew_quarters/cafeteria) "wAq" = ( /obj/item/kirbyplants/random, /turf/open/floor/carpet/ship/blue, @@ -33911,6 +33917,10 @@ anchored = 1 }, /obj/structure/window/reinforced, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 4 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/storage) "wCT" = ( @@ -34502,13 +34512,12 @@ /turf/open/floor/plating, /area/science/storage) "wVE" = ( -/obj/machinery/light{ +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; dir = 1 }, -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/machinery/door/firedoor/border_only/directional/west, -/turf/open/floor/carpet/ship/orange_carpet, -/area/engine/storage) +/turf/open/floor/carpet/ship/blue, +/area/medical/medbay/central) "wVM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -34699,6 +34708,10 @@ dir = 8 }, /obj/structure/window/reinforced, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 8 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/storage) "xcI" = ( @@ -35935,8 +35948,10 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "xVt" = ( -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/machinery/door/firedoor/border_only/directional/west, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 1 + }, /turf/open/floor/engine, /area/engine/engine_room) "xVu" = ( @@ -36039,14 +36054,14 @@ /area/security/processing) "xYo" = ( /obj/machinery/paystand, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, /obj/machinery/door/poddoor/ship{ id = "maintshop"; layer = 3.1 }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) "xYH" = ( @@ -36189,14 +36204,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/medical) -"ycR" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible/layer2{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, -/turf/open/floor/carpet/ship/orange_carpet, -/area/engine/atmos) "ydc" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -50745,7 +50752,7 @@ fZX fZX lgl fZX -qra +fZX fZX fZX fZX @@ -51259,7 +51266,7 @@ uJR wbV wyl xKu -nHb +xKu xKu wyl xKu @@ -52801,7 +52808,7 @@ wks wut vWE yeR -tey +yeR yeR vWE yeR @@ -53025,8 +53032,8 @@ drp ftM iJR buP -dEm -fCu +pDJ +luW dEm ydV ydV @@ -53061,7 +53068,7 @@ msJ fdV fRI kuj -fRI +aUX oBp jbm eBl @@ -54333,7 +54340,7 @@ qhd gIw pYa pYa -luB +pYa pYa pYa woH @@ -54590,7 +54597,7 @@ puN mDK mYq bXd -vmu +bXd bXd bXd bXd @@ -54602,7 +54609,7 @@ pYa iFb kcL ybJ -ybJ +tuR orb muI twL @@ -54612,7 +54619,7 @@ twL twL gII vdr -ybJ +tuR ybJ meh gEd @@ -54843,11 +54850,11 @@ pYa nCk pYa lkj -qjO +hUe +pYa pYa pYa pYa -luB pYa pYa pYa @@ -54859,7 +54866,7 @@ pYa bXV kcL oAs -xVt +ybJ kxf sjL qfG @@ -54869,7 +54876,7 @@ hks qfG sjL miN -xVt +ybJ xVt meh gEd @@ -55105,7 +55112,7 @@ pYa pYa pYa cWy -pYa +jwj pYa pYa pYa @@ -55126,7 +55133,7 @@ kfc oDl pSO lIF -ybJ +tuR asd meh bQM @@ -55353,10 +55360,10 @@ nbm ygl ume tHv -sIz +pYa mCA aCt -qqu +lkj aHo lNQ rLL @@ -56623,9 +56630,9 @@ drp ftM krX krX -qGE +pDJ luW -qGE +dEm wvf hBt eWR @@ -56880,9 +56887,9 @@ drp ftM xAe krX -wVE -fCu -dEm +afF +luW +qGE ico ico ico @@ -58190,7 +58197,7 @@ rVF vAl fcT rhb -upw +ngd vWz jUx xeT @@ -58448,11 +58455,11 @@ kSt iJu lNQ pkR -omD -ycR -iUx -sIz -toT +vjB +wOE +xeT +pYa +uyD oqh meh meh @@ -60228,7 +60235,7 @@ ghW ykC mUK eVT -mUK +pxi mUK hKB mUK @@ -60484,7 +60491,7 @@ gnE gnE gnE gnE -mmp +gnE isN gnE jAn @@ -62044,7 +62051,7 @@ tqr kYR qcC aAG -jwj +err err err err @@ -62301,7 +62308,7 @@ lZW vDx liO lmx -tuR +olz jAk sNM olz @@ -63072,7 +63079,7 @@ jrV alP liO tfi -tuR +olz olz jZK olz @@ -63329,7 +63336,7 @@ oME abm liO tfi -wzs +jAk wyc xJD jAk @@ -63839,11 +63846,11 @@ eaL eaL eaL eaL -hHa +luB abm liO tfi -aUX +tkR rQZ tkR tkR @@ -64100,7 +64107,7 @@ xRQ roT liO bhA -qck +huD huD gzR olz @@ -64357,7 +64364,7 @@ rqs bYc jFF qRn -tuR +olz jAk cpt blH @@ -65383,7 +65390,7 @@ eaL kls oGt sIS -ewk +liO siD dsG tdz @@ -69753,7 +69760,7 @@ oHz oHz gqi pdJ -ihQ +aAR gkH gkH gkH @@ -75162,9 +75169,9 @@ eoI eoI eoI eoI -ogg -mPp +qck mPp +wVE pQv pQv pQv diff --git a/_maps/map_files/Aetherwhisp/Aetherwhisp2.dmm b/_maps/map_files/Aetherwhisp/Aetherwhisp2.dmm index fad2dff0a40..c0b48dde683 100644 --- a/_maps/map_files/Aetherwhisp/Aetherwhisp2.dmm +++ b/_maps/map_files/Aetherwhisp/Aetherwhisp2.dmm @@ -1013,7 +1013,7 @@ /area/bridge/showroom/corporate) "aIb" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "aIu" = ( /turf/open/floor/carpet/ship/purple_carpet, @@ -1259,7 +1259,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "aRj" = ( /obj/structure/closet/secure_closet/engineering_chief, @@ -1662,7 +1662,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "bfP" = ( /obj/machinery/firealarm/directional/west, @@ -2486,6 +2486,12 @@ /obj/machinery/door/firedoor/border_only/directional/east, /turf/open/floor/plating, /area/quartermaster/lobby) +"bAn" = ( +/obj/machinery/door/poddoor/ship{ + id = "minerlaunch1" + }, +/turf/open/floor/plating/airless, +/area/nsv/hanger/deck2/port) "bAo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/ship/preopen{ @@ -2780,7 +2786,7 @@ /area/maintenance/fore) "bNH" = ( /obj/machinery/firealarm/directional/west, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "bNR" = ( /obj/item/kirbyplants/random, @@ -3309,7 +3315,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "ckN" = ( /obj/effect/turf_decal/bot, @@ -3567,7 +3573,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "csG" = ( /obj/structure/cable{ @@ -4338,7 +4344,12 @@ pixel_y = 26; req_one_access_txt = "69" }, -/turf/open/floor/engine/vacuum, +/obj/machinery/button/shieldwallgen{ + id = "hangar"; + pixel_y = 27; + pixel_x = -6 + }, +/turf/open/floor/engine, /area/nsv/hanger) "cXE" = ( /obj/effect/turf_decal/stripes/line, @@ -4377,7 +4388,7 @@ dir = 9 }, /obj/machinery/computer/ship/viewscreen, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "cYB" = ( /obj/machinery/atmospherics/pipe/simple/purple/hidden, @@ -4445,7 +4456,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "dbe" = ( /obj/structure/cable{ @@ -4535,7 +4546,7 @@ pixel_y = 26; req_one_access_txt = "48" }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "dcQ" = ( /obj/structure/table/glass, @@ -4764,16 +4775,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/engine, /area/science/explab) -"dmG" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/border_only/directional/west, -/turf/open/floor/carpet/ship/blue{ - color = "#9999DD"; - name = "nanoweave carpet (bluer)" - }, -/area/ai_monitored/storage/eva) "dmU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -4807,6 +4808,16 @@ }, /turf/open/floor/engine, /area/nsv/weapons/fore) +"dnK" = ( +/obj/machinery/door/poddoor/ship{ + id = "launch1" + }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 8; + id = "hangar" + }, +/turf/open/floor/plating/airless, +/area/nsv/hanger) "dnX" = ( /turf/closed/wall/ship, /area/bridge/meeting_room/council) @@ -4863,12 +4874,13 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "dqX" = ( -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, /obj/machinery/door/poddoor/ship/preopen{ dir = 4; id = "aethermunitions" }, +/obj/machinery/power/shieldwallgen/atmos/strong{ + anchored = 1 + }, /turf/open/floor/engine, /area/nsv/weapons/fore) "drW" = ( @@ -5096,7 +5108,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "dBK" = ( /obj/machinery/door/firedoor/border_only/directional/south, @@ -5145,7 +5157,7 @@ dir = 4; name = "emergency shower" }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "dCU" = ( /obj/effect/turf_decal/stripes/line{ @@ -5154,7 +5166,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "dDe" = ( /obj/structure/cable/yellow{ @@ -5364,8 +5376,6 @@ /turf/open/floor/carpet, /area/library) "dMe" = ( -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, /obj/machinery/door/poddoor/shutters/ship{ dir = 4; id = "warehouse" @@ -5628,6 +5638,16 @@ name = "nanoweave carpet (bluer)" }, /area/bridge) +"dTs" = ( +/obj/machinery/door/poddoor/ship{ + id = "launch1" + }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 4; + id = "hangar" + }, +/turf/open/floor/plating/airless, +/area/nsv/hanger) "dTD" = ( /obj/structure/chair/office{ dir = 8 @@ -5882,22 +5902,15 @@ /turf/open/floor/carpet/ship/orange_carpet, /area/nsv/weapons/fore) "eex" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/door/poddoor/ship/preopen{ + dir = 4; + id = "aethermunitions" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/power/shieldwallgen/atmos/strong{ + dir = 1 }, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, -/turf/open/floor/carpet/ship, -/area/hallway/nsv/deck2/primary) +/turf/open/floor/engine, +/area/nsv/weapons/fore) "eff" = ( /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/heads/chief) @@ -6711,6 +6724,16 @@ }, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) +"eFd" = ( +/obj/machinery/door/poddoor/ship{ + id = "minerlaunch1" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "mining" + }, +/turf/open/floor/plating/airless, +/area/nsv/hanger/deck2/port) "eFu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/binary/dp_vent_pump{ @@ -6877,7 +6900,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "eJj" = ( /turf/open/floor/carpet/orange, @@ -7277,7 +7300,7 @@ "eXm" = ( /obj/item/wallframe/airalarm, /obj/item/electronics/airalarm, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "eXw" = ( /obj/effect/spawner/lootdrop/maintenance/two, @@ -7577,8 +7600,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -7624,10 +7645,13 @@ /obj/machinery/atmospherics/pipe/manifold/green/visible{ dir = 4 }, -/obj/machinery/door/firedoor/border_only/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 1 + }, /turf/open/floor/engine, /area/gateway) "fjc" = ( @@ -7734,7 +7758,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/engine/vacuum, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/engine, /area/nsv/hanger) "flV" = ( /obj/structure/cable{ @@ -7975,7 +8002,7 @@ /turf/open/floor/carpet/ship/purple_carpet, /area/science/research) "fsO" = ( -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/structure/cable{ icon_state = "0-4" }, @@ -8219,7 +8246,7 @@ /area/crew_quarters/dorms) "fBj" = ( /obj/effect/landmark/event_spawn, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "fBU" = ( /obj/structure/bookcase/random, @@ -8268,7 +8295,7 @@ /area/science/xenobiology) "fDg" = ( /obj/machinery/light/floor, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "fDm" = ( /obj/machinery/atmospherics/pipe/simple/purple/hidden{ @@ -9660,13 +9687,15 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) "gxM" = ( -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, /obj/machinery/door/poddoor/shutters/ship{ dir = 4; id = "warehouse" }, /obj/effect/landmark/nuclear_waste_spawner, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 1 + }, /turf/open/floor/plating, /area/quartermaster/storage) "gxS" = ( @@ -9833,7 +9862,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "gCc" = ( /obj/effect/spawner/structure/window/reinforced/ship, @@ -10039,7 +10068,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "gLR" = ( /obj/structure/closet/firecloset/full, @@ -10339,8 +10368,6 @@ /turf/open/floor/carpet/purple, /area/science/research) "gYj" = ( -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, /obj/machinery/door/poddoor/shutters/ship{ dir = 4; id = "warehouse" @@ -10478,7 +10505,7 @@ }, /obj/structure/cable, /obj/machinery/power/apc/auto_name/west, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "hbu" = ( /obj/machinery/disposal/bin, @@ -10500,7 +10527,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "hbT" = ( /obj/structure/lattice, @@ -10770,7 +10797,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "hlm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -10870,7 +10897,7 @@ dir = 1 }, /obj/machinery/computer/ship/viewscreen, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "hpA" = ( /obj/structure/closet/secure_closet/evidence{ @@ -10993,6 +11020,19 @@ /obj/machinery/meter, /turf/open/floor/plating, /area/nsv/atc) +"huj" = ( +/obj/machinery/door/poddoor/ship{ + id = "launch2" + }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 8; + id = "hangar" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating/airless, +/area/nsv/hanger) "huC" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -11149,10 +11189,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 8 }, -/obj/machinery/door/firedoor/border_only/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1 + }, /turf/open/floor/engine, /area/gateway) "hAj" = ( @@ -11357,7 +11399,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "hJZ" = ( /obj/machinery/light, @@ -11488,7 +11530,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "hPQ" = ( /obj/effect/turf_decal/stripes/line{ @@ -11497,7 +11539,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "hQz" = ( /obj/machinery/suit_storage_unit/pilot, @@ -12112,7 +12154,7 @@ /obj/structure/sign/solgov_seal{ pixel_y = 26 }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "ikZ" = ( /obj/machinery/suit_storage_unit/standard_unit, @@ -12389,10 +12431,13 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/firelock_frame/border, -/obj/machinery/door/firedoor/border_only/directional/north, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 4; + pixel_x = 7 + }, /turf/open/floor/plating, /area/science/nsv/astronomy) "ive" = ( @@ -12728,7 +12773,7 @@ /area/maintenance/disposal) "iHF" = ( /obj/machinery/recharge_station, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "iHZ" = ( /obj/structure/disposalpipe/segment, @@ -13654,7 +13699,7 @@ /area/bridge/secondary) "joM" = ( /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "jpO" = ( /obj/structure/disposalpipe/segment{ @@ -13673,7 +13718,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "jqk" = ( /obj/machinery/ship_weapon/torpedo_launcher/cargo/east{ @@ -13882,7 +13927,7 @@ /turf/open/floor/carpet/ship/purple_carpet, /area/medical/genetics) "jvn" = ( -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "jvC" = ( /obj/structure/cable{ @@ -14406,6 +14451,9 @@ dir = 4 }, /obj/machinery/meter, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/open/floor/engine, /area/gateway) "jMw" = ( @@ -14584,6 +14632,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating/airless, /area/nsv/hanger) "jUd" = ( @@ -14626,6 +14677,13 @@ }, /turf/open/floor/carpet/ship, /area/hallway/nsv/deck2/forward) +"jVx" = ( +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 8 + }, +/turf/open/floor/carpet/ship, +/area/hallway/nsv/deck2/primary) "jVK" = ( /obj/structure/bookcase/random/reference, /turf/open/floor/wood, @@ -15054,7 +15112,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "krz" = ( /obj/structure/cable{ @@ -15168,7 +15226,7 @@ /area/bridge/showroom/corporate) "kxr" = ( /obj/item/radio/intercom/directional/east, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "kxM" = ( /obj/structure/disposalpipe/trunk, @@ -15465,13 +15523,19 @@ }, /turf/open/floor/carpet/ship/purple_carpet, /area/science/nsv/astronomy) +"kKk" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/engine, +/area/nsv/hanger) "kKG" = ( /obj/machinery/camera/autoname, /turf/open/floor/carpet/ship, /area/hallway/nsv/deck2/primary) "kLc" = ( /obj/vehicle/sealed/car/realistic/fighter_tug, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "kLf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -17054,7 +17118,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "lVe" = ( /obj/machinery/light, @@ -17232,7 +17296,7 @@ /area/maintenance/nsv/hangar) "mfj" = ( /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "mfk" = ( /obj/machinery/door/firedoor/border_only/directional/east, @@ -17612,7 +17676,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "moz" = ( /obj/structure/cable{ @@ -18176,6 +18240,17 @@ }, /turf/open/floor/carpet/ship/purple_carpet, /area/science/xenobiology) +"mBJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/button/shieldwallgen{ + id = "mining"; + pixel_y = 27; + pixel_x = -6 + }, +/turf/open/floor/plating, +/area/nsv/hanger/deck2/port) "mCq" = ( /obj/effect/spawner/structure/window/reinforced/ship, /obj/structure/cable{ @@ -18816,7 +18891,7 @@ /obj/machinery/camera/autoname{ dir = 4 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "nea" = ( /obj/machinery/suit_storage_unit/pilot, @@ -18934,7 +19009,7 @@ dir = 8 }, /obj/structure/overmap/small_craft/transport/sabre, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "niQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -18996,6 +19071,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/window/reinforced{ + layer = 2.89 + }, /turf/open/floor/engine, /area/gateway) "njN" = ( @@ -19366,7 +19444,7 @@ /turf/open/floor/wood, /area/library) "nwM" = ( -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/structure/cable{ icon_state = "1-8" }, @@ -19401,13 +19479,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/door/firedoor/border_only/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/green/visible{ dir = 8 }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 1 + }, /turf/open/floor/engine, /area/gateway) "nyk" = ( @@ -19430,11 +19511,13 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible/layer2{ dir = 8 }, -/obj/machinery/door/firedoor/border_only/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1 + }, /turf/open/floor/engine, /area/gateway) "nyY" = ( @@ -19451,7 +19534,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "nzz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -19965,9 +20048,13 @@ /turf/open/floor/holofloor/wood, /area/bridge/showroom/corporate) "nNT" = ( -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, -/turf/open/floor/carpet/ship, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1 + }, +/turf/open/floor/engine, /area/hallway/nsv/deck2/primary) "nOe" = ( /obj/structure/cable{ @@ -20056,7 +20143,10 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plating/airless, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, /area/nsv/hanger) "nSK" = ( /obj/effect/turf_decal/pool{ @@ -20296,14 +20386,13 @@ /turf/open/floor/engine, /area/science/xenobiology) "nYf" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/structure/sign/poster/official/random{ pixel_x = 32 }, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 8 + }, /turf/open/floor/carpet/ship, /area/hallway/nsv/deck2/primary) "nYz" = ( @@ -20519,6 +20608,12 @@ /obj/item/electronics/airlock, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"ofR" = ( +/obj/machinery/camera/autoname{ + dir = 8 + }, +/turf/open/floor/carpet/ship, +/area/hallway/nsv/deck2/primary) "ofS" = ( /obj/structure/cable{ icon_state = "2-8" @@ -20660,7 +20755,7 @@ /obj/machinery/camera/autoname{ dir = 8 }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "ooB" = ( /obj/machinery/computer/scan_consolenew{ @@ -20847,6 +20942,9 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/structure/window/reinforced{ + layer = 2.89 + }, /turf/open/floor/engine, /area/gateway) "otW" = ( @@ -21032,7 +21130,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "oAO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -21353,7 +21451,7 @@ }, /obj/machinery/firealarm/directional/east, /obj/structure/ore_box, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "oKP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -21452,7 +21550,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "oPk" = ( /obj/machinery/disposal/bin, @@ -21942,7 +22040,7 @@ /turf/open/floor/engine, /area/nsv/weapons/port) "pey" = ( -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "peF" = ( /obj/structure/cable{ @@ -22377,6 +22475,15 @@ }, /turf/open/floor/engine, /area/nsv/weapons/fore) +"pqV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/engine, +/area/nsv/hanger) "prh" = ( /obj/structure/sign/warning/explosives, /obj/machinery/atmospherics/pipe/simple/general/visible, @@ -22943,7 +23050,7 @@ /obj/machinery/camera/autoname{ dir = 4 }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "pKP" = ( /obj/structure/table/glass, @@ -23042,6 +23149,10 @@ }, /obj/machinery/recharge_station, /obj/effect/landmark/start/cyborg, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 1 + }, /turf/open/floor/engine, /area/hallway/nsv/deck2/primary) "pOE" = ( @@ -23365,7 +23476,7 @@ dir = 10 }, /obj/structure/overmap/small_craft/transport/sabre/mining, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "pZn" = ( /obj/machinery/computer/mech_bay_power_console, @@ -23378,7 +23489,7 @@ }, /obj/structure/extinguisher_cabinet/east, /obj/structure/ore_box, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "pZx" = ( /turf/open/floor/engine, @@ -23456,8 +23567,6 @@ /obj/machinery/atmospherics/pipe/simple/purple/hidden{ dir = 4 }, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, /obj/machinery/door/poddoor/ship/preopen{ dir = 4; id = "aethermunitions" @@ -23596,7 +23705,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "qjY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -23953,7 +24062,7 @@ /obj/machinery/atmospherics/pipe/simple/purple/hidden{ dir = 4 }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "qvy" = ( /turf/open/floor/carpet/ship/red_carpet, @@ -24093,6 +24202,16 @@ }, /turf/open/floor/carpet/orange, /area/quartermaster/qm) +"qAZ" = ( +/obj/machinery/door/poddoor/ship{ + id = "launch2" + }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 4; + id = "hangar" + }, +/turf/open/floor/plating/airless, +/area/nsv/hanger) "qBu" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/three, @@ -24151,7 +24270,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "qDJ" = ( /obj/structure/cable{ @@ -24634,7 +24753,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "qVA" = ( /obj/item/pen, @@ -24675,7 +24794,7 @@ dir = 10 }, /obj/machinery/light, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "qXs" = ( /obj/machinery/light_switch/east, @@ -24891,7 +25010,7 @@ }, /obj/machinery/firealarm/directional/east, /obj/machinery/disposal/bin, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "rbK" = ( /turf/open/floor/holofloor/wood, @@ -24927,6 +25046,18 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/quartermaster/lobby) +"rcC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/power/shieldwallgen/atmos/strong{ + dir = 1 + }, +/turf/open/floor/carpet/ship/blue{ + color = "#9999DD"; + name = "nanoweave carpet (bluer)" + }, +/area/bridge) "rcI" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/structure/disposalpipe/segment, @@ -25072,10 +25203,13 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 8; + pixel_x = -7 + }, /turf/open/floor/carpet/ship/purple_carpet, /area/science/nsv/astronomy) "rgC" = ( @@ -25203,7 +25337,7 @@ /obj/machinery/camera/autoname{ dir = 1 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "rjD" = ( /obj/machinery/atmospherics/pipe/manifold/purple/hidden{ @@ -25353,6 +25487,15 @@ }, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) +"rok" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/nsv/hanger) "rpm" = ( /obj/structure/table_frame/wood, /obj/item/stack/sheet/mineral/wood{ @@ -25565,8 +25708,6 @@ /turf/open/floor/carpet/ship, /area/science/server) "rwe" = ( -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, /obj/machinery/button/door{ id = "warehouse"; name = "Warehouse doors"; @@ -25595,6 +25736,9 @@ pixel_x = -6; pixel_y = 38 }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1 + }, /turf/open/floor/plating, /area/quartermaster/storage) "rww" = ( @@ -26390,10 +26534,11 @@ /turf/open/floor/wood, /area/library) "rPY" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/suit_storage_unit/standard_unit, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 1 + }, /turf/open/floor/carpet/ship/blue{ color = "#9999DD"; name = "nanoweave carpet (bluer)" @@ -26578,6 +26723,21 @@ name = "nanoweave carpet (bluer)" }, /area/bridge) +"rVr" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/purple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/engine, +/area/nsv/hanger) "rWc" = ( /obj/structure/disposaloutlet{ dir = 1 @@ -27314,7 +27474,7 @@ dir = 10 }, /obj/structure/overmap/small_craft/transport/sabre/mining, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "swh" = ( /obj/structure/window/reinforced{ @@ -28084,7 +28244,7 @@ dir = 8 }, /obj/structure/overmap/small_craft/combat/heavy, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "sWE" = ( /obj/structure/closet/l3closet/scientist, @@ -28346,7 +28506,7 @@ }, /obj/machinery/recharge_station, /obj/effect/landmark/start/cyborg, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "toN" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -28924,6 +29084,10 @@ /obj/machinery/door/poddoor/ship{ id = "minerlaunch1" }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "mining" + }, /turf/open/floor/plating/airless, /area/nsv/hanger/deck2/port) "tND" = ( @@ -29110,7 +29274,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "tUI" = ( /obj/machinery/airalarm/directional/east, @@ -29331,7 +29495,7 @@ /area/quartermaster/lobby) "uaV" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "uaY" = ( /obj/machinery/space_heater, @@ -29412,7 +29576,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "ugt" = ( /obj/machinery/light{ @@ -29506,7 +29670,7 @@ dir = 8 }, /obj/structure/overmap/small_craft/combat/light, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "uiP" = ( /obj/structure/rack, @@ -29727,8 +29891,10 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "urt" = ( -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 1 + }, /turf/open/floor/carpet/ship, /area/hallway/nsv/deck2/primary) "urO" = ( @@ -29842,6 +30008,15 @@ name = "nanoweave carpet (puce)" }, /area/nsv/weapons/port) +"uwV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/nsv/hanger) "uxB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -29958,7 +30133,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "uDy" = ( /obj/effect/landmark/event_spawn, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "uDQ" = ( /turf/closed/wall/ship, @@ -30233,6 +30408,9 @@ /obj/structure/cable/white{ icon_state = "5-10" }, +/obj/machinery/power/shieldwallgen/atmos/strong{ + anchored = 1 + }, /turf/open/floor/carpet/ship/blue{ color = "#9999DD"; name = "nanoweave carpet (bluer)" @@ -30302,8 +30480,10 @@ /turf/open/floor/carpet/ship, /area/quartermaster/qm) "uRL" = ( -/obj/structure/firelock_frame/border, -/obj/machinery/door/firedoor/border_only/directional/north, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 8 + }, /turf/open/floor/plating, /area/science/nsv/astronomy) "uSs" = ( @@ -31120,7 +31300,7 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) "vAz" = ( -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "vAK" = ( /obj/structure/cable{ @@ -31379,7 +31559,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "vJH" = ( /obj/effect/turf_decal/stripes/line, @@ -31668,13 +31848,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) -"vVi" = ( -/obj/machinery/door/firedoor/border_only/directional/west, -/turf/open/floor/carpet/ship/blue{ - color = "#9999DD"; - name = "nanoweave carpet (bluer)" - }, -/area/ai_monitored/storage/eva) "vVH" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -32540,6 +32713,9 @@ dir = 8 }, /obj/machinery/meter, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/open/floor/engine, /area/gateway) "wCf" = ( @@ -32588,8 +32764,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/machinery/door/firedoor/border_only/directional/east, /obj/machinery/door/poddoor/ship/preopen{ dir = 4; id = "aethermunitions" @@ -32847,7 +33021,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "wMe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -32966,6 +33140,12 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"wPV" = ( +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1 + }, +/turf/open/floor/carpet/ship, +/area/hallway/nsv/deck2/primary) "wQe" = ( /obj/structure/table/wood, /obj/item/shard{ @@ -33109,7 +33289,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/nsv/hanger) "wTV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -33235,14 +33415,10 @@ /turf/open/floor/engine, /area/quartermaster/storage) "wXh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, /turf/open/floor/carpet/ship, /area/hallway/nsv/deck2/primary) "wXr" = ( @@ -33291,14 +33467,14 @@ }, /area/bridge/meeting_room) "wZi" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/suit_storage_unit/standard_unit, /obj/structure/sign/solgov_flag{ layer = 2.79; pixel_y = 26 }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1 + }, /turf/open/floor/carpet/ship/blue{ color = "#9999DD"; name = "nanoweave carpet (bluer)" @@ -33368,7 +33544,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "xba" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -33772,7 +33948,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "xpf" = ( /obj/structure/cable{ @@ -34264,8 +34440,10 @@ /turf/open/floor/carpet/blue, /area/bridge) "xJT" = ( -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 4 + }, /turf/open/floor/carpet/ship/purple_carpet, /area/science/nsv/astronomy) "xJU" = ( @@ -34832,7 +35010,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "xXE" = ( /obj/machinery/rnd/production/techfab, @@ -34922,7 +35100,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger) "ybT" = ( /obj/structure/window/reinforced{ @@ -35093,7 +35271,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/nsv/hanger/deck2/port) "yiA" = ( /obj/effect/landmark/start/shaft_miner, @@ -35179,14 +35357,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/nsv/weapons/starboard) -"ylv" = ( -/obj/machinery/camera/autoname{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/machinery/door/firedoor/border_only/directional/south, -/turf/open/floor/carpet/ship, -/area/hallway/nsv/deck2/primary) "ylI" = ( /obj/machinery/computer/ship/viewscreen{ pixel_x = -32; @@ -57909,7 +58079,7 @@ awB agZ agZ cOm -nzd +mBJ jvn joM nzd @@ -58165,7 +58335,7 @@ awB awB awB awB -tMv +eFd dcD hbS jqh @@ -58422,7 +58592,7 @@ awB awB awB awB -tMv +bAn jvn fDg jvn @@ -58679,7 +58849,7 @@ awB awB awB awB -tMv +bAn jvn jvn jvn @@ -66926,8 +67096,8 @@ vAz vAz vAz jQc -urt -eex +wPV +lQa urt wry vMA @@ -67168,7 +67338,7 @@ nZT nZT sdP nZT -wZr +dTs mot qjS uiF @@ -67186,7 +67356,7 @@ sFH vMA hSc vMA -ylv +wXh vMA vMA vMA @@ -67203,7 +67373,7 @@ vMA lnt vMA vMA -nNT +wXh ecO gYn oWJ @@ -67443,7 +67613,7 @@ sFH vMA lRI vMA -nNT +vMA vMA vMA fSL @@ -67460,7 +67630,7 @@ nzz pBk vGD ioz -wXh +ioz pkV kgx sPK @@ -67699,9 +67869,9 @@ ybo sFH vMA lTe -vMA +ofR nYf -vMA +nIf vMA vMA oLI @@ -67717,7 +67887,7 @@ nIf vMA vMA vMA -nNT +jVx wNF vMA orC @@ -67971,7 +68141,7 @@ xcR qOv qGn wry -pBV +nNT pBV pOB pQv @@ -68453,7 +68623,7 @@ nZT nZT aan awB -wZr +dnK vAz vAz vAz @@ -69481,7 +69651,7 @@ nZT nZT aan awB -mzQ +qAZ vAz vAz vAz @@ -69746,7 +69916,7 @@ vAz vAz wTG nIK -fkO +rVr vAz hPa pey @@ -70766,13 +70936,13 @@ nZT nZT aan awB -mzQ -csi -qCO -qCO +huj +uwV +rok +rok nSn -vAz -wTG +kKk +pqV jTU fkO ooy @@ -70810,8 +70980,8 @@ kxl kxl kxl wZi -dmG -vVi +nOe +iai rPY ntC vZK @@ -78226,7 +78396,7 @@ crV dqX qdS wEx -dqX +eex lJn hzd mAY @@ -78766,7 +78936,7 @@ wFq oEO oEO fhB -vix +rcC bVG bVG bVG diff --git a/_maps/map_files/Galactica/Galactica1.dmm b/_maps/map_files/Galactica/Galactica1.dmm index 1a11d154244..458b6a2165f 100644 --- a/_maps/map_files/Galactica/Galactica1.dmm +++ b/_maps/map_files/Galactica/Galactica1.dmm @@ -8752,7 +8752,7 @@ /turf/open/openspace/airless, /area/nsv/hanger/notkmcstupidhanger) "wk" = ( -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/machinery/door/poddoor/preopen{ id = "xb_containment"; name = "Xenobiology Containment Shutter" @@ -16594,7 +16594,7 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "Pt" = ( -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/machinery/door/poddoor/preopen{ id = "xb_containment"; name = "Xenobiology Containment Shutter" diff --git a/_maps/map_files/Galactica/old/Galactica_old.dmm b/_maps/map_files/Galactica/old/Galactica_old.dmm index d9f11278f5a..748193c0e9d 100644 --- a/_maps/map_files/Galactica/old/Galactica_old.dmm +++ b/_maps/map_files/Galactica/old/Galactica_old.dmm @@ -8080,7 +8080,7 @@ id = "xb_containment"; name = "Xenobiology Containment Shutter" }, -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -8094,7 +8094,7 @@ id = "xb_containment"; name = "Xenobiology Containment Shutter" }, -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/structure/cable{ icon_state = "0-2" }, diff --git a/_maps/map_files/Gladius/Gladius1.dmm b/_maps/map_files/Gladius/Gladius1.dmm index 18c223e1c6c..f7d582ecaa9 100644 --- a/_maps/map_files/Gladius/Gladius1.dmm +++ b/_maps/map_files/Gladius/Gladius1.dmm @@ -8226,7 +8226,7 @@ /turf/open/floor/monotile/dark, /area/security/nuke_storage) "dYy" = ( -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/structure/cable{ icon_state = "0-4" }, @@ -15185,7 +15185,7 @@ /turf/open/floor/plating/airless, /area/nsv/hanger) "hhO" = ( -/obj/machinery/shieldwallgen, +/obj/machinery/power/shieldwallgen, /obj/effect/turf_decal/delivery, /turf/open/floor/monotile/dark, /area/teleporter) @@ -50832,7 +50832,7 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck1/aft) "xZr" = ( -/obj/machinery/shieldwallgen, +/obj/machinery/power/shieldwallgen, /obj/effect/turf_decal/delivery, /obj/machinery/light{ dir = 8 diff --git a/_maps/map_files/Hammerhead/Hammerhead.dmm b/_maps/map_files/Hammerhead/Hammerhead.dmm index 67a7deb8ca5..069e07f8f59 100644 --- a/_maps/map_files/Hammerhead/Hammerhead.dmm +++ b/_maps/map_files/Hammerhead/Hammerhead.dmm @@ -51516,7 +51516,7 @@ /turf/open/floor/durasteel, /area/science/research) "vCL" = ( -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/machinery/door/poddoor/preopen{ id = "xb_containment"; name = "Xenobiology Containment Shutter" diff --git a/_maps/map_files/Instanced/map_files/Babylon2.dmm b/_maps/map_files/Instanced/map_files/Babylon2.dmm index eefdaf9af50..7e121dde255 100644 --- a/_maps/map_files/Instanced/map_files/Babylon2.dmm +++ b/_maps/map_files/Instanced/map_files/Babylon2.dmm @@ -25823,10 +25823,10 @@ /area/medical/medbay/pvp) "xIx" = ( /obj/structure/closet/crate/engineering, -/obj/machinery/shieldwallgen, -/obj/machinery/shieldwallgen, -/obj/machinery/shieldwallgen, -/obj/machinery/shieldwallgen, +/obj/machinery/power/shieldwallgen, +/obj/machinery/power/shieldwallgen, +/obj/machinery/power/shieldwallgen, +/obj/machinery/power/shieldwallgen, /turf/open/floor/plasteel/tech/grid, /area/hallway/pvp) "xIL" = ( diff --git a/_maps/map_files/Instanced/map_files/SpaceSHIP.dmm b/_maps/map_files/Instanced/map_files/SpaceSHIP.dmm index 259ee20079e..ea3351e0a9a 100644 --- a/_maps/map_files/Instanced/map_files/SpaceSHIP.dmm +++ b/_maps/map_files/Instanced/map_files/SpaceSHIP.dmm @@ -10420,7 +10420,7 @@ icon_state = "0-4" }, /obj/structure/lattice/catwalk, -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ desc = "Get fucked fighter assistants."; max_integrity = 1000; maximum_stored_power = 10000; @@ -16396,7 +16396,7 @@ /area/engine/engineering/pvp) "Nd" = ( /obj/structure/lattice/catwalk, -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ desc = "Get fucked fighter assistants."; max_integrity = 1000; maximum_stored_power = 10000; diff --git a/_maps/map_files/Serendipity/Serendipity1.dmm b/_maps/map_files/Serendipity/Serendipity1.dmm index 2a09dd46653..d4b17ae59d9 100644 --- a/_maps/map_files/Serendipity/Serendipity1.dmm +++ b/_maps/map_files/Serendipity/Serendipity1.dmm @@ -1828,7 +1828,7 @@ /turf/open/floor/carpet/ship/beige_carpet, /area/bridge/meeting_room/council) "gn" = ( -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/effect/turf_decal/tile/ship/purple{ dir = 8 }, @@ -2329,7 +2329,7 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "hO" = ( -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/effect/turf_decal/tile/ship/purple{ dir = 1 }, diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index 38b235c6c30..83ddb4965ac 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -38492,7 +38492,7 @@ id = "xb_containment"; name = "Xenobiology Containment Shutter" }, -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/structure/cable, /turf/open/floor/plating, /area/science/xenobiology) @@ -45113,7 +45113,7 @@ id = "xb_containment"; name = "Xenobiology Containment Shutter" }, -/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/structure/cable, /turf/open/floor/plating, /area/science/xenobiology) diff --git a/_maps/map_files/vonneumann/vnmk3.dmm b/_maps/map_files/vonneumann/vnmk3.dmm index 8b785f5fbbb..bb8b6e2c394 100644 --- a/_maps/map_files/vonneumann/vnmk3.dmm +++ b/_maps/map_files/vonneumann/vnmk3.dmm @@ -489,10 +489,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/machinery/status_display/evac/north, /obj/effect/turf_decal/guideline/guideline_in/blue{ dir = 1; @@ -508,9 +504,7 @@ /obj/effect/turf_decal/guideline/guideline_mid/purple{ icon_state = "guideline_mid-s" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/carpet/ship, /area/hallway/nsv/deck1/frame2/starboard) "asr" = ( @@ -1518,10 +1512,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/effect/turf_decal/guideline/guideline_in/blue{ dir = 1; icon_state = "guideline_in-s" @@ -1536,9 +1526,7 @@ /obj/effect/turf_decal/guideline/guideline_mid/purple{ icon_state = "guideline_mid-s" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/carpet/ship, /area/hallway/upper/primary/starboard) "bbg" = ( @@ -1611,17 +1599,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/camera/autoname{ - dir = 4 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/effect/turf_decal/tile/blue/flat_side{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/power/shieldwallgen/atmos{ + dir = 4 }, /turf/open/floor/monotile/light, /area/medical/medbay) @@ -2242,10 +2225,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/power/shieldwallgen/atmos{ + dir = 8 }, /turf/open/floor/carpet/ship, /area/hallway/secondary/exit/departure_lounge) @@ -2307,13 +2288,7 @@ dir = 1; icon_state = "guideline_mid-s" }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/carpet/ship, /area/hallway/primary/starboard) "bAX" = ( @@ -2647,8 +2622,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/effect/turf_decal/guideline/guideline_in/blue{ icon_state = "guideline_in-s" }, @@ -2663,7 +2636,9 @@ dir = 1; icon_state = "guideline_mid-s" }, -/obj/machinery/door/firedoor/border_only/directional/east, +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 + }, /turf/open/floor/carpet/ship, /area/hallway/primary/port) "bJp" = ( @@ -3358,10 +3333,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -3379,8 +3350,8 @@ dir = 1; icon_state = "guideline_mid-s" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 }, /turf/open/floor/carpet/ship, /area/hallway/upper/primary/port) @@ -3397,15 +3368,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 }, /turf/open/floor/carpet/ship, /area/hallway/upper/primary/port) @@ -3786,6 +3753,7 @@ /obj/structure/sign/ship/nosmoking{ pixel_y = 27 }, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/carpet/ship/beige_carpet{ color = "#CC8899"; name = "nanoweave carpet (puce)" @@ -4417,12 +4385,10 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/door/firedoor/border_only/directional/west, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/border_only/directional/east, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/carpet/ship, /area/hallway/primary/port) "daR" = ( @@ -4671,6 +4637,7 @@ name = "Bridge Fax Machine"; pixel_y = 8 }, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/circuit, /area/bridge/cic) "dnl" = ( @@ -4931,6 +4898,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/carpet/ship/beige_carpet{ color = "#CC8899"; name = "nanoweave carpet (puce)" @@ -5784,6 +5752,9 @@ /obj/effect/turf_decal/tile/blue/flat_side{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/monotile/light, /area/medical/medbay) "dWn" = ( @@ -5883,9 +5854,9 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/door/firedoor/border_only/directional/south, -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/machinery/door/firedoor/border_only/directional/north, +/obj/machinery/power/shieldwallgen/atmos{ + dir = 8 + }, /turf/open/floor/circuit/green/anim, /area/engine/engineering/reactor_control) "ecd" = ( @@ -6604,7 +6575,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/cmo) "eIJ" = ( -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ req_access_txt = "24;10"; req_access = null; name = "Reactor shield generator"; @@ -7026,16 +6997,10 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /obj/item/wrench/medical, /obj/machinery/atmospherics/components/unary/portables_connector, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/structure/sign/poster/official/random{ pixel_y = 30 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/monotile/light, /area/medical/medbay) "eZz" = ( @@ -7129,7 +7094,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ req_access_txt = "24;10"; req_access = null; name = "Reactor shield generator"; @@ -7432,10 +7397,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/effect/turf_decal/guideline/guideline_in/blue{ dir = 1; icon_state = "guideline_in-s" @@ -7450,8 +7411,8 @@ /obj/effect/turf_decal/guideline/guideline_mid/purple{ icon_state = "guideline_mid-s" }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 }, /turf/open/floor/carpet/ship, /area/hallway/upper/primary/starboard) @@ -7716,7 +7677,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ anchored = 1; shield_range = 18; locked = 0; @@ -7947,13 +7908,7 @@ /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos/port_atmos) "fAC" = ( -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/carpet/ship/beige_carpet{ color = "#CC8899"; name = "nanoweave carpet (puce)" @@ -8047,7 +8002,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ req_access_txt = "24;10"; req_access = null; name = "Reactor shield generator"; @@ -10184,19 +10139,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/carpet/ship, /area/hallway/upper/primary/port) "hha" = ( @@ -11194,7 +11140,7 @@ }, /area/nsv/weapons/fore) "hVv" = ( -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ anchored = 1; locked = 0; req_access = null; @@ -12473,6 +12419,9 @@ /obj/item/pen{ pixel_x = -4 }, +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 + }, /turf/open/floor/circuit, /area/bridge/cic) "iOx" = ( @@ -12551,15 +12500,13 @@ /obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/machinery/door/firedoor/border_only/directional/west, +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 + }, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos/port_atmos) "iQn" = ( @@ -12728,13 +12675,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /obj/structure/cable{ icon_state = "0-8" }, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -12744,9 +12687,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/carpet/ship, /area/hallway/upper/primary/starboard) "iUO" = ( @@ -12756,6 +12697,9 @@ /obj/effect/turf_decal/tile/blue/flat_side{ dir = 4 }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay) "iVg" = ( @@ -14018,9 +13962,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only/directional/south, -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/machinery/door/firedoor/border_only/directional/north, +/obj/machinery/power/shieldwallgen/atmos{ + dir = 4 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engineering/reactor_control) "jSV" = ( @@ -14079,6 +14023,9 @@ /area/engine/armour_pump) "jVA" = ( /obj/item/radio/intercom/directional/south, +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 + }, /turf/open/floor/carpet/ship/beige_carpet{ color = "#CC8899"; name = "nanoweave carpet (puce)" @@ -14514,21 +14461,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/camera/autoname{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 }, /turf/open/floor/carpet/ship, /area/hallway/primary/starboard) @@ -15008,7 +14948,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ req_access_txt = "24;10"; req_access = null; name = "Reactor shield generator"; @@ -16360,7 +16300,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ req_access_txt = "24;10"; req_access = null; name = "Reactor shield generator"; @@ -16620,12 +16560,9 @@ /obj/machinery/atmospherics/components/binary/pump/layer4{ dir = 8 }, -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only/directional/west, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 8 }, @@ -16809,14 +16746,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/camera/autoname{ - dir = 5 - }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/structure/extinguisher_cabinet/west, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/power/shieldwallgen/atmos{ + dir = 4 }, /turf/open/floor/carpet/ship, /area/hallway/secondary/exit/departure_lounge) @@ -17436,6 +17368,9 @@ /obj/machinery/vending/wallmed{ pixel_y = -32 }, +/obj/machinery/camera/autoname{ + dir = 1 + }, /turf/open/floor/monotile/light, /area/medical/medbay) "myT" = ( @@ -18504,8 +18439,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -18523,7 +18456,9 @@ dir = 1; icon_state = "guideline_mid-s" }, -/obj/machinery/door/firedoor/border_only/directional/west, +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 + }, /turf/open/floor/carpet/ship, /area/hallway/nsv/deck1/frame2/port) "noU" = ( @@ -18780,6 +18715,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos/port_atmos) "nzq" = ( @@ -18821,7 +18759,7 @@ "nAV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ req_access_txt = "24;10"; req_access = null; name = "Reactor shield generator"; @@ -18915,6 +18853,9 @@ dir = 8 }, /obj/machinery/status_display/ai/north, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/carpet/ship, /area/hallway/upper/primary/port) "nFA" = ( @@ -18955,7 +18896,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ req_access_txt = "24;10"; req_access = null; name = "Reactor shield generator"; @@ -19395,16 +19336,11 @@ /turf/open/floor/carpet/ship/orange_carpet, /area/crew_quarters/heads/chief) "nYd" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/effect/turf_decal/tile/blue/flat_side{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/power/shieldwallgen/atmos{ + dir = 8 }, /turf/open/floor/monotile/light, /area/medical/medbay) @@ -20644,22 +20580,12 @@ /turf/open/floor/monotile/light, /area/medical/medbay) "oXR" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/power/shieldwallgen/atmos{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/border_only/directional/south, -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ - piping_layer = 5; - name = "layer5"; - dir = 1; - icon_state = "pipe11-5" +/obj/machinery/power/shieldwallgen/atmos{ + dir = 8 }, -/obj/machinery/door/firedoor/border_only/directional/north, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engineering/reactor_control) "oYc" = ( @@ -20905,13 +20831,6 @@ /area/engine/atmos/port_atmos) "phr" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /turf/open/floor/monotile/light, /area/medical/medbay) "phz" = ( @@ -21635,6 +21554,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet/north, +/obj/machinery/camera/autoname, /turf/open/floor/carpet/ship, /area/hallway/nsv/deck1/frame2/port) "pGM" = ( @@ -22608,15 +22528,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 }, /turf/open/floor/carpet/ship, /area/hallway/nsv/deck1/frame2/starboard) @@ -23251,12 +23167,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 }, /turf/open/floor/carpet/ship/beige_carpet{ color = "#CC8899"; @@ -23792,10 +23704,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/camera/autoname, -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/machinery/door/firedoor/border_only/directional/west, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/carpet/ship, /area/hallway/nsv/deck1/frame2/port) "ruv" = ( @@ -24253,7 +24162,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ req_access_txt = "24;10"; req_access = null; name = "Reactor shield generator"; @@ -25519,7 +25428,7 @@ }, /area/nsv/weapons/fore) "sPz" = ( -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ anchored = 1; locked = 0; req_access = null; @@ -26299,9 +26208,20 @@ /turf/open/floor/grass, /area/maintenance/fore/secondary) "tqm" = ( -/obj/structure/hull_plate, -/turf/open/floor/engine/airless, -/area/space/nearstation) +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 + }, +/turf/open/floor/carpet/ship/beige_carpet{ + color = "#CC8899"; + name = "nanoweave carpet (puce)" + }, +/area/nsv/weapons/fore) "tqy" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -27616,9 +27536,7 @@ /obj/structure/sign/plaques/atmos{ pixel_y = 30 }, -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/machinery/door/firedoor/border_only/directional/west, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos/port_atmos) "uuY" = ( @@ -27749,6 +27667,9 @@ /obj/effect/turf_decal/tile/blue/flat_side{ dir = 4 }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay) "uAu" = ( @@ -28407,10 +28328,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -28420,8 +28337,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 }, /turf/open/floor/carpet/ship, /area/hallway/upper/primary/starboard) @@ -28537,12 +28454,23 @@ /turf/open/floor/carpet/ship/purple_carpet, /area/science/lab) "vlF" = ( -/obj/machinery/door/firedoor/border_only/directional/north, -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/firedoor/border_only/directional/south, -/turf/open/floor/carpet/ship/orange_carpet, -/area/engine/engineering/reactor_control) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera/autoname{ + dir = 10 + }, +/turf/open/floor/carpet/ship, +/area/hallway/primary/starboard) "vmg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -28611,6 +28539,9 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/camera/autoname{ + dir = 5 + }, /turf/open/floor/carpet/ship, /area/hallway/secondary/exit/departure_lounge) "vpu" = ( @@ -28632,10 +28563,6 @@ icon_state = "4-8" }, /obj/machinery/computer/ship/viewscreen, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/effect/turf_decal/guideline/guideline_in/blue{ icon_state = "guideline_in-s" }, @@ -28650,9 +28577,7 @@ /obj/effect/turf_decal/guideline/guideline_mid/yellow{ icon_state = "guideline_mid-s" }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, +/obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/carpet/ship, /area/hallway/upper/primary/port) "vqf" = ( @@ -29834,23 +29759,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/light, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/ship/delivery/yellow, /obj/effect/turf_decal/tile/blue/flat_side, /obj/machinery/requests_console{ department = "Medical"; departmentType = 3; pixel_y = -34 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 + }, /turf/open/floor/monotile/light, /area/medical/medbay) "weM" = ( @@ -29918,7 +29838,7 @@ /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos/port_atmos) "wis" = ( -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ req_access_txt = "24;10"; req_access = null; name = "Reactor shield generator"; @@ -31783,9 +31703,9 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 8 }, -/obj/machinery/door/firedoor/border_only/directional/east, -/obj/effect/turf_decal/ship/delivery/yellow, -/obj/machinery/door/firedoor/border_only/directional/west, +/obj/machinery/power/shieldwallgen/atmos{ + dir = 1 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos/port_atmos) "xNv" = ( @@ -31989,7 +31909,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/shieldwallgen{ +/obj/machinery/power/shieldwallgen{ anchored = 1; shield_range = 18; locked = 0; @@ -41728,8 +41648,8 @@ nkk kuy yjs yjs -vlF yjs +oXR kBR jek lud @@ -44152,7 +44072,7 @@ bqV lsW oGW okV -oXR +oGW ncP bqV chj @@ -48004,7 +47924,7 @@ bSB bSB nqu dAE -ulp +vlF cxt iue jDD @@ -49375,7 +49295,7 @@ lfF qwl gNZ jng -tqm +lGb jfJ iKp bKw @@ -62927,9 +62847,9 @@ oLI oLI oLI vcm -tqm -tqm -tqm +lGb +lGb +lGb quY gCB ekx @@ -62945,9 +62865,9 @@ mQt fjk ers qzq -tqm -tqm -tqm +lGb +lGb +lGb bwd bwd mMr @@ -63129,9 +63049,9 @@ oLI oLI dqF vcm -tqm -tqm -tqm +lGb +lGb +lGb quY nef sTC @@ -63147,9 +63067,9 @@ muH oqI vik qzq -tqm -tqm -tqm +lGb +lGb +lGb bwd bwd xGT @@ -63331,9 +63251,9 @@ oLI oLI oLI vcm -tqm -tqm -tqm +lGb +lGb +lGb wuv wuv wuv @@ -63349,9 +63269,9 @@ qzq cst jwM qzq -tqm -tqm -tqm +lGb +lGb +lGb bwd bwd cNI @@ -63533,9 +63453,9 @@ oLI oLI vcm vcm -tqm -tqm -tqm +lGb +lGb +lGb wuv wuv wuv @@ -63551,9 +63471,9 @@ wuv wuv wuv wuv -tqm -tqm -tqm +lGb +lGb +lGb bwd bwd xqS @@ -63735,9 +63655,9 @@ oLI oLI vcm vcm -tqm -tqm -tqm +lGb +lGb +lGb wuv wuv qGr @@ -63753,9 +63673,9 @@ vLb skj wuv wuv -tqm -tqm -tqm +lGb +lGb +lGb bwd bwd eGs @@ -63927,7 +63847,7 @@ lfF lfF lfF rle -tqm +lGb vcm oLI oLI @@ -63937,9 +63857,9 @@ oLI oLI vcm jMR -tqm -tqm -tqm +lGb +lGb +lGb wuv cef aiP @@ -63955,10 +63875,10 @@ gfN aiP cef wuv -tqm -tqm -tqm -tqm +lGb +lGb +lGb +lGb bwd urG nHH @@ -64129,7 +64049,7 @@ lfF lfF lfF qwl -tqm +lGb vcm pGk oLI @@ -64138,10 +64058,10 @@ oLI oLI oLI vcm -tqm -tqm -tqm -tqm +lGb +lGb +lGb +lGb jMR cef xVa @@ -64157,10 +64077,10 @@ dpu fsL cef jMR -tqm -tqm -tqm -tqm +lGb +lGb +lGb +lGb bwd tga sbQ @@ -64340,11 +64260,11 @@ njV njV njV vcm -tqm -tqm -tqm -tqm -tqm +lGb +lGb +lGb +lGb +lGb cef ulY iVg @@ -64358,11 +64278,11 @@ hzw hzw kXt cef -tqm -tqm -tqm -tqm -tqm +lGb +lGb +lGb +lGb +lGb bwd iFO hUL @@ -64534,7 +64454,7 @@ lfF lfF lfF rle -tqm +lGb vcm njV njV @@ -64542,11 +64462,11 @@ njV njV njV vcm -tqm +lGb iTH iTH iTH -tqm +lGb cef cef cef @@ -64560,11 +64480,11 @@ cef cef cef cef -tqm +lGb iTH iTH iTH -tqm +lGb bwd wQk hUL @@ -64736,32 +64656,32 @@ ido lfF lfF rle -tqm +lGb tAD -tqm -tqm -tqm -tqm -tqm -tqm +lGb +lGb +lGb +lGb +lGb +lGb rzk lfF wEM wEM rle -tqm -tqm -tqm -tqm -tqm -tqm -tqm -tqm -tqm -tqm -tqm -tqm -tqm +lGb +lGb +lGb +lGb +lGb +lGb +lGb +lGb +lGb +lGb +lGb +lGb +lGb rzk wEM wEM @@ -64938,14 +64858,14 @@ lfF lfF lfF qwl -tqm -tqm -tqm -tqm -tqm -tqm -tqm -tqm +lGb +lGb +lGb +lGb +lGb +lGb +lGb +lGb rzk lfF iSP @@ -64972,7 +64892,7 @@ rle bwd dvV nUg -ncr +tqm bwd bwd qWw @@ -65141,13 +65061,13 @@ lfF lfF lfF rle -tqm +lGb skc -tqm -tqm -tqm +lGb +lGb +lGb fGN -tqm +lGb rzk lfF iSP @@ -65343,13 +65263,13 @@ lfF lfF lfF rle -tqm -tqm -tqm -tqm -tqm -tqm -tqm +lGb +lGb +lGb +lGb +lGb +lGb +lGb rzk lfF iSP @@ -65545,13 +65465,13 @@ lfF lfF lfF qwl -tqm -tqm -tqm -tqm -tqm -tqm -tqm +lGb +lGb +lGb +lGb +lGb +lGb +lGb mNh lfF lfF @@ -65748,10 +65668,10 @@ lfF lfF lfF rle -tqm -tqm -tqm -tqm +lGb +lGb +lGb +lGb lGb rzk lfF @@ -65950,11 +65870,11 @@ lfF lfF lfF rle -tqm -tqm -tqm -tqm -tqm +lGb +lGb +lGb +lGb +lGb rzk lfF lfF @@ -66152,11 +66072,11 @@ lfF lfF lfF qwl -tqm -tqm -tqm -tqm -tqm +lGb +lGb +lGb +lGb +lGb rzk lfF lfF @@ -66355,10 +66275,10 @@ lfF lfF lfF rle -tqm lGb lGb -tqm +lGb +lGb rzk lfF lfF @@ -66557,10 +66477,10 @@ lfF lfF lfF rle -tqm -tqm -tqm -tqm +lGb +lGb +lGb +lGb rzk lfF lfF @@ -66760,9 +66680,9 @@ lfF lfF qwl lGb -tqm -tqm -tqm +lGb +lGb +lGb rzk lfF lfF @@ -66962,9 +66882,9 @@ lfF lfF lfF rle -tqm -tqm -tqm +lGb +lGb +lGb rzk lfF lfF @@ -67164,9 +67084,9 @@ lfF ido lfF rle -tqm -tqm -tqm +lGb +lGb +lGb rzk lfF lfF @@ -67366,8 +67286,8 @@ lfF lfF lfF rle -tqm -tqm +lGb +lGb lGb rzk lfF diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 611bf3f1758..dbd92b2a4c5 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -64,6 +64,7 @@ flags_1 = CAN_BE_DIRTY_1 var/list/firedoors + var/list/atmosshields var/list/cameras var/list/firealarms var/firedoors_last_closed_on = 0 @@ -369,6 +370,25 @@ GLOBAL_LIST_EMPTY(teleportlocs) else if(!(D.density ^ opening)) INVOKE_ASYNC(D, (opening ? TYPE_PROC_REF(/obj/machinery/door/firedoor, open) : TYPE_PROC_REF(/obj/machinery/door/, close))) +/area/proc/ModifyAtmosshields(opening) + if(atmosshields) + for(var/obj/machinery/power/shieldwallgen/atmos/eachshield in atmosshields) + if(opening) + for(var/b in eachshield.affecting_areas) + var/area/area2 = b + if(area2.fire) + break + if(eachshield.power) + if(opening && eachshield.shieldstate > 0) + INVOKE_ASYNC(eachshield.toggle()) + else if(eachshield.power && eachshield.shieldstate == 0) + INVOKE_ASYNC(eachshield.toggle()) + +/area/proc/shieldsup() + for(var/obj/machinery/power/shieldwallgen/atmos/shield in atmosshields) + shield.rapidsetup() + shield.breachalert = TRUE + /** * Generate an firealarm alert for this area * @@ -383,6 +403,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) if (!fire) set_fire_alarm_effect() ModifyFiredoors(FALSE) + ModifyAtmosshields(FALSE) START_PROCESSING(SSobj, src) for(var/item in firealarms) var/obj/machinery/firealarm/F = item @@ -413,6 +434,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) if (fire) unset_fire_alarm_effects() ModifyFiredoors(TRUE) + ModifyAtmosshields(TRUE) STOP_PROCESSING(SSobj, src) for(var/item in firealarms) var/obj/machinery/firealarm/F = item @@ -449,6 +471,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) /area/process() if(firedoors_last_closed_on + 100 < world.time) //every 10 seconds ModifyFiredoors(FALSE) + ModifyAtmosshields(FALSE) /** * Close and lock a door passed into this proc diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 0effaaf6b90..5d8b9aa7e6a 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -291,3 +291,18 @@ icon_state = "button" result_path = /obj/machinery/button materials = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT) + +//NSV EDIT START -beestation port lol + + +/obj/machinery/button/shieldwallgen + name = "Atmospheric barrier switch" + desc = "A remote switch for a barrier generator" + icon_state = "launcher" + skin = "launcher" + device_type = /obj/item/assembly/control/shieldwallgen + req_access = list() + id = 1 + +/obj/machinery/button/shieldwallgen/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + id = "[REF(port)][id]" diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 583cd90848c..a0775639279 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -5,7 +5,7 @@ icon_state = "shield-old" density = TRUE move_resist = INFINITY - opacity = 0 + opacity = FALSE anchored = TRUE resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF max_integrity = 200 //The shield can only take so much beating (prevents perma-prisons) @@ -14,10 +14,10 @@ /obj/structure/emergency_shield/Initialize(mapload) . = ..() setDir(pick(GLOB.cardinals)) - air_update_turf() + air_update_turf(1) /obj/structure/emergency_shield/Destroy() - air_update_turf() + air_update_turf(1) . = ..() /obj/structure/emergency_shield/Move() @@ -42,7 +42,7 @@ if(BRUTE) playsound(loc, 'sound/effects/empulse.ogg', 75, 1) -/obj/structure/emergency_shield/take_damage(damage, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) +/obj/structure/emergency_shield/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() if(.) //damage was dealt new /obj/effect/temp_visual/impact_effect/ion(loc) @@ -74,7 +74,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "shieldoff" density = TRUE - opacity = 0 + opacity = FALSE anchored = FALSE pressure_resistance = 2*ONE_ATMOSPHERE req_access = list(ACCESS_ENGINE) @@ -84,6 +84,7 @@ var/locked = FALSE var/shield_range = 4 + /obj/machinery/shieldgen/Initialize(mapload) . = ..() deployed_shields = list() @@ -202,166 +203,249 @@ return ..() /obj/machinery/shieldgen/emag_act(mob/user) + ..() if(obj_flags & EMAGGED) to_chat(user, "The access controller is damaged!") return obj_flags |= EMAGGED locked = FALSE - playsound(src, "sparks", 100, 1) + playsound(src, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) to_chat(user, "You short out the access controller.") -/obj/machinery/shieldgen/update_icon() - if(active) - icon_state = (machine_stat & BROKEN) ? "shieldonbr":"shieldon" - else - icon_state = (machine_stat & BROKEN) ? "shieldoffbr":"shieldoff" +/obj/machinery/shieldgen/update_icon_state() + icon_state = "shield[active ? "on" : "off"][(machine_stat & BROKEN) ? "br" : null]" + return ..() + -#define ACTIVE_SETUPFIELDS 1 -#define ACTIVE_HASFIELDS 2 -/obj/machinery/shieldwallgen +#define SHIELD_NOTACTIVE 0 +#define SHIELD_SETUPFIELDS 1 +#define SHIELD_HASFIELDS 2 +#define SHIELD_MIN_POWER 75 + +/obj/machinery/power/shieldwallgen name = "shield wall generator" desc = "A shield generator." icon = 'icons/obj/stationobjs.dmi' - icon_state = "Shield_Gen" + icon_state = "shield_wall_gen" anchored = FALSE density = TRUE req_access = list(ACCESS_TELEPORTER) flags_1 = CONDUCT_1 use_power = NO_POWER_USE - max_integrity = 300 - var/active = FALSE + idle_power_usage = 10 + active_power_usage = 50 var/power = 0 var/maximum_stored_power = 500 + circuit = /obj/item/circuitboard/machine/shieldwallgen + max_integrity = 300 + var/shieldstate = SHIELD_NOTACTIVE + var/id = null var/locked = TRUE var/shield_range = 8 - var/obj/structure/cable/attached // the attached cable - -/obj/machinery/shieldwallgen/Initialize(mapload) + var/shocked = FALSE + var/list/affecting_areas + var/fields = 0 + var/hardshielded = TRUE + var/cabled = 1 + var/shieldwall_cost = 50 + +/obj/machinery/power/shieldwallgen/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, PROC_REF(block_singularity_if_active)) + if(hardshielded == TRUE) + RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, PROC_REF(block_singularity_if_active)) -/obj/machinery/shieldwallgen/xenobiologyaccess //use in xenobiology containment +/obj/machinery/power/shieldwallgen/xenobiologyaccess //use in xenobiology containment name = "xenobiology shield wall generator" desc = "A shield generator meant for use in xenobiology." - icon_state = "Shield_Gen" req_access = list(ACCESS_XENOBIOLOGY) -/obj/machinery/shieldwallgen/Destroy() - for(var/d in GLOB.cardinals) - cleanup_field(d) +/obj/machinery/power/shieldwallgen/anchored + anchored = TRUE + +/obj/machinery/power/shieldwallgen/Initialize(mapload) + . = ..() + wires = new /datum/wires/shieldwallgen(src) + if(anchored) + connect_to_network() + CalculateAffectingAreas() + UpdateAdjacencyFlags() + +/obj/machinery/power/shieldwallgen/Destroy() + for(var/direction in GLOB.cardinals) + cleanup_field(direction) + remove_from_areas() + QDEL_NULL(wires) return ..() -/obj/machinery/shieldwallgen/proc/power() +//obj/machinery/power/shieldwallgen/should_have_node() +// return anchored + +/obj/machinery/power/shieldwallgen/connect_to_network() if(!anchored) - power = 0 - return - var/turf/T = get_turf(src) + return FALSE + . = ..() - var/obj/structure/cable/C = T.get_cable_node() - var/datum/powernet/PN - if(C) - PN = C.powernet //find the powernet of the connected cable +/obj/machinery/power/shieldwallgen/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + id = "[REF(port)][id]" - if(!PN) - return +/obj/machinery/power/shieldwallgen/proc/power() - var/surplus = max(PN.avail - PN.load, 0) - var/avail_power = min(rand(50,200), surplus) - if(avail_power) - power += avail_power - PN.load += avail_power //uses powernet power. + if(cabled) + if(!anchored) + return + if(!powernet) + return + var/surplus = max(powernet.avail - powernet.load, 0) + var/avail_power = min(rand(50,200), surplus) + if(avail_power) + power += avail_power + else + use_power(active_power_usage, AREA_USAGE_ENVIRON) + power += active_power_usage+shieldwall_cost*(shield_range) -/obj/machinery/shieldwallgen/process() +/obj/machinery/power/shieldwallgen/proc/use_stored_power(amount) + power = CLAMP(power - amount, -50, maximum_stored_power) + +/obj/machinery/power/shieldwallgen/process() power() - use_stored_power(50) - -/obj/machinery/shieldwallgen/proc/use_stored_power(amount) - power = CLAMP(power - amount, 0, maximum_stored_power) - update_activity() - -/obj/machinery/shieldwallgen/proc/update_activity() - if(active) - icon_state = "Shield_Gen +a" - if(active == ACTIVE_SETUPFIELDS) - var/fields = 0 - for(var/d in GLOB.cardinals) - if(setup_field(d)) + if(shieldstate) + if(shieldstate == SHIELD_SETUPFIELDS) + fields = 0 + for(var/direction in GLOB.cardinals) + if(setup_field(direction)) fields++ if(fields) - active = ACTIVE_HASFIELDS - if(!power) - visible_message("The [src.name] shuts down due to lack of power!", \ - "You hear heavy droning fade out.") - icon_state = "Shield_Gen" - active = FALSE - for(var/d in GLOB.cardinals) - cleanup_field(d) + shieldstate = SHIELD_HASFIELDS + if(power >= SHIELD_MIN_POWER) + use_stored_power(active_power_usage) + else + visible_message("The [src.name] shuts down due to lack of power!", blind_message = "You hear heavy droning fade out.") + shieldstate = SHIELD_NOTACTIVE + log_game("[src] deactivated due to lack of power at [AREACOORD(src)]") + for(var/direction in GLOB.cardinals) + cleanup_field(direction) else - icon_state = "Shield_Gen" - for(var/d in GLOB.cardinals) - cleanup_field(d) + for(var/direction in GLOB.cardinals) + cleanup_field(direction) + update_appearance() -/obj/machinery/shieldwallgen/proc/setup_field(direction) + + + +/obj/machinery/power/shieldwallgen/proc/rapidsetup() + if(power && !shieldstate) + for(var/direction in GLOB.cardinals) + setup_field(direction) + fields++ + if(fields) + shieldstate = SHIELD_HASFIELDS + else + shieldstate = FALSE + +/obj/machinery/power/shieldwallgen/update_icon_state() + if(shieldstate) + icon_state = initial(icon_state) + "_on" + else + icon_state = initial(icon_state) + return ..() + +/obj/machinery/power/shieldwallgen/update_overlays() + . = ..() + if((machine_stat & MAINT) || panel_open) + . += initial(icon_state)+"-maint" + +/// Constructs the actual field walls in the specified direction, cleans up old/stuck shields before doing so +/obj/machinery/power/shieldwallgen/proc/setup_field(direction) if(!direction) return - var/turf/T = loc - var/obj/machinery/shieldwallgen/G + var/turf/turf = loc + var/obj/machinery/power/shieldwallgen/generator var/steps = 0 var/opposite_direction = turn(direction, 180) for(var/i in 1 to shield_range) //checks out to 8 tiles away for another generator - T = get_step(T, direction) - G = (locate(/obj/machinery/shieldwallgen) in T) - if(G) - if(!G.active) + turf = get_step(turf, direction) + generator = locate(/obj/machinery/power/shieldwallgen) in turf + if(generator) + if(!generator.shieldstate) return - G.cleanup_field(opposite_direction) + generator.cleanup_field(opposite_direction) break else steps++ - if(!G || !steps) //no shield gen or no tiles between us and the gen + if(!generator || !steps) //no shield gen or no tiles between us and the gen return for(var/i in 1 to steps) //creates each field tile - T = get_step(T, opposite_direction) - new/obj/machinery/shieldwall(T, src, G) + turf = get_step(turf, opposite_direction) + new/obj/machinery/shieldwall(turf, src, generator) return TRUE -/obj/machinery/shieldwallgen/proc/cleanup_field(direction) - var/obj/machinery/shieldwall/F - var/obj/machinery/shieldwallgen/G - var/turf/T = loc +/// cleans up fields in the specified direction if they belong to this generator +/obj/machinery/power/shieldwallgen/proc/cleanup_field(direction) + var/obj/machinery/shieldwall/field + var/obj/machinery/power/shieldwallgen/generator + var/turf/turf = loc for(var/i in 1 to shield_range) - T = get_step(T, direction) + turf = get_step(turf, direction) - G = (locate(/obj/machinery/shieldwallgen) in T) - if(G && !G.active) + generator = (locate(/obj/machinery/power/shieldwallgen) in turf) + if(generator && !generator.shieldstate) break - F = (locate(/obj/machinery/shieldwall) in T) - if(F && (F.gen_primary == src || F.gen_secondary == src)) //it's ours, kill it. - qdel(F) + field = (locate(/obj/machinery/shieldwall) in turf) + if(field && (field.gen_primary == src || field.gen_secondary == src)) //it's ours, kill it. + qdel(field) -/obj/machinery/shieldwallgen/proc/block_singularity_if_active() +/obj/machinery/power/shieldwallgen/proc/block_singularity_if_active() SIGNAL_HANDLER - if(active) + if(shieldstate) return SINGULARITY_TRY_MOVE_BLOCK -/obj/machinery/shieldwallgen/can_be_unfasten_wrench(mob/user, silent) - if(active) +/obj/machinery/power/shieldwallgen/can_be_unfasten_wrench(mob/user, silent) + if(shieldstate) if(!silent) to_chat(user, "Turn off the shield generator first!") return FAILED_UNFASTEN return ..() -/obj/machinery/shieldwallgen/attackby(obj/item/W, mob/user, params) - if(W.tool_behaviour == TOOL_WRENCH) - default_unfasten_wrench(user, W, 0) +/obj/machinery/power/shieldwallgen/wrench_act(mob/living/user, obj/item/item) + . = ..() + . |= default_unfasten_wrench(user, item, 0) +// update_cable_icons_on_turf(T) - Removed because smartwire Revert + if(. == SUCCESSFUL_UNFASTEN && anchored) + connect_to_network() + +/obj/machinery/power/shieldwallgen/setAnchored(anchorvalue) + .=..() + if(anchorvalue == 0) + remove_from_areas() + CalculateAffectingAreas() + UpdateAdjacencyFlags() + +/obj/machinery/power/shieldwallgen/attackby(obj/item/item, mob/user, params) + if(default_deconstruction_screwdriver(user, icon_state, icon_state, item)) + update_appearance() + updateUsrDialog() + return TRUE + + if(default_deconstruction_crowbar(item)) + return TRUE + + if(panel_open && is_wire_tool(item)) + wires.interact(user) + return TRUE + + if(user.a_intent == INTENT_HARM) //so we can hit the machine + return ..() - else if(W.GetID()) + if(machine_stat) + return TRUE + + if(item.GetID()) if(allowed(user) && !(obj_flags & EMAGGED)) locked = !locked to_chat(user, "You [src.locked ? "lock" : "unlock"] the controls.") @@ -374,35 +458,49 @@ add_fingerprint(user) return ..() -/obj/machinery/shieldwallgen/interact(mob/user) +/obj/machinery/power/shieldwallgen/interact(mob/user) . = ..() if(.) return + if(shocked && !(machine_stat & NOPOWER)) + shock(user,50) + return if(!anchored) to_chat(user, "\The [src] needs to be firmly secured to the floor first!") return if(locked && !issilicon(user)) to_chat(user, "The controls are locked!") return - if(!power) + if(!powernet) to_chat(user, "\The [src] needs to be powered by a wire!") return - - if(active) - user.visible_message("[user] turned \the [src] off.", \ - "You turn off \the [src].", \ - "You hear heavy droning fade out.") - active = FALSE - update_activity() + if(shieldstate) + visible_message("The [src.name] shuts down due to lack of power!", blind_message = "You hear heavy droning fade out.") + shieldstate = SHIELD_NOTACTIVE else user.visible_message("[user] turned \the [src] on.", \ "You turn on \the [src].", \ "You hear heavy droning.") - active = ACTIVE_SETUPFIELDS - update_activity() + shieldstate = SHIELD_SETUPFIELDS add_fingerprint(user) -/obj/machinery/shieldwallgen/emag_act(mob/user) +/obj/machinery/power/shieldwallgen/proc/toggle() + if(!anchored) + return + if(!powernet) + return + if(shieldstate) + visible_message("The [src.name] shuts down due to lack of power!", blind_message = "You hear heavy droning fade out.") + playsound(src, 'sound/machines/synth_no.ogg', 50, TRUE, frequency = 6120) + shieldstate = SHIELD_NOTACTIVE + log_game("[src] was deactivated by toggle at [AREACOORD(src)]") + else + visible_message("The [src.name] beeps as it powers up.", blind_message = "You hear heavy droning.") + shieldstate = SHIELD_SETUPFIELDS + log_game("[src] was activated by toggle at [AREACOORD(src)]") + +/obj/machinery/power/shieldwallgen/emag_act(mob/user) + ..() if(obj_flags & EMAGGED) to_chat(user, "The access controller is damaged!") return @@ -411,6 +509,152 @@ playsound(src, "sparks", 100, 1) to_chat(user, "You short out the access controller.") +/obj/machinery/power/shieldwallgen/proc/shock(mob/user, prb) + if(machine_stat & (BROKEN|NOPOWER)) // unpowered, no shock + return FALSE + if(!prob(prb)) + return FALSE + var/datum/effect_system/spark_spread/spark = new /datum/effect_system/spark_spread + spark.set_up(5, 1, src) + spark.start() + if (electrocute_mob(user, get_area(src), src, 0.7, TRUE)) + return TRUE + else + return FALSE + +/obj/machinery/power/shieldwallgen/proc/reset(wire) + switch(wire) + if(WIRE_SHOCK) + if(!wires.is_cut(wire)) + shocked = FALSE + +/obj/machinery/power/shieldwallgen/proc/CalculateAffectingAreas() + remove_from_areas() + affecting_areas = get_adjacent_open_areas(src) | get_area(src) + for(var/I in affecting_areas) + var/area/A = I + LAZYADD(A.atmosshields, src) + +/obj/machinery/power/shieldwallgen/proc/UpdateAdjacencyFlags() + var/turf/T = get_turf(src) + var/turf/turf = loc + for(var/direction in GLOB.cardinals) + for(var/i in 1 to shield_range) + turf = get_step(turf, direction) + for(var/t in T.atmos_adjacent_turfs & turf.atmos_adjacent_turfs) + var/turf/open/T2 = t + if(T2 in T.atmos_adjacent_turfs) + T.atmos_adjacent_turfs[T2] |= ATMOS_ADJACENT_FIRELOCK + if(T in T2.atmos_adjacent_turfs) + T2.atmos_adjacent_turfs[T] |= ATMOS_ADJACENT_FIRELOCK + +/obj/machinery/power/shieldwallgen/proc/remove_from_areas() + if(affecting_areas) + for(var/I in affecting_areas) + var/area/A = I + LAZYREMOVE(A.atmosshields, src) + +/obj/machinery/power/shieldwallgen/atmos + name = "atmospheric barrier generator" + desc = "A barrier generator designed for use in ship loading bays." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "shield_wall_gen_atmos" + circuit = /obj/item/circuitboard/machine/shieldwallgen/atmos + anchored = FALSE + density = FALSE + req_access = list(ACCESS_ATMOSPHERICS) + locked = TRUE + cabled = 0 + shield_range = 10 + var/breachalert = FALSE + layer = WALL_OBJ_LAYER + hardshielded = FALSE + power = 3000 + maximum_stored_power = 3000 + shieldwall_cost = 100 + + + +/obj/machinery/power/shieldwallgen/atmos/roundstart + anchored = TRUE + shieldstate = SHIELD_SETUPFIELDS + +/obj/machinery/power/shieldwallgen/atmos/strong //these are for ruins and large hangars, try to not use them on ships + name = "high power atmospheric barrier generator" + desc = "A barrier generator designed for use in hangar bays." + circuit = /obj/item/circuitboard/machine/shieldwallgen/atmos/strong + shield_range = 20 + maximum_stored_power = 50000 + active_power_usage = 5000 + +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart + anchored = TRUE + shieldstate = SHIELD_SETUPFIELDS + +/obj/machinery/power/shieldwallgen/ruin + anchored = TRUE + shieldstate = SHIELD_SETUPFIELDS + active_power_usage = 0 + +/obj/machinery/power/shieldwallgen/atmos/ComponentInitialize() + . = ..() + AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, PROC_REF(can_be_rotated))) + +/obj/machinery/power/shieldwallgen/atmos/proc/can_be_rotated(mob/user, rotation_type) + if (anchored) + to_chat(user, "It is fastened to the floor!") + return FALSE + return TRUE + +/// Same as in the normal shieldwallgen, but with the shieldwalls replaced with atmos shieldwalls +/obj/machinery/power/shieldwallgen/atmos/setup_field(direction) + if(!direction) + return + if(direction != dir) + return + + var/turf/turf = loc + var/obj/machinery/power/shieldwallgen/generator + var/steps = 0 + var/opposite_direction = turn(direction, 180) + + for(var/i in 1 to shield_range) //checks out to 10 tiles away for another generator + turf = get_step(turf, direction) + generator = locate(/obj/machinery/power/shieldwallgen/atmos) in turf + if(generator) + if(!generator.shieldstate) + return + generator.cleanup_field(opposite_direction) + break + else + steps++ + + if(!generator) //no shield gen, generators are allowed to function adjacent to eachother + return + + for(var/i in 1 to steps+2) //creates each field tile + new /obj/machinery/shieldwall/atmos(turf, src, generator) + turf = get_step(turf, opposite_direction) + return TRUE + +/obj/machinery/power/shieldwallgen/atmos/cleanup_field(direction) + var/obj/machinery/shieldwall/field + var/obj/machinery/power/shieldwallgen/generator + var/turf/turf = loc + + for(var/i in 1 to shield_range+1) + + generator = (locate(/obj/machinery/power/shieldwallgen) in turf) + if(generator && !generator.shieldstate) + break + + field = (locate(/obj/machinery/shieldwall) in turf) + if(field && (field.gen_primary == src || field.gen_secondary == src)) //it's ours, kill it. + qdel(field) + + turf = get_step(turf, direction) + + //////////////Containment Field START /obj/machinery/shieldwall name = "shield wall" @@ -421,20 +665,39 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF light_range = 3 var/needs_power = FALSE - var/obj/machinery/shieldwallgen/gen_primary - var/obj/machinery/shieldwallgen/gen_secondary + var/hardshield = TRUE + var/obj/machinery/power/shieldwallgen/gen_primary + var/obj/machinery/power/shieldwallgen/gen_secondary + +//atmos blocking shieldwalls for shiptest use +/obj/machinery/shieldwall/atmos + name = "atmospheric barrier" + desc = "An energy shield capable of blocking gas movement." + icon = 'nsv13/icons/obj/smooth_structures/atmosshield.dmi' + icon_state = "atmosshield-3" + density = FALSE + use_power = NO_POWER_USE + CanAtmosPass = ATMOS_PASS_NO + CanAtmosPassVertical = 0 + hardshield = FALSE + layer = ABOVE_MOB_LAYER + light_color = "#61a3ff" + light_system = MOVABLE_LIGHT //for instant visual feedback regardless of lag -/obj/machinery/shieldwall/Initialize(mapload, obj/machinery/shieldwallgen/first_gen, obj/machinery/shieldwallgen/second_gen) + +/obj/machinery/shieldwall/Initialize(mapload, obj/machinery/power/shieldwallgen/first_gen, obj/machinery/power/shieldwallgen/second_gen) . = ..() gen_primary = first_gen gen_secondary = second_gen if(gen_primary && gen_secondary) needs_power = TRUE setDir(get_dir(gen_primary, gen_secondary)) - for(var/mob/living/L in get_turf(src)) - visible_message("\The [src] is suddenly occupying the same space as \the [L]!") - L.gib() - RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, PROC_REF(block_singularity)) + if(hardshield == TRUE) + for(var/mob/living/victim in get_turf(src)) + visible_message("\The [src] is suddenly occupying the same space as \the [victim]!") + victim.investigate_log("has been gibbed by [src].", ADMIN_INVESTIGATE_TARGET) + victim.gib() + RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, PROC_REF(block_singularity)) /obj/machinery/shieldwall/Destroy() gen_primary = null @@ -443,25 +706,26 @@ /obj/machinery/shieldwall/process() if(needs_power) - if(!gen_primary || !gen_primary.active || !gen_secondary || !gen_secondary.active) + if(!gen_primary || !gen_primary.shieldstate || !gen_secondary || !gen_secondary.shieldstate) qdel(src) return - drain_power(10) + drain_power(gen_primary.shieldwall_cost) /obj/machinery/shieldwall/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BURN) - playsound(loc, 'sound/effects/empulse.ogg', 75, 1) + playsound(loc, 'sound/effects/empulse.ogg', 75, TRUE) if(BRUTE) - playsound(loc, 'sound/effects/empulse.ogg', 75, 1) + playsound(loc, 'sound/effects/empulse.ogg', 75, TRUE) //the shield wall is immune to damage but it drains the stored power of the generators. -/obj/machinery/shieldwall/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) +/obj/machinery/shieldwall/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() if(damage_type == BRUTE || damage_type == BURN) drain_power(damage_amount) +/// succs power from the connected shield wall generator /obj/machinery/shieldwall/proc/drain_power(drain_amount) if(needs_power && gen_primary) gen_primary.use_stored_power(drain_amount*0.5) @@ -470,12 +734,121 @@ /obj/machinery/shieldwall/proc/block_singularity() SIGNAL_HANDLER - return SINGULARITY_TRY_MOVE_BLOCK + if(hardshield) + return SINGULARITY_TRY_MOVE_BLOCK + + + /obj/machinery/shieldwall/CanAllowThrough(atom/movable/mover, turf/target) . = ..() - if(istype(mover) && (mover.pass_flags & PASSGLASS)) - return prob(20) + if(hardshield == TRUE) + if(istype(mover) && (mover.pass_flags & PASSGLASS)) + return prob(20) + else + if(istype(mover, /obj/item/projectile)) + return prob(10) + + + + +/obj/machinery/shieldwall/atmos/Initialize(mapload) + . = ..() + air_update_turf(TRUE) + +/obj/machinery/power/shieldwallgen/atmos/toggle() + if(!anchored) + return + if(power <= SHIELD_MIN_POWER) + return + if(shieldstate) + visible_message("The [src.name] shuts down due to lack of power!", blind_message = "You hear heavy droning fade out.") + playsound(src, 'sound/machines/synth_no.ogg', 50, TRUE, frequency = 6120) + shieldstate = SHIELD_NOTACTIVE + breachalert = FALSE + log_game("[src] was deactivated by toggle at [AREACOORD(src)]") + else + visible_message("The [src.name] beeps as it powers up.", blind_message = "You hear heavy droning.") + shieldstate = SHIELD_SETUPFIELDS + breachalert = TRUE + log_game("[src] was activated by toggle at [AREACOORD(src)]") + +/obj/machinery/power/shieldwallgen/atmos/process() + power() + if(breachalert) + rapidsetup() + if(shieldstate) + if(shieldstate == SHIELD_SETUPFIELDS) + fields = 0 + for(var/direction in GLOB.cardinals) + if(setup_field(direction)) + fields++ + if(fields) + shieldstate = SHIELD_HASFIELDS + if(is_operational && power >= SHIELD_MIN_POWER) //I'm in the dark about this. my brain no work + use_stored_power(active_power_usage) + if(power <= SHIELD_MIN_POWER) + visible_message("The [src.name] shuts down due to lack of power!", blind_message = "You hear heavy droning fade out.") + shieldstate = SHIELD_NOTACTIVE + log_game("[src] deactivated due to lack of power at [AREACOORD(src)]") + for(var/direction in GLOB.cardinals) + cleanup_field(direction) + else + for(var/direction in GLOB.cardinals) + cleanup_field(direction) + update_appearance() + +/obj/machinery/power/shieldwallgen/atmos/interact(mob/user) + add_fingerprint(user) + if(shocked && !(machine_stat & NOPOWER)) + shock(user,50) + return + if(!anchored) + to_chat(user, "\The [src] needs to be firmly secured to the floor first!") + return + if(locked && !issiliconoradminghost(user)) + to_chat(user, "The controls are locked!") + return + if(!is_operational) + to_chat(user, "\The [src] needs to be powered!") + return + if(power <= SHIELD_MIN_POWER) + to_chat(user, "\The [src] is completely depleted!") + return + if(shieldstate) + visible_message("The [src.name] shuts down due to lack of power!", blind_message = "You hear heavy droning fade out.") + shieldstate = SHIELD_NOTACTIVE else - if(istype(mover, /obj/item/projectile)) - return prob(10) + user.visible_message("[user] turned \the [src] on.", \ + "You turn on \the [src].", \ + "You hear heavy droning.") + shieldstate = SHIELD_SETUPFIELDS + breachalert = TRUE + add_fingerprint(user) + +/obj/machinery/power/shieldwallgen/atmos/power_change() + if(powered(power_channel)) + set_machine_stat(machine_stat & ~NOPOWER) + INVOKE_ASYNC(src, PROC_REF(latetoggle)) + else + set_machine_stat(machine_stat | NOPOWER) + + +/obj/machinery/power/shieldwallgen/atmos/proc/latetoggle() + if(!power || !breachalert) + return + else + rapidsetup() + +/obj/machinery/shieldwall/atmos/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) + . = ..() + if(damage_type == BRUTE || damage_type == BURN) + drain_power(damage_amount*2500) + +/obj/machinery/power/shieldwallgen/atmos/use_stored_power(amount) + power = CLAMP(power - amount, -maximum_stored_power, maximum_stored_power) + +#undef SHIELD_NOTACTIVE +#undef SHIELD_SETUPFIELDS +#undef SHIELD_HASFIELDS +#undef SHIELD_MIN_POWER diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 1805fdd016a..fa343eb6baf 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -398,6 +398,36 @@ . = ..() . += "It is set to layer [pipe_layer]." + +//NSV EDIT +/obj/item/circuitboard/machine/shieldwallgen + name = "Shieldwall Generator (Machine Board)" + icon_state = "engineering" + build_path = /obj/machinery/power/shieldwallgen + req_components = list( + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/micro_laser = 2, + /obj/item/stack/sheet/plasmaglass = 1, + /obj/item/stack/cable_coil = 5 + ) + needs_anchored = FALSE + +/obj/item/circuitboard/machine/shieldwallgen/atmos + name = "Atmospheric Holofield Generator (Machine Board)" + build_path = /obj/machinery/power/shieldwallgen/atmos + +/obj/item/circuitboard/machine/shieldwallgen/atmos/strong + name = "High Power Atmospheric Holofield Generator (Machine Board)" + build_path = /obj/machinery/power/shieldwallgen/atmos/strong + req_components = list( + /obj/item/stock_parts/manipulator/nano = 2, + /obj/item/stock_parts/micro_laser/high = 2, + /obj/item/stock_parts/capacitor/adv = 2, + /obj/item/stack/sheet/plasmaglass = 1, + /obj/item/stack/cable_coil = 5, + ) + +//NSV EDIT //Generic diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm index cefcbcb860e..253899f0db8 100644 --- a/code/modules/antagonists/swarmer/swarmer.dm +++ b/code/modules/antagonists/swarmer/swarmer.dm @@ -429,7 +429,7 @@ to_chat(S, "This object does not contain solid matter. Aborting.") return FALSE -/obj/machinery/shieldwallgen/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) +/obj/machinery/power/shieldwallgen/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) //nsv edit to_chat(S, "Destroying this object would have an unpredictable effect on structure integrity. Aborting.") return FALSE diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm index 08c7dabcf3f..c61274386e6 100644 --- a/code/modules/assembly/doorcontrol.dm +++ b/code/modules/assembly/doorcontrol.dm @@ -146,3 +146,20 @@ C.cremate(usr) addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 50) + +/obj/item/assembly/control/shieldwallgen + name = "atmospheric barrier controller" + desc = "A small device used to remotely operate barrier generators." + +/obj/item/assembly/control/shieldwallgen/activate() + if(cooldown) + return + cooldown = TRUE + for(var/obj/machinery/power/shieldwallgen/machine in GLOB.machines) + if(machine.id == src.id) + INVOKE_ASYNC(machine, TYPE_PROC_REF(/obj/machinery/power/shieldwallgen, toggle)) + + addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 20) + +/obj/item/assembly/control/shieldwallgen/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + id = "[REF(port)][id]" diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm index 3e432cb01c7..bb191e53a89 100644 --- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm +++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm @@ -203,6 +203,12 @@ FD.emergency_pressure_stop() for(var/obj/machinery/door/firedoor/FD in src) FD.emergency_pressure_stop() + var/area/A = get_area(src) + A.shieldsup() + var/area/A2 = get_area(T2) + A2.shieldsup() + + /turf/proc/handle_decompression_floor_rip() /turf/open/floor/handle_decompression_floor_rip(sum) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index ca3bead749e..8c0411a5f1b 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1798,10 +1798,10 @@ desc = "These high powered Shield Wall Generators are guaranteed to keep any unwanted lifeforms on the outside, where they belong! Contains four shield wall generators. Requires Teleporter access to open." cost = 1700 access = ACCESS_TELEPORTER - contains = list(/obj/machinery/shieldwallgen, - /obj/machinery/shieldwallgen, - /obj/machinery/shieldwallgen, - /obj/machinery/shieldwallgen) + contains = list(/obj/machinery/power/shieldwallgen, + /obj/machinery/power/shieldwallgen, + /obj/machinery/power/shieldwallgen, + /obj/machinery/power/shieldwallgen) crate_name = "shield generators crate" crate_type = /obj/structure/closet/crate/secure/science diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 2f381bcfd2a..fd634b35ca1 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -308,9 +308,9 @@ var/obj/machinery/field/generator/G = locate(/obj/machinery/field/generator) in T if(G?.active) return 0 - else if(locate(/obj/machinery/shieldwallgen) in T) - var/obj/machinery/shieldwallgen/S = locate(/obj/machinery/shieldwallgen) in T - if(S?.active) + else if(locate(/obj/machinery/power/shieldwallgen) in T) + var/obj/machinery/power/shieldwallgen/S = locate(/obj/machinery/power/shieldwallgen) in T + if(S?.shieldstate) return 0 return 1 diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 132a26849bc..2a8443722e3 100644 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/nsv13.dme b/nsv13.dme index fa0b30da307..000c996a9fa 100644 --- a/nsv13.dme +++ b/nsv13.dme @@ -3752,6 +3752,7 @@ #include "nsv13\code\datums\mood_events\nsv_events.dm" #include "nsv13\code\datums\traits\negative.dm" #include "nsv13\code\datums\traits\neutral.dm" +#include "nsv13\code\datums\wires\shieldwallgen.dm" #include "nsv13\code\game\atoms_movable.dm" #include "nsv13\code\game\sound.dm" #include "nsv13\code\game\area\aetherwhisp.dm" diff --git a/nsv13/code/datums/wires/shieldwallgen.dm b/nsv13/code/datums/wires/shieldwallgen.dm new file mode 100644 index 00000000000..72abb51171f --- /dev/null +++ b/nsv13/code/datums/wires/shieldwallgen.dm @@ -0,0 +1,46 @@ +/datum/wires/shieldwallgen + holder_type = /obj/machinery/power/shieldwallgen + proper_name = "Shield Wall Generator" + +/datum/wires/shieldwallgen/New(atom/holder) + wires = list( + WIRE_ACTIVATE, + WIRE_DISABLE, + WIRE_SHOCK + ) + add_duds(2) + ..() + +/datum/wires/shieldwallgen/interactable(mob/user) + var/obj/machinery/power/shieldwallgen/generator = holder + if(generator.panel_open) + return TRUE + +/datum/wires/shieldwallgen/get_status() + var/obj/machinery/power/shieldwallgen/generator = holder + var/list/status = list() + status += "The interface light is [generator.locked ? "red" : "green"]." + status += "The activity light is [generator.shieldstate ? "blinking steadily" : "off"]." + return status + +/datum/wires/shieldwallgen/on_pulse(wire) + var/obj/machinery/power/shieldwallgen/generator = holder + switch(wire) + if(WIRE_SHOCK) + generator.shocked = !generator.shocked + addtimer(CALLBACK(generator, TYPE_PROC_REF(/obj/machinery/power/shieldwallgen, reset), wire), 60) + if(WIRE_ACTIVATE) + generator.toggle() + if(WIRE_DISABLE) + generator.locked = !generator.locked + +/datum/wires/shieldwallgen/on_cut(wire, mend) + var/obj/machinery/power/shieldwallgen/generator = holder + switch(wire) + if(WIRE_SHOCK) + generator.shocked = !mend + if(WIRE_ACTIVATE) + if(!mend) + generator.shieldstate = FALSE + if(WIRE_DISABLE) + generator.locked = !mend diff --git a/nsv13/icons/obj/smooth_structures/atmosshield.dmi b/nsv13/icons/obj/smooth_structures/atmosshield.dmi new file mode 100644 index 00000000000..2b1bcf1bb04 Binary files /dev/null and b/nsv13/icons/obj/smooth_structures/atmosshield.dmi differ