From d91e13f8741b3f092c5322d8e68c73ef02ca71f6 Mon Sep 17 00:00:00 2001 From: EdgeLordExe <42111655+EdgeLordExe@users.noreply.github.com> Date: Fri, 7 Aug 2020 21:23:41 +0200 Subject: [PATCH] [Ready]Medipens no longer instantly inject if you walk while do_after is still going (#52712) * E * E * Update code/modules/reagents/reagent_containers/hypospray.dm Co-authored-by: Rohesie Co-authored-by: Rohesie --- .../reagents/reagent_containers/hypospray.dm | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 157b733cd78..3179d4d5857 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -224,17 +224,22 @@ list_reagents = list( /datum/reagent/medicine/epinephrine = 8, /datum/reagent/medicine/c2/aiuri = 8, /datum/reagent/medicine/c2/libital = 8 ,/datum/reagent/medicine/leporazine = 6) /obj/item/reagent_containers/hypospray/medipen/survival/inject(mob/living/M, mob/user) - if(!lavaland_equipment_pressure_check(get_turf(user))) - if(M in user.do_afters) - to_chat(user,"You are too busy to use \the [src]!") - return - to_chat(user,"You start manually releasing the low-pressure gauge...") - if(do_mob(user, M ,10 SECONDS)) - amount_per_transfer_from_this = initial(amount_per_transfer_from_this) * 0.5 - return ..() - amount_per_transfer_from_this = initial(amount_per_transfer_from_this) + if(lavaland_equipment_pressure_check(get_turf(user))) + amount_per_transfer_from_this = initial(amount_per_transfer_from_this) + return ..() + + if(M in user.do_afters) + to_chat(user,"You are too busy to use \the [src]!") + return + + to_chat(user,"You start manually releasing the low-pressure gauge...") + if(!do_mob(user, M, 10 SECONDS)) + return + + amount_per_transfer_from_this = initial(amount_per_transfer_from_this) * 0.5 return ..() + /obj/item/reagent_containers/hypospray/medipen/survival/luxury name = "luxury medipen" desc = "Cutting edge bluespace technology allowed Nanotrasen to compact 60u of volume into a single medipen. Contains rare and powerful chemicals used to aid in exploration of very hard enviroments. WARNING: DO NOT MIX WITH EPINEPHRINE OR ATROPINE."