shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-32161

Browse Source
This commit is contained in:
LetterJay
2017-11-11 23:02:13 -06:00
committed by GitHub
parent 545ac04b78 1f7deabbfb
commit 6286f4d4c2
625 changed files with 27981 additions and 20284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/bot/medbot.dm
+1 -1
View File
@@ -343,7 +343,7 @@
if(C.stat == DEAD || (C.status_flags & FAKEDEATH))
return FALSE //welp too late for them!
if(!(loc == C.loc) || !(isturf(C.loc) && isturf(loc)))
if(!(loc == C.loc) && !(isturf(C.loc) && isturf(loc)))
return FALSE
if(C.suiciding)