mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-21 12:04:48 +01:00
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: commitc61a500319Author: 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 commit034a6403daAuthor: 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 <Gatchapod@users.noreply.github.com> commit7b8f0f3d66Author: 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> commit8a10336780Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Mon Aug 29 16:45:49 2022 +0100 The headcoder shuffle (#18923) commit629c099db7Author: 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 commit5d3310cdefAuthor: 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>
This commit is contained in:
@@ -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"
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user