From d4657df9f5083f486827babc24954f4f016150e4 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 24 Feb 2020 13:58:51 -0700
Subject: [PATCH] Update glass.dm
---
code/modules/reagents/reagent_containers/glass.dm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index d4a59b2b6c..8806dbed81 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -32,7 +32,7 @@
var/turf/UT = get_turf(user)
var/turf/MT = get_turf(M)
var/turf/OT = get_turf(target)
- log_reagent("SPLASH: attack(target mob [key_name(M)] at [COORD(MT)], from user [key_name(user)] at [COORD(UT)], target object [target[ at [COORD(OT)]) - [R]")
+ log_reagent("SPLASH: attack(target mob [key_name(M)] at [AREA_COORD(MT)], from user [key_name(user)] at [AREA_COORD(UT)], target object [target] at [AREA_COORD(OT)]) - [R]")
reagents.clear_reagents()
else
var/self_fed = M == user
@@ -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 [COORD(UT)]) -> [key_name(M)] (loc [M.loc] at [COORD(MT)]) - [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())]")
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 [COORD(T)]) - [reagents.log_list())]")
+ log_reagent("INGESTION: SELF: [key_name(user)] (loc [user.loc] at [AREA_COORD(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)