diff --git a/modular_ss220/detective_rework/code/sample_kits.dm b/modular_ss220/detective_rework/code/sample_kits.dm index faab69249258..85a745597db4 100644 --- a/modular_ss220/detective_rework/code/sample_kits.dm +++ b/modular_ss220/detective_rework/code/sample_kits.dm @@ -86,7 +86,7 @@ name = ("[initial(name)] ([H])") icon_state = "fingerprint1" -/obj/item/sample/print/attack(mob/living/M, mob/user) +/obj/item/sample/print/attack__legacy__attackchain(mob/living/M, mob/user) if(!ishuman(M)) return ..() diff --git a/modular_ss220/detective_rework/code/swabs.dm b/modular_ss220/detective_rework/code/swabs.dm index 7159e9290b3d..a130dbe34de9 100644 --- a/modular_ss220/detective_rework/code/swabs.dm +++ b/modular_ss220/detective_rework/code/swabs.dm @@ -21,7 +21,7 @@ /obj/item/forensics/swab/proc/is_used() return used -/obj/item/forensics/swab/attack(mob/living/M, mob/user) +/obj/item/forensics/swab/attack__legacy__attackchain(mob/living/M, mob/user) if(!ishuman(M)) return ..() if(is_used()) diff --git a/modular_ss220/food_and_drinks/code/food/fancy_food.dm b/modular_ss220/food_and_drinks/code/food/fancy_food.dm index a581d2390fd1..d92c77183827 100644 --- a/modular_ss220/food_and_drinks/code/food/fancy_food.dm +++ b/modular_ss220/food_and_drinks/code/food/fancy_food.dm @@ -17,7 +17,7 @@ if(opened) icon_state = "[initial(icon_state)]_open" -/obj/item/food/fancy/attack(mob/M, mob/user, def_zone) +/obj/item/food/fancy/attack__legacy__attackchain(mob/M, mob/user, def_zone) if(!opened) to_chat(user, span_warning("[src] сначала нужно открыть!")) return FALSE diff --git a/modular_ss220/maps220/code/objects.dm b/modular_ss220/maps220/code/objects.dm index d5636d90eaad..f729a7ece368 100644 --- a/modular_ss220/maps220/code/objects.dm +++ b/modular_ss220/maps220/code/objects.dm @@ -214,7 +214,7 @@ var/list/skeletons = list() var/number = 2 // for ingame VV change -/obj/item/emerald_stone/attack(mob/living/carbon/human/undead, mob/living/carbon/human/user) +/obj/item/emerald_stone/attack__legacy__attackchain(mob/living/carbon/human/undead, mob/living/carbon/human/user) if(!istype(undead)) return ..() diff --git a/modular_ss220/mobs/code/mob_holder.dm b/modular_ss220/mobs/code/mob_holder.dm index 11ceab3332a3..d9fbf24f3829 100644 --- a/modular_ss220/mobs/code/mob_holder.dm +++ b/modular_ss220/mobs/code/mob_holder.dm @@ -6,7 +6,7 @@ origin_tech = "biotech=2" slot_flags = ITEM_SLOT_HEAD -/obj/item/holder/attack(mob/living/target, mob/living/user, def_zone) +/obj/item/holder/attack__legacy__attackchain(mob/living/target, mob/living/user, def_zone) ASSERT(length(contents) > 0) var/mob/living/simple_animal/animal = contents[1] var/mob/living/carbon/devourer = target diff --git a/modular_ss220/objects/code/weapons/melee/baseball_bat.dm b/modular_ss220/objects/code/weapons/melee/baseball_bat.dm index a7c7fa824840..09f96305d243 100644 --- a/modular_ss220/objects/code/weapons/melee/baseball_bat.dm +++ b/modular_ss220/objects/code/weapons/melee/baseball_bat.dm @@ -71,7 +71,7 @@ playsound(loc, extend_sound, 50, TRUE) add_fingerprint(user) -/obj/item/melee/baseball_bat/homerun/central_command/attack(mob/living/target, mob/living/user) +/obj/item/melee/baseball_bat/homerun/central_command/attack__legacy__attackchain(mob/living/target, mob/living/user) if(on) homerun_ready = TRUE . = ..() diff --git a/modular_ss220/objects/code/weapons/melee/vibroblade.dm b/modular_ss220/objects/code/weapons/melee/vibroblade.dm index 4b1063f7af5e..37667a1006e8 100644 --- a/modular_ss220/objects/code/weapons/melee/vibroblade.dm +++ b/modular_ss220/objects/code/weapons/melee/vibroblade.dm @@ -94,7 +94,7 @@ . = ..() force = initial(force) * get_damage_factor() -/obj/item/melee/vibroblade/attack(mob/living/target, mob/living/user, def_zone) +/obj/item/melee/vibroblade/attack__legacy__attackchain(mob/living/target, mob/living/user, def_zone) var/obj/item/organ/external/selected_bodypart if(user.zone_selected in cutoff_candidates) selected_bodypart = target.get_organ(user.zone_selected) diff --git a/modular_ss220/species/code/mob/living/carbon/human/eat/eat_items.dm b/modular_ss220/species/code/mob/living/carbon/human/eat/eat_items.dm index d982576cc37e..7e4bfa77a8ec 100644 --- a/modular_ss220/species/code/mob/living/carbon/human/eat/eat_items.dm +++ b/modular_ss220/species/code/mob/living/carbon/human/eat/eat_items.dm @@ -15,7 +15,7 @@ var/material_string = item_string_material(user) . = ..(user, "", material_string) -/obj/item/attack(mob/living/target, mob/living/user, def_zone) +/obj/item/attack__legacy__attackchain(mob/living/target, mob/living/user, def_zone) if(check_item_eat(target, user)) try_item_eat(target, user) return TRUE diff --git a/modular_ss220/species/code/mob/surgery/organs/subtypes/nucleation_organs.dm b/modular_ss220/species/code/mob/surgery/organs/subtypes/nucleation_organs.dm index 986a8c4bc28d..b6f0a764afb0 100644 --- a/modular_ss220/species/code/mob/surgery/organs/subtypes/nucleation_organs.dm +++ b/modular_ss220/species/code/mob/surgery/organs/subtypes/nucleation_organs.dm @@ -51,7 +51,7 @@ else try_burn_hit(I, user) -/obj/item/organ/internal/nucleation/attack(mob/living/carbon/M, mob/user) +/obj/item/organ/internal/nucleation/attack__legacy__attackchain(mob/living/carbon/M, mob/user) if(!try_burn_hit(affected_user = user, def_zone = user.zone_selected)) return ..()