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

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 196886319797fa1ba617868911c52abe5a78473c..57d95562cb3c0e88e1faf9c88a6a9dfccb53f40a 100644 (file)
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -259,7 +259,7 @@ flavor-complex-xeno-basher = like killing bugs
 flavor-complex-budget-insuls-drink = like door hacking
 flavor-complex-watermelon-wakeup = like a sweet wakeup call
 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-cogchamp = like brass
 flavor-complex-white-gilgamesh = like lightly carbonated cream

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 27e0cb2a812463063c0a09a52f656e3adc99416c..c384c0c9366c142738a88a8b8b235f1df63b9376 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
@@ -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-desc-iced-beer = A beer which is so cold the air around it freezes.
 
-reagent-name-irish-car-bomb = irish car bomb
-reagent-desc-irish-car-bomb = A troubling mixture of irish cream and ale.
+reagent-name-irish-slammer = irish slammer
+reagent-desc-irish-slammer = An unconventional mixture of irish cream and stout.
 
 reagent-name-irish-cream = irish cream
 reagent-desc-irish-cream = Whiskey-imbued cream. What else could you expect from the Irish.

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 f8fc2998d7f9a6f4132ad1e084a6df276161c528..5167613cbe7995c4aa3425e79af5d63b62b11f4e 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
@@ -59,7 +59,7 @@
       - DrinkIcedBeerGlass
       - DrinkIceCreamGlass
       - IrishBoolGlass
-      - DrinkIrishCarBomb
+      - DrinkIrishSlammer
       - DrinkIrishCoffeeGlass
       - DrinkLemonadeGlass
       - DrinkKiraSpecial

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 4a9d5c04635ddf7aff8e49eeb76762f8df173c6f..462266b9b6bfa941c565f3b1ef7ed33f802d3c30 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -1115,18 +1115,18 @@
 
 - type: entity
   parent: DrinkGlass
-  id: DrinkIrishCarBomb
-  suffix: irish car bomb
+  id: DrinkIrishSlammer
+  suffix: irish slammer
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
         reagents:
-        - ReagentId: IrishCarBomb
+        - ReagentId: IrishSlammer
           Quantity: 30
   - type: Icon
-    sprite: Objects/Consumable/Drinks/irishcarbomb.rsi
+    sprite: Objects/Consumable/Drinks/irishslammer.rsi
     state: icon
 
 - type: entity

diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 24507c950aec61804648c58d81de66b8e1ccc4bf..b9609883ab422dff35bf1882158c1ccd4746ff6a 100644 (file)
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -595,9 +595,9 @@
   description: flavor-complex-vermouth
 
 - type: flavor
-  id: irishcarbomb
+  id: irishslammer
   flavorType: Complex
-  description: flavor-complex-irish-car-bomb
+  description: flavor-complex-irish-slammer
 
 - type: flavor
   id: vodkaredbool

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index e5525b9043b5218f803e0e498b400bb6790baf03..caa3d162760957a49385804171a98bdbac0085ac 100644 (file)
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -1072,15 +1072,15 @@
   fizziness: 0.6
 
 - type: reagent
-  id: IrishCarBomb
-  name: reagent-name-irish-car-bomb
+  id: IrishSlammer
+  name: reagent-name-irish-slammer
   parent: BaseAlcohol
-  desc: reagent-desc-irish-car-bomb
+  desc: reagent-desc-irish-slammer
   physicalDesc: reagent-physical-desc-bubbly
-  flavor: irishcarbomb
+  flavor: irishslammer
   color: "#2E6671"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/irishcarbomb.rsi
+    sprite: Objects/Consumable/Drinks/irishslammer.rsi
     state: icon_empty
   metamorphicMaxFillLevels: 6
   metamorphicFillBaseName: fill-

diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index 9ae0493efe9298c719aa214306cd069be1a823d3..790a236d5cf31acef988bfbd93f1a5aff77a9095 100644 (file)
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -85,7 +85,7 @@
   reactants:
     Cognac:
       amount: 1
-    IrishCarBomb:
+    IrishSlammer:
       amount: 1
     CoffeeLiqueur:
       amount: 1
@@ -559,20 +559,20 @@
   reactants:
     EnergyDrink:
       amount: 1
-    IrishCarBomb:
+    IrishSlammer:
       amount: 1
   products:
     IrishBool: 2
 
 - type: reaction
-  id: IrishCarBomb
+  id: IrishSlammer
   reactants:
     Ale:
       amount: 1
     IrishCream:
       amount: 1
   products:
-    IrishCarBomb: 2
+    IrishSlammer: 2
 
 - type: reaction
   id: IrishCoffee

diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-1.png

diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-2.png

diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-3.png

diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-4.png
rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-4.png

diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-5.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-5.png
rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-5.png

diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-6.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-6.png
rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-6.png

diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon.png
rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/icon.png

diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/icon_empty.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon_empty.png
rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/icon_empty.png

diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/meta.json
rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/meta.json

diff --git a/Resources/migration.yml b/Resources/migration.yml
index 1486a2f7b4d255d798a996dcb18c5a946e5bae3f..a3081713aff04105c35bb04dfc1933947e6c2862 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -537,3 +537,6 @@ LightTree03: LightTree
 LightTree04: LightTree
 LightTree05: LightTree
 LightTree06: LightTree
+
+#2024-12-28
+DrinkIrishCarBomb: DrinkIrishSlammer