From 980bbb489d27baa168d30d044d573d017845015b Mon Sep 17 00:00:00 2001 From: LiberatedWaveMan <81937308+LiberatedWaveMan@users.noreply.github.com> Date: Wed, 31 Aug 2022 11:07:49 -0400 Subject: [PATCH] Adds a New Drink: The Bilkshake (#18932) * Update drinks.dmi * Update alcohol.dm * Update drinks.dm * Update drinks.dm * Update code/modules/reagents/chemistry/recipes/drinks.dm Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> * Squashed commit of the following: commit c61a500319dec842f6e8da636b801da25fccf4fa Author: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Mon Aug 29 18:05:38 2022 -0400 Fixes some broken code with a dirt grenade (#18928) * i hate old code i hate old code * good fix im so good at code commit 034a6403daebec9e15ad5de99858e859483ced97 Author: Gatchapod <20936555+Gatchapod@users.noreply.github.com> Date: Mon Aug 29 23:01:52 2022 +0200 More positions for body scanners and sleepers when using a wrench (#18815) * Adds positions to sleepers and scanners * Requested changes Co-authored-by: Gatchapod commit 7b8f0f3d661b8b85101abbce3baeff2b555aa9d0 Author: Octus <62493359+Tokorizo@users.noreply.github.com> Date: Mon Aug 29 11:17:25 2022 -0500 The Bartender's shaker now acts like a real shaker! (#18852) * SHAKESHAKERHSKAERIT * Update code/modules/food_and_drinks/drinks/drinks.dm Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> * maint recommends * Update code/modules/reagents/chemistry/holder.dm Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> * STOP SHAKING MF * Update code/modules/food_and_drinks/drinks/drinks.dm Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> commit 8a1033678014c37c2b250d0bf43e36f8e021b660 Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Mon Aug 29 16:45:49 2022 +0100 The headcoder shuffle (#18923) commit 629c099db7149e4e48b39e1525a503cfc21c57b9 Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Mon Aug 29 16:45:29 2022 +0100 Refactors status displays (#18811) * Refactors status displays * biggest commit commit 5d3310cdefea303142c7b69b31f63631ce6dfd42 Author: Christasmurf <25437893+Christasmurf@users.noreply.github.com> Date: Mon Aug 29 15:39:56 2022 +0100 Bag icons fixes + Extra bag sprites for vox/grey (#18903) * icons * dufflehandle * Update drinks.dmi * Update code/modules/reagents/chemistry/recipes/drinks.dm thanks hal Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> * Update code/modules/reagents/chemistry/reagents/alcohol.dm Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> --- .../reagents/chemistry/reagents/alcohol.dm | 14 ++++++++++++++ .../reagents/chemistry/recipes/drinks.dm | 10 ++++++++++ icons/obj/drinks.dmi | Bin 96019 -> 96343 bytes 3 files changed, 24 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index bbaa9baf0ed..53b91e19fd1 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1518,3 +1518,17 @@ drink_name = "Pina Colada" drink_desc = "After taking a sip, you feel contractually obligated to start singing a certain song of the same name." taste_description = "tart and tropical pineapple" + +/datum/reagent/consumable/ethanol/bilkshake + name = "Bilkshake" + id = "bilkshake" + description = "An upsetting treat that combines beer and milk." + color = "#7B5835" // rgb: (123, 88, 53) + nutriment_factor = 2 * REAGENTS_METABOLISM + alcohol_perc = 0.1 + drink_icon = "bilkshake" + drink_name = "Bilkshake" + drink_desc = "Your mind bubbles and oozes as it tries to comprehend what it's seeing. What the HELL is this?" + taste_description = "bilk, cream, and cold tears" + + diff --git a/code/modules/reagents/chemistry/recipes/drinks.dm b/code/modules/reagents/chemistry/recipes/drinks.dm index c5f4a2b63bf..1a13f186f3c 100644 --- a/code/modules/reagents/chemistry/recipes/drinks.dm +++ b/code/modules/reagents/chemistry/recipes/drinks.dm @@ -950,3 +950,13 @@ required_reagents = list("rum" = 3, "pineapplejuice" = 2, "cream" = 1) result_amount = 6 mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/bilkshake + name = "Bilkshake" + id = "bilkshake" + result = "bilkshake" + required_reagents = list("cream" = 1, "bilk" = 2, "ice" = 2) + result_amount = 5 + + + diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index f079c4eaf15091cef96b85c3d739a9539815d847..f719334eef2dc2738e096d097f16ebebf88f3c81 100644 GIT binary patch delta 3308 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 delta 2981 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