Merge upstream

This commit is contained in:
Cyberboss
2017-04-01 23:38:37 -04:00
121 changed files with 2258 additions and 4320 deletions
@@ -57,7 +57,7 @@
/obj/item/weapon/implantcase/chem/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W,/obj/item/weapon/reagent_containers/syringe) && imp)
W.afterattack(imp, user, params)
W.afterattack(imp, user, TRUE, params)
return TRUE
else
return ..()