Merge pull request #7038 from mwerezak/diona-scream

Fixes #7026
This commit is contained in:
Zuhayr
2014-11-19 23:11:50 +10:30
16 changed files with 75 additions and 40 deletions
+7 -1
View File
@@ -319,7 +319,13 @@
for(var/mob/living/M in contents)
if (M.stat!=2)
M.emote("scream")
if (!iscarbon(M))
M.emote("scream")
else
var/mob/living/carbon/C = M
if (!(C.species && (C.species.flags & NO_PAIN)))
C.emote("scream")
//Logging for this causes runtimes resulting in the cremator locking up. Commenting it out until that's figured out.
//M.attack_log += "\[[time_stamp()]\] Has been cremated by <b>[user]/[user.ckey]</b>" //No point in this when the mob's about to be deleted
//user.attack_log +="\[[time_stamp()]\] Cremated <b>[M]/[M.ckey]</b>"