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

Fixes auto pain emotes + groan/scream spam. (#9661)

Browse Source 
This bug made it possible for the game to pick a 70 pain strength emote at like 10 pain.

Which is no bueno.

Security machos can't cry, we all know that.
This commit is contained in:
Matt Atlas
2020-08-11 12:36:59 +02:00
committed by GitHub
parent 3c3e5bf09f
commit 981a8aebab
3 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_external.dm
+1 -1
View File
@@ -258,7 +258,7 @@
var/blunt = !!(brute && !sharp && !edge)
if(status & ORGAN_BROKEN && prob(40) && brute)
if(owner && (owner.can_feel_pain()))
if(owner && (owner.can_feel_pain()) && owner.stat == CONSCIOUS)
owner.emote(pick("scream", "groan")) //getting hit on broken hand hurts
if(used_weapon)