]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Combine flower crown and wreath (#26605)
authorlzk <124214523+lzk228@users.noreply.github.com>
Sun, 31 Mar 2024 08:52:52 +0000 (10:52 +0200)
committerGitHub <noreply@github.com>
Sun, 31 Mar 2024 08:52:52 +0000 (19:52 +1100)
commit55c77af33cad8e173c6281286fc66f3a67579eb5
treed56f191df29cbb8c1a1524c410977a23cfc1423d
parentad438a7ac2216c6295cae97025b4204a9c2ae41f
Combine flower crown and wreath (#26605)

* Combine flower crown and wreath

* huh

* huuh :trollface:
13 files changed:
Resources/Prototypes/Entities/Clothing/Head/misc.yml
Resources/Prototypes/Entities/Clothing/Neck/misc.yml
Resources/Prototypes/Entities/Objects/Decoration/present.yml
Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml [deleted file]
Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowerwreath.yml
Resources/Prototypes/Recipes/Crafting/improvised.yml
Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png [deleted file]
Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-HELMET.png [moved from Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/equipped-HELMET.png with 100% similarity]
Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-NECK.png [moved from Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/equipped-NECK.png with 100% similarity]
Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/icon.png [moved from Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/icon.png with 100% similarity]
Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json [moved from Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json with 59% similarity]
Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/meta.json [deleted file]
Resources/migration.yml