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

Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733

Browse Source 
[MIRROR] [s] Cameranet fixes
This commit is contained in:
deathride58
2018-02-23 13:21:23 +00:00
committed by GitHub
parent 15b3716f07 952df00550
commit 21179c9105
23 changed files with 848 additions and 1183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomZLevels/moonoutpost19.dmm
+14 -14
View File
@@ -2068,7 +2068,7 @@
},
/obj/machinery/camera{
c_tag = "Xenobiology Containment North";
network = list("MO19X")
network = list("mo19x")
},
/turf/open/floor/engine,
/area/awaymission/moonoutpost19/research)
@@ -2133,7 +2133,7 @@
desc = "Used for watching the contents of the xenobiology containment pen.";
dir = 8;
name = "xenobiology monitor";
network = list("MO19X")
network = list("mo19x")
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -2209,7 +2209,7 @@
/obj/machinery/camera{
c_tag = "Xenobiology";
dir = 4;
network = list("MO19","MO19R")
network = list("mo19","mo19r")
},
/turf/open/floor/plasteel/white/side{
dir = 6;
@@ -2750,7 +2750,7 @@
/obj/machinery/camera{
c_tag = "Xenobiology Containment East";
dir = 8;
network = list("MO19X")
network = list("mo19x")
},
/turf/open/floor/engine,
/area/awaymission/moonoutpost19/research)
@@ -3326,7 +3326,7 @@
/obj/machinery/computer/security{
desc = "Used to access the various cameras on the outpost.";
dir = 4;
network = list("MO19R","MO19")
network = list("mo19r","mo19")
},
/turf/open/floor/plasteel/red/side{
dir = 8;
@@ -3461,7 +3461,7 @@
/obj/machinery/camera{
c_tag = "Xenobiology Containment South";
dir = 1;
network = list("MO19X")
network = list("mo19x")
},
/turf/open/floor/engine,
/area/awaymission/moonoutpost19/research)
@@ -3759,7 +3759,7 @@
/obj/machinery/camera{
c_tag = "Research Division";
dir = 1;
network = list("MO19","MO19R")
network = list("mo19","mo19r")
},
/turf/open/floor/plasteel/whitepurple/corner{
dir = 8;
@@ -3956,7 +3956,7 @@
/obj/machinery/computer/security/telescreen{
desc = "Used for monitoring the research division and the labs within.";
name = "research monitor";
network = list("MO19X","MO19R")
network = list("mo19x","mo19r")
},
/turf/open/floor/plasteel/cafeteria{
dir = 5
@@ -4306,7 +4306,7 @@
/obj/machinery/camera{
c_tag = "Research Director's Office";
dir = 1;
network = list("MO19","MO19R")
network = list("mo19","mo19r")
},
/turf/open/floor/plasteel/cafeteria{
dir = 5
@@ -5163,7 +5163,7 @@
/obj/machinery/camera{
c_tag = "Arrivals North";
dir = 1;
network = list("MO19")
network = list("mo19")
},
/turf/open/floor/plasteel/arrival{
dir = 2;
@@ -5447,7 +5447,7 @@
/obj/machinery/camera{
c_tag = "Kitchen";
dir = 8;
network = list("MO19")
network = list("mo19")
},
/turf/open/floor/plasteel/cafeteria{
dir = 5
@@ -5593,7 +5593,7 @@
/obj/machinery/camera{
c_tag = "Bar";
dir = 8;
network = list("MO19")
network = list("mo19")
},
/turf/open/floor/plasteel/bar{
heat_capacity = 1e+006
@@ -6136,7 +6136,7 @@
/obj/machinery/camera{
c_tag = "Arrivals South";
dir = 8;
network = list("MO19")
network = list("mo19")
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -6379,7 +6379,7 @@
/obj/machinery/camera{
c_tag = "Dormitories";
dir = 4;
network = list("MO19")
network = list("mo19")
},
/turf/open/floor/plasteel{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
_maps/RandomZLevels/undergroundoutpost45.dmm
+21 -21
View File
@@ -552,7 +552,7 @@
/obj/machinery/camera{
c_tag = "Arrivals";
dir = 8;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel/neutral/side{
dir = 4;
@@ -2216,7 +2216,7 @@
"eY" = (
/obj/machinery/computer/security{
dir = 1;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel/red/side{
dir = 6;
@@ -2280,7 +2280,7 @@
/obj/machinery/camera{
c_tag = "Hydroponics";
dir = 1;
network = list("UO45")
network = list("uo45")
},
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 2;
@@ -2667,7 +2667,7 @@
/obj/machinery/camera{
c_tag = "Central Hallway";
dir = 1;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel{
heat_capacity = 1e+006
@@ -3113,7 +3113,7 @@
/obj/machinery/camera{
c_tag = "Research Lab";
dir = 2;
network = list("UO45","UO45R")
network = list("uo45","uo45r")
},
/turf/open/floor/plasteel/white{
heat_capacity = 1e+006
@@ -3299,7 +3299,7 @@
/obj/machinery/camera{
c_tag = "Kitchen";
dir = 8;
network = list("UO45")
network = list("uo45")
},
/obj/structure/table,
/obj/machinery/microwave{
@@ -4178,7 +4178,7 @@
/obj/machinery/camera{
c_tag = "Gateway Chamber";
dir = 4;
network = list("UO45","UO45R")
network = list("uo45","uo45r")
},
/turf/open/floor/plasteel/floorgrime{
dir = 8;
@@ -4348,7 +4348,7 @@
/obj/machinery/camera{
c_tag = "Bar";
dir = 8;
network = list("UO45")
network = list("uo45")
},
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/bar{
@@ -5363,7 +5363,7 @@
/obj/machinery/camera{
c_tag = "Gateway Ready Room";
dir = 2;
network = list("UO45","UO45R")
network = list("uo45","uo45r")
},
/turf/open/floor/plasteel{
heat_capacity = 1e+006
@@ -5480,7 +5480,7 @@
/obj/machinery/camera{
c_tag = "Research Division West";
dir = 1;
network = list("UO45","UO45R")
network = list("uo45","uo45r")
},
/turf/open/floor/plasteel/whitepurple/corner{
dir = 2;
@@ -5662,7 +5662,7 @@
/obj/machinery/camera{
c_tag = "Research Division East";
dir = 1;
network = list("UO45","UO45R")
network = list("uo45","uo45r")
},
/turf/open/floor/plasteel/whitepurple/corner{
dir = 2;
@@ -5784,7 +5784,7 @@
/obj/machinery/camera{
c_tag = "Engineering Secure Storage";
dir = 2;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plating{
heat_capacity = 1e+006
@@ -6466,7 +6466,7 @@
"no" = (
/obj/machinery/computer/security{
dir = 4;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel/red/side{
dir = 8;
@@ -6487,7 +6487,7 @@
desc = "Used for monitoring the research division and the labs within.";
dir = 8;
name = "research monitor";
network = list("UO45R")
network = list("uo45r")
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/red/side{
@@ -6801,7 +6801,7 @@
desc = "Used for monitoring the research division and the labs within.";
dir = 2;
name = "research monitor";
network = list("UO45R")
network = list("uo45r")
},
/turf/open/floor/plasteel/cafeteria{
dir = 5;
@@ -6968,7 +6968,7 @@
/obj/machinery/camera{
c_tag = "Dormitories";
dir = 2;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel/neutral/corner{
dir = 1;
@@ -8452,7 +8452,7 @@
/obj/machinery/camera{
c_tag = "Atmospherics";
dir = 2;
network = list("UO45")
network = list("uo45")
},
/obj/structure/table,
/obj/item/clothing/gloves/color/yellow,
@@ -9086,7 +9086,7 @@
/obj/machinery/camera{
c_tag = "Engineering Hallway";
dir = 4;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel{
heat_capacity = 1e+006
@@ -10114,7 +10114,7 @@
"tz" = (
/obj/machinery/computer/security{
dir = 1;
network = list("UO45")
network = list("uo45")
},
/obj/machinery/button/door{
desc = "A remote control-switch for the security privacy shutters.";
@@ -11389,7 +11389,7 @@
/obj/machinery/camera{
c_tag = "Engineering Foyer";
dir = 1;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel/floorgrime{
dir = 8;
@@ -12258,7 +12258,7 @@
/obj/machinery/camera{
c_tag = "Mining";
dir = 4;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel/floorgrime{
heat_capacity = 1e+006