From 3f1e86e8e70b2c3870fe28a7c8ffdfb3affddd0b Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 14 Apr 2016 23:32:12 -0400 Subject: [PATCH] Syringe Injection QoL --- .../reagents/reagent_containers/syringes.dm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 5c7e6d0ca4c..e95e213fd9f 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -96,14 +96,12 @@ return - var/time = 30 //Injecting through a hardsuit takes longer due to needing to find a port. + var/time = 30 if(istype(target,/mob/living/carbon/human)) var/mob/living/carbon/human/H = T if(H.species.flags & NO_BLOOD) to_chat(usr, "You are unable to locate any blood.") return - if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space)) - time = 60 if(target == user) time = 0 else @@ -185,18 +183,10 @@ return */ if(ismob(target) && target != user) - var/time = 30 //Injecting through a hardsuit takes longer due to needing to find a port. - if(istype(target,/mob/living/carbon/human)) - if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space)) - time = 60 - for(var/mob/O in viewers(world.view, user)) - if(time == 30) - O.show_message(text("\red [] is trying to inject []!", user, target), 1) - else - O.show_message(text("\red [] begins hunting for an injection port on []'s suit!", user, target), 1) + O.show_message(text("\red [] is trying to inject []!", user, target), 1) - if(!do_mob(user, target, time)) return + if(!do_mob(user, target, 30)) return for(var/mob/O in viewers(world.view, user)) O.show_message(text("\red [] injects [] with the syringe!", user, target), 1)