diff --git a/code/game/objects/items/weapons/improvised_components.dm b/code/game/objects/items/weapons/improvised_components.dm index c76f927ef2..74b325b9ae 100644 --- a/code/game/objects/items/weapons/improvised_components.dm +++ b/code/game/objects/items/weapons/improvised_components.dm @@ -68,3 +68,34 @@ qdel(src) user.put_in_hands(finished) update_icon(user) + +/obj/item/woodcirclet + name = "wood circlet" + desc = "A small wood circlet for making a flower crown." + icon = 'icons/obj/buildingobject.dmi' + icon_state = "woodcirclet" + w_class = ITEMSIZE_SMALL + +/obj/item/woodcirclet/attackby(obj/item/W as obj, mob/user as mob) + var/obj/item/complete + if(istype(W,/obj/item/seeds/poppyseed)) + user << "You attach the poppy to the circlet and create a beautiful flower crown." + complete = new /obj/item/clothing/head/poppy_crown(get_turf(user)) + qdel(W) + qdel(src) + user.put_in_hands(complete) + return + else if(istype(W,/obj/item/seeds/sunflowerseed)) + user << "You attach the sunflower to the circlet and create a beautiful flower crown." + complete = new /obj/item/clothing/head/sunflower_crown(get_turf(user)) + qdel(W) + qdel(src) + user.put_in_hands(complete) + return + else if(istype(W,/obj/item/seeds/lavenderseed)) + user << "You attach the lavender to the circlet and create a beautiful flower crown." + complete = new /obj/item/clothing/head/lavender_crown(get_turf(user)) + qdel(W) + qdel(src) + user.put_in_hands(complete) + return \ No newline at end of file diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index d354ec315e..8ed16e4591 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -347,3 +347,24 @@ desc = "A wide-brimmed hat popularly worn in Mexico." icon_state = "sombrero" body_parts_covered = 0 + + + //Flower crowns + + /obj/item/clothing/head/sunflower_crown + name = "sunflower crown" + desc = "A flower crown weaved with sunflowers." + icon_state = "sunflower_crown" + body_parts_covered = 0 + + /obj/item/clothing/head/lavender_crown + name = "lavender crown" + desc = "A flower crown weaved with lavender." + icon_state = "lavender_crown" + body_parts_covered = 0 + + /obj/item/clothing/head/poppy_crown + name = "poppy crown" + desc = "A flower crown weaved with poppies." + icon_state = "poppy_crown" + body_parts_covered = 0 \ No newline at end of file diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm index 4bc6c814ee..e7c7d0ecd9 100644 --- a/code/modules/materials/material_recipes.dm +++ b/code/modules/materials/material_recipes.dm @@ -120,6 +120,7 @@ /material/wood/generate_recipes() ..() recipes += new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1) + recipes += new/datum/stack_recipe("wood circlet", /obj/item/woodcirclet, 1) recipes += new/datum/stack_recipe("clipboard", /obj/item/weapon/clipboard, 1) recipes += new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20) recipes += new/datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood, 3, time = 10, one_per_turf = 1, on_floor = 1) diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 8799515814..dff3abd7d7 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index f77c8c5207..ad160c7247 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/lefthand_hats.dmi b/icons/mob/items/lefthand_hats.dmi index 620da132c0..c52c6c9018 100644 Binary files a/icons/mob/items/lefthand_hats.dmi and b/icons/mob/items/lefthand_hats.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index da47c520be..9eb88606ca 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/mob/items/righthand_hats.dmi b/icons/mob/items/righthand_hats.dmi index be3ed9b8ee..7d089a8a0f 100644 Binary files a/icons/mob/items/righthand_hats.dmi and b/icons/mob/items/righthand_hats.dmi differ diff --git a/icons/obj/buildingobject.dmi b/icons/obj/buildingobject.dmi index 76fa0e4350..d55e9ec99f 100644 Binary files a/icons/obj/buildingobject.dmi and b/icons/obj/buildingobject.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 88105392b5..920e73a891 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ