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

Merge branch 'master' into xantholne-christmas01

Browse Source
This commit is contained in:
Unknown
2019-12-15 16:14:37 -07:00
parent 73abc2ae40 423b2e7e90
commit 9bfba1d1d9
110 changed files with 6046 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/neck/_neck.dm
+3 -1
View File
@@ -66,7 +66,9 @@
var/obj/item/organ/heart/heart = M.getorganslot(ORGAN_SLOT_HEART)
var/obj/item/organ/lungs/lungs = M.getorganslot(ORGAN_SLOT_LUNGS)
if(!(M.stat == DEAD || (HAS_TRAIT(M, TRAIT_FAKEDEATH))))
if (!do_mob(user,M,60)) // Stethoscope should take a moment to listen
return // FAIL
if(!(M.stat == DEAD || (HAS_TRAIT(M, TRAIT_FAKEDEATH)) || (HAS_TRAIT(M, TRAIT_NOPULSE))))
if(heart && istype(heart))
heart_strength = "<span class='danger'>an unstable</span>"
if(heart.beating)