From 10ea7bac294af464e9341cd4ed5f59eb01c16800 Mon Sep 17 00:00:00 2001 From: MarinaGryphon Date: Sat, 25 Aug 2018 06:51:53 -0500 Subject: [PATCH] Fixes #5157 (#5167) For once, it wasn't actually Burger's fault, Burger did a completely reasonable thing and the ancient reagent code screwed it up. This should properly fix #5157, as well as a few possible future glitches in case we decide to add pouring out a specified number of units onto the floor, or mobs? --- code/modules/reagents/Chemistry-Holder.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index fef9a74a08d..5171c029253 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -412,6 +412,7 @@ var/datum/reagents/R = new /datum/reagents(amount) . = trans_to_holder(R, amount, multiplier, copy) R.touch_mob(target) + return /datum/reagents/proc/trans_to_turf(var/turf/target, var/amount = 1, var/multiplier = 1, var/copy = 0) // Turfs don't have any reagents (at least, for now). Just touch it. if(!target || !target.simulated) @@ -420,7 +421,7 @@ var/datum/reagents/R = new /datum/reagents(amount * multiplier) . = trans_to_holder(R, amount, multiplier, copy) R.touch_turf(target) - return 0 + /datum/reagents/proc/trans_to_obj(var/turf/target, var/amount = 1, var/multiplier = 1, var/copy = 0) // Objects may or may not; if they do, it's probably a beaker or something and we need to transfer properly; otherwise, just touch. if(!target || !target.simulated) @@ -430,7 +431,7 @@ var/datum/reagents/R = new /datum/reagents(amount * multiplier) . = trans_to_holder(R, amount, multiplier, copy) R.touch_obj(target) - return 0 + return return trans_to_holder(target.reagents, amount, multiplier, copy)