From 1668bc598ad8eb7dc9f69c98d431b91f8aa87387 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 24 Feb 2020 13:55:44 -0700
Subject: [PATCH 1/4] Update glass.dm
---
code/modules/reagents/reagent_containers/glass.dm | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 23f149ade4..d4a59b2b6c 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -29,20 +29,30 @@
message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
reagents.reaction(M, TOUCH)
log_combat(user, M, "splashed", R)
+ 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]")
reagents.clear_reagents()
else
var/self_fed = M == user
if(!self_fed)
M.visible_message("[user] attempts to feed something to [M].", \
"[user] attempts to feed something to you.")
+ log_combat(user, M, "is attempting to feed", reagents.log_list())
if(!do_mob(user, M))
return
if(!reagents || !reagents.total_volume)
return // The drink might be empty after the delay, such as by spam-feeding
+ var/turf/UT = get_turf(user) // telekenesis memes
+ 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())]")
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())]")
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)
@@ -325,6 +335,8 @@
if (slot == SLOT_HEAD)
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)")
reagents.reaction(user, TOUCH)
reagents.clear_reagents()
reagent_flags = NONE
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 2/4] 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)
From 77edc602dcbfa592468efce3102b4716b1394476 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 24 Feb 2020 13:59:27 -0700
Subject: [PATCH 3/4] Update glass.dm
---
code/modules/reagents/reagent_containers/glass.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 8806dbed81..d455ea4294 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 [AREA_COORD(MT)], from user [key_name(user)] at [AREA_COORD(UT)], target object [target] at [AREA_COORD(OT)]) - [R]")
+ log_reagent("SPLASH: attack(target mob [key_name(M)] at [AREACOORD(MT)], from user [key_name(user)] at [AREACOORD(UT)], target object [target] at [AREA_COORD(OT)]) - [R]")
reagents.clear_reagents()
else
var/self_fed = M == user
From 5cece42c1a6f30c24a2275ce1a74415212a3a281 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 24 Feb 2020 14:20:40 -0700
Subject: [PATCH 4/4] Update glass.dm
---
code/modules/reagents/reagent_containers/glass.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index d455ea4294..af93dfe77a 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 [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 [AREA_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)