]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Rename kira special to the orange-lime soda (#41167)
authorkosticia <kosticia46@gmail.com>
Tue, 28 Oct 2025 19:46:56 +0000 (22:46 +0300)
committerGitHub <noreply@github.com>
Tue, 28 Oct 2025 19:46:56 +0000 (19:46 +0000)
commit87a3b4fa5647753de6ff18473d356ed81dc2e855
tree59001bb46b829cd664338f1f1ad8284d0c9cd120
parentf039432aa5dfdd66b71daf922916663b53af4f88
Rename kira special to the orange-lime soda (#41167)

* rename kira

* these one too

* migration

* Revert "migration"

This reverts commit ae0006ef745909c2e17b37fd18fd1d57204fe773.

* Revert "these one too"

This reverts commit 9757d2cf6898719b158e03c0f3b637cd2b55ce17.

* Revert "rename kira"

This reverts commit 170408c6f7486a6746b7a7c52cf10c597ead2608.

* bless the emo

* aaaaa

* time to end this right here and right now

* Revert "time to end this right here and right now"

This reverts commit b2c38573f9f8b5e8f736443d646d26839a0694cf.

* Revert "aaaaa"

This reverts commit 0f9451e22533b2f646211219e04103ce16d952ca.

* Revert "bless the emo"

This reverts commit 223607accf81e286481cab8d1037b1eb89a44dac.

* rename

* bikeshedding

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
13 files changed:
Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
Resources/Prototypes/Recipes/Reactions/drinks.yml
Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/icon.png [moved from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/icon.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/icon_empty.png [moved from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/icon_empty.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/meta.json [moved from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/meta.json with 100% similarity]
Resources/migration.yml