diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 9e0218e460..50e3da93fb 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -51,12 +51,15 @@ parent: ClothingHeadBase id: ClothingHeadHatHairflower name: hairflower - description: A red rose for beautiful ladies. + description: A red flower for beautiful ladies. components: - type: Sprite sprite: Clothing/Head/Misc/hairflower.rsi - type: Clothing sprite: Clothing/Head/Misc/hairflower.rsi + - type: Construction + graph: hairflower + node: hairflower - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 7a729a7ab3..02fffadc03 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -864,7 +864,7 @@ grindableSolutionName: food - type: Tag tags: - - Flower + - Flower # TODO add "RedFlower" or "Poppy" tag, when other color flowers will be - type: entity name: lingzhi @@ -927,6 +927,9 @@ sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi slots: - HEAD + - type: Tag + tags: + - Ambrosia - type: entity name: galaxythistle diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml index b5940491ab..cba454b663 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml @@ -11,6 +11,16 @@ icon: sprite: Objects/Specific/Hydroponics/poppy.rsi state: produce + - tag: Flower + name: flower + icon: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce + - tag: Ambrosia + name: ambrosia + icon: + sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi + state: produce doAfter: 10 - node: flowercrown entity: ClothingHeadHatFlowerCrown diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/hairflower.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/hairflower.yml new file mode 100644 index 0000000000..76bc124290 --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/hairflower.yml @@ -0,0 +1,16 @@ +- type: constructionGraph + id: hairflower + start: start + graph: + - node: start + edges: + - to: hairflower + steps: + - tag: Flower # TODO change to "RedFlower" or "Poppy" tag, so you cant make red flower from bluesyellow etc., when it will be + name: flower + icon: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce + doAfter: 3.5 + - node: hairflower + entity: ClothingHeadHatHairflower diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 3043c0f7a1..277a67e283 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -17,7 +17,7 @@ graph: GhostSheet startNode: start targetNode: ghost_sheet - category: construction-category-misc + category: construction-category-clothing description: Become a spooky ghost. Boo! icon: sprite: Clothing/OuterClothing/Misc/ghostsheet.rsi @@ -87,13 +87,26 @@ sprite: Clothing/Eyes/Misc/blindfold.rsi state: icon +- type: construction + name: hairflower + id: hairflower + graph: hairflower + startNode: start + targetNode: hairflower + category: construction-category-clothing + description: "A red flower for beautiful ladies." + icon: + sprite: Clothing/Head/Misc/hairflower.rsi + state: icon + objectType: Item + - type: construction name: flower crown id: flowercrown graph: flowercrown startNode: start targetNode: flowercrown - category: construction-category-misc + category: construction-category-clothing description: "A coronet of fresh and fragrant flowers." icon: sprite: Clothing/Head/Misc/flower-crown.rsi diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 5a5d407dde..a0a6433c61 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -7,6 +7,9 @@ - type: Tag id: AirSensor +- type: Tag + id: Ambrosia + - type: Tag id: AppraisalTool @@ -648,7 +651,7 @@ - type: Tag id: Plunger - + - type: Tag id: PlushieGhost @@ -824,7 +827,7 @@ - type: Tag id: TrashBag - + - type: Tag id: Unstackable # To prevent things like atmos devices (filters etc) being stacked on one tile. See NoUnstackableInTile