Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045

TG Sync #4985279348672983476
This commit is contained in:
deathride58
2018-02-14 04:11:44 +00:00
committed by GitHub
230 changed files with 2829 additions and 3185 deletions
+2 -1
View File
@@ -319,9 +319,10 @@
break
/proc/get_mob_by_key(key)
var/ckey = ckey(key)
for(var/i in GLOB.player_list)
var/mob/M = i
if(M.ckey == lowertext(key))
if(M.ckey == ckey)
return M
return null
+1 -1
View File
@@ -38,7 +38,6 @@
while(parent > 0 && (call(cmp)(L[index],L[parent]) > 0))
L.Swap(index,parent)
index = parent
parent = round(index * 0.5)
@@ -68,6 +67,7 @@
//Replaces a given node so it verify the heap condition
/datum/Heap/proc/ReSort(atom/A)
var/index = L.Find(A)
Swim(index)
Sink(index)