Skip to content

Commit

Permalink
Update legacy attack() overrides (#1683)
Browse files Browse the repository at this point in the history
## Что этот PR делает
Я как-то пропустил этот прок, исправляюсь.

## Тестирование
Не было.

## Changelog

:cl: Maxiemar
fix: Исправлено взаимодействие с некоторыми предметами.
/:cl:
  • Loading branch information
m-dzianishchyts authored Dec 3, 2024
1 parent fa357bb commit 37aca75
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion modular_ss220/detective_rework/code/sample_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()
Expand Down
2 changes: 1 addition & 1 deletion modular_ss220/detective_rework/code/swabs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion modular_ss220/food_and_drinks/code/food/fancy_food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modular_ss220/maps220/code/objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()
Expand Down
2 changes: 1 addition & 1 deletion modular_ss220/mobs/code/mob_holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modular_ss220/objects/code/weapons/melee/baseball_bat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
. = ..()
2 changes: 1 addition & 1 deletion modular_ss220/objects/code/weapons/melee/vibroblade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()

Expand Down

0 comments on commit 37aca75

Please sign in to comment.