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

Involuntary emotes no longer check if you are conscious.

Browse Source 
Fixes: #11791

Unconcious folks don't scream.
This commit is contained in:
ccomp5950
2015-12-28 17:47:52 -05:00
parent 1b3267a0a8
commit cf0320ee14
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/emote.dm
View File

@@ -2,7 +2,7 @@
//m_type == 1 --> visual.
//m_type == 2 --> audible
/mob/proc/custom_emote(var/m_type=1,var/message = null)
if(stat || !use_me && usr == src)
if(usr && stat || !use_me && usr == src)
src << "You are unable to emote."
return

2
code/modules/mob/living/carbon/human/human_damage.dm
View File

@@ -355,7 +355,7 @@ This function restores all organs.
//visible_message("Hit debug. [damage] | [damagetype] | [def_zone] | [blocked] | [sharp] | [used_weapon]")
//Handle other types of damage
if((damagetype != BRUTE) && (damagetype != BURN))
if(!stat && damagetype != BRUTE && damagetype != BURN)
if(damagetype == HALLOSS && !(species && (species.flags & NO_PAIN)))
if ((damage > 25 && prob(20)) || (damage > 50 && prob(60)))
emote("scream")