cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 16:13:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes several attack chain call sites (#27553)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/melee/melee_misc.dm
+1 -1
View File
@@ -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))
code/game/objects/items/weapons/storage/firstaid.dm
+2 -2
View File
@@ -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