]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Change 'Irish slammer' to 'Grenade Penguin' (#34181)
authorAlpaccalypse <21291379+Alpaccalypse@users.noreply.github.com>
Sat, 19 Apr 2025 00:24:26 +0000 (01:24 +0100)
committerGitHub <noreply@github.com>
Sat, 19 Apr 2025 00:24:26 +0000 (20:24 -0400)
* 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

Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
Resources/Prototypes/Recipes/Reactions/drinks.yml

index 962f0898b1ff1979e9c7515fc0664dae1c3e02a5..5a22328900e1f464aa4e2bdfbf68a78e7d05ab4b 100644 (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-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.
index ca56fbcb359cd06bf71a17091900b9c31e40ec78..1891ed71ecc186e19ba24f9d5eb2fff8f02cfd7f 100644 (file)
 - type: entity
   parent: DrinkGlass
   id: DrinkIrishSlammer
-  suffix: irish slammer
+  suffix: grenade penguin
   components:
   - type: SolutionContainerManager
     solutions:
index a46dfa296982e94fef31d0f73e90568e3ce18f11..b307166aa80149436217ab957444640d85a799c6 100644 (file)
       amount: 1
   products:
     IrishSlammer: 2
+  sound:
+    path: /Audio/Animals/penguin_squawk.ogg # Cocktail is called grenade penguin in localisation
 
 - type: reaction
   id: IrishCoffee