diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index 3d069f1cff..444435eb2c 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -452,24 +452,30 @@
return
if(!req_defib && !combat)
return
+ M.visible_message("[user] hastily places [src] on [M]'s chest!", \
+ "[user] hastily places [src] on [M]'s chest!")
busy = TRUE
- M.visible_message("[user] has touched [M] with [src]!", \
- "[user] has touched [M] with [src]!")
- M.adjustStaminaLoss(50)
- M.Knockdown(100)
- M.updatehealth() //forces health update before next life tick
- playsound(src, 'sound/machines/defib_zap.ogg', 50, 1, -1)
- M.emote("gasp")
- add_logs(user, M, "stunned", src)
- if(req_defib)
- defib.deductcharge(revivecost)
- cooldown = TRUE
+ update_icon()
+ if(do_after(user, 10, target = M))
+ M.visible_message("[user] zaps [M] with [src]!", \
+ "[user] zaps [M] with [src]!")
+ M.adjustStaminaLoss(50)
+ M.Knockdown(100)
+ M.updatehealth() //forces health update before next life tick
+ playsound(src, 'sound/machines/defib_zap.ogg', 50, 1, -1)
+ M.emote("gasp")
+ add_logs(user, M, "stunned", src)
+ if(req_defib)
+ defib.deductcharge(revivecost)
+ cooldown = TRUE
+ busy = FALSE
+ update_icon()
+ if(!req_defib)
+ recharge(60)
+ if(req_defib && (defib.cooldowncheck(user)))
+ return
busy = FALSE
update_icon()
- if(req_defib)
- defib.cooldowncheck(user)
- else
- recharge(60)
/obj/item/twohanded/shockpaddles/proc/do_harm(mob/living/carbon/H, mob/living/user)
if(req_defib && defib.safety)