cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

review stuff + mute in magic mirror

Browse Source
This commit is contained in:
datlo
2020-03-26 16:14:25 +01:00
parent be91b68214
commit 4db33fce5d
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/wizard/wizard.dm
+5 -5
View File
@@ -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)
code/game/gamemodes/wizard/wizloadouts.dm
+4 -4
View File
@@ -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)
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)
code/game/objects/structures/mirror.dm
+3 -1
View File
@@ -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)