Renamed "Irish Car Bomb" drink to "Irish Slammer" (#34107)

* Renamed "Irish Car Bomb" drink to "Irish Slammer", due to concerns over insensitivity.

* Fixing some missed references

* Added prototype id changes to migration.yml. Removed any reference to the troubles (and corrected ale to stout for flavour text).

* Corrected description back to "Irish Cream"

* Removed non-entities from migration.yml
This commit is contained in:
Alpaccalypse
2025-01-02 09:46:30 +00:00
committed by GitHub
parent 1bda7393ee
commit f4e60ff96e
17 changed files with 22 additions and 19 deletions

View File

@@ -259,7 +259,7 @@ flavor-complex-xeno-basher = like killing bugs
flavor-complex-budget-insuls-drink = like door hacking flavor-complex-budget-insuls-drink = like door hacking
flavor-complex-watermelon-wakeup = like a sweet wakeup call flavor-complex-watermelon-wakeup = like a sweet wakeup call
flavor-complex-rubberneck = like synthetics flavor-complex-rubberneck = like synthetics
flavor-complex-irish-car-bomb = like a spiked cola float flavor-complex-irish-slammer = like a spiked cola float
flavor-complex-themartinez = like violets and lemon vodka flavor-complex-themartinez = like violets and lemon vodka
flavor-complex-cogchamp = like brass flavor-complex-cogchamp = like brass
flavor-complex-white-gilgamesh = like lightly carbonated cream flavor-complex-white-gilgamesh = like lightly carbonated cream

View File

@@ -157,8 +157,8 @@ reagent-desc-hooch = Either someone's failure at cocktail making or attempt in a
reagent-name-iced-beer = iced beer reagent-name-iced-beer = iced beer
reagent-desc-iced-beer = A beer which is so cold the air around it freezes. reagent-desc-iced-beer = A beer which is so cold the air around it freezes.
reagent-name-irish-car-bomb = irish car bomb reagent-name-irish-slammer = irish slammer
reagent-desc-irish-car-bomb = A troubling mixture of irish cream and ale. reagent-desc-irish-slammer = An unconventional mixture of irish cream and stout.
reagent-name-irish-cream = irish cream reagent-name-irish-cream = irish cream
reagent-desc-irish-cream = Whiskey-imbued cream. What else could you expect from the Irish. reagent-desc-irish-cream = Whiskey-imbued cream. What else could you expect from the Irish.

View File

@@ -59,7 +59,7 @@
- DrinkIcedBeerGlass - DrinkIcedBeerGlass
- DrinkIceCreamGlass - DrinkIceCreamGlass
- IrishBoolGlass - IrishBoolGlass
- DrinkIrishCarBomb - DrinkIrishSlammer
- DrinkIrishCoffeeGlass - DrinkIrishCoffeeGlass
- DrinkLemonadeGlass - DrinkLemonadeGlass
- DrinkKiraSpecial - DrinkKiraSpecial

View File

@@ -1115,18 +1115,18 @@
- type: entity - type: entity
parent: DrinkGlass parent: DrinkGlass
id: DrinkIrishCarBomb id: DrinkIrishSlammer
suffix: irish car bomb suffix: irish slammer
components: components:
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
drink: drink:
maxVol: 30 maxVol: 30
reagents: reagents:
- ReagentId: IrishCarBomb - ReagentId: IrishSlammer
Quantity: 30 Quantity: 30
- type: Icon - type: Icon
sprite: Objects/Consumable/Drinks/irishcarbomb.rsi sprite: Objects/Consumable/Drinks/irishslammer.rsi
state: icon state: icon
- type: entity - type: entity

View File

@@ -595,9 +595,9 @@
description: flavor-complex-vermouth description: flavor-complex-vermouth
- type: flavor - type: flavor
id: irishcarbomb id: irishslammer
flavorType: Complex flavorType: Complex
description: flavor-complex-irish-car-bomb description: flavor-complex-irish-slammer
- type: flavor - type: flavor
id: vodkaredbool id: vodkaredbool

View File

@@ -1072,15 +1072,15 @@
fizziness: 0.6 fizziness: 0.6
- type: reagent - type: reagent
id: IrishCarBomb id: IrishSlammer
name: reagent-name-irish-car-bomb name: reagent-name-irish-slammer
parent: BaseAlcohol parent: BaseAlcohol
desc: reagent-desc-irish-car-bomb desc: reagent-desc-irish-slammer
physicalDesc: reagent-physical-desc-bubbly physicalDesc: reagent-physical-desc-bubbly
flavor: irishcarbomb flavor: irishslammer
color: "#2E6671" color: "#2E6671"
metamorphicSprite: metamorphicSprite:
sprite: Objects/Consumable/Drinks/irishcarbomb.rsi sprite: Objects/Consumable/Drinks/irishslammer.rsi
state: icon_empty state: icon_empty
metamorphicMaxFillLevels: 6 metamorphicMaxFillLevels: 6
metamorphicFillBaseName: fill- metamorphicFillBaseName: fill-

View File

@@ -85,7 +85,7 @@
reactants: reactants:
Cognac: Cognac:
amount: 1 amount: 1
IrishCarBomb: IrishSlammer:
amount: 1 amount: 1
CoffeeLiqueur: CoffeeLiqueur:
amount: 1 amount: 1
@@ -559,20 +559,20 @@
reactants: reactants:
EnergyDrink: EnergyDrink:
amount: 1 amount: 1
IrishCarBomb: IrishSlammer:
amount: 1 amount: 1
products: products:
IrishBool: 2 IrishBool: 2
- type: reaction - type: reaction
id: IrishCarBomb id: IrishSlammer
reactants: reactants:
Ale: Ale:
amount: 1 amount: 1
IrishCream: IrishCream:
amount: 1 amount: 1
products: products:
IrishCarBomb: 2 IrishSlammer: 2
- type: reaction - type: reaction
id: IrishCoffee id: IrishCoffee

View File

@@ -537,3 +537,6 @@ LightTree03: LightTree
LightTree04: LightTree LightTree04: LightTree
LightTree05: LightTree LightTree05: LightTree
LightTree06: LightTree LightTree06: LightTree
#2024-12-28
DrinkIrishCarBomb: DrinkIrishSlammer