cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-27 10:32:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution.

Browse Source
This commit is contained in:
Zuhayr
2014-11-19 23:19:33 +10:30
parent f14c1e4402 98df09d400
commit 660b32629e
19 changed files with 125 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/objects/structures/morgue.dm
View File

@@ -310,7 +310,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>"