Merge pull request #1149 from Citadel-Station-13/upstream-merge-27572

[MIRROR] Add Glass Panes to Box Armoury Weapon Racks
This commit is contained in:
LetterJay
2017-05-24 07:57:13 -05:00
committed by GitHub
+40 -18
View File
@@ -1142,6 +1142,10 @@
/obj/effect/turf_decal/bot{ /obj/effect/turf_decal/bot{
dir = 2 dir = 2
}, },
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
/turf/open/floor/plasteel{ /turf/open/floor/plasteel{
dir = 2 dir = 2
}, },
@@ -1338,6 +1342,13 @@
/obj/effect/turf_decal/bot{ /obj/effect/turf_decal/bot{
dir = 2 dir = 2
}, },
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
/obj/structure/window/reinforced{
dir = 4
},
/turf/open/floor/plasteel{ /turf/open/floor/plasteel{
dir = 2 dir = 2
}, },
@@ -1356,6 +1367,13 @@
/obj/effect/turf_decal/bot{ /obj/effect/turf_decal/bot{
dir = 2 dir = 2
}, },
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
/obj/structure/window/reinforced{
dir = 8
},
/turf/open/floor/plasteel{ /turf/open/floor/plasteel{
dir = 2 dir = 2
}, },
@@ -53772,6 +53790,10 @@
/obj/effect/turf_decal/bot{ /obj/effect/turf_decal/bot{
dir = 2 dir = 2
}, },
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
/turf/open/floor/plasteel{ /turf/open/floor/plasteel{
dir = 2 dir = 2
}, },
@@ -112232,11 +112254,11 @@ btp
cbv cbv
ccq ccq
bns bns
cjD aof
cjD aof
cjD aof
cjD aof
cnj amw
aaa aaa
aaa aaa
aaa aaa
@@ -112489,13 +112511,13 @@ ckS
bky bky
ccq ccq
cds cds
cjD aof
ckt ckt
cly cly
cmw cmw
cnj amw
cnj amw
cnj amw
aaa aaa
aaa aaa
aaf aaf
@@ -113003,13 +113025,13 @@ cbg
bTr bTr
cct cct
cdu cdu
cjG aqx
cku cku
clz clz
cmx cmx
cnj amw
cnj amw
cnj amw
aaa aaa
aaa aaa
aaf aaf
@@ -113260,11 +113282,11 @@ bky
bky bky
bky bky
bky bky
cjD aof
cjD aof
cjD aof
cjD aof
cnj amw
aaa aaa
aaa aaa
aaa aaa