From: dragonryan06 <71857681+dragonryan06@users.noreply.github.com> Date: Mon, 16 Dec 2024 15:25:06 +0000 (-0500) Subject: Add the Zombie, a new cocktail (#32802) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1e80dd289129cb4848dd45e56e08c12e0d3c6c70;p=space-station-14.git Add the Zombie, a new cocktail (#32802) --- diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index c305f521a8..2789e59938 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -263,6 +263,7 @@ flavor-complex-themartinez = like violets and lemon vodka flavor-complex-cogchamp = like brass flavor-complex-white-gilgamesh = like lightly carbonated cream flavor-complex-antifreeze = warm +flavor-complex-zombiecocktail = like eating brains flavor-complex-absinthe = like anise flavor-complex-blue-curacao = like orange flowers flavor-complex-acidspit = like French battery acid 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 1cac0495b0..27e0cb2a81 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -279,3 +279,6 @@ reagent-desc-watermelon-wakeup = If you want to be awake, this will do it... Als reagent-name-rubberneck = rubberneck reagent-desc-rubberneck = A popular drink amongst those adhering to an all synthetic diet. + +reagent-name-zombiecocktail = zombie +reagent-desc-zombiecocktail = It gets in your head. Your he-eyeh-ead. \ No newline at end of file diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 2e31b12f2f..b79d6530ec 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1328,3 +1328,8 @@ id: compressed-meat flavorType: Complex description: flavor-complex-compressed-meat + +- type: flavor + id: zombiecocktail + flavorType: Complex + description: flavor-complex-zombiecocktail \ No newline at end of file diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 7478161a54..e5525b9043 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -1953,3 +1953,26 @@ time: 1.0 type: Remove fizziness: 0.25 + +- type: reagent + id: ZombieCocktail + name: reagent-name-zombiecocktail + parent: BaseAlcohol + desc: reagent-desc-zombiecocktail + physicalDesc: reagent-physical-desc-strong-smelling + flavor: zombiecocktail + color: "#d17844" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/zombiecocktail.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.25 \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 1c69be5045..cf6da10b8b 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -1219,3 +1219,15 @@ amount: 1 products: Cola: 4 + +- type: reaction + id: ZombieCocktail + reactants: + Rum: + amount: 2 + Grenadine: + amount: 1 + ZombieBlood: + amount: 1 + products: + ZombieCocktail: 4 \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-1.png new file mode 100644 index 0000000000..f6133a7acd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-2.png new file mode 100644 index 0000000000..bf9f0246c8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-3.png new file mode 100644 index 0000000000..4d67d86e40 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-4.png new file mode 100644 index 0000000000..b52661b478 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/icon.png new file mode 100644 index 0000000000..e020b30f58 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/icon_empty.png new file mode 100644 index 0000000000..b1e461c3db Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/meta.json new file mode 100644 index 0000000000..b95ee96c6d --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by dragonryan06 on Github", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + } + ] +} \ No newline at end of file