From 55bf2fe756bd9cbef005b344b8daba9a1daaf85c Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Tue, 12 Nov 2019 05:03:43 -0600 Subject: [PATCH 1/3] Spray bottle admin attack log tweaks --- code/modules/reagents/reagent_containers.dm | 8 ++++++++ .../reagents/reagent_containers/spray.dm | 17 ++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 41f9524874b..82d430bfcd7 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -72,3 +72,11 @@ obj/item/reagent_containers/proc/add_initial_reagents() to_chat(user, "You fill [src] from [source].") return ..() + +// Returns a string that contains a list of reagents seperated with commas +/obj/item/reagent_containers/proc/get_formatted_contents_string() + var/contents_string + for(var/R in reagents.reagent_list) + contents_string += "[R], " + contents_string = copytext(contents_string, 1, lentext(contents_string)-1) + return contents_string diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 482b8b20ccd..a778a4fd56f 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -43,21 +43,20 @@ to_chat(user, "[src] is empty!") return + var/contents_log = get_formatted_contents_string() spray(A) playsound(loc, 'sound/effects/spray2.ogg', 50, 1, -6) user.changeNext_move(CLICK_CD_RANGE*2) user.newtonian_move(get_dir(A, user)) - if(reagents.has_reagent("sacid")) - msg_admin_attack("[key_name_admin(user)] fired sulphuric acid from \a [src] at [COORD(user)].", ATKLOG_FEW) - log_game("[key_name(user)] fired sulphuric acid from \a [src] at [COORD(user)].") - if(reagents.has_reagent("facid")) - msg_admin_attack("[key_name_admin(user)] fired fluorosulfuric acid from \a [src] at [COORD(user)].", ATKLOG_FEW) - log_game("[key_name(user)] fired fluorosulfuric Acid from \a [src] at [COORD(user)].") - if(reagents.has_reagent("lube")) - msg_admin_attack("[key_name_admin(user)] fired space lube from \a [src] at [COORD(user)].") - log_game("[key_name(user)] fired space lube from \a [src] at [COORD(user)].") + if(reagents.reagent_list.len == 1 && reagents.has_reagent("cleaner")) // Don't show logs for bottles spraying only space cleaner + return + + var/attack_log_type = ATKLOG_MOST + if(reagents.has_reagent("sacid") || reagents.has_reagent("facid") || reagents.has_reagent("lube")) + attack_log_type = ATKLOG_FEW + msg_admin_attack("[key_name_admin(user)] used a spray bottle at [COORD(user)] - Contents: [contents_log] - Temperature: [reagents.chem_temp]K", attack_log_type) return From 468ebe87e0aa21ac952815f6e6eca49a9228a5fc Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Tue, 12 Nov 2019 10:17:54 -0600 Subject: [PATCH 2/3] temp based cleaner logs, uses Join() --- code/modules/reagents/reagent_containers.dm | 8 -------- code/modules/reagents/reagent_containers/spray.dm | 8 +++++--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 82d430bfcd7..41f9524874b 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -72,11 +72,3 @@ obj/item/reagent_containers/proc/add_initial_reagents() to_chat(user, "You fill [src] from [source].") return ..() - -// Returns a string that contains a list of reagents seperated with commas -/obj/item/reagent_containers/proc/get_formatted_contents_string() - var/contents_string - for(var/R in reagents.reagent_list) - contents_string += "[R], " - contents_string = copytext(contents_string, 1, lentext(contents_string)-1) - return contents_string diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index a778a4fd56f..7433c227e45 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -43,20 +43,22 @@ to_chat(user, "[src] is empty!") return - var/contents_log = get_formatted_contents_string() + var/contents_log = reagents.reagent_list.Join(", ") spray(A) playsound(loc, 'sound/effects/spray2.ogg', 50, 1, -6) user.changeNext_move(CLICK_CD_RANGE*2) user.newtonian_move(get_dir(A, user)) - if(reagents.reagent_list.len == 1 && reagents.has_reagent("cleaner")) // Don't show logs for bottles spraying only space cleaner - return + if(reagents.reagent_list.len == 1 && reagents.has_reagent("cleaner")) // Only show space cleaner logs if it's burning people from being too hot or cold + if((reagents.chem_temp < 300) && (reagents.chem_temp > 280)) // 280 is the cold threshold for slimes, 300 the hot threshold for drask + return var/attack_log_type = ATKLOG_MOST if(reagents.has_reagent("sacid") || reagents.has_reagent("facid") || reagents.has_reagent("lube")) attack_log_type = ATKLOG_FEW msg_admin_attack("[key_name_admin(user)] used a spray bottle at [COORD(user)] - Contents: [contents_log] - Temperature: [reagents.chem_temp]K", attack_log_type) + log_game("[key_name(user)] used a spray bottle at [COORD(user)] - Contents: [contents_log] - Temperature: [reagents.chem_temp]K") return From 87a8a933e8d109e0a9c546de27f3ddcb73bef8b6 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Thu, 14 Nov 2019 10:53:22 -0600 Subject: [PATCH 3/3] remove useless parentheses --- code/modules/reagents/reagent_containers/spray.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 7433c227e45..a4320639f39 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -51,7 +51,7 @@ user.newtonian_move(get_dir(A, user)) if(reagents.reagent_list.len == 1 && reagents.has_reagent("cleaner")) // Only show space cleaner logs if it's burning people from being too hot or cold - if((reagents.chem_temp < 300) && (reagents.chem_temp > 280)) // 280 is the cold threshold for slimes, 300 the hot threshold for drask + if(reagents.chem_temp < 300 && reagents.chem_temp > 280) // 280 is the cold threshold for slimes, 300 the hot threshold for drask return var/attack_log_type = ATKLOG_MOST