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

Merge branch 'master' into upstream-merge-36442

Browse Source
This commit is contained in:
LetterJay
2018-04-01 19:50:37 -05:00
committed by GitHub
parent 6d117d18a3 28e188cbbe
commit f7be23e78a
132 changed files with 1560 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/cit_map_files/BoxStation/BoxStation.dmm
+2
View File
@@ -52947,6 +52947,8 @@
/obj/item/gun/energy/e_gun/dragnet,
/obj/item/gun/energy/e_gun/dragnet,
/obj/effect/turf_decal/bot_white,
/obj/item/gun/energy/pumpaction/blaster,
/obj/item/gun/energy/pumpaction/blaster,
/turf/open/floor/plasteel/dark,
/area/security/armory)
"ipA" = (
_maps/cit_map_files/Deltastation/DeltaStation2.dmm
+1
View File
@@ -47348,6 +47348,7 @@
/obj/item/gun/energy/ionrifle,
/obj/item/clothing/suit/armor/laserproof,
/obj/item/gun/energy/temperature/security,
/obj/item/gun/energy/pumpaction/blaster,
/turf/open/floor/plasteel/vault{
dir = 8
},
_maps/cit_map_files/MetaStation/MetaStation.dmm
+2
View File
@@ -3218,6 +3218,8 @@
/obj/item/storage/fancy/donut_box,
/obj/item/gun/energy/e_gun/dragnet,
/obj/item/gun/energy/e_gun/dragnet,
/obj/item/gun/energy/pumpaction/blaster,
/obj/item/gun/energy/pumpaction/blaster,
/turf/open/floor/plasteel/vault{
dir = 1
},
_maps/cit_map_files/OmegaStation/OmegaStation.dmm
+2
View File
@@ -6902,6 +6902,8 @@
},
/obj/item/gun/energy/e_gun/dragnet,
/obj/item/gun/energy/e_gun/dragnet,
/obj/item/gun/energy/pumpaction/blaster,
/obj/item/gun/energy/pumpaction/blaster,
/turf/open/floor/plasteel/red/corner{
dir = 8
},
_maps/cit_map_files/PubbyStation/PubbyStation.dmm
+1
View File
@@ -2937,6 +2937,7 @@
dir = 4;
pixel_x = -23
},
/obj/item/gun/energy/pumpaction/blaster,
/turf/open/floor/plasteel/dark,
/area/security/armory)
"ajh" = (
_maps/map_files/PubbyStation/PubbyStation.dmm
+4 -4
View File
@@ -36064,10 +36064,10 @@
/area/science/mixing)
"bJT" = (
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the test chamber.";
desc = "Used for watching the bomb testing site.";
dir = 2;
layer = 4;
name = "Test Chamber Telescreen";
name = "Testing Site Telescreen";
network = list("toxins");
pixel_y = -32
},
@@ -45555,7 +45555,7 @@
invuln = 1;
luminosity = 3;
name = "Hardened Bomb-Test Camera";
network = list("toxins");
network = list("ss13", "rd", "toxins");
use_power = 0
},
/turf/open/floor/plating/asteroid/airless,
@@ -46582,7 +46582,7 @@
invuln = 1;
luminosity = 3;
name = "Hardened Bomb-Test Camera";
network = list("toxins");
network = list("ss13", "rd", "toxins");
use_power = 0
},
/turf/open/floor/plating/asteroid/airless,