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/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,