From d4275b5ab41f5b73a000974a5bc703029cfe3f4c Mon Sep 17 00:00:00 2001 From: Spamcat Date: Wed, 20 Mar 2013 12:43:29 +0400 Subject: [PATCH 1/3] 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 From 3b0c07d2328c0390ea7dfb4a8e5f4f7698ee847b Mon Sep 17 00:00:00 2001 From: Spamcat Date: Wed, 20 Mar 2013 13:17:55 +0400 Subject: [PATCH 2/3] Removed unneeded message when feeding people. hacky-hacky --- code/modules/reagents/reagent_containers/food/snacks.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index c20091e4c30..7dc5eea3f33 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -11,10 +11,11 @@ var/slices_num //Placeholder for effect that trigger on eating that aren't tied to reagents. -/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume() +/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/M) if(!usr) return if(!reagents.total_volume) - usr.visible_message("[usr] finishes eating [src].","You finish eating [src].") + if(M == usr) + usr << "You finish eating \the [src]." usr.drop_from_inventory(src) //so icons update :[ if(trash) @@ -90,7 +91,7 @@ else reagents.trans_to(M, reagents.total_volume) bitecount++ - On_Consume() + On_Consume(M) return 1 return 0 From 47606f0142e5c612defbca397fdec071362efd9f Mon Sep 17 00:00:00 2001 From: Spamcat Date: Wed, 20 Mar 2013 18:58:01 +0400 Subject: [PATCH 3/3] Whoops... fixed the fix --- code/modules/reagents/syringe_gun.dm | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/code/modules/reagents/syringe_gun.dm b/code/modules/reagents/syringe_gun.dm index a01040d41e1..a0562269cab 100644 --- a/code/modules/reagents/syringe_gun.dm +++ b/code/modules/reagents/syringe_gun.dm @@ -21,19 +21,21 @@ if (!(usr in view(2)) && usr!=src.loc) return usr << "\blue [syringes.len] / [max_syringes] syringes." - attackby(obj/item/weapon/reagent_containers/syringe/I as obj, mob/user as mob) - - if(I.mode != 2)// 2 is SYRINGE_BROKEN in syringes.dm - if(syringes.len < max_syringes) - user.drop_item() - I.loc = src - syringes += I - user << "\blue You put the syringe in [src]." - user << "\blue [syringes.len] / [max_syringes] syringes." + attackby(obj/item/I as obj, mob/user as mob) + if(istype(I, /obj/item/weapon/reagent_containers/syringe)) + var/obj/item/weapon/reagent_containers/syringe/S = I + if(S.mode != 2) + if(syringes.len < max_syringes) + user.drop_item() + I.loc = src + syringes += I + user << "\blue You put the syringe in [src]." + user << "\blue [syringes.len] / [max_syringes] syringes." + else + usr << "\red [src] cannot hold more syringes." else - usr << "\red [src] cannot hold more syringes." - else - usr << "\red This syringe is broken!" + usr << "\red This syringe is broken!" + afterattack(obj/target, mob/user , flag) if(!isturf(target.loc) || target == user) return