From: Alpaccalypse <21291379+Alpaccalypse@users.noreply.github.com> Date: Sat, 19 Apr 2025 00:24:26 +0000 (+0100) Subject: Change 'Irish slammer' to 'Grenade Penguin' (#34181) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=07c1a6fd45f47c625ce6cdd242ca3d71b5449e26;p=space-station-14.git Change 'Irish slammer' to 'Grenade Penguin' (#34181) * Changed irish slammer to grenade penguin. * changed DrinkGlass suffix to grenade penguin * Fixed typo * Added penguin squawk to reaction * Added comment as ID differs from localisation * Minor, post merge fix --- 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 962f0898b1..5a22328900 100644 --- 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-slammer = Irish slammer -reagent-desc-irish-slammer = An unconventional mixture of irish cream and stout. +reagent-name-irish-slammer = Grenade Penguin +reagent-desc-irish-slammer = What's black and white and red all over? 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/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index ca56fbcb35..1891ed71ec 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -1116,7 +1116,7 @@ - type: entity parent: DrinkGlass id: DrinkIrishSlammer - suffix: irish slammer + suffix: grenade penguin components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index a46dfa2969..b307166aa8 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -573,6 +573,8 @@ amount: 1 products: IrishSlammer: 2 + sound: + path: /Audio/Animals/penguin_squawk.ogg # Cocktail is called grenade penguin in localisation - type: reaction id: IrishCoffee