cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 11:31:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5841 from Anewbe/voice_changer

Browse Source 
Voice changer tweaks and fixes
This commit is contained in:
Atermonera
2019-01-16 19:50:54 -08:00
committed by GitHub
parent 8f7a1092a3 4a0de3a12b
commit 1f4f8a955b
3 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/clothing/masks/voice.dm
View File

@@ -1,8 +1,8 @@
/obj/item/voice_changer
name = "voice changer"
desc = "A voice scrambling module. If you can see this, report it as a bug on the tracker."
var/voice //If set and item is present in mask/suit, this name will be used for the wearer's speech.
var/active
var/voice = null //If set and item is present in mask/suit, this name will be used for the wearer's speech.
var/active = TRUE
/obj/item/clothing/mask/gas/voice
name = "gas mask"
@@ -15,7 +15,7 @@
set src in usr
changer.active = !changer.active
usr << "<span class='notice'>You [changer.active ? "enable" : "disable"] the voice-changing module in \the [src].</span>"
to_chat(usr, "<span class='notice'>You [changer.active ? "enable" : "disable"] the voice-changing module in \the [src].</span>")
/obj/item/clothing/mask/gas/voice/verb/Set_Voice(name as text)
set category = "Object"
@@ -24,7 +24,14 @@
var/voice = sanitize(name, MAX_NAME_LEN)
if(!voice || !length(voice)) return
changer.voice = voice
usr << "<span class='notice'>You are now mimicking <B>[changer.voice]</B>.</span>"
to_chat(usr, "<span class='notice'>You are now mimicking <B>[changer.voice]</B>.</span>")
/obj/item/clothing/mask/gas/voice/verb/Reset_Voice()
set category = "Object"
set src in usr
changer.voice = null
to_chat(usr, "<span class='notice'>You have reset your voice changer's mimicry feature.</span>")
/obj/item/clothing/mask/gas/voice/New()
..()

9
code/modules/mob/living/carbon/human/say.dm
View File

@@ -83,13 +83,16 @@
// todo: fix this shit
if(rig.speech && rig.speech.voice_holder && rig.speech.voice_holder.active && rig.speech.voice_holder.voice)
voice_sub = rig.speech.voice_holder.voice
else
if(!voice_sub) // If the rig has a voice changer, then we use that. Otherwise, use this
for(var/obj/item/gear in list(wear_mask,wear_suit,head))
if(!gear)
continue
var/obj/item/voice_changer/changer = locate() in gear
if(changer && changer.active && changer.voice)
voice_sub = changer.voice
if(changer && changer.active)
if(changer.voice)
voice_sub = changer.voice
else
voice_sub = get_id_name()
if(voice_sub)
return voice_sub
if(mind && mind.changeling && mind.changeling.mimicing)