cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 02:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: chugging (#23952)

Browse Source 
* fix: chugging

* implement suggestions
This commit is contained in:
awkwardsocialist
2024-01-31 23:49:25 +00:00
committed by GitHub
parent 257692d6df
commit fd7cb2e55c
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks_base.dm
+1 -1
View File
@@ -45,7 +45,7 @@
"<span class='notice'>You hear what sounds like gulping.</span>")
chugging = TRUE
while(do_after_once(chugger, 4 SECONDS, TRUE, chugger, null, "You stop chugging [src]."))
chugger.eat(src, chugger, 25) //Half of a glass, quarter of a bottle.
chugger.drink(src, chugger, 25) //Half of a glass, quarter of a bottle.
if(!reagents.total_volume) //Finish in style.
chugger.emote("gasp")
chugger.visible_message("<span class='notice'>[chugger] [pick("finishes","downs","polishes off","slams")] the entire [src], what a [pick("savage","monster","champ","beast")]!</span>",
code/modules/mob/living/carbon/carbon.dm
+12 -12
View File
@@ -1182,22 +1182,22 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
SSticker.score.score_food_eaten++
return TRUE
/mob/living/carbon/proc/drink(obj/item/reagent_containers/drinks/to_eat, mob/user)
/mob/living/carbon/proc/drink(obj/item/reagent_containers/drinks/to_drink, mob/user, drinksize_override)
if(user == src)
if(!selfDrink(to_eat))
if(!selfDrink(to_drink))
return FALSE
else if(!forceFed(to_eat, user, nutrition))
else if(!forceFed(to_drink, user, nutrition))
return FALSE
if(to_eat.consume_sound)
playsound(loc, to_eat.consume_sound, rand(10, 50), TRUE)
if(to_eat.reagents.total_volume)
taste(to_eat.reagents)
var/fraction = min(1 / to_eat.reagents.total_volume, 1)
var/drink_size = to_eat.amount_per_transfer_from_this > 5 ? 5 : to_eat.amount_per_transfer_from_this
if(fraction)
to_eat.reagents.reaction(src, REAGENT_INGEST, fraction)
to_eat.reagents.trans_to(src, drink_size)
if(to_drink.consume_sound)
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)
if(drinksize_override)
drink_size = drinksize_override
to_drink.reagents.reaction(src, REAGENT_INGEST)
to_drink.reagents.trans_to(src, drink_size)
SSticker.score.score_food_eaten++
return TRUE