From c896fd6fcb2cacb872ba5094e6a86fba2cbfc841 Mon Sep 17 00:00:00 2001 From: GauHelldragon Date: Tue, 27 Nov 2012 05:47:43 -0800 Subject: [PATCH] Added feedback messages for when service bot auto-refills their drink containers. Tweaked battery charge usage for refilling, and fixed bug where it would not refill if you empty it completely. --- .../reagents/reagent_containers/food/drinks.dm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index 8471568c3e..020efe4a31 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -93,15 +93,27 @@ user << "\red [target] is full." return + + + var/datum/reagent/refill + var/datum/reagent/refillName + if(isrobot(user)) + refill = reagents.get_master_reagent_id() + refillName = reagents.get_master_reagent_name() + var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) user << "\blue You transfer [trans] units of the solution to [target]." if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell var/mob/living/silicon/robot/bro = user - bro.cell.use(30) - var/refill = reagents.get_master_reagent_id() - spawn(600) + var/chargeAmount = max(30,4*trans) + bro.cell.use(chargeAmount) + user << "Now synthesizing [trans] units of [refillName]..." + + + spawn(300) reagents.add_reagent(refill, trans) + user << "Cyborg [src] refilled." return