manly dorf is now like oily oaf (#16349)

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 0bdd22804d94aa7ba27af973aa6abf4535f9ddce..2e8f4929a30cbf8255038cdab8f7ab2068966379 100644 (file)
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -150,6 +150,7 @@ flavor-complex-parents = like someone's parents
 flavor-complex-alcohol = like alcohol
 flavor-complex-soda = like soda
 flavor-complex-juice = like juice
+flavor-complex-rocksandstones = like rocks and stones
 
 ## Basic drinks
 flavor-complex-water = like water

diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
index 4c636ac252815763f45d355d7a8fb5d9a0842002..3879cb4bce11dbb5adba76dc5021d64c427ee038 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
+++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
@@ -61,6 +61,7 @@ reagent-physical-desc-powdery = powdery
 reagent-physical-desc-creamy = creamy
 reagent-physical-desc-sticky = sticky
 reagent-physical-desc-bubbly = bubbly
+reagent-physical-desc-rocky = rocky
 reagent-physical-desc-lemony-fresh = lemony fresh
 reagent-physical-desc-crisp = crisp
 reagent-physical-desc-citric = citric

diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index d55a17320a8e9c87332d1238f492bcf267b364f5..e350762dab4a33145d4baad1d9c4ed16d19f3265 100644 (file)
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -793,3 +793,8 @@
   id: themartinez
   flavorType: Complex
   description: flavor-complex-themartinez
+
+- type: flavor
+  id: rocksandstones
+  flavorType: Complex
+  description: flavor-complex-rocksandstones

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index f2b1cdd317ce4c1fa59f446af23e3345dfd76648..ab736c73c7dc2933946bcd55edf379ed017f05fc 100644 (file)
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -957,8 +957,8 @@
   name: reagent-name-manly-dorf
   parent: BaseAlcohol
   desc: reagent-desc-manly-dorf
-  physicalDesc: reagent-physical-desc-bubbly
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-fizzy-and-creamy
+  flavor: rocksandstones
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/manlydorfglass.rsi

diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index 59fdccee025e9434e593219e02bc5bce847e0a56..7df188e8be8d22d0689fa92cc3b5633f84751ce4 100644 (file)
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -534,8 +534,8 @@
       amount: 1
   products:
     ManlyDorf: 3
-- type: reaction
 
+- type: reaction
   id: Margarita
   reactants:
     Tequila:

diff --git a/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/icon.png
index e920b2dda3df0f05988637caa4384284e6256b39..3248e4be690ff2b812933cfa722de24e004ff38c 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/meta.json
index db0ac608ed068f887d184f45e9acd83fba0a3976..50423f6144ba385fcf7aef90fa1687513f091713 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/meta.json
@@ -1 +1,14 @@
-{"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", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Based on manly dorf from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Edited by deltanedas (github) to look like an oily oaf",
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}