From 9d1e6e017c8c473836df536626e7869dfcc2bcde Mon Sep 17 00:00:00 2001 From: Atlantis Date: Fri, 1 Jan 2016 01:43:53 +0100 Subject: [PATCH] Fixes chemical cartridge splashing - Fixes #11853 - Attempting to transfer reagents into the cartridge when it is closed will no longer splash the reagents. --- code/modules/reagents/reagent_containers.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index c154ba8dfc5..c743745104f 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -135,7 +135,15 @@ return 1 /obj/item/weapon/reagent_containers/proc/standard_pour_into(var/mob/user, var/atom/target) // This goes into afterattack and yes, it's atom-level - if(!target.is_open_container() || !target.reagents) + if(!target.reagents) + return 0 + + // Ensure we don't splash beakers and similar containers. + if(!target.is_open_container() && istype(target, /obj/item/weapon/reagent_containers)) + user << "\The [target] is closed." + return 1 + // Otherwise don't care about splashing. + else if(!target.is_open_container()) return 0 if(!reagents || !reagents.total_volume)