Adds better control of bridge shutters(rip bridge watchers) v2 (#15339)

* Better bridge shutter control v2

* Deconflicted
This commit is contained in:
Darkmight9
2021-01-29 12:09:24 +00:00
committed by GitHub
parent fed65b1b02
commit 9340921cbb
+160 -68
View File
@@ -26853,7 +26853,7 @@
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
id_tag = "bridge blast";
id_tag = "bridge blast west";
name = "Bridge Blast Doors";
opacity = 0
},
@@ -27224,7 +27224,7 @@
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
id_tag = "bridge blast";
id_tag = "bridge blast east";
name = "Bridge Blast Doors";
opacity = 0
},
@@ -30981,15 +30981,15 @@
/turf/simulated/floor/wood,
/area/library)
"bkR" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
id_tag = "bridge blast";
id_tag = "bridge blast west";
name = "Bridge Blast Doors";
opacity = 0
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/bridge)
"bkS" = (
@@ -31476,7 +31476,7 @@
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
id_tag = "bridge blast";
id_tag = "bridge blast north";
name = "Bridge Blast Doors";
opacity = 0
},
@@ -31485,10 +31485,6 @@
d2 = 4;
icon_state = "0-4"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/simulated/floor/plating,
/area/bridge)
"blV" = (
@@ -31511,23 +31507,26 @@
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
id_tag = "bridge blast";
id_tag = "bridge blast north";
name = "Bridge Blast Doors";
opacity = 0
},
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
icon_state = "0-4";
d2 = 4
},
/obj/machinery/status_display{
density = 0;
layer = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0;
tag = ""
},
/turf/simulated/floor/plating,
/area/bridge)
"blZ" = (
@@ -31537,7 +31536,7 @@
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
id_tag = "bridge blast";
id_tag = "bridge blast north";
name = "Bridge Blast Doors";
opacity = 0
},
@@ -31546,10 +31545,6 @@
d2 = 8;
icon_state = "0-8"
},
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/plating,
/area/bridge)
"bmb" = (
@@ -31563,22 +31558,25 @@
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
id_tag = "bridge blast";
id_tag = "bridge blast north";
name = "Bridge Blast Doors";
opacity = 0
},
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "0-8"
icon_state = "2-8";
tag = ""
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "0-4"
},
/obj/structure/cable{
d2 = 2;
icon_state = "0-2"
icon_state = "2-4"
},
/turf/simulated/floor/plating,
/area/bridge)
@@ -33180,23 +33178,6 @@
/obj/item/flash,
/turf/simulated/floor/plasteel,
/area/bridge)
"bps" = (
/obj/structure/chair{
dir = 1
},
/obj/machinery/door_control{
id = "bridge blast";
name = "Bridge Blast Door Control";
pixel_x = 28;
pixel_y = -2;
req_access_txt = "19"
},
/obj/machinery/keycard_auth{
pixel_x = 29;
pixel_y = 8
},
/turf/simulated/floor/plasteel,
/area/bridge)
"bpt" = (
/obj/structure/chair{
dir = 1
@@ -33231,6 +33212,31 @@
/area/hallway/primary/central/north)
"bpw" = (
/obj/structure/table/reinforced,
/obj/machinery/door_control{
id = "bridge blast east";
name = "East Bridge Blast Door Control";
pixel_x = 6;
pixel_y = -2;
req_access_txt = "19"
},
/obj/machinery/door_control{
id = "bridge blast west";
name = "West Bridge Blast Door Control";
pixel_x = -6;
pixel_y = -2;
req_access_txt = "19"
},
/obj/machinery/door_control{
id = "bridge blast north";
name = "North Bridge Blast Door Control";
pixel_x = 6;
pixel_y = 8;
req_access_txt = "19"
},
/obj/machinery/keycard_auth{
pixel_x = -6;
pixel_y = 8
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "blue"
@@ -36537,13 +36543,6 @@
},
/area/crew_quarters/locker/locker_toilet)
"bwR" = (
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
id_tag = "bridge blast";
name = "Bridge Blast Doors";
opacity = 0
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -36558,6 +36557,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
id_tag = "bridge blast west";
name = "Bridge Blast Doors";
opacity = 0
},
/turf/simulated/floor/plasteel,
/area/bridge)
"bwS" = (
@@ -37296,13 +37302,6 @@
/turf/simulated/floor/plating,
/area/maintenance/port)
"byf" = (
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
id_tag = "bridge blast";
name = "Bridge Blast Doors";
opacity = 0
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -37320,6 +37319,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
id_tag = "bridge blast east";
name = "Bridge Blast Doors";
opacity = 0
},
/turf/simulated/floor/plasteel,
/area/bridge)
"byg" = (
@@ -89114,6 +89120,27 @@
},
/turf/simulated/wall/r_wall,
/area/maintenance/fsmaint)
"dHM" = (
/obj/machinery/light{
dir = 1;
on = 1
},
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
/area/shuttle/escape)
"dLF" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
id_tag = "bridge blast east";
name = "Bridge Blast Doors";
opacity = 0
},
/turf/simulated/floor/plasteel,
/area/bridge)
"dQa" = (
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/engine,
@@ -89890,6 +89917,71 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"ksF" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"kwt" = (
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
id_tag = "bridge blast north";
name = "Bridge Blast Doors";
opacity = 0
},
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0;
tag = ""
},
/turf/simulated/floor/plating,
/area/bridge)
"kyW" = (
/obj/structure/table,
/obj/item/weldingtool/largetank{
pixel_x = 4;
pixel_y = -4
},
/obj/item/clothing/glasses/welding{
pixel_y = 10
},
/obj/machinery/light/small{
dir = 4;
pixel_y = 8
},
/turf/simulated/floor/plasteel{
icon_state = "bot";
dir = 1
},
/area/shuttle/escape)
"kCR" = (
/obj/machinery/light{
dir = 1;
on = 1
},
/obj/structure/chair/comfy/shuttle,
/turf/simulated/floor/plasteel{
icon_state = "bot";
dir = 1
},
/area/shuttle/escape)
"kHU" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "vault"
},
/area/shuttle/escape)
"kIR" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
@@ -119137,7 +119229,7 @@ aRw
bgU
bna
bkz
blU
kwt
bnR
bpo
bqS
@@ -119651,7 +119743,7 @@ diw
bhb
bnd
bkz
blU
kwt
bnV
bpq
buo
@@ -119908,7 +120000,7 @@ bdv
bhc
bnh
bkz
bma
kwt
bnY
bpu
bqU
@@ -120165,9 +120257,9 @@ bhd
biI
bnf
bkB
bma
kwt
bnX
bps
bpt
bqS
bsz
bxC
@@ -120422,7 +120514,7 @@ bhV
biK
bnj
bkz
bma
kwt
boa
bpw
bqV
@@ -120679,7 +120771,7 @@ bdw
bgW
bni
bkC
bma
kwt
aYf
aYg
bup
@@ -122741,7 +122833,7 @@ aaa
bmc
bdP
byf
bkR
dLF
bxv
byV
bAa