diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index bf8474adca71..e297574f7de8 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -297,7 +297,7 @@ CONTENTS: user.do_attack_animation(L) if(isrobot(L)) - L.apply_damage(120, STAMINA) //Force a reboot instantly + L.apply_damage(80, STAMINA) //Force a reboot on two hits for consistency. return if(ishuman(L)) @@ -327,8 +327,8 @@ CONTENTS: L.lastattacker = user.real_name L.lastattackerckey = user.ckey - L.Stun(14 SECONDS) - L.Weaken(14 SECONDS) + L.KnockDown(7 SECONDS) + L.apply_damage(80, STAMINA) L.Stuttering(14 SECONDS) L.visible_message("[user] has stunned [L] with [src]!", \ @@ -337,18 +337,22 @@ CONTENTS: add_attack_logs(user, L, "Stunned with [src]") -/obj/item/abductor_baton/proc/SleepAttack(mob/living/L,mob/living/user) - if(L.IsStunned() || L.IsSleeping()) - L.visible_message("[user] has induced sleep in [L] with [src]!", \ +/obj/item/abductor_baton/proc/SleepAttack(mob/living/L, mob/living/user) + var/mob/living/carbon/C = L + if(!iscarbon(L)) + return + if((C.getStaminaLoss() < 100) && !C.IsSleeping()) + C.AdjustDrowsy(2 SECONDS) + to_chat(user, "Sleep inducement works fully only on stunned or asleep specimens!") + C.visible_message("[user] tried to induce sleep in [L] with [src]!", \ + "You suddenly feel drowsy!") + return + if(do_mob(user, C, 2.5 SECONDS)) + C.visible_message("[user] has induced sleep in [L] with [src]!", \ "You suddenly feel very drowsy!") playsound(loc, 'sound/weapons/egloves.ogg', 50, TRUE, -1) - L.Sleeping(120 SECONDS) - add_attack_logs(user, L, "Put to sleep with [src]") - else - L.AdjustDrowsy(2 SECONDS) - to_chat(user, "Sleep inducement works fully only on stunned specimens!") - L.visible_message("[user] tried to induce sleep in [L] with [src]!", \ - "You suddenly feel drowsy!") + C.Sleeping(120 SECONDS) + add_attack_logs(user, C, "Put to sleep with [src]") /obj/item/abductor_baton/proc/CuffAttack(mob/living/L,mob/living/user) if(!iscarbon(L)) @@ -358,7 +362,7 @@ CONTENTS: playsound(loc, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2) C.visible_message("[user] begins restraining [C] with [src]!", \ "[user] begins shaping an energy field around your hands!") - if(do_mob(user, C, 30)) + if(do_mob(user, C, 3 SECONDS)) if(!C.handcuffed) C.handcuffed = new /obj/item/restraints/handcuffs/energy(C) C.update_handcuffed()