From 4857bd120ca61e5afeb2c7c726583bf4428fe74e Mon Sep 17 00:00:00 2001 From: Ragolution Date: Fri, 6 Mar 2020 10:06:59 -0500 Subject: [PATCH 1/3] Fixes bartender drink slide spill Forces drink throw call to check for bartender throwing before spilling contents. Feels like a lazy fix, but it works. --- code/modules/reagents/reagent_containers.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index c9cfdde797..a8189f169f 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -156,7 +156,8 @@ if(QDELETED(src)) return - reagents.clear_reagents() + if (!bartender_check(target)) // Needs to check for Bartender Slide before spilling. + reagents.clear_reagents() // Clear reagents of thrown container. //melts plastic beakers /obj/item/reagent_containers/microwave_act(obj/machinery/microwave/M) From 860d6b08276d31476151787548dcdcfb512a7df5 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Sat, 7 Mar 2020 01:58:06 -0500 Subject: [PATCH 2/3] Update code/modules/reagents/reagent_containers.dm Drink slide changes recommended by Ghom p.1 Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/reagents/reagent_containers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index a8189f169f..21933c640f 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -153,9 +153,9 @@ log_reagent("SPLASH - [src] object SplashReagents() onto [target] at [T] ([AREACOORD(T)])[throwerstring] - [reagents.log_list()]") visible_message("[src] spills its contents all over [target].") reagents.reaction(target, TOUCH) + reagents.clear_reagents() if(QDELETED(src)) return - if (!bartender_check(target)) // Needs to check for Bartender Slide before spilling. reagents.clear_reagents() // Clear reagents of thrown container. From 9d1cef2e97b64b6dc65b976b1309121f843efa41 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Sat, 7 Mar 2020 01:58:17 -0500 Subject: [PATCH 3/3] Update code/modules/reagents/reagent_containers.dm Drink slide changes recommended by Ghom p.2 Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/reagents/reagent_containers.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 21933c640f..f1de696558 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -156,8 +156,6 @@ reagents.clear_reagents() if(QDELETED(src)) return - if (!bartender_check(target)) // Needs to check for Bartender Slide before spilling. - reagents.clear_reagents() // Clear reagents of thrown container. //melts plastic beakers /obj/item/reagent_containers/microwave_act(obj/machinery/microwave/M)