cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

global lists global defined

Browse Source
This commit is contained in:
Desolate
2018-10-02 15:52:46 -05:00
parent c47df961d9
commit c974e29a3c
385 changed files with 1403 additions and 1403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/conveyor2.dm
+2 -2
View File
@@ -220,7 +220,7 @@
spawn(5)
conveyors = list()
for(var/obj/machinery/conveyor/C in machines)
for(var/obj/machinery/conveyor/C in GLOB.machines)
if(C.id == id)
conveyors += C
@@ -287,7 +287,7 @@
update()
// find any switches with same id as this one, and set their positions to match us
for(var/obj/machinery/conveyor_switch/S in machines)
for(var/obj/machinery/conveyor_switch/S in GLOB.machines)
if(S.id == src.id)
S.position = position
S.update()
code/modules/recycling/disposal.dm
+2 -2
View File
@@ -983,7 +983,7 @@
proc/updatedesc()
desc = "An underfloor disposal pipe with a package sorting mechanism."
if(sortType>0)
var/tag = uppertext(TAGGERLOCATIONS[sortType])
var/tag = uppertext(GLOB.TAGGERLOCATIONS[sortType])
desc += "\nIt's tagged with [tag]"
proc/updatedir()
@@ -1015,7 +1015,7 @@
if(O.currTag > 0)// Tag set
sortType = O.currTag
playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1)
var/tag = uppertext(TAGGERLOCATIONS[O.currTag])
var/tag = uppertext(GLOB.TAGGERLOCATIONS[O.currTag])
to_chat(user, "<span class='notice'>Changed filter to [tag]</span>")
updatedesc()
code/modules/recycling/sortingmachinery.dm
+6 -6
View File
@@ -30,7 +30,7 @@
var/obj/item/destTagger/O = W
if(sortTag != O.currTag)
var/tag = uppertext(TAGGERLOCATIONS[O.currTag])
var/tag = uppertext(GLOB.TAGGERLOCATIONS[O.currTag])
to_chat(user, "<span class='notice'>*[tag]*</span>")
sortTag = O.currTag
playsound(loc, 'sound/machines/twobeep.ogg', 100, 1)
@@ -94,7 +94,7 @@
var/obj/item/destTagger/O = W
if(sortTag != O.currTag)
var/tag = uppertext(TAGGERLOCATIONS[O.currTag])
var/tag = uppertext(GLOB.TAGGERLOCATIONS[O.currTag])
to_chat(user, "<span class='notice'>*[tag]*</span>")
sortTag = O.currTag
playsound(loc, 'sound/machines/twobeep.ogg', 100, 1)
@@ -227,13 +227,13 @@
var/dat = "<tt><center><h1><b>TagMaster 2.2</b></h1></center>"
dat += "<table style='width:100%; padding:4px;'><tr>"
for(var/i = 1, i <= TAGGERLOCATIONS.len, i++)
dat += "<td><a href='?src=[UID()];nextTag=[i]'>[TAGGERLOCATIONS[i]]</a></td>"
for(var/i = 1, i <= GLOB.TAGGERLOCATIONS.len, i++)
dat += "<td><a href='?src=[UID()];nextTag=[i]'>[GLOB.TAGGERLOCATIONS[i]]</a></td>"
if(i%4==0)
dat += "</tr><tr>"
dat += "</tr></table><br>Current Selection: [currTag ? TAGGERLOCATIONS[currTag] : "None"]</tt>"
dat += "</tr></table><br>Current Selection: [currTag ? GLOB.TAGGERLOCATIONS[currTag] : "None"]</tt>"
user << browse(dat, "window=destTagScreen;size=450x350")
onclose(user, "destTagScreen")
@@ -426,7 +426,7 @@
/obj/item/shippingPackage/proc/update_desc()
desc = "A pre-labeled package for shipping an item to coworkers."
if(sortTag)
desc += " The label says \"Deliver to [TAGGERLOCATIONS[sortTag]]\"."
desc += " The label says \"Deliver to [GLOB.TAGGERLOCATIONS[sortTag]]\"."
if(!sealed)
desc += " The package is not sealed."