mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-13 00:47:31 +01:00
Fixes auto pain emotes + groan/scream spam. (#9661)
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:
@@ -630,7 +630,7 @@
|
||||
return
|
||||
for(var/pain_emotes in pain_emotes_with_pain_level)
|
||||
var/pain_level = pain_emotes_with_pain_level[pain_emotes]
|
||||
if(pain_level >= pain_power)
|
||||
if(pain_power >= pain_level)
|
||||
// This assumes that if a pain-level has been defined it also has a list of emotes to go with it
|
||||
var/decl/emote/E = decls_repository.get_decl(pick(pain_emotes))
|
||||
return E.key
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user