Skip to content

Commit

Permalink
Off-station (ruins) shield wall gens start unlocked (tgstation#61312)
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
YakumoChen authored Sep 15, 2021
1 parent 7068da7 commit 9cd4785
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
10 changes: 5 additions & 5 deletions _maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/crashedship.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomZLevels/Academy.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
5 changes: 1 addition & 4 deletions _maps/RandomZLevels/moonoutpost19.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions code/game/machinery/shieldgen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 9cd4785

Please sign in to comment.