diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 13f64e5859c..4579ec45f8b 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1129,6 +1129,27 @@ desc = "A red coat with cheaply made plastic accessories." icon_state = "pineapple_trench" +/obj/item/fluff/pinapplehairgel ////Pineapple Salad: Dan Jello + name = "slime hair gel" + desc = "A bottle containing extra..material..for custom 'hair' styling." + icon = 'icons/obj/custom_items.dmi' + icon_state = "ps_hairgel" + attack_verb = list("smacked") + hitsound = 'sound/weapons/tap.ogg' + force = 0 + throwforce = 0 + w_class = WEIGHT_CLASS_SMALL + +/obj/item/fluff/pinapplehairgel/attack_self(mob/user) + var/mob/living/carbon/human/target = user + if(!istype(target) || !isslimeperson(target)) + return + + if(target.change_hair("Sasook Hair", 1)) + to_chat(target, "You dump some of [src] on your head and style it around.") + + + /obj/item/clothing/suit/hooded/wintercoat/fluff/shesi //MrSynnester : Shesi Skaklas name = "custom made winter coat" desc = "A custom made winter coat with the arms removed. Looks comfy." diff --git a/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm b/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm index c37ab2a8822..794e6ea0ff4 100644 --- a/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm +++ b/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm @@ -4,7 +4,7 @@ /datum/sprite_accessory/hair/short name = "Short Hair" // try to capatilize the names please~ - icon_state = "short" // you do not need to define _s or _l sub-states, game automatically does this for you a + icon_state = "short" // you do not need to define _s or _l sub-states, game automatically does this for you a glasses_over = 1 /datum/sprite_accessory/hair/cut @@ -682,4 +682,10 @@ /////////////////////////////////// //////END POLARIS HAIRSTYLES/////// -////////////////////////////////// \ No newline at end of file +////////////////////////////////// + +///Fluff HairStyles// +datum/sprite_accessory/hair/fluff/pinapple_fluff_hair //Pineapple Salad hair fluff its for a slime..has to go under human + name = "Sasook Hair" + icon_state = "psalad_fluff_hair" + species_allowed = list("Slime People") \ No newline at end of file diff --git a/icons/mob/sprite_accessories/human/human_hair.dmi b/icons/mob/sprite_accessories/human/human_hair.dmi index 0d5d01c3a3f..05a0b030052 100644 Binary files a/icons/mob/sprite_accessories/human/human_hair.dmi and b/icons/mob/sprite_accessories/human/human_hair.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 51ca7d9e5af..1dae65d3237 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ