From d4275b5ab41f5b73a000974a5bc703029cfe3f4c Mon Sep 17 00:00:00 2001 From: Spamcat Date: Wed, 20 Mar 2013 12:43:29 +0400 Subject: [PATCH] Made syringe guns reject broken syringes. --- code/modules/reagents/syringe_gun.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/syringe_gun.dm b/code/modules/reagents/syringe_gun.dm index a724d91ecdd..a01040d41e1 100644 --- a/code/modules/reagents/syringe_gun.dm +++ b/code/modules/reagents/syringe_gun.dm @@ -21,9 +21,9 @@ if (!(usr in view(2)) && usr!=src.loc) return usr << "\blue [syringes.len] / [max_syringes] syringes." - attackby(obj/item/I as obj, mob/user as mob) + attackby(obj/item/weapon/reagent_containers/syringe/I as obj, mob/user as mob) - if(istype(I, /obj/item/weapon/reagent_containers/syringe)) + if(I.mode != 2)// 2 is SYRINGE_BROKEN in syringes.dm if(syringes.len < max_syringes) user.drop_item() I.loc = src @@ -32,6 +32,8 @@ user << "\blue [syringes.len] / [max_syringes] syringes." else usr << "\red [src] cannot hold more syringes." + else + usr << "\red This syringe is broken!" afterattack(obj/target, mob/user , flag) if(!isturf(target.loc) || target == user) return