diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 1c71948d8edc..f236b83fa3ad 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -25,6 +25,13 @@ if(!iscarbon(M)) return + //Always log attemped injects for admins + var/list/injected = list() + for(var/datum/reagent/R in reagents.reagent_list) + injected += R.name + var/contained = english_list(injected) + add_logs(user, M, "attempted to inject", src, "([contained])") + if(reagents.total_volume && (ignore_flags || M.can_inject(user, 1))) // Ignore flag should be checked first or there will be an error message. to_chat(M, "You feel a tiny prick!") to_chat(user, "You inject [M] with [src].") @@ -32,9 +39,6 @@ var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1) reagents.reaction(M, INJECT, fraction) if(M.reagents) - var/list/injected = list() - for(var/datum/reagent/R in reagents.reagent_list) - injected += R.name var/trans = 0 if(!infinite) trans = reagents.trans_to(M, amount_per_transfer_from_this) @@ -43,7 +47,6 @@ to_chat(user, "[trans] unit\s injected. [reagents.total_volume] unit\s remaining in [src].") - var/contained = english_list(injected) add_logs(user, M, "injected", src, "([contained])") diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 324a7d7066af..daf955d0ef95 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -110,6 +110,13 @@ update_icon() if(SYRINGE_INJECT) + //Always log attemped injections for admins + var/list/rinject = list() + for(var/datum/reagent/R in reagents.reagent_list) + rinject += R.name + var/contained = english_list(rinject) + add_logs(user, L, "attemped to inject", src, addition="which had [contained]") + if(!reagents.total_volume) to_chat(user, "[src] is empty.") return @@ -137,11 +144,6 @@ L.visible_message("[user] injects [L] with the syringe!", \ "[user] injects [L] with the syringe!") - var/list/rinject = list() - for(var/datum/reagent/R in reagents.reagent_list) - rinject += R.name - var/contained = english_list(rinject) - if(L != user) add_logs(user, L, "injected", src, addition="which had [contained]") else