]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Remake hairflowers (#25475)
authorlzk <124214523+lzk228@users.noreply.github.com>
Sun, 31 Mar 2024 05:33:23 +0000 (07:33 +0200)
committerGitHub <noreply@github.com>
Sun, 31 Mar 2024 05:33:23 +0000 (16:33 +1100)
commitd5052697aa21ffddb9cec49f9b445ce194e41eab
tree2569429ccc40762df5527bed2850b602befdeed3
parentf5e5b6b0952e73acfcc500cd2d65d30d6bcd5b96
Remake hairflowers (#25475)

* Add more lily usage (orange hairflower and flowercrown)

* comit 2

* ee

* more fixes

* w

* im stupid

* bring poppy in authodrobe

* weh

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
15 files changed:
Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
Resources/Prototypes/Entities/Clothing/Head/misc.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Prototypes/Entities/Objects/Decoration/present.yml
Resources/Prototypes/Recipes/Crafting/Graphs/improvised/hairflower.yml [deleted file]
Resources/Prototypes/Recipes/Crafting/improvised.yml
Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png [deleted file]
Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-left.png [deleted file]
Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-right.png [deleted file]
Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json [deleted file]
Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/equipped-HELMET.png [moved from Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png with 100% similarity]
Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
Resources/migration.yml