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

Merge pull request #2410 from Crazylemon64/conscious_scream

Browse Source 
Dead humans are now no longer able to emote
This commit is contained in:
Fox McCloud
2015-10-25 16:33:40 -04:00
parent 185439855e 95e574d4d5
commit 2aed207eb4
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/death.dm
+4 -3
View File
@@ -84,6 +84,9 @@
if(stat == DEAD) return
if(healths) healths.icon_state = "health5"
if(!gibbed)
emote("deathgasp") //let the world KNOW WE ARE DEAD
stat = DEAD
dizziness = 0
jitteriness = 0
@@ -128,8 +131,6 @@
H.mind.kills += "[name] ([ckey])"
if(!gibbed)
emote("deathgasp") //let the world KNOW WE ARE DEAD
update_canmove()
if(client) blind.layer = 0
@@ -175,4 +176,4 @@
/mob/living/carbon/human/proc/Drain()
ChangeToHusk()
mutations |= NOCLONE
return
return
code/modules/mob/living/carbon/human/emote.dm
+5 -1
View File
@@ -1,4 +1,8 @@
/mob/living/carbon/human/emote(var/act,var/m_type=1,var/message = null,var/force)
if (stat == DEAD)
return // No screaming bodies
var/param = null
if (findtext(act, "-", 1, null))
var/t1 = findtext(act, "-", 1, null)
@@ -814,4 +818,4 @@
set desc = "Sets an extended description of your character's features."
set category = "IC"
flavor_text = TextPreview(input(usr, "Please enter your new flavour text.", "Flavour text", null) as text)
flavor_text = TextPreview(input(usr, "Please enter your new flavour text.", "Flavour text", null) as text)