Merge pull request #4909 from Miauw62/ninjacangosuckadick

Fixes voice changers.
This commit is contained in:
Remie Richards
2014-09-22 17:19:13 +01:00
3 changed files with 20 additions and 4 deletions
+8 -4
View File
@@ -47,10 +47,14 @@
return message
/mob/living/carbon/human/GetVoice()
if(istype(src.wear_mask, /obj/item/clothing/mask/gas/voice))
var/obj/item/clothing/mask/gas/voice/V = src.wear_mask
if(V.vchange)
return V.voice
if(istype(wear_mask, /obj/item/clothing/mask/gas/voice))
var/obj/item/clothing/mask/gas/voice/V = wear_mask
if(V.vchange && wear_id)
var/obj/item/weapon/card/id/idcard = wear_id.GetID()
if(istype(idcard))
return idcard.registered_name
else
return real_name
else
return real_name
if(mind && mind.changeling && mind.changeling.mimicing)