diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index c4bf3681635..501bfcb60b9 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -580,3 +580,58 @@ sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) + +/obj/item/clothing/head/flower_crown + name = "flower crown" + desc = "A colorful flower crown made out of lilies, sunflowers and poppies." + icon_state = "flower_crown" + item_state = "flower_crown" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi' + ) + +/obj/item/clothing/head/sunflower_crown + name = "sunflower crown" + desc = "A bright flower crown made out sunflowers that is sure to brighten up anyone's day!" + icon_state = "sunflower_crown" + item_state = "sunflower_crown" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi' + ) + +/obj/item/clothing/head/poppy_crown + name = "poppy crown" + desc = "A flower crown made out of a string of bright red poppies." + icon_state = "poppy_crown" + item_state = "poppy_crown" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi' + ) + +/obj/item/clothing/head/lily_crown + name = "lily crown" + desc = "A leafy flower crown with a cluster of large white lilies at the front." + icon_state = "lily_crown" + item_state = "lily_crown" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi' + ) + +/obj/item/clothing/head/geranium_crown + name = "geranium crown" + desc = "A flower crown made out of an array of rich purple geraniums." + icon_state = "geranium_crown" + item_state = "geranium_crown" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi' + ) diff --git a/code/modules/crafting/tailoring.dm b/code/modules/crafting/tailoring.dm index 5ce8299daee..b072b042488 100644 --- a/code/modules/crafting/tailoring.dm +++ b/code/modules/crafting/tailoring.dm @@ -280,3 +280,41 @@ /obj/item/assembly/voice = 1, /obj/item/stack/cable_coil = 5) category = CAT_CLOTHING + +/datum/crafting_recipe/flower_crown + name = "Flower Crown" + result = list(/obj/item/clothing/head/flower_crown) + reqs = list(/obj/item/food/snacks/grown/poppy = 3, + /obj/item/food/snacks/grown/poppy/lily = 3, + /obj/item/grown/sunflower = 3 + ) + time = 2 SECONDS + category = CAT_CLOTHING + +/datum/crafting_recipe/sunflower_crown + name = "Sunflower Crown" + result = list(/obj/item/clothing/head/sunflower_crown) + reqs = list(/obj/item/grown/sunflower = 5) + time = 2 SECONDS + category = CAT_CLOTHING + +/datum/crafting_recipe/poppy_crown + name = "Poppy Crown" + result = list(/obj/item/clothing/head/poppy_crown) + reqs = list(/obj/item/food/snacks/grown/poppy = 5) + time = 2 SECONDS + category = CAT_CLOTHING + +/datum/crafting_recipe/lily_crown + name = "Lily Crown" + result = list(/obj/item/clothing/head/lily_crown) + reqs = list(/obj/item/food/snacks/grown/poppy/lily = 5) + time = 2 SECONDS + category = CAT_CLOTHING + +/datum/crafting_recipe/geranium_crown + name = "Geranium Crown" + result = list(/obj/item/clothing/head/geranium_crown) + reqs = list(/obj/item/food/snacks/grown/poppy/geranium = 5) + time = 2 SECONDS + category = CAT_CLOTHING diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 7bd0b30f04f..0a3c3cba298 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi index baef8c01ccb..c344b3195a8 100644 Binary files a/icons/mob/clothing/species/drask/head.dmi and b/icons/mob/clothing/species/drask/head.dmi differ diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index 15518988940..83416f9d242 100644 Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index 6267c55e3f2..d9bb7cad94b 100644 Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index e818a16eaea..a50bfbca3f1 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ