Merge pull request #3765 from Citadel-Station-13/upstream-merge-31640

[MIRROR] [Ready]Ghosts can now Health Scan
This commit is contained in:
LetterJay
2017-11-03 00:13:58 -05:00
committed by GitHub
3 changed files with 22 additions and 3 deletions
+2 -2
View File
@@ -106,8 +106,8 @@ MASS SPECTROMETER
// Used by the PDA medical scanner too
/proc/healthscan(mob/living/user, mob/living/M, mode = 1, advanced = FALSE)
if(user.incapacitated() || user.eye_blind)
/proc/healthscan(mob/user, mob/living/M, mode = 1, advanced = FALSE)
if(isliving(user) && (user.incapacitated() || user.eye_blind))
return
//Damage specifics
var/oxy_loss = M.getOxyLoss()