From bbcc9cf4e53b1a275c7c396dd1bde4dce5b4731b Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 24 Feb 2020 15:15:21 -0700
Subject: [PATCH] never ever webeditor
---
code/modules/reagents/chemistry/reagents.dm | 1 +
code/modules/reagents/reagent_containers.dm | 4 ++--
code/modules/reagents/reagent_containers/glass.dm | 6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index 8de788e971..ca7f7827c0 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -92,6 +92,7 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
if(!iscarbon(L))
return
var/mob/living/carbon/M = L
+ var/turf/T = get_turf(M)
log_reagent("MOB ADD: on_mob_add(): [key_name(M)] at [AREACOORD(T)] - [volume] of [type] with [purity] purity")
if (purity == 1)
return
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 525f6e62ae..9c6ea3deb4 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -148,8 +148,8 @@
var/throwerstring
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()]")
+ throwerstring = " THROWN BY [key_name(thrownby)] at [AT] ([AREACOORD(AT)])"
+ 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)
if(QDELETED(src))
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index af93dfe77a..39a5595137 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -48,11 +48,11 @@
var/turf/MT = get_turf(M)
M.visible_message("[user] feeds something to [M].", "[user] feeds something to you.")
log_combat(user, M, "fed", reagents.log_list())
- log_reagent("INGESTION: FED BY: [key_name(user)] (loc [user.loc] at [AREA_COORD(UT)]) -> [key_name(M)] (loc [M.loc] at [AREA_COORD(MT)]) - [reagents.log_list()]")
+ log_reagent("INGESTION: FED BY: [key_name(user)] (loc [user.loc] at [AREACOORD(UT)]) -> [key_name(M)] (loc [M.loc] at [AREACOORD(MT)]) - [reagents.log_list()]")
else
var/turf/T = get_turf(user)
to_chat(user, "You swallow a gulp of [src].")
- log_reagent("INGESTION: SELF: [key_name(user)] (loc [user.loc] at [AREA_COORD(T)]) - [reagents.log_list()]")
+ log_reagent("INGESTION: SELF: [key_name(user)] (loc [user.loc] at [AREACOORD(T)]) - [reagents.log_list()]")
var/fraction = min(5/reagents.total_volume, 1)
reagents.reaction(M, INGEST, fraction)
addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5, null, null, null, self_fed? "self swallowed" : "fed by [user]"), 5)
@@ -336,7 +336,7 @@
if(reagents.total_volume)
to_chat(user, "[src]'s contents spill all over you!")
var/R = reagents.log_list()
- log_reagent("SPLASH: [user] splashed [src] on their head via bucket/equipped(self, SLOT_HEAD)")
+ log_reagent("SPLASH: [user] splashed [src] on their head via bucket/equipped(self, SLOT_HEAD) - [R]")
reagents.reaction(user, TOUCH)
reagents.clear_reagents()
reagent_flags = NONE