cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into botany-rework

Browse Source
This commit is contained in:
Fox-McCloud
2017-01-23 01:01:09 -05:00
parent dc0710135e d2181b5342
commit 7007f6bbdf
102 changed files with 366 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/morgue.dm
+2 -2
View File
@@ -382,8 +382,8 @@
if(M.stat!=2)
M.emote("scream")
if(istype(user))
M.attack_log += "\[[time_stamp()]\] <font color='orange'>Has been cremated by [user.name] ([user.ckey])</font>"
user.attack_log +="\[[time_stamp()]\] <font color='red'>Cremated [M.name] ([M.ckey])</font>"
M.create_attack_log("<font color='orange'>Has been cremated by [user.name] ([user.ckey])</font>")
user.create_attack_log("<font color='red'>Cremated [M.name] ([M.ckey])</font>")
log_attack("[user.name] ([user.ckey]) cremated [M.name] ([M.ckey])")
M.death(1)
if(!M || !isnull(M.gcDestroyed))