diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 163fa202d00..cbfefe662e7 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -1074,6 +1074,15 @@ reqs = list(/obj/item/stack/sheet/cloth = 4) category = CAT_CLOTHING +/datum/crafting_recipe/flower_garland + name = "Flower Garland" + result = /obj/item/clothing/head/garland + time = 10 + reqs = list(/obj/item/food/grown/poppy = 4, + /obj/item/food/grown/harebell = 4, + /obj/item/food/grown/rose = 4) + category = CAT_CLOTHING + /datum/crafting_recipe/guillotine name = "Guillotine" result = /obj/structure/guillotine diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 44acc5a3228..fd4e90e2254 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -282,6 +282,10 @@ mood_change = 2 timeout = 3 MINUTES +/datum/mood_event/garland + description = "These flowers are rather soothing." + mood_change = 1 + /datum/mood_event/playing_cards/add_effects(param) var/card_players = 1 for(var/mob/living/carbon/player in viewers(COMBAT_MESSAGE_RANGE, owner)) diff --git a/code/modules/clothing/head/garlands.dm b/code/modules/clothing/head/garlands.dm new file mode 100644 index 00000000000..84333fefea3 --- /dev/null +++ b/code/modules/clothing/head/garlands.dm @@ -0,0 +1,14 @@ +/obj/item/clothing/head/garland + name = "floral garland" + desc = "Someone, somewhere, is starving while wearing this. And it's definitely not you." + icon_state = "garland" + worn_icon_state = "garland" + +/obj/item/clothing/head/garland/equipped(mob/user, slot) + . = ..() + if(slot_flags & slot) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "garland", /datum/mood_event/garland) + +/obj/item/clothing/head/garland/dropped(mob/user) + . = ..() + SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "garland") diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 9694491fd09..32aa54f6b75 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index e839d4f4ea9..608133aa4db 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 92835526506..5db2ec100cc 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2628,6 +2628,7 @@ #include "code\modules\clothing\head\crown.dm" #include "code\modules\clothing\head\fedora.dm" #include "code\modules\clothing\head\frenchberet.dm" +#include "code\modules\clothing\head\garlands.dm" #include "code\modules\clothing\head\hardhat.dm" #include "code\modules\clothing\head\hat.dm" #include "code\modules\clothing\head\helmet.dm"