diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index f2324a861b..4bacc26b91 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -32,6 +32,20 @@ sprite: Clothing/Head/Misc/chickenhead.rsi - type: IngestionBlocker +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatFlowerCrown + name: flower crown + description: A coronet of fresh and fragrant flowers. + components: + - type: Sprite + sprite: Clothing/Head/Misc/flower-crown.rsi + - type: Clothing + sprite: Clothing/Head/Misc/flower-crown.rsi + - type: Construction + graph: flowercrown + node: flowercrown + - type: entity parent: ClothingHeadBase id: ClothingHeadHatHairflower diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 2f72fa6ff7..d1d4de75fc 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -699,6 +699,9 @@ seedId: poppy - type: Extractable grindableSolutionName: food + - type: Tag + tags: + - Flower - type: entity name: lingzhi diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml new file mode 100644 index 0000000000..b5940491ab --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml @@ -0,0 +1,16 @@ +- type: constructionGraph + id: flowercrown + start: start + graph: + - node: start + edges: + - to: flowercrown + steps: + - tag: Flower + name: flower + icon: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce + doAfter: 10 + - node: flowercrown + entity: ClothingHeadHatFlowerCrown diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index b04a43c6fc..e146e21a0f 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -60,3 +60,16 @@ icon: sprite: Clothing/Eyes/Misc/blindfold.rsi state: icon + +- type: construction + name: flower crown + id: flowercrown + graph: flowercrown + startNode: start + targetNode: flowercrown + category: Misc + description: "A coronet of fresh and fragrant flowers." + icon: + sprite: Clothing/Head/Misc/flower-crown.rsi + state: icon + objectType: Item diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 68780b7d09..c5c8fef176 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -195,6 +195,9 @@ - type: Tag id: Flashlight +- type: Tag + id: Flower + - type: Tag id: Folder diff --git a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..be8a12d5a1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png new file mode 100644 index 0000000000..e1e80b9293 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json new file mode 100644 index 0000000000..2899868b90 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Kevin Zheng 2022", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +}