Merge branch 'master' into upstream-merge-32435

This commit is contained in:
LetterJay
2017-11-13 11:30:06 -06:00
committed by GitHub
254 changed files with 6257 additions and 5355 deletions
+2 -2
View File
@@ -17,7 +17,7 @@
var/list/affecting // the list of all items that will be moved this ptick
var/id = "" // the control ID - must match controller ID
var/verted = 1 // set to -1 to have the conveyour belt be inverted, so you can use the other corner icons
speed_process = 1
speed_process = TRUE
/obj/machinery/conveyor/centcom_auto
id = "round_end_belt"
@@ -208,7 +208,7 @@
var/list/conveyors // the list of converyors that are controlled by this switch
anchored = TRUE
speed_process = 1
speed_process = TRUE
+1 -1
View File
@@ -154,7 +154,7 @@
dat += "<table style='width:100%; padding:4px;'><tr>"
for (var/i = 1, i <= GLOB.TAGGERLOCATIONS.len, i++)
dat += "<td><a href='?src=\ref[src];nextTag=[i]'>[GLOB.TAGGERLOCATIONS[i]]</a></td>"
dat += "<td><a href='?src=[REF(src)];nextTag=[i]'>[GLOB.TAGGERLOCATIONS[i]]</a></td>"
if(i%4==0)
dat += "</tr><tr>"