mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 14:07:51 +01:00
Fixes several attack chain call sites (#27553)
This commit is contained in:
@@ -61,7 +61,7 @@
|
||||
AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = NON_PROJECTILE_ATTACKS)
|
||||
RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(alert_admins_on_destroy))
|
||||
|
||||
/obj/item/melee/saber/attack(mob/living/target, mob/living/user)
|
||||
/obj/item/melee/saber/attack__legacy__attackchain(mob/living/target, mob/living/user)
|
||||
if(user.a_intent != INTENT_HELP || !ishuman(target))
|
||||
return ..()
|
||||
if(!COOLDOWN_FINISHED(src, slap_cooldown))
|
||||
|
||||
@@ -308,7 +308,7 @@
|
||||
return
|
||||
applying_meds = TRUE
|
||||
for(var/obj/item/reagent_containers/P in contents)
|
||||
if(P.attack(M, user))
|
||||
if(P.attack__legacy__attackchain(M, user))
|
||||
applying_meds = FALSE
|
||||
else
|
||||
applying_meds = FALSE
|
||||
@@ -357,7 +357,7 @@
|
||||
C.visible_message("<span class='danger'>[C] [rapid_intake_message]</span>")
|
||||
if(do_mob(C, C, 100)) // 10 seconds
|
||||
for(var/obj/item/reagent_containers/pill/P in contents)
|
||||
P.attack(C, C)
|
||||
P.attack__legacy__attackchain(C, C)
|
||||
C.visible_message("<span class='danger'>[C] [rapid_post_instake_message]</span>")
|
||||
return
|
||||
|
||||
|
||||
@@ -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
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user