From 87a3b4fa5647753de6ff18473d356ed81dc2e855 Mon Sep 17 00:00:00 2001 From: kosticia Date: Tue, 28 Oct 2025 22:46:56 +0300 Subject: [PATCH] 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> --- .../reagents/meta/consumable/drink/alcohol.ftl | 3 --- .../en-US/reagents/meta/consumable/drink/drinks.ftl | 3 +++ .../Spawners/Random/Food_Drinks/drinks_glass.yml | 2 +- .../Consumable/Drinks/drinks_metamorphic.yml | 8 ++++---- .../Prototypes/Reagents/Consumable/Drink/drinks.yml | 8 ++++---- Resources/Prototypes/Recipes/Reactions/drinks.yml | 4 ++-- .../fill-1.png | Bin .../fill-2.png | Bin .../fill-3.png | Bin .../icon.png | Bin .../icon_empty.png | Bin .../meta.json | 0 Resources/migration.yml | 3 +++ 13 files changed, 17 insertions(+), 14 deletions(-) rename Resources/Textures/Objects/Consumable/Drinks/{kiraspecial.rsi => orangelime_soda.rsi}/fill-1.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{kiraspecial.rsi => orangelime_soda.rsi}/fill-2.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{kiraspecial.rsi => orangelime_soda.rsi}/fill-3.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{kiraspecial.rsi => orangelime_soda.rsi}/icon.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{kiraspecial.rsi => orangelime_soda.rsi}/icon_empty.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{kiraspecial.rsi => orangelime_soda.rsi}/meta.json (100%) diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl index 733fad4cf9..12f6a2d867 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -193,9 +193,6 @@ reagent-desc-jungle-bird = Despite the name, it’s not exceptionally popular am reagent-name-kalimotxo = kalimotxo reagent-desc-kalimotxo = A high-class Cuba Libre, for the discerning alcoholic. -reagent-name-kira-special = Kira special -reagent-desc-kira-special = Long live the guy who everyone had mistaken for a girl. Baka! - reagent-name-tortuga = Tortuga reagent-desc-tortuga = Perfect for pirates who’ve been selected as the designated driver. Yarr! diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl index c6964b55bc..02a87260d5 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl @@ -93,3 +93,6 @@ reagent-desc-posca = Poor warriors' drink from a forgotten era. reagent-name-mopwata = mopwata reagent-desc-mopwata = Dirty, stagnant mop water. + +reagent-name-orange-lime-soda = citrus bikeshed +reagent-desc-orange-lime-soda = The soda should be orange! No, it should be lemon-lime! diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml index 8504925528..d049250b55 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -70,7 +70,7 @@ - DrinkJackRoseGlass - DrinkJungleBirdGlass - DrinkKalimotxoGlass - - DrinkKiraSpecial + - DrinkOrangeLimeSodaGlass - DrinkLongIslandIcedTeaGlass - DrinkManhattanGlass - DrinkManlyDorfGlass diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml index 10a2b76657..aaa58be59c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml @@ -1230,18 +1230,18 @@ - type: entity parent: DrinkGlass - id: DrinkKiraSpecial - suffix: kira special + id: DrinkOrangeLimeSodaGlass + suffix: citrus bikeshed components: - type: SolutionContainerManager solutions: drink: maxVol: 30 reagents: - - ReagentId: KiraSpecial + - ReagentId: OrangeLimeSoda Quantity: 30 - type: Icon - sprite: Objects/Consumable/Drinks/kiraspecial.rsi + sprite: Objects/Consumable/Drinks/orangelime_soda.rsi state: icon - type: entity diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 6fac8606d9..d21de70031 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -567,15 +567,15 @@ color: "#B3B599" - type: reagent - id: KiraSpecial - name: reagent-name-kira-special + id: OrangeLimeSoda + name: reagent-name-orange-lime-soda parent: BaseDrink - desc: reagent-desc-kira-special + desc: reagent-desc-orange-lime-soda physicalDesc: reagent-physical-desc-strong-smelling flavor: sweet color: "#CCCC99" metamorphicSprite: - sprite: Objects/Consumable/Drinks/kiraspecial.rsi + sprite: Objects/Consumable/Drinks/orangelime_soda.rsi state: icon_empty metamorphicMaxFillLevels: 3 metamorphicFillBaseName: fill- diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 1838f47509..c048b27b1a 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -715,7 +715,7 @@ Kalimotxo: 2 - type: reaction - id: KiraSpecial + id: OrangeLimeSoda requiredMixerCategories: - Stir reactants: @@ -726,7 +726,7 @@ SodaWater: amount: 1 products: - KiraSpecial: 3 + OrangeLimeSoda: 3 - type: reaction id: Lemonade diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-1.png rename to Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-2.png rename to Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-3.png rename to Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/icon_empty.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/icon_empty.png rename to Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/icon_empty.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/meta.json rename to Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/meta.json diff --git a/Resources/migration.yml b/Resources/migration.yml index 9a59d61c39..849e586655 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -735,3 +735,6 @@ WarpPointBombing: null ToyGriffin: ToyFigurineGriffin ToyOwlman: ToyFigurineOwlman ToySkeleton: ToyFigurineSkeleton + +# 2025-10-28 +DringKiraSpecial: DrinkOrangeLimeSodaGlass -- 2.51.2