Merge pull request #5066 from Citadel-Station-13/upstream-merge-34773

[MIRROR] Shifts vars off /mob to the correct subtype
This commit is contained in:
LetterJay
2018-01-24 20:46:46 -06:00
committed by GitHub
8 changed files with 39 additions and 39 deletions
+2 -2
View File
@@ -166,10 +166,10 @@
L[avoid_assoc_duplicate_keys(A.name, areaindex)] = R
for(var/obj/item/implant/tracking/I in GLOB.tracked_implants)
if(!I.imp_in || !ismob(I.loc))
if(!I.imp_in || !isliving(I.loc))
continue
else
var/mob/M = I.loc
var/mob/living/M = I.loc
if(M.stat == DEAD)
if(M.timeofdeath + 6000 < world.time)
continue
+2 -2
View File
@@ -84,10 +84,10 @@ Frequency:
src.temp += "<B>Extranneous Signals:</B><BR>"
for (var/obj/item/implant/tracking/W in GLOB.tracked_implants)
if (!W.imp_in || !ismob(W.loc))
if (!W.imp_in || !isliving(W.loc))
continue
else
var/mob/M = W.loc
var/mob/living/M = W.loc
if (M.stat == DEAD)
if (M.timeofdeath + 6000 < world.time)
continue