From 9cd478586dd76a667d7df2d4db1c2f18602a4025 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Wed, 15 Sep 2021 02:17:20 +0000 Subject: [PATCH] Off-station (ruins) shield wall gens start unlocked (#61312) Adds a variant of shield wall generators (the kind in xenobio and the teleporter) without access restrictions, for use in ruins. Consistency with most things in space not having access requirements. Given its use is limited to the RD, captain, or silicons, having a bunch of them in space and unusable is not really sensible. Unlocks the few in away missions as well (and in one case turns a varedited one into just the unlocked one) --- _maps/RandomRuins/SpaceRuins/abandonedzoo.dmm | 10 +++++----- _maps/RandomRuins/SpaceRuins/crashedship.dmm | 2 +- _maps/RandomZLevels/Academy.dmm | 2 +- _maps/RandomZLevels/moonoutpost19.dmm | 5 +---- code/game/machinery/shieldgen.dm | 7 +++++++ 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm index 1b479fda27f..c81d9642ee3 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "ab" = ( -/obj/machinery/power/shieldwallgen/anchored, +/obj/machinery/power/shieldwallgen/unlocked/anchored, /obj/structure/cable, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) @@ -99,7 +99,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/abandonedzoo) "aE" = ( -/obj/machinery/power/shieldwallgen/anchored, +/obj/machinery/power/shieldwallgen/unlocked/anchored, /obj/structure/cable, /turf/open/floor/plating, /area/ruin/space/has_grav/abandonedzoo) @@ -298,12 +298,12 @@ /area/ruin/space/has_grav/abandonedzoo) "bs" = ( /obj/structure/cable, -/obj/machinery/power/shieldwallgen/anchored, +/obj/machinery/power/shieldwallgen/unlocked/anchored, /turf/open/floor/plating, /area/ruin/space/has_grav/abandonedzoo) "bt" = ( /obj/structure/cable, -/obj/machinery/power/shieldwallgen/anchored, +/obj/machinery/power/shieldwallgen/unlocked/anchored, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) "bu" = ( @@ -429,7 +429,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) "bV" = ( -/obj/machinery/power/shieldwallgen, +/obj/machinery/power/shieldwallgen/unlocked, /turf/template_noop, /area/template_noop) "bW" = ( diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index b7f6c8fe631..7a3931a5817 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -914,7 +914,7 @@ /turf/open/floor/carpet, /area/awaymission/bmpship/fore) "dL" = ( -/obj/machinery/power/shieldwallgen, +/obj/machinery/power/shieldwallgen/unlocked, /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/bmpship/midship) diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index 52aee1bdf4f..232ecfb29e4 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -1291,7 +1291,7 @@ /turf/open/floor/carpet, /area/awaymission/academy/academyaft) "fH" = ( -/obj/machinery/power/shieldwallgen, +/obj/machinery/power/shieldwallgen/unlocked, /obj/effect/turf_decal/stripes/line{ dir = 8 }, diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 50f8436a74e..f57ad24c4db 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -3173,10 +3173,7 @@ }, /area/awaymission/moonoutpost19/research) "gZ" = ( -/obj/machinery/power/shieldwallgen{ - locked = 0; - req_access = null - }, +/obj/machinery/power/shieldwallgen/unlocked, /obj/structure/cable, /turf/open/floor/plating{ heat_capacity = 1e+006 diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 500481f30e5..f9d8015e273 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -276,6 +276,13 @@ /obj/machinery/power/shieldwallgen/anchored anchored = TRUE +/obj/machinery/power/shieldwallgen/unlocked //for use in ruins, etc + locked = FALSE + req_access = null + +/obj/machinery/power/shieldwallgen/unlocked/anchored + anchored = TRUE + /obj/machinery/power/shieldwallgen/Initialize() . = ..() if(anchored)