From 8fff8cc0f77d8ca60327eb5c5c1a9af77a00c8b2 Mon Sep 17 00:00:00 2001 From: Peter Wedder Date: Tue, 14 Jan 2025 15:54:32 +0200 Subject: [PATCH] Add logging to Chef Excellence's Special Sauce and always log & adminwarn on reagent transfers of dangerous reagents (#37367) * attack_log deaths to Chef Excellence's Special Sauce * Add special sauce to list of reagents_to_log * Always log transfers of dangerous reagents * fix * Add alpha-amanitin --- code/game/objects/objs.dm | 5 ++++- code/modules/reagents/Chemistry-Holder.dm | 2 ++ code/modules/reagents/reagents/reagents_toxin.dm | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 0e9455747eb4..6bfc45205655 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -1,4 +1,7 @@ -var/global/list/reagents_to_log = list(FUEL, PLASMA, PACID, SACID, AMUTATIONTOXIN, MINDBREAKER, SPIRITBREAKER, CYANIDE, IMPEDREZENE, LUBE) +//reagents that should adminwarn upon transfer +var/global/list/reagents_to_log = list(FUEL, PLASMA, PACID, SACID, AMUTATIONTOXIN, MINDBREAKER, SPIRITBREAKER, CYANIDE, IMPEDREZENE, LUBE, CHEFSPECIAL, AMANITIN) +//dangerous reagents that should always be logged upon transfer no matter what +var/global/list/reagents_to_always_log = list(AMUTATIONTOXIN, CYANIDE, CHEFSPECIAL, AMANITIN) /obj var/origin_tech = null //Used by R&D to determine what research bonuses it grants. diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 2e4ab62c50c2..8c26ba9358fc 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -210,6 +210,8 @@ var/const/INGEST = 2 var/current_reagent_transfer = current_reagent.volume * part if(preserve_data) trans_data = current_reagent.data + if(current_reagent.id in reagents_to_always_log) + log_transfer = TRUE if(log_transfer) logged_message += "[current_reagent_transfer]u of [current_reagent.name]" if(current_reagent.id in reagents_to_log) diff --git a/code/modules/reagents/reagents/reagents_toxin.dm b/code/modules/reagents/reagents/reagents_toxin.dm index 4365b93d4287..ef9392bae0ae 100644 --- a/code/modules/reagents/reagents/reagents_toxin.dm +++ b/code/modules/reagents/reagents/reagents_toxin.dm @@ -148,6 +148,7 @@ /datum/reagent/chefspecial/on_overdose(var/mob/living/M) M.death(0) M.attack_log += "\[[time_stamp()]\]Died a quick and painless death by Chef Excellence's Special Sauce." + log_attack("[key_name(M)] was killed by Chef Excellence's Special Sauce (CHEFSPECIAL).") //Otherwise known as a "Mickey Finn" /datum/reagent/chloralhydrate