Rename Kahlua to Coffee Liqueur (#12525)

Closes https://github.com/space-wizards/space-station-14/issues/10486
This commit is contained in:
Mervill
2022-11-16 12:59:43 -08:00
committed by GitHub
parent 3184619d42
commit 07da6ba416
16 changed files with 26 additions and 26 deletions

View File

@@ -22,8 +22,8 @@ reagent-desc-ethanol = A simple alcohol, makes you drunk if consumed, flammable.
reagent-name-gin = gin reagent-name-gin = gin
reagent-desc-gin = A distilled alcoholic drink that derives its predominant flavour from juniper berries. reagent-desc-gin = A distilled alcoholic drink that derives its predominant flavour from juniper berries.
reagent-name-kahlua = kahlua reagent-name-coffeeliqueur = coffee liqueur
reagent-desc-kahlua = A widely known, Mexican coffee-flavoured liqueur. reagent-desc-coffeeliqueur = Liquor flavoured with cold brewed coffee and spices.
reagent-name-melon-liquor = melon liquor reagent-name-melon-liquor = melon liquor
reagent-desc-melon-liquor = A relatively sweet and fruity 46 proof liquor. reagent-desc-melon-liquor = A relatively sweet and fruity 46 proof liquor.

View File

@@ -138512,7 +138512,7 @@ entities:
parent: 100 parent: 100
type: Transform type: Transform
- content: > - content: >
Brave Bull - Tequila 2, Kahlua 1 Brave Bull - Tequila 2, Coffee Liqueur 1
Moonshine - Vodka 1, Tequila 1, Whiskey 1 Moonshine - Vodka 1, Tequila 1, Whiskey 1
@@ -138526,7 +138526,7 @@ entities:
Starkist - Cola 1, OJ 2 Starkist - Cola 1, OJ 2
Black Russian - Vodka 2, Kahlua 1 Black Russian - Vodka 2, Coffee Liqueur 1
type: Paper type: Paper
- uid: 16611 - uid: 16611
type: PosterLegitObey type: PosterLegitObey

View File

@@ -34,7 +34,7 @@
- SodaWater - SodaWater
- TonicWater - TonicWater
- Beer - Beer
- Kahlua - CoffeeLiqueur
- Whiskey - Whiskey
- Wine - Wine
- Vodka - Vodka

View File

@@ -18,7 +18,7 @@
DrinkJuiceLimeCarton: 3 DrinkJuiceLimeCarton: 3
DrinkJuiceOrangeCarton: 3 DrinkJuiceOrangeCarton: 3
DrinkJuiceTomatoCarton: 3 DrinkJuiceTomatoCarton: 3
DrinkKahluaBottleFull: 3 DrinkCoffeeLiqueurBottleFull: 3
DrinkMelonLiquorBottleFull: 3 DrinkMelonLiquorBottleFull: 3
DrinkPatronBottleFull: 2 DrinkPatronBottleFull: 2
DrinkRumBottleFull: 4 DrinkRumBottleFull: 4

View File

@@ -19,7 +19,7 @@
- DrinkGrenadineBottleFull - DrinkGrenadineBottleFull
- DrinkGinBottleFull - DrinkGinBottleFull
- DrinkGoldschlagerBottleFull - DrinkGoldschlagerBottleFull
- DrinkKahluaBottleFull - DrinkCoffeeLiqueurBottleFull
- DrinkMelonLiquorBottleFull - DrinkMelonLiquorBottleFull
- DrinkPatronBottleFull - DrinkPatronBottleFull
- DrinkRumBottleFull - DrinkRumBottleFull

View File

@@ -1026,8 +1026,8 @@
- type: entity - type: entity
parent: DrinkGlassBase parent: DrinkGlassBase
id: DrinkKahluaGlass id: DrinkCoffeeLiqueurGlass
name: kahlua glass name: Coffee Liqueur glass
description: DAMN, THIS THING LOOKS ROBUST description: DAMN, THIS THING LOOKS ROBUST
components: components:
- type: SolutionContainerManager - type: SolutionContainerManager
@@ -1035,10 +1035,10 @@
drink: drink:
maxVol: 50 maxVol: 50
reagents: reagents:
- ReagentId: Kahlua - ReagentId: CoffeeLiqueur
Quantity: 50 Quantity: 50
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/kahluaglass.rsi sprite: Objects/Consumable/Drinks/coffeeliqueurglass.rsi
- type: entity - type: entity
parent: DrinkGlassBase parent: DrinkGlassBase

View File

@@ -167,18 +167,18 @@
- type: entity - type: entity
parent: DrinkBottleBaseFull parent: DrinkBottleBaseFull
id: DrinkKahluaBottleFull id: DrinkCoffeeLiqueurBottleFull
name: kahlua bottle name: coffee liqueur bottle
description: A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK. description: The great taste of coffee with none of the benifits.
components: components:
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
drink: drink:
reagents: reagents:
- ReagentId: Kahlua - ReagentId: CoffeeLiqueur
Quantity: 100 Quantity: 100
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/kahluabottle.rsi sprite: Objects/Consumable/Drinks/coffeeliqueurbottle.rsi
- type: entity - type: entity
parent: DrinkBottleBaseFull parent: DrinkBottleBaseFull

View File

@@ -129,12 +129,12 @@
- type: entity - type: entity
name: kahlua bottle name: coffee liqueur bottle
parent: DrinkBottleBaseEmpty parent: DrinkBottleBaseEmpty
id: DrinkBottleKahlua id: DrinkBottleCoffeeLiqueur
components: components:
- type: Sprite - type: Sprite
sprite: Objects/Consumable/TrashDrinks/kahluabottle_empty.rsi sprite: Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi
- type: entity - type: entity

View File

@@ -143,14 +143,14 @@
amount: 0.2 amount: 0.2
- type: reagent - type: reagent
id: Kahlua id: CoffeeLiqueur
name: reagent-name-kahlua name: reagent-name-coffeeliqueur
parent: BaseAlcohol parent: BaseAlcohol
desc: reagent-desc-kahlua desc: reagent-desc-coffeeliqueur
physicalDesc: reagent-physical-desc-cloudy physicalDesc: reagent-physical-desc-cloudy
flavor: coffeeliquor flavor: coffeeliquor
color: "#664300" color: "#664300"
spritePath: kahluaglass.rsi spritePath: coffeeliqueurglass.rsi
- type: reagent - type: reagent
id: MelonLiquor id: MelonLiquor

View File

@@ -27,7 +27,7 @@
amount: 1 amount: 1
IrishCarBomb: IrishCarBomb:
amount: 1 amount: 1
Kahlua: CoffeeLiqueur:
amount: 1 amount: 1
products: products:
B52: 3 B52: 3
@@ -69,7 +69,7 @@
- type: reaction - type: reaction
id: BlackRussian id: BlackRussian
reactants: reactants:
Kahlua: CoffeeLiqueur:
amount: 1 amount: 1
Vodka: Vodka:
amount: 2 amount: 2
@@ -105,7 +105,7 @@
- type: reaction - type: reaction
id: BraveBull id: BraveBull
reactants: reactants:
Kahlua: CoffeeLiqueur:
amount: 1 amount: 1
Tequila: Tequila:
amount: 2 amount: 2