From 4db33fce5da8599edd70157f413c37279dd01f54 Mon Sep 17 00:00:00 2001 From: datlo Date: Thu, 26 Mar 2020 16:14:25 +0100 Subject: [PATCH] review stuff + mute in magic mirror --- code/game/gamemodes/wizard/wizard.dm | 10 +++++----- code/game/gamemodes/wizard/wizloadouts.dm | 8 ++++---- code/game/objects/structures/mirror.dm | 4 +++- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 3063e0b37f6..a0bb4c349af 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -135,14 +135,14 @@ qdel(wizard_mob.r_store) qdel(wizard_mob.l_store) - if(!isplasmaman(wizard_mob)) - wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(wizard_mob), slot_w_uniform) - wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), slot_head) - wizard_mob.dna.species.after_equip_job(null, wizard_mob) - else + if(isplasmaman(wizard_mob)) wizard_mob.equipOutfit(new /datum/outfit/plasmaman/wizard) wizard_mob.internal = wizard_mob.r_hand wizard_mob.update_action_buttons_icon() + else + wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(wizard_mob), slot_w_uniform) + wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), slot_head) + wizard_mob.dna.species.after_equip_job(null, wizard_mob) wizard_mob.rejuvenate() //fix any damage taken by naked vox/plasmamen/etc while round setups wizard_mob.equip_to_slot_or_del(new /obj/item/radio/headset(wizard_mob), slot_l_ear) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(wizard_mob), slot_shoes) diff --git a/code/game/gamemodes/wizard/wizloadouts.dm b/code/game/gamemodes/wizard/wizloadouts.dm index af31a7ee0d4..e39cc6094b1 100644 --- a/code/game/gamemodes/wizard/wizloadouts.dm +++ b/code/game/gamemodes/wizard/wizloadouts.dm @@ -47,7 +47,7 @@ destroy_spellbook = TRUE /obj/effect/proc_holder/spell/targeted/lichdom/gunslinger/equip_lich(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(H), slot_gloves) - H.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(H), slot_w_uniform) \ No newline at end of file + H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(H), slot_w_uniform) \ No newline at end of file diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index aae2295e18f..c657e0056e8 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -131,7 +131,7 @@ AC.ui_interact(user) if("Voice") - var/voice_choice = input(user, "Perhaps...", "Voice effects") as null|anything in list("Comic Sans", "Wingdings", "Swedish", "Chav") + var/voice_choice = input(user, "Perhaps...", "Voice effects") as null|anything in list("Comic Sans", "Wingdings", "Swedish", "Chav", "Mute") var/voice_mutation switch(voice_choice) if("Comic Sans") @@ -142,6 +142,8 @@ voice_mutation = GLOB.swedeblock if("Chav") voice_mutation = GLOB.chavblock + if("Mute") + voice_mutation = GLOB.muteblock if(voice_mutation) if(H.dna.GetSEState(voice_mutation)) H.dna.SetSEState(voice_mutation, FALSE)