Fixes several attack chain call sites (#27553)

This commit is contained in:
warriorstar-orion
2024-12-06 17:20:12 -05:00
committed by GitHub
parent 9a17eccd0d
commit d23c808e47
6 changed files with 53 additions and 19 deletions
@@ -560,7 +560,7 @@
var/threat = C.assess_threat(src)
var/prev_intent = a_intent
a_intent = INTENT_HELP
baton.attack(C, src)
baton.attack__legacy__attackchain(C, src)
a_intent = prev_intent
baton_delayed = TRUE
addtimer(VARSET_CALLBACK(src, baton_delayed, FALSE), BATON_COOLDOWN)
@@ -263,7 +263,7 @@
var/threat = C.assess_threat(src)
var/prev_intent = a_intent
a_intent = harmbaton ? INTENT_HARM : INTENT_HELP
baton.attack(C, src)
baton.attack__legacy__attackchain(C, src)
a_intent = prev_intent
baton_delayed = TRUE
addtimer(VARSET_CALLBACK(src, baton_delayed, FALSE), BATON_COOLDOWN)
@@ -211,7 +211,7 @@
if(S)
H.drop_item()
H.put_in_active_hand(S)
S.attack(H, H)
S.attack__legacy__attackchain(H, H)
qdel(src)
else
..()