Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modernizes abductor Baton #27082

Merged
merged 8 commits into from
Nov 10, 2024
Merged

Modernizes abductor Baton #27082

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
99ae6f3
Modernizes abductor baton
silverplatedelta Oct 12, 2024
f2a4546
Contra review
silverplatedelta Oct 12, 2024
b36df54
lewc review
silverplatedelta Oct 23, 2024
6347dc4
Fixes logic.
silverplatedelta Nov 2, 2024
3f63fe8
returns origional funcionality
silverplatedelta Nov 3, 2024
95f8b74
testing, removes uneeded return else
silverplatedelta Nov 4, 2024
b8b38cd
fixed logic
silverplatedelta Nov 4, 2024
30e383a
Update code/game/gamemodes/miniantags/abduction/abduction_gear.dm
silverplatedelta Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions code/game/gamemodes/miniantags/abduction/abduction_gear.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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("<span class='danger'>[user] has stunned [L] with [src]!</span>", \
Expand All @@ -337,18 +337,24 @@ 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("<span class='danger'>[user] has induced sleep in [L] with [src]!</span>", \
/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)
silverplatedelta marked this conversation as resolved.
Show resolved Hide resolved
C.AdjustDrowsy(2 SECONDS)
to_chat(user, "<span class='warning'>Sleep inducement works fully only on stunned or asleep specimens!</span>")
C.visible_message("<span class='danger'>[user] tried to induce sleep in [L] with [src]!</span>", \
"<span class='userdanger'>You suddenly feel drowsy!</span>")
return
if(do_mob(user, C, 2.5 SECONDS))
C.visible_message("<span class='danger'>[user] has induced sleep in [L] with [src]!</span>", \
"<span class='userdanger'>You suddenly feel very drowsy!</span>")
playsound(loc, 'sound/weapons/egloves.ogg', 50, TRUE, -1)
L.Sleeping(120 SECONDS)
add_attack_logs(user, L, "Put to sleep with [src]")
C.Sleeping(120 SECONDS)
add_attack_logs(user, C, "Put to sleep with [src]")
else
L.AdjustDrowsy(2 SECONDS)
to_chat(user, "<span class='warning'>Sleep inducement works fully only on stunned specimens!</span>")
L.visible_message("<span class='danger'>[user] tried to induce sleep in [L] with [src]!</span>", \
"<span class='userdanger'>You suddenly feel drowsy!</span>")
return
silverplatedelta marked this conversation as resolved.
Show resolved Hide resolved
silverplatedelta marked this conversation as resolved.
Show resolved Hide resolved

/obj/item/abductor_baton/proc/CuffAttack(mob/living/L,mob/living/user)
if(!iscarbon(L))
Expand All @@ -358,7 +364,7 @@ CONTENTS:
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2)
C.visible_message("<span class='danger'>[user] begins restraining [C] with [src]!</span>", \
"<span class='userdanger'>[user] begins shaping an energy field around your hands!</span>")
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()
Expand Down