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 a223331ed3..cbf5217435 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -22,8 +22,8 @@ reagent-desc-ethanol = A simple alcohol, makes you drunk if consumed, flammable. reagent-name-gin = gin reagent-desc-gin = A distilled alcoholic drink that derives its predominant flavour from juniper berries. -reagent-name-kahlua = kahlua -reagent-desc-kahlua = A widely known, Mexican coffee-flavoured liqueur. +reagent-name-coffeeliqueur = coffee liqueur +reagent-desc-coffeeliqueur = Liquor flavoured with cold brewed coffee and spices. reagent-name-melon-liquor = melon liquor reagent-desc-melon-liquor = A relatively sweet and fruity 46 proof liquor. diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml index 1b3aae8ec4..2fe37251fe 100644 --- a/Resources/Maps/lighthouse.yml +++ b/Resources/Maps/lighthouse.yml @@ -138512,7 +138512,7 @@ entities: parent: 100 type: Transform - content: > - Brave Bull - Tequila 2, Kahlua 1 + Brave Bull - Tequila 2, Coffee Liqueur 1 Moonshine - Vodka 1, Tequila 1, Whiskey 1 @@ -138526,7 +138526,7 @@ entities: Starkist - Cola 1, OJ 2 - Black Russian - Vodka 2, Kahlua 1 + Black Russian - Vodka 2, Coffee Liqueur 1 type: Paper - uid: 16611 type: PosterLegitObey diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml index 9ae1f2e2e1..2f75edb09a 100644 --- a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml +++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml @@ -34,7 +34,7 @@ - SodaWater - TonicWater - Beer - - Kahlua + - CoffeeLiqueur - Whiskey - Wine - Vodka diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 1b8b067739..ca24ad8c9c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -18,7 +18,7 @@ DrinkJuiceLimeCarton: 3 DrinkJuiceOrangeCarton: 3 DrinkJuiceTomatoCarton: 3 - DrinkKahluaBottleFull: 3 + DrinkCoffeeLiqueurBottleFull: 3 DrinkMelonLiquorBottleFull: 3 DrinkPatronBottleFull: 2 DrinkRumBottleFull: 4 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml index 8a715382bf..d8b1f431d7 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml @@ -19,7 +19,7 @@ - DrinkGrenadineBottleFull - DrinkGinBottleFull - DrinkGoldschlagerBottleFull - - DrinkKahluaBottleFull + - DrinkCoffeeLiqueurBottleFull - DrinkMelonLiquorBottleFull - DrinkPatronBottleFull - DrinkRumBottleFull diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 780edc5391..9797ff5cc9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -1026,8 +1026,8 @@ - type: entity parent: DrinkGlassBase - id: DrinkKahluaGlass - name: kahlua glass + id: DrinkCoffeeLiqueurGlass + name: Coffee Liqueur glass description: DAMN, THIS THING LOOKS ROBUST components: - type: SolutionContainerManager @@ -1035,10 +1035,10 @@ drink: maxVol: 50 reagents: - - ReagentId: Kahlua + - ReagentId: CoffeeLiqueur Quantity: 50 - type: Sprite - sprite: Objects/Consumable/Drinks/kahluaglass.rsi + sprite: Objects/Consumable/Drinks/coffeeliqueurglass.rsi - type: entity parent: DrinkGlassBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 24fc0d137b..93dad63665 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -167,18 +167,18 @@ - type: entity parent: DrinkBottleBaseFull - id: DrinkKahluaBottleFull - name: kahlua bottle - description: A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK. + id: DrinkCoffeeLiqueurBottleFull + name: coffee liqueur bottle + description: The great taste of coffee with none of the benifits. components: - type: SolutionContainerManager solutions: drink: reagents: - - ReagentId: Kahlua + - ReagentId: CoffeeLiqueur Quantity: 100 - type: Sprite - sprite: Objects/Consumable/Drinks/kahluabottle.rsi + sprite: Objects/Consumable/Drinks/coffeeliqueurbottle.rsi - type: entity parent: DrinkBottleBaseFull diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml index 010bb73504..c41671830f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml @@ -129,12 +129,12 @@ - type: entity - name: kahlua bottle + name: coffee liqueur bottle parent: DrinkBottleBaseEmpty - id: DrinkBottleKahlua + id: DrinkBottleCoffeeLiqueur components: - type: Sprite - sprite: Objects/Consumable/TrashDrinks/kahluabottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi - type: entity diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 6f62911030..7588a57a0c 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -143,14 +143,14 @@ amount: 0.2 - type: reagent - id: Kahlua - name: reagent-name-kahlua + id: CoffeeLiqueur + name: reagent-name-coffeeliqueur parent: BaseAlcohol - desc: reagent-desc-kahlua + desc: reagent-desc-coffeeliqueur physicalDesc: reagent-physical-desc-cloudy flavor: coffeeliquor color: "#664300" - spritePath: kahluaglass.rsi + spritePath: coffeeliqueurglass.rsi - type: reagent id: MelonLiquor diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index a7dfe03035..80993db4e4 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -27,7 +27,7 @@ amount: 1 IrishCarBomb: amount: 1 - Kahlua: + CoffeeLiqueur: amount: 1 products: B52: 3 @@ -69,7 +69,7 @@ - type: reaction id: BlackRussian reactants: - Kahlua: + CoffeeLiqueur: amount: 1 Vodka: amount: 2 @@ -105,7 +105,7 @@ - type: reaction id: BraveBull reactants: - Kahlua: + CoffeeLiqueur: amount: 1 Tequila: amount: 2 diff --git a/Resources/Textures/Objects/Consumable/Drinks/kahluabottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kahluabottle.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/kahluabottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kahluabottle.rsi/meta.json rename to Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json diff --git a/Resources/Textures/Objects/Consumable/Drinks/kahluaglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kahluaglass.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/kahluaglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kahluaglass.rsi/meta.json rename to Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/meta.json diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/kahluabottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/TrashDrinks/kahluabottle_empty.rsi/icon.png rename to Resources/Textures/Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/kahluabottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Consumable/TrashDrinks/kahluabottle_empty.rsi/meta.json rename to Resources/Textures/Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi/meta.json