From b279d3bd4a6ab3629e5ef3ccd932f4f632928126 Mon Sep 17 00:00:00 2001 From: Luc <89928798+lewcc@users.noreply.github.com> Date: Mon, 19 Feb 2024 06:43:40 -0500 Subject: [PATCH] Shotglasses now go down in one sip (#24134) * Shotglasses now actually let you shoot them down * Update code/modules/food_and_drinks/drinks/drinks/shotglass.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * thanks snowball --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 11c74b9dcc7..ff85b6ec8e5 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -1192,7 +1192,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven playsound(loc, to_drink.consume_sound, rand(10, 50), TRUE) if(to_drink.reagents.total_volume) taste(to_drink.reagents) - var/drink_size = min(to_drink.amount_per_transfer_from_this, 5) + var/drink_size = max(initial(to_drink.amount_per_transfer_from_this), 5) if(drinksize_override) drink_size = drinksize_override to_drink.reagents.reaction(src, REAGENT_INGEST)