cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9711 from mwerezak/syringelog

Browse Source 
Syringe gun logs, logging helper reorganization
This commit is contained in:
PsiOmegaDelta
2015-06-07 09:00:21 +02:00
parent 8d799293ba f62cc38883
commit 2e920bce69
8 changed files with 78 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/projectiles/guns/launcher/syringe_gun.dm
View File

@@ -50,9 +50,11 @@
if(speed >= 10 && isliving(hit_atom))
var/mob/living/L = hit_atom
//unfortuately we don't know where the dart will actually hit, since that's done by the parent.
if(L.can_inject())
if(syringe.reagents)
syringe.reagents.trans_to_mob(L, 15, CHEM_BLOOD)
if(L.can_inject() && syringe.reagents)
var/reagent_log = syringe.reagents.get_reagents()
syringe.reagents.trans_to_mob(L, 15, CHEM_BLOOD)
admin_inject_log(thrower, L, src, reagent_log, 15, violent=1)
syringe.break_syringe(iscarbon(hit_atom)? hit_atom : null)
syringe.update_icon()