cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports the Flower Garland from JollyStation (#67468)

Browse Source 
* pick 12 flowers and regret your decisions

* Update code/modules/clothing/head/garlands.dm

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* Update code/modules/clothing/head/garlands.dm

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* Update code/modules/clothing/head/garlands.dm

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* Update code/modules/clothing/head/garlands.dm

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* grammar

* sanity mood event

* willards review

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
This commit is contained in:
Jolly
2022-06-05 23:40:24 -04:00
committed by GitHub
co-authored by ATH1909
parent c39b39e89e
commit 2da4f98da5
6 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/crafting/recipes.dm
+9
View File
@@ -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
code/datums/mood_events/generic_positive_events.dm
+4
View File
@@ -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))