cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Log attempted injections as well as successful ones

Browse Source
This commit is contained in:
oranges
2017-09-27 22:45:07 +00:00
committed by KorPhaeron
parent 2ddc4aa332
commit eda8f7f7df
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/reagents/reagent_containers/hypospray.dm
View File

@@ -25,6 +25,13 @@
if(!iscarbon(M)) if(!iscarbon(M))
return 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. 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, "<span class='warning'>You feel a tiny prick!</span>") to_chat(M, "<span class='warning'>You feel a tiny prick!</span>")
to_chat(user, "<span class='notice'>You inject [M] with [src].</span>") to_chat(user, "<span class='notice'>You inject [M] with [src].</span>")
@@ -32,9 +39,6 @@
var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1) var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1)
reagents.reaction(M, INJECT, fraction) reagents.reaction(M, INJECT, fraction)
if(M.reagents) if(M.reagents)
var/list/injected = list()
for(var/datum/reagent/R in reagents.reagent_list)
injected += R.name
var/trans = 0 var/trans = 0
if(!infinite) if(!infinite)
trans = reagents.trans_to(M, amount_per_transfer_from_this) trans = reagents.trans_to(M, amount_per_transfer_from_this)
@@ -43,7 +47,6 @@
to_chat(user, "<span class='notice'>[trans] unit\s injected. [reagents.total_volume] unit\s remaining in [src].</span>") to_chat(user, "<span class='notice'>[trans] unit\s injected. [reagents.total_volume] unit\s remaining in [src].</span>")
var/contained = english_list(injected)
add_logs(user, M, "injected", src, "([contained])") add_logs(user, M, "injected", src, "([contained])")

12
code/modules/reagents/reagent_containers/syringes.dm
View File

@@ -110,6 +110,13 @@
update_icon() update_icon()
if(SYRINGE_INJECT) 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) if(!reagents.total_volume)
to_chat(user, "<span class='notice'>[src] is empty.</span>") to_chat(user, "<span class='notice'>[src] is empty.</span>")
return return
@@ -137,11 +144,6 @@
L.visible_message("<span class='danger'>[user] injects [L] with the syringe!", \ L.visible_message("<span class='danger'>[user] injects [L] with the syringe!", \
"<span class='userdanger'>[user] injects [L] with the syringe!</span>") "<span class='userdanger'>[user] injects [L] with the syringe!</span>")
var/list/rinject = list()
for(var/datum/reagent/R in reagents.reagent_list)
rinject += R.name
var/contained = english_list(rinject)
if(L != user) if(L != user)
add_logs(user, L, "injected", src, addition="which had [contained]") add_logs(user, L, "injected", src, addition="which had [contained]")
else else