diff --git a/Resources/Locale/en-US/_DV/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/_DV/reagents/meta/physical-desc.ftl index 8b83c1ad20b..d32351983cc 100644 --- a/Resources/Locale/en-US/_DV/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/_DV/reagents/meta/physical-desc.ftl @@ -1,3 +1,4 @@ reagent-physical-desc-maddening = maddening reagent-physical-desc-dark = dark -reagent-physical-desc-menacing = menacing \ No newline at end of file +reagent-physical-desc-menacing = menacing + diff --git a/Resources/Locale/en-US/_Omu/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_Omu/flavors/flavor-profiles.ftl index 5b9344b71c2..d4a5794922e 100644 --- a/Resources/Locale/en-US/_Omu/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_Omu/flavors/flavor-profiles.ftl @@ -5,6 +5,6 @@ flavor-complex-dwarfgrudge = like grudges and resentment flavor-complex-rawshrimp = shrimply uncooked flavor-complex-shrimp = shrimply wonderful flavor-complex-thewelles= like a city you've got to burn - # Description of what plutonium tastes like from IFL Science article "What Does Plutonium Taste Like?" published March 5, 2025 flavor-complex-atomicPrecision = sour and sweet, enough to drown out the umami of "I'm going to die soon" +flavor-complex-wolfs-milk = like you're a disgusting cretin \ No newline at end of file diff --git a/Resources/Locale/en-US/_Omu/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/_Omu/reagents/meta/physical-desc.ftl index 4fc5e570164..83056dd4c30 100644 --- a/Resources/Locale/en-US/_Omu/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/_Omu/reagents/meta/physical-desc.ftl @@ -6,3 +6,4 @@ reagent-physical-desc-veryfeathery = very feathery reagent-physical-desc-pandemonicallyfuzzy = pandemonically fuzzy reagent-physical-desc-veryheadacheinducing = very headache inducing reagent-physical-desc-verygritty = very gritty +reagent-physical-desc-chunky = chunky \ No newline at end of file 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 57d09076cc3..ae0570a6670 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -374,6 +374,9 @@ reagent-desc-moscow-mule = A surpsingly strong and refreshing mixed drink, serve # Omu start reagent-name-welles = the welles reagent-desc-welles = A smooth drink for the big dreamers from the lower classes in Night City. Made with love and mourning. + +reagent-name-wolfs-milk = Wolf's Milk +reagent-desc-wolfs-milk = Rancid combination for a rancid human being. Best served in a vacuum flask, assuming you consider this drinkable. # Omu end reagent-name-the-sun-also-rises = the sun also rises @@ -387,3 +390,5 @@ reagent-desc-zombiecocktail = It gets in your head. Your he-eyeh-ead. reagent-name-bacchus-blessing = bacchus's blessing reagent-desc-bacchus-blessing = You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...? + + diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index e8f6021d267..a3a5435a4b3 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2938,3 +2938,4 @@ - type: Icon sprite: Objects/Consumable/Drinks/bacchusblessing.rsi state: icon + diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 690bbb54c3f..a59e8a0e938 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -2401,7 +2401,9 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 # Omu end + amount: 0.2 + + # Omu end - type: reagent id: Mimeosa diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index c38381497f2..4947eb3a40c 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -1396,20 +1396,6 @@ products: TheMartinez: 6 -- type: reaction # Omu start - id: TheWelles - requiredMixerCategories: - - Shake - reactants: - Vodka: - amount: 4 - JuiceLime: - amount: 1 - SolDry: - amount: 1 - products: - TheWelles: 6 # Omu end - - type: reaction id: Vodka requiredMixerCategories: @@ -1607,17 +1593,3 @@ amount: 1 products: ZombieCocktail: 4 - -- type: reaction - id: BacchusBlessing - reactants: - Hooch: - amount: 1 - Absinthe: - amount: 1 - ManlyDorf: - amount: 1 - SyndicateBomb: - amount: 1 - products: - BacchusBlessing: 4 diff --git a/Resources/Prototypes/_Goobstation/Flavors/flavors.yml b/Resources/Prototypes/_Goobstation/Flavors/flavors.yml index 4b37b073de3..2f8eed3b001 100644 --- a/Resources/Prototypes/_Goobstation/Flavors/flavors.yml +++ b/Resources/Prototypes/_Goobstation/Flavors/flavors.yml @@ -115,3 +115,8 @@ id: chuddy flavorType: Base description: flavor-base-chuddy + +- type: flavor + id: chuddy + flavorType: Base + description: flavor-base-chuddy diff --git a/Resources/Prototypes/_Omu/Flavors/flavors.yml b/Resources/Prototypes/_Omu/Flavors/flavors.yml index abe4704207c..808e9a33b52 100644 --- a/Resources/Prototypes/_Omu/Flavors/flavors.yml +++ b/Resources/Prototypes/_Omu/Flavors/flavors.yml @@ -32,3 +32,8 @@ id: thewelles flavorType: Complex description: flavor-complex-thewelles + +- type: flavor + id: wolfsmilk + flavorType: Base + description: flavor-complex-wolfs-milk diff --git a/Resources/Prototypes/_Omu/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_Omu/Objects/Consumable/Drinks/drinks.yml new file mode 100644 index 00000000000..5799e585761 --- /dev/null +++ b/Resources/Prototypes/_Omu/Objects/Consumable/Drinks/drinks.yml @@ -0,0 +1,16 @@ +- type: entity + parent: DrinkGlass + id: DrinkWolfsMilk + suffix: Wolf's Milk + description: Nasty! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Wolf's Milk + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/eggnogglass.rsi + state: icon diff --git a/Resources/Prototypes/_Omu/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/_Omu/Reagents/Consumable/Drink/drinks.yml index 2d63203ac0f..ee5772dd4a5 100644 --- a/Resources/Prototypes/_Omu/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/_Omu/Reagents/Consumable/Drink/drinks.yml @@ -78,3 +78,18 @@ metamorphicMaxFillLevels: 4 metamorphicFillBaseName: fill- metamorphicChangeColor: false + +- type: reagent + id: WolfsMilk + name: reagent-name-wolfs-milk + parent: BaseAlcohol + desc: reagent-desc-wolfs-milk + physicalDesc: reagent-physical-desc-chunky + flavor: wolfsmilk + color: "#C1C2AE" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/wolfsmilk.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false diff --git a/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/fill-1.png new file mode 100644 index 00000000000..42adce74999 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/fill-2.png new file mode 100644 index 00000000000..6765360e5c7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/fill-3.png new file mode 100644 index 00000000000..10364317bef Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/fill-4.png new file mode 100644 index 00000000000..40ecfaa91a5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/icon.png new file mode 100644 index 00000000000..a420604afe7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/icon_empty.png new file mode 100644 index 00000000000..3ee71be1669 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/meta.json new file mode 100644 index 00000000000..20e933bb577 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/wolfsmilk.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + } + ] +}