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

This commit is contained in:
CitadelStationBot
2017-04-16 18:14:19 -04:00
committed by TalkingCactus
parent ba95892ddd
commit dfd470adf9
6 changed files with 127 additions and 66 deletions
+13 -13
View File
@@ -75503,13 +75503,13 @@
}, },
/area/toxins/xenobiology) /area/toxins/xenobiology)
"cMK" = ( "cMK" = (
/obj/machinery/shieldwallgen,
/obj/structure/cable/white{ /obj/structure/cable/white{
icon_state = "0-4" icon_state = "0-4"
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 6 dir = 6
}, },
/obj/machinery/shieldwallgen/xenobiologyaccess,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/toxins/xenobiology) /area/toxins/xenobiology)
"cML" = ( "cML" = (
@@ -81009,13 +81009,13 @@
}, },
/area/toxins/xenobiology) /area/toxins/xenobiology)
"cWP" = ( "cWP" = (
/obj/machinery/shieldwallgen,
/obj/structure/cable/white{ /obj/structure/cable/white{
icon_state = "0-4" icon_state = "0-4"
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 5 dir = 5
}, },
/obj/machinery/shieldwallgen/xenobiologyaccess,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/toxins/xenobiology) /area/toxins/xenobiology)
"cWQ" = ( "cWQ" = (
@@ -137319,7 +137319,7 @@ ehy
auC auC
auC auC
auC auC
ehH ehy
azc azc
aAc aAc
aAZ aAZ
@@ -137572,13 +137572,13 @@ aoJ
apL apL
are are
asj asj
ehz ehy
auD auD
avP avP
avP avP
axP axP
ehJ ehJ
ehL ehy
aAY aAY
ark ark
aDH aDH
@@ -137829,7 +137829,7 @@ aoK
apM apM
arf arf
ask ask
ehA ehy
auE auE
auE auE
auE auE
@@ -138343,7 +138343,7 @@ aoK
apO apO
arh arh
asm asm
ehC ehy
auF auF
auF auF
auF auF
@@ -138600,13 +138600,13 @@ aoL
apP apP
ari ari
asn asn
ehD ehy
auG auG
avR avR
avR avR
axT axT
ehK ehJ
ehM ehy
aBd aBd
ark ark
aDL aDL
@@ -138857,11 +138857,11 @@ aoI
apK apK
ebP ebP
aso aso
ehE ehy
auH auH
ehF ehF
ehG ehF
ehI ehy
azg azg
aAe aAe
aBe aBe
+42 -44
View File
@@ -86618,10 +86618,8 @@
name = "Xeno Maintenance" name = "Xeno Maintenance"
}) })
"cTD" = ( "cTD" = (
/obj/machinery/shieldwallgen{
req_access_txt = "55"
},
/obj/structure/cable/yellow, /obj/structure/cable/yellow,
/obj/machinery/shieldwallgen/xenobiologyaccess,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/toxins/xenobiology) /area/toxins/xenobiology)
"cTE" = ( "cTE" = (
@@ -127413,9 +127411,9 @@ cRi
cRi cRi
cRi cRi
dlV dlV
dlX dlV
dlZ dlV
dmb dlV
aaf aaf
aaa aaa
aaa aaa
@@ -127672,15 +127670,15 @@ cRi
dde dde
ddj ddj
cTp cTp
dmc dlV
dmf dlV
dmh dlV
dmj dlV
dml dlV
dmn dlV
dmp dlV
dmt dlV
dmB dlV
aaa aaa
aaa aaa
aai aai
@@ -127937,7 +127935,7 @@ cTC
cTC cTC
daO daO
bIx bIx
dmC dlV
aaf aaf
aaf aaf
aag aag
@@ -128450,7 +128448,7 @@ daF
daJ daJ
cRi cRi
bvT bvT
dmu dlV
cRi cRi
cRi cRi
cRi cRi
@@ -128707,7 +128705,7 @@ cSn
cSn cSn
cRi cRi
dmq dmq
dmv dlV
cZv cZv
cZv cZv
cRi cRi
@@ -129735,7 +129733,7 @@ cSn
daN daN
cRi cRi
dmr dmr
dmw dlV
cZv cZv
dbw dbw
cRi cRi
@@ -129992,7 +129990,7 @@ daI
daM daM
cRi cRi
cTA cTA
dmx dlV
cRi cRi
cRi cRi
cRi cRi
@@ -130249,7 +130247,7 @@ cRi
cRi cRi
cRi cRi
cTA cTA
dmy dlV
aaf aaf
aaa aaa
aaa aaa
@@ -130506,7 +130504,7 @@ ddw
cTA cTA
cTA cTA
ddy ddy
dmz dlV
aaf aaf
aaf aaf
aaa aaa
@@ -130756,14 +130754,14 @@ cRi
ddi ddi
ddr ddr
cTB cTB
dmd dlV
dmg dlV
dmi dlV
dmk dlV
dmm dlV
dmo dlV
dms dlV
dmA dlV
aaf aaf
aaa aaa
aaa aaa
@@ -131010,10 +131008,10 @@ cRi
cRi cRi
cRi cRi
cRi cRi
dlW dlV
dlY dlV
dma dlV
dme dlV
aaa aaa
aaf aaf
aaf aaf
@@ -137584,11 +137582,11 @@ aEr
aFC aFC
aGZ aGZ
aGZ aGZ
dlK dlI
aKG aKG
aMj aMj
aKG aKG
dlO dlI
aQe aQe
aRv aRv
dfD dfD
@@ -137841,11 +137839,11 @@ dej
aFC aFC
deC deC
deC deC
dlL dlI
aKH aKH
aMk aMk
aNu aNu
dlP dlI
dfp dfp
dfp dfp
dfE dfE
@@ -138103,7 +138101,7 @@ aKI
aMj aMj
dfb dfb
dfj dfj
dlR dlI
deD deD
dfF dfF
aTN aTN
@@ -138874,7 +138872,7 @@ dbb
aMk aMk
aNv aNv
dfm dfm
dlT dlS
djt djt
dbg dbg
dfR dfR
@@ -139125,13 +139123,13 @@ aCY
dem dem
aFD aFD
deD deD
dlJ dlI
dlM dlI
deV deV
dlN dlN
dfc dfc
dlQ dlI
dlU dlI
deD deD
dfI dfI
dfS dfS
@@ -30544,13 +30544,11 @@
}, },
/area/toxins/xenobiology) /area/toxins/xenobiology)
"bjI" = ( "bjI" = (
/obj/machinery/shieldwallgen{
req_access_txt = "55"
},
/obj/structure/cable{ /obj/structure/cable{
icon_state = "0-4"; icon_state = "0-4";
d2 = 4 d2 = 4
}, },
/obj/machinery/shieldwallgen/xenobiologyaccess,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/toxins/xenobiology) /area/toxins/xenobiology)
"bjJ" = ( "bjJ" = (
@@ -30641,9 +30639,6 @@
/turf/open/floor/engine, /turf/open/floor/engine,
/area/toxins/xenobiology) /area/toxins/xenobiology)
"bjO" = ( "bjO" = (
/obj/machinery/shieldwallgen{
req_access_txt = "55"
},
/obj/structure/cable{ /obj/structure/cable{
icon_state = "0-2"; icon_state = "0-2";
pixel_y = 1; pixel_y = 1;
@@ -30653,6 +30648,7 @@
d2 = 8; d2 = 8;
icon_state = "0-8" icon_state = "0-8"
}, },
/obj/machinery/shieldwallgen/xenobiologyaccess,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/toxins/xenobiology) /area/toxins/xenobiology)
"bjP" = ( "bjP" = (
@@ -39615,9 +39615,7 @@
icon_state = "0-2"; icon_state = "0-2";
d2 = 2 d2 = 2
}, },
/obj/machinery/shieldwallgen{ /obj/machinery/shieldwallgen/xenobiologyaccess,
req_access_txt = "55"
},
/turf/open/floor/plating, /turf/open/floor/plating,
/area/toxins/xenobiology) /area/toxins/xenobiology)
"bJI" = ( "bJI" = (
@@ -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
View File
@@ -239,6 +239,12 @@
var/shield_range = 8 var/shield_range = 8
var/obj/structure/cable/attached // the attached cable 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() /obj/machinery/shieldwallgen/Destroy()
for(var/d in GLOB.cardinal) for(var/d in GLOB.cardinal)
cleanup_field(d) cleanup_field(d)