cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts clown mask selection to a radial menu (#19675)

Browse Source 
* converts clown mask selection to radial menu

* desc update

* Sirryan review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Sirryan review pt2

* Reverting as it no longer builds

* Revert "Reverting as it no longer builds"

This reverts commit 56873c79b1.

* right everything should work now haha

* removed else, thanks Contra

* Sirryan request

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
Coolrune206
2022-11-22 14:53:15 +10:00
committed by GitHub
parent 615ae2db4e
commit d4744d0d8d
1 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/masks/gasmask.dm
+34 -16
View File
@@ -109,35 +109,53 @@
/obj/item/clothing/mask/gas/clown_hat
name = "clown wig and mask"
desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask."
desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask. Its form can be changed by using it in your hand."
icon_state = "clown"
item_state = "clown_hat"
flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR
resistance_flags = FLAMMABLE
dog_fashion = /datum/dog_fashion/head/clown
/obj/item/clothing/mask/gas/clown_hat/attack_self(mob/user)
/obj/item/clothing/mask/gas/clown_hat/attack_self(mob/living/user)
var/list/mask_type = list("True Form" = /obj/item/clothing/mask/gas/clown_hat,
"The Feminist" = /obj/item/clothing/mask/gas/clown_hat/sexy,
"The Madman" = /obj/item/clothing/mask/gas/clown_hat/joker,
"The Rainbow Color" = /obj/item/clothing/mask/gas/clown_hat/rainbow)
var/list/mask_icons = list("True Form" = image(icon = 'icons/obj/clothing/masks.dmi', icon_state = "clown"),
"The Feminist" = image(icon = 'icons/obj/clothing/masks.dmi', icon_state = "sexyclown"),
"The Madman" = image(icon = 'icons/obj/clothing/masks.dmi', icon_state = "joker"),
"The Rainbow Color" = image(icon = 'icons/obj/clothing/masks.dmi', icon_state = "rainbow"))
var/mask_choice = show_radial_menu(user, src, mask_icons)
var/picked_mask = mask_type[mask_choice]
var/mob/M = usr
var/list/options = list()
options["True Form"] = "clown"
options["The Feminist"] = "sexyclown"
options["The Madman"] = "joker"
options["The Rainbow Color"] ="rainbow"
var/choice = input(M,"To what form do you wish to Morph this mask?","Morph Mask") in options
if(src && choice && !M.stat && in_range(M,src))
icon_state = options[choice]
to_chat(M, "Your Clown Mask has now morphed into [choice], all praise the Honk Mother!")
return 1
if(QDELETED(src) || !picked_mask)
return
if(user.stat || !in_range(user, src))
return
var/obj/item/clothing/mask/gas/clown_hat/new_mask = new picked_mask(get_turf(user))
qdel(src)
user.put_in_active_hand(new_mask)
to_chat(user, "<span class='notice'>Your Clown Mask has now morphed into its new form, all praise the Honk Mother!</span>")
return TRUE
/obj/item/clothing/mask/gas/clown_hat/sexy
name = "sexy-clown wig and mask"
desc = "A feminine clown mask for the dabbling crossdressers or female entertainers."
desc = "A feminine clown mask for the dabbling crossdressers or female entertainers. Its form can be changed by using it in your hand."
icon_state = "sexyclown"
item_state = "sexyclown"
/obj/item/clothing/mask/gas/clown_hat/joker
name = "deranged clown wig and mask"
desc = "A fiendish clown mask that inspires a deranged mirth. Its form can be changed by using it in your hand."
icon_state = "joker"
item_state = "joker"
/obj/item/clothing/mask/gas/clown_hat/rainbow
name = "rainbow clown wig and mask"
desc = "A colorful clown mask for the clown that loves to dazzle and impress. Its form can be changed by using it in your hand."
icon_state = "rainbow"
item_state = "rainbow"
/obj/item/clothing/mask/gas/clownwiz
name = "wizard clown wig and mask"
desc = "Some pranksters are truly magical."