cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-14 09:27:45 +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/mob/living/carbon/human/species/species.dm
+1 -1
View File
@@ -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