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>
@@ -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!
|
||||
|
||||
|
||||
@@ -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!
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
- DrinkJackRoseGlass
|
||||
- DrinkJungleBirdGlass
|
||||
- DrinkKalimotxoGlass
|
||||
- DrinkKiraSpecial
|
||||
- DrinkOrangeLimeSodaGlass
|
||||
- DrinkLongIslandIcedTeaGlass
|
||||
- DrinkManhattanGlass
|
||||
- DrinkManlyDorfGlass
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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-
|
||||
|
||||
@@ -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
|
||||
|
||||
|
Before Width: | Height: | Size: 504 B After Width: | Height: | Size: 504 B |
|
Before Width: | Height: | Size: 634 B After Width: | Height: | Size: 634 B |
|
Before Width: | Height: | Size: 685 B After Width: | Height: | Size: 685 B |
|
Before Width: | Height: | Size: 841 B After Width: | Height: | Size: 841 B |
|
Before Width: | Height: | Size: 339 B After Width: | Height: | Size: 339 B |
@@ -735,3 +735,6 @@ WarpPointBombing: null
|
||||
ToyGriffin: ToyFigurineGriffin
|
||||
ToyOwlman: ToyFigurineOwlman
|
||||
ToySkeleton: ToyFigurineSkeleton
|
||||
|
||||
# 2025-10-28
|
||||
DringKiraSpecial: DrinkOrangeLimeSodaGlass
|
||||
|
||||