Merge pull request #12118 from datlo/cursedoutfits

Add the Banana Touch and Mime Malaise wizard spells
This commit is contained in:
variableundefined
2019-09-02 23:38:26 -04:00
committed by GitHub
12 changed files with 152 additions and 9 deletions
+4 -5
View File
@@ -140,11 +140,7 @@
flags_inv = HIDEEARS | HIDEEYES
magical = TRUE
/obj/item/clothing/mask/gas/virusclown_hat
name = "clown wig and mask"
desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask."
icon_state = "clown"
item_state = "clown_hat"
/obj/item/clothing/mask/gas/clown_hat/nodrop
flags = NODROP
/obj/item/clothing/mask/gas/mime
@@ -154,6 +150,9 @@
item_state = "mime"
burn_state = FLAMMABLE
/obj/item/clothing/mask/gas/mime/nodrop
flags = NODROP
/obj/item/clothing/mask/gas/monkeymask
name = "monkey mask"
desc = "A mask used when acting as a monkey."
@@ -88,6 +88,9 @@
to_chat(user, "<span class='notice'>You switch on the waddle dampeners!</span>")
enabled_waddle = FALSE
/obj/item/clothing/shoes/clown_shoes/nodrop
flags = NODROP
/obj/item/clothing/shoes/clown_shoes/magical
name = "magical clown shoes"
desc = "Standard-issue shoes of the wizarding class clown. Damn they're huge! And powerful! Somehow."
+5 -2
View File
@@ -30,7 +30,7 @@
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
//Botonist
//Botanist
/obj/item/clothing/suit/apron
name = "apron"
desc = "A basic blue apron."
@@ -364,6 +364,9 @@
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
/obj/item/clothing/suit/suspenders/nodrop
flags = NODROP
// Surgeon
/obj/item/clothing/suit/apron/surgical
name = "surgical apron"
@@ -371,7 +374,7 @@
icon_state = "surgical"
item_state = "surgical"
allowed = list(/obj/item/scalpel, /obj/item/surgical_drapes, /obj/item/cautery, /obj/item/hemostat, /obj/item/retractor)
//Research Director
/obj/item/clothing/suit/mantle/labcoat
name = "research director's mantle"
@@ -88,6 +88,9 @@
item_state = "sexyclown"
item_color = "sexyclown"
/obj/item/clothing/under/rank/clown/nodrop
flags = NODROP
/obj/item/clothing/under/rank/head_of_personnel
desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
name = "head of personnel's jumpsuit"
@@ -208,6 +211,8 @@
item_color = "mime"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/mime/nodrop
flags = NODROP
/obj/item/clothing/under/rank/miner
desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."