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 01/13] 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 02/13] 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 03/13] 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 3709992b460e36c636eb7df77ac865dde14b1fb1 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 24 Feb 2020 14:07:58 -0700
Subject: [PATCH 04/13] Update reagent_containers.dm
---
code/modules/reagents/reagent_containers.dm | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index c178aad717..2fd2d3a361 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -123,28 +123,35 @@
if(thrown)
reagents.total_volume *= rand(5,10) * 0.1 //Not all of it makes contact with the target
var/mob/M = target
- var/R
+ var/R = reagents.log_list()
target.visible_message("[M] has been splashed with something!", \
"[M] has been splashed with something!")
- for(var/datum/reagent/A in reagents.reagent_list)
- R += "[A.type] ([A.volume]),"
-
+ var/turf/TT = get_turf(target)
+ var/throwerstring
if(thrownby)
log_combat(thrownby, M, "splashed", R)
+ var/turf/AT = get_turf(thrownby)
+ throwerstring = " THROWN BY [key_name(thrownby)] at [AT] (AREACOORD(AT)]"
+ log_reagent("SPLASH: [src] mob SplashReagents() onto [key_name(target)] at [TT] ([AREACOORD(TT)])[throwerstring] - [R])
+
reagents.reaction(target, TOUCH)
else if(bartender_check(target) && thrown)
visible_message("[src] lands onto the [target.name] without spilling a single drop.")
transform = initial(transform)
addtimer(CALLBACK(src, .proc/ForceResetRotation), 1)
- return
-
else
if(isturf(target) && reagents.reagent_list.len && thrownby)
log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]", "in [AREACOORD(target)]")
log_game("[key_name(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] in [AREACOORD(target)].")
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)
+ 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()]")
visible_message("[src] spills its contents all over [target].")
reagents.reaction(target, TOUCH)
if(QDELETED(src))
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 05/13] 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()]")
From 23aa38a381fdde4c56c23841742b73bcf8d26a94 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 24 Feb 2020 14:17:48 -0700
Subject: [PATCH 06/13] Update reagent_containers.dm
---
code/modules/reagents/reagent_containers.dm | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 614aeb7b38..e5e428ffdd 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -67,7 +67,6 @@
else
amount_per_transfer_from_this = possible_transfer_amounts[1]
to_chat(user, "[src]'s transfer amount is now [amount_per_transfer_from_this] units.")
- return
/obj/item/reagent_containers/attack(mob/M, mob/user, def_zone)
if(user.a_intent == INTENT_HARM)
@@ -132,8 +131,7 @@
log_combat(thrownby, M, "splashed", R)
var/turf/AT = get_turf(thrownby)
throwerstring = " THROWN BY [key_name(thrownby)] at [AT] (AREACOORD(AT)]"
- log_reagent("SPLASH: [src] mob SplashReagents() onto [key_name(target)] at [TT] ([AREACOORD(TT)])[throwerstring] - [R])
-
+ log_reagent("SPLASH: [src] mob SplashReagents() onto [key_name(target)] at [TT] ([AREACOORD(TT)])[throwerstring] - [R]")
reagents.reaction(target, TOUCH)
else if(bartender_check(target) && thrown)
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 07/13] 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)
From 2b3e8a64f7bd9181aaf10b54ee97f4872cbae1f7 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 24 Feb 2020 14:23:44 -0700
Subject: [PATCH 08/13] Update holder.dm
---
code/modules/reagents/chemistry/holder.dm | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 8635626209..e5a501aa4d 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -303,6 +303,8 @@
if(R.overdose_threshold)
if(R.volume > R.overdose_threshold && !R.overdosed)
R.overdosed = 1
+ var/turf/CT = get_turf(C)
+ log_reagent("OVERDOSE START: [key_name(C)] at [AREACOORD(CT)] started overdosing on [R.volume] units of [R}.")
need_mob_update += R.overdose_start(C)
if(R.addiction_threshold)
if(R.volume > R.addiction_threshold && !is_type_in_list(R, cached_addictions))
@@ -347,6 +349,9 @@
/datum/reagents/proc/remove_addiction(datum/reagent/R)
to_chat(my_atom, "You feel like you've gotten over your need for [R.name].")
SEND_SIGNAL(my_atom, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_overdose")
+ if(ismob(my_atom))
+ var/turf/T = get_turf(my_atom)
+ log_reagent("OVERDOSE STOP: [key_name(my_atom)] at [AREACOORD(T)] got over their need for [R].")
addiction_list.Remove(R)
qdel(R)
From 306b711ab174b6937ce407bc392bdbcc96d772d3 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 24 Feb 2020 14:30:50 -0700
Subject: [PATCH 09/13] Update reagents.dm
---
code/modules/reagents/chemistry/reagents.dm | 29 +++++++--------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index 4aabd82d6a..8de788e971 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -78,7 +78,6 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
current_cycle++
if(holder)
holder.remove_reagent(type, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears.
- return
//called when a mob processes chems when dead.
/datum/reagent/proc/on_mob_dead(mob/living/carbon/M)
@@ -87,15 +86,14 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
current_cycle++
if(holder)
holder.remove_reagent(type, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears.
- return
// Called when this reagent is first added to a mob
/datum/reagent/proc/on_mob_add(mob/living/L, amount)
if(!iscarbon(L))
return
var/mob/living/carbon/M = L
+ log_reagent("MOB ADD: on_mob_add(): [key_name(M)] at [AREACOORD(T)] - [volume] of [type] with [purity] purity")
if (purity == 1)
- log_game("CHEM: [L] ckey: [L.key] has ingested [volume]u of [type]")
return
if(cached_purity == 1)
cached_purity = purity
@@ -112,20 +110,18 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
R.name = name//Negative effects are hidden
if(R.chemical_flags & REAGENT_INVISIBLE)
R.chemical_flags |= (REAGENT_INVISIBLE)
- log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume]u of [inverse_chem]")
- return
+ log_reagent("MOB ADD: on_mob_add() (impure): merged [volume] of [inverse_chem]")
else if (impure_chem)
var/impureVol = amount * (1 - purity) //turns impure ratio into impure chem
if(!(chemical_flags & REAGENT_SPLITRETAINVOL))
M.reagents.remove_reagent(type, (impureVol), FALSE)
M.reagents.add_reagent(impure_chem, impureVol, FALSE, other_purity = 1-cached_purity)
- log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume - impureVol]u of [type]")
- log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume]u of [impure_chem]")
- return
+ log_reagent("MOB ADD: on_mob_add() (mixed purity): merged [volume - impureVol] of [type] and [volume] of [impure_chem]")
// Called when this reagent is removed while inside a mob
/datum/reagent/proc/on_mob_delete(mob/living/L)
- return
+ var/turf/T = get_turf(L)
+ log_reagent("MOB DELETE: on_mob_delete: [key_name(L)] at [AREACOORD(T)] - [type]")
// Called when this reagent first starts being metabolized by a liver
/datum/reagent/proc/on_mob_metabolize(mob/living/L)
@@ -146,8 +142,9 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
/datum/reagent/proc/on_merge(data, amount, mob/living/carbon/M, purity)
if(!iscarbon(M))
return
+ var/turf/T = get_turf(M)
+ log_reagent("MOB ADD: on_merge(): [key_name(M)] at [AREACOORD(T)] - [volume] of [type] with [purity] purity")
if (purity == 1)
- log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume]u of [type]")
return
cached_purity = purity //purity SHOULD be precalculated from the add_reagent, update cache.
if (purity < 0)
@@ -163,16 +160,13 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
R.name = name//Negative effects are hidden
if(R.chemical_flags & REAGENT_INVISIBLE)
R.chemical_flags |= (REAGENT_INVISIBLE)
- log_game("FERMICHEM: [M] ckey: [M.key] has merged [volume]u of [inverse_chem]")
- return
+ log_reagent("MOB ADD: on_merge() (impure): merged [volume] of [inverse_chem]")
else if (impure_chem) //SPLIT
var/impureVol = amount * (1 - purity)
if(!(chemical_flags & REAGENT_SPLITRETAINVOL))
M.reagents.remove_reagent(type, impureVol, FALSE)
M.reagents.add_reagent(impure_chem, impureVol, FALSE, other_purity = 1-cached_purity)
- log_game("FERMICHEM: [M] ckey: [M.key] has merged [volume - impureVol]u of [type]")
- log_game("FERMICHEM: [M] ckey: [M.key] has merged [volume]u of [impure_chem]")
- return
+ log_reagent("MOB ADD: on_merge() (mixed purity): merged [volume - impureVol] of [type] and [volume] of [impure_chem]")
/datum/reagent/proc/on_update(atom/A)
return
@@ -188,31 +182,26 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
/datum/reagent/proc/overdose_start(mob/living/M)
to_chat(M, "You feel like you took too much of [name]!")
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/overdose, name)
- return
/datum/reagent/proc/addiction_act_stage1(mob/living/M)
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_light, name)
if(prob(30))
to_chat(M, "You feel like having some [name] right about now.")
- return
/datum/reagent/proc/addiction_act_stage2(mob/living/M)
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_medium, name)
if(prob(30))
to_chat(M, "You feel like you need [name]. You just can't get enough.")
- return
/datum/reagent/proc/addiction_act_stage3(mob/living/M)
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_severe, name)
if(prob(30))
to_chat(M, "You have an intense craving for [name].")
- return
/datum/reagent/proc/addiction_act_stage4(mob/living/M)
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_critical, name)
if(prob(30))
to_chat(M, "You're not feeling good at all! You really need some [name].")
- return
/proc/pretty_string_from_reagent_list(list/reagent_list)
//Convert reagent list to a printable string for logging etc
From 5ad51758e02b67d7b04580cf2d5587f99d938880 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 24 Feb 2020 15:04:25 -0700
Subject: [PATCH 10/13] fix
---
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 e5e428ffdd..525f6e62ae 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -133,7 +133,7 @@
throwerstring = " THROWN BY [key_name(thrownby)] at [AT] (AREACOORD(AT)]"
log_reagent("SPLASH: [src] mob SplashReagents() onto [key_name(target)] at [TT] ([AREACOORD(TT)])[throwerstring] - [R]")
reagents.reaction(target, TOUCH)
-
+
else if(bartender_check(target) && thrown)
visible_message("[src] lands onto the [target.name] without spilling a single drop.")
transform = initial(transform)
@@ -148,7 +148,7 @@
var/throwerstring
if(thrownby && thrown)
var/turf/AT = get_turf(thrownby)
- throwerstring = " THROWN BY [key_name(thrownby)] at [AREACOORD(AT])"
+ 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()]")
visible_message("[src] spills its contents all over [target].")
reagents.reaction(target, TOUCH)
From 672da86c5122de52bcfc11f0bd458d274de1bb9a Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 24 Feb 2020 15:08:08 -0700
Subject: [PATCH 11/13] NEVERWEBEDITORGUYS
---
code/modules/reagents/chemistry/holder.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index e5a501aa4d..d53e4dfcbe 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -304,7 +304,7 @@
if(R.volume > R.overdose_threshold && !R.overdosed)
R.overdosed = 1
var/turf/CT = get_turf(C)
- log_reagent("OVERDOSE START: [key_name(C)] at [AREACOORD(CT)] started overdosing on [R.volume] units of [R}.")
+ log_reagent("OVERDOSE START: [key_name(C)] at [AREACOORD(CT)] started overdosing on [R.volume] units of [R].")
need_mob_update += R.overdose_start(C)
if(R.addiction_threshold)
if(R.volume > R.addiction_threshold && !is_type_in_list(R, cached_addictions))
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 12/13] 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
From 5144e45ba9364b099f093d93c41b8f833f3f63dc Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 24 Feb 2020 15:32:46 -0700
Subject: [PATCH 13/13] it works now :D
---
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 39a5595137..78c335ce14 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 [AREACOORD(MT)], from user [key_name(user)] at [AREACOORD(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 [AREACOORD(OT)]) - [R]")
reagents.clear_reagents()
else
var/self_fed = M == user