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

Move mask verb change down so it takes precedence

Browse Source
This commit is contained in:
Stokes52
2021-09-19 07:43:01 -07:00
parent 119385057b
commit 21aec6ec03
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/say.dm
+4 -5
View File
@@ -145,11 +145,6 @@
if(silent || HAS_TRAIT(src, TRAIT_MUTE))
S.message = ""
if(wear_mask)
var/speech_verb_when_masked = wear_mask.change_speech_verb()
if(speech_verb_when_masked)
verb = speech_verb_when_masked
if(istype(wear_mask, /obj/item/clothing/mask/horsehead))
var/obj/item/clothing/mask/horsehead/hoers = wear_mask
if(hoers.voicechange)
@@ -172,6 +167,10 @@
if(span)
S.message = "<span class='[span]'>[S.message]</span>"
if(wear_mask)
var/speech_verb_when_masked = wear_mask.change_speech_verb()
if(speech_verb_when_masked)
verb = speech_verb_when_masked
return list("verb" = verb)