shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds an xenobiology access shield wall generator to all maps' except Cerestation's xenobiology (#424)

Browse Source
This commit is contained in:
CitadelStationBot
2017-04-16 17:14:19 -05:00
committed by TalkingCactus
parent ba95892ddd
commit dfd470adf9
6 changed files with 127 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
_maps/map_files/Deltastation/DeltaStation2.dmm
View File

@@ -75503,13 +75503,13 @@
},
/area/toxins/xenobiology)
"cMK" = (
/obj/machinery/shieldwallgen,
/obj/structure/cable/white{
icon_state = "0-4"
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/machinery/shieldwallgen/xenobiologyaccess,
/turf/open/floor/plating,
/area/toxins/xenobiology)
"cML" = (
@@ -81009,13 +81009,13 @@
},
/area/toxins/xenobiology)
"cWP" = (
/obj/machinery/shieldwallgen,
/obj/structure/cable/white{
icon_state = "0-4"
},
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/machinery/shieldwallgen/xenobiologyaccess,
/turf/open/floor/plating,
/area/toxins/xenobiology)
"cWQ" = (
@@ -137319,7 +137319,7 @@ ehy
auC
auC
auC
ehH
ehy
azc
aAc
aAZ
@@ -137572,13 +137572,13 @@ aoJ
apL
are
asj
ehz
ehy
auD
avP
avP
axP
ehJ
ehL
ehy
aAY
ark
aDH
@@ -137829,7 +137829,7 @@ aoK
apM
arf
ask
ehA
ehy
auE
auE
auE
@@ -138343,7 +138343,7 @@ aoK
apO
arh
asm
ehC
ehy
auF
auF
auF
@@ -138600,13 +138600,13 @@ aoL
apP
ari
asn
ehD
ehy
auG
avR
avR
axT
ehK
ehM
ehJ
ehy
aBd
ark
aDL
@@ -138857,11 +138857,11 @@ aoI
apK
ebP
aso
ehE
ehy
auH
ehF
ehG
ehI
ehF
ehy
azg
aAe
aBe

86
_maps/map_files/MetaStation/MetaStation.dmm
View File

@@ -86618,10 +86618,8 @@
name = "Xeno Maintenance"
})
"cTD" = (
/obj/machinery/shieldwallgen{
req_access_txt = "55"
},
/obj/structure/cable/yellow,
/obj/machinery/shieldwallgen/xenobiologyaccess,
/turf/open/floor/plating,
/area/toxins/xenobiology)
"cTE" = (
@@ -127413,9 +127411,9 @@ cRi
cRi
cRi
dlV
dlX
dlZ
dmb
dlV
dlV
dlV
aaf
aaa
aaa
@@ -127672,15 +127670,15 @@ cRi
dde
ddj
cTp
dmc
dmf
dmh
dmj
dml
dmn
dmp
dmt
dmB
dlV
dlV
dlV
dlV
dlV
dlV
dlV
dlV
dlV
aaa
aaa
aai
@@ -127937,7 +127935,7 @@ cTC
cTC
daO
bIx
dmC
dlV
aaf
aaf
aag
@@ -128450,7 +128448,7 @@ daF
daJ
cRi
bvT
dmu
dlV
cRi
cRi
cRi
@@ -128707,7 +128705,7 @@ cSn
cSn
cRi
dmq
dmv
dlV
cZv
cZv
cRi
@@ -129735,7 +129733,7 @@ cSn
daN
cRi
dmr
dmw
dlV
cZv
dbw
cRi
@@ -129992,7 +129990,7 @@ daI
daM
cRi
cTA
dmx
dlV
cRi
cRi
cRi
@@ -130249,7 +130247,7 @@ cRi
cRi
cRi
cTA
dmy
dlV
aaf
aaa
aaa
@@ -130506,7 +130504,7 @@ ddw
cTA
cTA
ddy
dmz
dlV
aaf
aaf
aaa
@@ -130756,14 +130754,14 @@ cRi
ddi
ddr
cTB
dmd
dmg
dmi
dmk
dmm
dmo
dms
dmA
dlV
dlV
dlV
dlV
dlV
dlV
dlV
dlV
aaf
aaa
aaa
@@ -131010,10 +131008,10 @@ cRi
cRi
cRi
cRi
dlW
dlY
dma
dme
dlV
dlV
dlV
dlV
aaa
aaf
aaf
@@ -137584,11 +137582,11 @@ aEr
aFC
aGZ
aGZ
dlK
dlI
aKG
aMj
aKG
dlO
dlI
aQe
aRv
dfD
@@ -137841,11 +137839,11 @@ dej
aFC
deC
deC
dlL
dlI
aKH
aMk
aNu
dlP
dlI
dfp
dfp
dfE
@@ -138103,7 +138101,7 @@ aKI
aMj
dfb
dfj
dlR
dlI
deD
dfF
aTN
@@ -138874,7 +138872,7 @@ dbb
aMk
aNv
dfm
dlT
dlS
djt
dbg
dfR
@@ -139125,13 +139123,13 @@ aCY
dem
aFD
deD
dlJ
dlM
dlI
dlI
deV
dlN
dfc
dlQ
dlU
dlI
dlI
deD
dfI
dfS

8
_maps/map_files/PubbyStation/PubbyStation.dmm
View File

@@ -30544,13 +30544,11 @@
},
/area/toxins/xenobiology)
"bjI" = (
/obj/machinery/shieldwallgen{
req_access_txt = "55"
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
},
/obj/machinery/shieldwallgen/xenobiologyaccess,
/turf/open/floor/plating,
/area/toxins/xenobiology)
"bjJ" = (
@@ -30641,9 +30639,6 @@
/turf/open/floor/engine,
/area/toxins/xenobiology)
"bjO" = (
/obj/machinery/shieldwallgen{
req_access_txt = "55"
},
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
@@ -30653,6 +30648,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/shieldwallgen/xenobiologyaccess,
/turf/open/floor/plating,
/area/toxins/xenobiology)
"bjP" = (

4
_maps/map_files/TgStation/tgstation.2.1.3.dmm
View File

@@ -39615,9 +39615,7 @@
icon_state = "0-2";
d2 = 2
},
/obj/machinery/shieldwallgen{
req_access_txt = "55"
},
/obj/machinery/shieldwallgen/xenobiologyaccess,
/turf/open/floor/plating,
/area/toxins/xenobiology)
"bJI" = (

63
_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej Normal file
View File

@@ -0,0 +1,63 @@
diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm (rejected hunks)
@@ -93201,11 +93199,11 @@ cpy
cDv
cDD
cqU
-cMF
+cMD
cEu
cMI
-cMJ
-cML
+cMI
+cMD
cFL
cGf
cGw
@@ -93457,12 +93455,12 @@ chV
cDq
cqf
cqD
-cME
+cMD
crs
cEv
cEv
cFe
-cMM
+cMD
cFM
czE
cGx
@@ -93975,7 +93973,7 @@ cqZ
crt
cMH
cAm
-cMK
+cMH
cMN
cFO
csC
@@ -94490,7 +94488,7 @@ crv
cEy
cEy
cFh
-cMO
+cMD
cFQ
czE
cGx
@@ -94743,11 +94741,11 @@ cDr
cDw
cDE
cEa
-cMG
+cMD
cEz
cEz
cEz
-cMP
+cMD
cFR
cGf
cGz

6
code/game/machinery/shieldgen.dm
View File

@@ -239,6 +239,12 @@
var/shield_range = 8
var/obj/structure/cable/attached // the attached cable
/obj/machinery/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(GLOB.access_xenobiology)
/obj/machinery/shieldwallgen/Destroy()
for(var/d in GLOB.cardinal)
cleanup_field(d)