From c6a041894677284acfb9cb156259ec046609afa3 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 24 Feb 2020 14:10:53 -0700 Subject: [PATCH] Update reagent_containers.dm --- code/modules/reagents/reagent_containers.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 2fd2d3a361..614aeb7b38 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -128,7 +128,7 @@ "[M] has been splashed with something!") var/turf/TT = get_turf(target) var/throwerstring - if(thrownby) + if(thrownby && thrown) log_combat(thrownby, M, "splashed", R) var/turf/AT = get_turf(thrownby) throwerstring = " THROWN BY [key_name(thrownby)] at [AT] (AREACOORD(AT)]" @@ -148,7 +148,7 @@ message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] in [ADMIN_VERBOSEJMP(target)].") var/turf/T = get_turf(target) var/throwerstring - if(thrownby) + if(thrownby && thrown) var/turf/AT = get_turf(thrownby) throwerstring = " THROWN BY [key_name(thrownby)] at [AREACOORD(AT])" log_reagent("SPLASH - [src] object SplashReagents() onto [target] at [TT] ([AREACOORD(TT)])[throwerstring] - [reagents.log_list()]")