From 22088f693be724b41c1c518c83b5eb047f3993a7 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sat, 13 May 2023 12:14:56 +0000 Subject: [PATCH] manly dorf is now like oily oaf (#16349) --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../en-US/reagents/meta/physical-desc.ftl | 1 + Resources/Prototypes/Flavors/flavors.yml | 5 +++++ .../Reagents/Consumable/Drink/alcohol.yml | 4 ++-- .../Prototypes/Recipes/Reactions/drinks.yml | 2 +- .../Drinks/manlydorfglass.rsi/icon.png | Bin 294 -> 1001 bytes .../Drinks/manlydorfglass.rsi/meta.json | 15 ++++++++++++++- 7 files changed, 24 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 0bdd22804d..2e8f4929a3 100644 --- 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 4c636ac252..3879cb4bce 100644 --- 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 d55a17320a..e350762dab 100644 --- 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 f2b1cdd317..ab736c73c7 100644 --- 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 59fdccee02..7df188e8be 100644 --- 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 GIT binary patch delta 980 zcmV;_11tQd0_g{kBYy#JX+uL$X=7sm04R}lkv&VpP!xtAt3}a@gCB^9bWm}qAPVBB zb?8z=s)ALQCQVx*ts!ZV;wrc}6dXhszXtz-u7azAASi-}o4a3&lz6TYTEyOPa~|G% z-^0lp@I_5M>oiP4HkY?!k#KM^z7%YH!A}dFbkUd49cyZKHh)UZ^?65~s<*?cSM7WM zu9l?X=up=rJg!@IURb6fx}LWbZwq(mnM6|fP&j1EfWlWw*F1h!oc8!#u{|G~2A}E~ zOjog1#d^lh3J(eQXU&5CJCFL3fRS66liDM@7l#-T!UWMMu!>2ZVW~OE?0?_Lk8g%G z@#yllC}N8vO@BtbAyEs`)sUJJ-H^wmsB-_Cr;{2R^|}Yb;D2)6w*hF}fpW=pzm8nD zd<^xEaFMI{*CeNj57A2%t^WYpHsS2DqG`Kuz6IS6R>DsFNcFOPsT91PLTen_Z=iYE z%j)->lY5xokY98Sd;2gb_uE#!0rXvH1R+q1CR@%A*~ z$xI4kqrl2)NkmF;gJ_?rLQ`!~`7tb&n}|gvB;paMUsR}?h2g%I~ zfYJzztqyY>|HkdEaKQ<>p2Q&GUvWqvB(UoVgtiIwLfZ!r!%;l|00002h z#3dLn0ScJiN3Bm{NcKC@G^~wjRt_;hzJ{^_&sbkpcD;J3TAu<1_^=6|D~bOAkgwt7 z2e^jwSO{X-S0QhnVk{D5P07v>QfA!jZ@)U~!zOB}$Kmim$0WJ}aIwNPW SN#_6n002ovP6b4+LSTY^&T_>7 diff --git a/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/meta.json index db0ac608ed..50423f6144 100644 --- 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" + } + ] +} -- 2.51.2