Refactor modulator and horse mask to use the new speech change proc

This commit is contained in:
Stokes52
2021-09-19 07:42:58 -07:00
parent 03013e5945
commit 8f1e2344fa
5 changed files with 11 additions and 4 deletions
+5 -1
View File
@@ -313,7 +313,7 @@
flags = BLOCKHAIR
flags_inv = HIDEFACE
w_class = WEIGHT_CLASS_SMALL
var/voicechange = 0
var/voicechange = FALSE
var/temporaryname = " the Horse"
var/originalname = ""
@@ -347,6 +347,10 @@
if(user.real_name == "[originalname][temporaryname]" || user.real_name == "A Horse With No Name") //if it's somehow changed while the mask is on it doesn't revert
user.real_name = originalname
/obj/item/clothing/mask/horsehead/change_speech_verb()
if (voicechange == TRUE)
return pick("whinnies", "neighs", "says")
/obj/item/clothing/mask/face
flags_inv = HIDEFACE
flags_cover = MASKCOVERSMOUTH
@@ -38,3 +38,7 @@
/obj/item/clothing/mask/gas/voice_modulator/chameleon/emp_act(severity)
. = ..()
chameleon_action.emp_randomise()
/obj/item/clothing/mask/gas/voice_modulator/change_speech_verb()
if (voice_modulator.active)
return pick("modulates", "drones", "hums", "buzzes")
@@ -154,7 +154,6 @@
var/obj/item/clothing/mask/horsehead/hoers = wear_mask
if(hoers.voicechange)
S.message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
verb = pick("whinnies", "neighs", "says")
if(dna)
for(var/mutation_type in active_mutations)