Skip to content

Commit

Permalink
Adds flower crowns! (#3914)
Browse files Browse the repository at this point in the history
* Adds flower crowns!

Partial port of tgstation/tgstation#78022

* Fix flower crowns not actually appearing in loadout
  • Loading branch information
Absolucy authored Oct 23, 2024
1 parent 1767ae7 commit 057aa23
Show file tree
Hide file tree
Showing 7 changed files with 119 additions and 0 deletions.
40 changes: 40 additions & 0 deletions code/datums/components/crafting/tailoring.dm
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,46 @@
)
category = CAT_CLOTHING

/datum/crafting_recipe/poppy_crown
name = "Poppy Crown"
result = /obj/item/clothing/head/costume/garland/poppy
time = 1 SECONDS
reqs = list(
/obj/item/food/grown/poppy = 5,
/obj/item/stack/cable_coil = 3,
)
category = CAT_CLOTHING

/datum/crafting_recipe/lily_crown
name = "Lily Crown"
result = /obj/item/clothing/head/costume/garland/lily
time = 1 SECONDS
reqs = list(
/obj/item/food/grown/poppy/lily = 5,
/obj/item/stack/cable_coil = 3,
)
category = CAT_CLOTHING

/datum/crafting_recipe/sunflower_crown
name = "Sunflower Crown"
result = /obj/item/clothing/head/costume/garland/sunflower
time = 1 SECONDS
reqs = list(
/obj/item/food/grown/sunflower = 5,
/obj/item/stack/cable_coil = 3,
)
category = CAT_CLOTHING

/datum/crafting_recipe/rainbow_bunch_crown
name = "Rainbow Flower Crown"
result = /obj/item/clothing/head/costume/garland/rainbowbunch
time = 1 SECONDS
reqs = list(
/obj/item/food/grown/rainbow_flower = 5,
/obj/item/stack/cable_coil = 3,
)
category = CAT_CLOTHING

/datum/crafting_recipe/pillow_suit
name = "pillow suit"
result = /obj/item/clothing/suit/pillow_suit
Expand Down
39 changes: 39 additions & 0 deletions code/modules/clothing/head/garlands.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,42 @@
/obj/item/clothing/head/costume/garland/dropped(mob/living/user)
. = ..()
user.clear_mood_event("garland")

/obj/item/clothing/head/costume/garland/rainbowbunch
name = "rainbow flower crown"
desc = "A flower crown made out of the flowers of the rainbow bunch plant."
icon_state = "rainbow_bunch_crown_1"
base_icon_state = "rainbow_bunch_crown"

/obj/item/clothing/head/costume/garland/rainbowbunch/Initialize(mapload)
. = ..()
var/crown_type = rand(1,4)
icon_state = "[base_icon_state]_[crown_type]"
switch(crown_type)
if(1)
desc += " This one has red, yellow, and white flowers."
if(2)
desc += " This one has blue, yellow, green, and white flowers."
if(3)
desc += " This one has red, blue, purple, and pink flowers."
if(4)
desc += " This one has yellow, green, and white flowers."

/obj/item/clothing/head/costume/garland/sunflower
name = "sunflower crown"
desc = "A bright flower crown made out sunflowers that is sure to brighten up anyone's day!"
icon_state = "sunflower_crown"
worn_icon_state = "sunflower_crown"

/obj/item/clothing/head/costume/garland/poppy
name = "poppy crown"
desc = "A flower crown made out of a string of bright red poppies."
icon_state = "poppy_crown"
worn_icon_state = "poppy_crown"

/obj/item/clothing/head/costume/garland/lily
name = "lily crown"
desc = "A leafy flower crown with a cluster of large white lilies at at the front."
icon_state = "lily_crown"
worn_icon_state = "lily_crown"

Binary file modified icons/mob/clothing/head/costume.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/head/costume.dmi
Binary file not shown.
16 changes: 16 additions & 0 deletions monkestation/code/modules/loadouts/items/heads.dm
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,22 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
name = "Floral Garland"
item_path = /obj/item/clothing/head/costume/garland

/datum/loadout_item/head/rainbowbunch //BUYABLE
name = "Rainbow Flower Crown"
item_path = /obj/item/clothing/head/costume/garland/rainbowbunch

/datum/loadout_item/head/sunflower_crown //BUYABLE
name = "Sunflower Crown"
item_path = /obj/item/clothing/head/costume/garland/sunflower

/datum/loadout_item/head/poppy_crown //BUYABLE
name = "Poppy Crown"
item_path = /obj/item/clothing/head/costume/garland/poppy

/datum/loadout_item/head/lily_crown //BUYABLE
name = "Lily Crown"
item_path = /obj/item/clothing/head/costume/garland/lily

/datum/loadout_item/head/sombrero //BUYABLE
name = "Sombrero"
item_path = /obj/item/clothing/head/costume/sombrero
Expand Down
20 changes: 20 additions & 0 deletions monkestation/code/modules/store/store_items/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,26 @@ GLOBAL_LIST_INIT(store_head, generate_store_items(/datum/store_item/head))
item_path = /obj/item/clothing/head/costume/garland
item_cost = 3000

/datum/store_item/head/rainbowbunch //BUYABLE
name = "Rainbow Flower Crown"
item_path = /obj/item/clothing/head/costume/garland/rainbowbunch
item_cost = 5000

/datum/store_item/head/sunflower_crown //BUYABLE
name = "Sunflower Crown"
item_path = /obj/item/clothing/head/costume/garland/sunflower
item_cost = 3000

/datum/store_item/head/poppy_crown //BUYABLE
name = "Poppy Crown"
item_path = /obj/item/clothing/head/costume/garland/poppy
item_cost = 3000

/datum/store_item/head/lily_crown //BUYABLE
name = "Lily Crown"
item_path = /obj/item/clothing/head/costume/garland/lily
item_cost = 3000

/datum/store_item/head/sombrero //BUYABLE
name = "Sombrero"
item_path = /obj/item/clothing/head/costume/sombrero
Expand Down
4 changes: 4 additions & 0 deletions monkestation/code/modules/trading/lootbox_odds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ GLOBAL_LIST_INIT(possible_lootbox_clothing, list(
/obj/item/clothing/head/costume/foilhat,
/obj/item/clothing/head/costume/football_helmet,
/obj/item/clothing/head/costume/garland,
/obj/item/clothing/head/costume/garland/rainbowbunch,
/obj/item/clothing/head/costume/garland/sunflower,
/obj/item/clothing/head/costume/garland/poppy,
/obj/item/clothing/head/costume/garland/lily,
/obj/item/clothing/head/costume/griffin,
/obj/item/clothing/head/costume/hasturhood,
/obj/item/clothing/head/costume/irs,
Expand Down

0 comments on commit 057aa23

Please sign in to comment.