diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 1a21cda6535..40f373d19e0 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -195,6 +195,11 @@ var/voice = "Unknown" var/vchange = 0//This didn't do anything before. It now checks if the mask has special functions/N origin_tech = "syndicate=4" + action_button_name = "Toggle mask" + +/obj/item/clothing/mask/gas/voice/attack_self(mob/user) + vchange = !vchange + user << "The voice changer is now [vchange ? "on" : "off"]!" /obj/item/clothing/mask/gas/voice/space_ninja name = "ninja mask" diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 1d1faa53c25..9eb619a907f 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -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) diff --git a/html/changelogs/Miauw-PR-4909.yml b/html/changelogs/Miauw-PR-4909.yml new file mode 100644 index 00000000000..f76ab32c763 --- /dev/null +++ b/html/changelogs/Miauw-PR-4909.yml @@ -0,0 +1,7 @@ +author: Miauw + +delete-after: True + +changes: + - bugfix: Voice changer masks work again. + - tweak: You can now turn voice changer masks on/off by activating them in your hand. They start off.