The Honkening

This commit is contained in:
TheDZD
2016-07-07 21:35:19 -04:00
parent 1b2d8b317f
commit 52e6df894e
23 changed files with 200 additions and 19 deletions
@@ -47,4 +47,11 @@
name = "batgloves"
icon_state = "bmgloves"
item_state = "bmgloves"
item_color="bmgloves"
item_color="bmgloves"
/obj/item/clothing/gloves/cursedclown
name = "cursed white gloves"
desc = "These things smell terrible, and they're all lumpy. Gross."
icon_state = "latex"
item_state = "lgloves"
flags = NODROP
@@ -275,3 +275,28 @@ obj/item/clothing/mask/bandana/purple
icon_state = "bandblack"
item_color = "black"
desc = "It's a black bandana."
/obj/item/clothing/mask/cursedclown
name = "cursed clown mask"
desc = "This is a very, very odd looking mask."
icon = 'icons/goonstation/objects/clothing/mask.dmi'
icon_state = "cursedclown"
item_state = "cclown_hat"
icon_override = 'icons/goonstation/mob/clothing/mask.dmi'
lefthand_file = 'icons/goonstation/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi'
flags = NODROP
/obj/item/clothing/mask/cursedclown/equipped(mob/user, slot)
..()
var/mob/living/carbon/human/H = user
if(istype(H) && slot == slot_wear_mask)
to_chat(H, "<span class='danger'>[src] grips your face!</span>")
if(H.mind && H.mind.assigned_role != "Cluwne")
H.makeCluwne()
/obj/item/clothing/mask/cursedclown/suicide_act(mob/user)
user.visible_message("<span class='danger'>[user] gazes into the eyes of [src]. [src] gazes back!</span>")
spawn(10)
user.gib()
return BRUTELOSS
@@ -207,3 +207,13 @@
item_color = "fancysandal"
species_restricted = null
/obj/item/clothing/shoes/cursedclown
name = "cursed clown shoes"
desc = "Moldering clown flip flops. They're neon green for some reason."
icon = 'icons/goonstation/objects/clothing/feet.dmi'
icon_state = "cursedclown"
item_state = "cclown_shoes"
icon_override = 'icons/goonstation/mob/clothing/feet.dmi'
lefthand_file = 'icons/goonstation/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi'
flags = NODROP
+1 -1
View File
@@ -657,4 +657,4 @@
if(user.reagents.get_reagent_amount("syndicate_nanites") < 15)
user.reagents.add_reagent("syndicate_nanites", 15)
else
processing_objects.Remove(src)
processing_objects.Remove(src)
@@ -709,3 +709,15 @@
to_chat(user,"<span class='warning'>You can't fit inside while wearing that \the [user.get_item_by_slot(slot_id)].</span>")
return 0
return 1
/obj/item/clothing/under/cursedclown
name = "cursed clown suit"
desc = "It wasn't already?"
icon = 'icons/goonstation/objects/clothing/uniform.dmi'
icon_state = "cursedclown"
item_state = "cclown_uniform"
item_color = "cursedclown"
icon_override = 'icons/goonstation/mob/clothing/uniform.dmi'
lefthand_file = 'icons/goonstation/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi'
flags = NODROP
+14 -7
View File
@@ -476,13 +476,21 @@
var/mob/living/carbon/human/H = owner
if(isobj(H.shoes))
var/thingy = H.shoes
H.unEquip(H.shoes)
walk_away(thingy,H,15,2)
spawn(20)
if(thingy)
walk(thingy,0)
if(H.unEquip(H.shoes))
walk_away(thingy,H,15,2)
spawn(20)
if(thingy)
walk(thingy,0)
..()
/obj/item/organ/internal/honktumor/cursed
/obj/item/organ/internal/honktumor/cursed/remove(mob/living/carbon/M, special = 0, clean_remove = 0)
..()
if(!clean_remove)
insert(M) //You're not getting away that easily!
else
qdel(src)
/obj/item/organ/internal/beard
name = "beard organ"
@@ -493,7 +501,6 @@
parent_organ = "head"
slot = "hair_organ"
/obj/item/organ/internal/beard/on_life()
if(!owner)
@@ -516,4 +523,4 @@
head_organ.r_facial = 216
head_organ.g_facial = 192
head_organ.b_facial = 120
H.update_fhair()
H.update_fhair()