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

Merge pull request #6858 from Citadel-Station-13/upstream-merge-37984

Browse Source 
[MIRROR] Fix entertainment monitors viewing the wrong Thunderdome
This commit is contained in:
LetterJay
2018-05-23 06:49:31 -05:00
committed by GitHub
parent 3b1304e1a2 db01c0a9b9
commit 938c590ce1
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/generic/CentCom.dmm
+10 -15
View File
@@ -2028,14 +2028,6 @@
},
/turf/open/floor/plasteel,
/area/tdome/arena_source)
"fR" = (
/obj/machinery/camera{
pixel_x = 10;
network = list("thunder");
c_tag = "Arena"
},
/turf/open/floor/circuit/green,
/area/tdome/arena_source)
"fS" = (
/turf/open/floor/plasteel/red/corner{
dir = 8
@@ -12599,10 +12591,11 @@
/area/tdome/tdomeadmin)
"Jg" = (
/obj/machinery/camera{
c_tag = "Red Team";
network = list("thunder");
pixel_x = 11;
pixel_y = -9;
network = list("thunder");
c_tag = "Red Team"
resistance_flags = 64
},
/obj/effect/landmark/thunderdome/two,
/turf/open/floor/plasteel/neutral,
@@ -12631,10 +12624,11 @@
/area/tdome/arena)
"Jl" = (
/obj/machinery/camera{
c_tag = "Green Team";
network = list("thunder");
pixel_x = 12;
pixel_y = -10;
network = list("thunder");
c_tag = "Green Team"
resistance_flags = 64
},
/obj/effect/landmark/thunderdome/one,
/turf/open/floor/plasteel/neutral,
@@ -12671,9 +12665,10 @@
/area/tdome/tdomeadmin)
"Jq" = (
/obj/machinery/camera{
pixel_x = 10;
c_tag = "Arena";
network = list("thunder");
c_tag = "Arena"
pixel_x = 10;
resistance_flags = 64
},
/turf/open/floor/circuit/green,
/area/tdome/arena)
@@ -75069,7 +75064,7 @@ fz
fH
fH
fP
fR
fO
fH
fH
fz