From 5b368c3f8f237553f5bb9dec343613021329e021 Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Thu, 4 Sep 2025 03:11:59 -0400 Subject: [PATCH] Renames some pre_attack arguments (#30324) * Renames some pre_attack arguments * fix --- code/_onclick/item_attack.dm | 22 +++++++++---------- code/game/objects/items/cigs.dm | 10 ++++----- .../objects/items/robot/cyborg_gripper.dm | 8 +++---- code/game/objects/items/weapons/stunbaton.dm | 6 ++--- code/game/objects/items/weapons/teleprod.dm | 6 ++--- code/game/objects/items/weapons/weaponry.dm | 8 +++---- .../powers/flayer_stealth_powers.dm | 6 ++--- .../antagonists/zombie/zombie_spells.dm | 2 +- .../food_and_drinks/drinks/drinks/bottle.dm | 8 +++---- code/modules/hydroponics/hydroitemdefines.dm | 6 ++--- code/modules/mod/mod_paint.dm | 6 ++--- .../projectiles/guns/energy/special_eguns.dm | 6 ++--- code/modules/recycling/sortingmachinery.dm | 10 ++++----- 13 files changed, 52 insertions(+), 52 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 7bf344bac1b..99aa28939e0 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -55,31 +55,31 @@ * Called on ourselves before we hit something. Return TRUE to cancel the remainder of the attack chain. * * Arguments: - * * atom/A - The atom about to be hit + * * atom/target - The atom about to be hit * * mob/living/user - The mob doing the htting * * params - click params such as alt/shift etc * * See: [/obj/item/proc/melee_attack_chain] */ -/obj/item/proc/pre_attack(atom/A, mob/living/user, params) +/obj/item/proc/pre_attack(atom/target, mob/living/user, params) SHOULD_CALL_PARENT(TRUE) - if(SEND_SIGNAL(src, COMSIG_PRE_ATTACK, A, user, params) & COMPONENT_CANCEL_ATTACK_CHAIN) + if(SEND_SIGNAL(src, COMSIG_PRE_ATTACK, target, user, params) & COMPONENT_CANCEL_ATTACK_CHAIN) return TRUE // TODO: Turn this into a component and have a sane implementation instead of extra-specific behavior in a core proc var/temperature = get_heat() - if(temperature && A.reagents && !ismob(A) && !istype(A, /obj/item/clothing/mask/cigarette)) - var/reagent_temp = A.reagents.chem_temp + if(temperature && target.reagents && !ismob(target) && !istype(target, /obj/item/clothing/mask/cigarette)) + var/reagent_temp = target.reagents.chem_temp var/time = (reagent_temp / 10) / (temperature / 1000) if(user.mind && HAS_TRAIT(user.mind, TRAIT_QUICK_HEATER)) - while(do_after_once(user, time, TRUE, user, TRUE, attempt_cancel_message = "You stop heating up [A].")) - to_chat(user, "You heat [A] with [src].") - A.reagents.temperature_reagents(temperature) + while(do_after_once(user, time, TRUE, user, TRUE, attempt_cancel_message = "You stop heating up [target].")) + to_chat(user, "You heat [target] with [src].") + target.reagents.temperature_reagents(temperature) else - if(do_after_once(user, time, TRUE, user, TRUE, attempt_cancel_message = "You stop heating up [A].")) - to_chat(user, "You heat [A] with [src].") - A.reagents.temperature_reagents(temperature) + if(do_after_once(user, time, TRUE, user, TRUE, attempt_cancel_message = "You stop heating up [target].")) + to_chat(user, "You heat [target] with [src].") + target.reagents.temperature_reagents(temperature) /** * Called when mob `user` is hitting us with an item `attacking`. diff --git a/code/game/objects/items/cigs.dm b/code/game/objects/items/cigs.dm index 0f4aba42224..eb3d9419942 100644 --- a/code/game/objects/items/cigs.dm +++ b/code/game/objects/items/cigs.dm @@ -118,11 +118,11 @@ LIGHTERS ARE IN LIGHTERS.DM to_chat(user, "[src] is full.") return ITEM_INTERACT_COMPLETE -/obj/item/clothing/mask/cigarette/pre_attack(atom/A, mob/living/user, params) - if(!ismob(A)) +/obj/item/clothing/mask/cigarette/pre_attack(atom/atom_target, mob/living/user, params) + if(!ismob(atom_target)) return ..() - var/mob/living/target = A + var/mob/living/target = atom_target if(target.on_fire) user.do_attack_animation(target) if(target != user) @@ -140,11 +140,11 @@ LIGHTERS ARE IN LIGHTERS.DM return FINISH_ATTACK | MELEE_COOLDOWN_PREATTACK // The above section doesn't check for carbons to allow ALL burning bodies to be used. - if(!iscarbon(A)) + if(!iscarbon(target)) return ..() // If the target has no cig, try to give them the cig. - var/mob/living/carbon_target = A + var/mob/living/carbon_target = target if(user.zone_selected == "mouth" && !carbon_target.wear_mask && user.a_intent == INTENT_HELP) user.drop_item_to_ground(src, force = TRUE) carbon_target.equip_to_slot_if_possible(src, ITEM_SLOT_MASK) diff --git a/code/game/objects/items/robot/cyborg_gripper.dm b/code/game/objects/items/robot/cyborg_gripper.dm index 2081ca1edb9..cc29b5587d5 100644 --- a/code/game/objects/items/robot/cyborg_gripper.dm +++ b/code/game/objects/items/robot/cyborg_gripper.dm @@ -168,16 +168,16 @@ ..() return TRUE -/obj/item/gripper/pre_attack(atom/A, mob/living/user, params) +/obj/item/gripper/pre_attack(atom/atom_target, mob/living/user, params) . = FINISH_ATTACK | MELEE_COOLDOWN_PREATTACK if(gripped_item) - gripped_item.attack(A, user) + gripped_item.attack(atom_target, user) return - if(!ismob(A)) + if(!ismob(atom_target)) return ..() - var/mob/living/target = A + var/mob/living/target = atom_target // If a human target is horizonal, try to help them up. Unless you're trying to kill them. if(ishuman(target) && user.a_intent == INTENT_HELP && can_help_up) var/mob/living/carbon/human/pickup_target = target diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 9af9e5342f1..1b5235edf9f 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -192,7 +192,7 @@ if(!. && turned_on && istype(hit_mob)) thrown_baton_stun(hit_mob) -/obj/item/melee/baton/pre_attack(atom/A, mob/living/user, params) +/obj/item/melee/baton/pre_attack(atom/atom_target, mob/living/user, params) if(..()) return FINISH_ATTACK @@ -209,10 +209,10 @@ to_chat(user, user.mind.martial_art.no_baton_reason) return FINISH_ATTACK - if(!ismob(A)) + if(!ismob(atom_target)) return - var/mob/living/target = A + var/mob/living/target = atom_target if(user.a_intent == INTENT_HARM) return // Harmbaton! diff --git a/code/game/objects/items/weapons/teleprod.dm b/code/game/objects/items/weapons/teleprod.dm index 900ba9c0eb0..d0f5e255e42 100644 --- a/code/game/objects/items/weapons/teleprod.dm +++ b/code/game/objects/items/weapons/teleprod.dm @@ -5,7 +5,7 @@ base_icon = "teleprod" origin_tech = "combat=2;bluespace=4;materials=3" -/obj/item/melee/baton/cattleprod/teleprod/pre_attack(atom/A, mob/living/user, params) +/obj/item/melee/baton/cattleprod/teleprod/pre_attack(atom/target, mob/living/user, params) . = ..() if(.) return @@ -13,10 +13,10 @@ if(!turned_on) return FINISH_ATTACK | MELEE_COOLDOWN_PREATTACK - if(!ismob(A)) + if(!ismob(target)) return - var/mob/living/carbon/M + var/mob/living/carbon/M = target if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) user.visible_message( "[user] accidentally hits [user.p_themselves()] with [src]!", diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 361958d95a3..0e1faacf962 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -19,14 +19,14 @@ visible_message("[user] is hitting [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to ban [user.p_themselves()] from life.") return BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS -/obj/item/banhammer/pre_attack(atom/A, mob/living/user, params) +/obj/item/banhammer/pre_attack(atom/target, mob/living/user, params) if(..()) return FINISH_ATTACK - if(ismob(A)) + if(ismob(target)) user.changeNext_move(CLICK_CD_MELEE) - to_chat(A, "You have been banned FOR NO REISIN by [user]") - to_chat(user, "You have BANNED [A]") + to_chat(target, "You have been banned FOR NO REISIN by [user]") + to_chat(user, "You have BANNED [target]") playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much return FINISH_ATTACK diff --git a/code/modules/antagonists/mind_flayer/powers/flayer_stealth_powers.dm b/code/modules/antagonists/mind_flayer/powers/flayer_stealth_powers.dm index df54057bc60..add1ff5f552 100644 --- a/code/modules/antagonists/mind_flayer/powers/flayer_stealth_powers.dm +++ b/code/modules/antagonists/mind_flayer/powers/flayer_stealth_powers.dm @@ -188,15 +188,15 @@ new_attack_chain = TRUE var/conversion_time = 7 SECONDS -/obj/item/melee/swarm_hand/pre_attack(atom/A, mob/living/user, params) +/obj/item/melee/swarm_hand/pre_attack(atom/target, mob/living/user, params) if(..()) return FINISH_ATTACK - if(!isrobot(A)) + if(!isrobot(target)) to_chat(user, "[src] will have no effect against this target!") return FINISH_ATTACK - var/mob/living/silicon/robot/borg = A + var/mob/living/silicon/robot/borg = target borg.visible_message( "[user] puts [user.p_their()] hands on [borg] and begins transferring energy!", "[user] puts [user.p_their()] hands on you and begins transferring energy!") diff --git a/code/modules/antagonists/zombie/zombie_spells.dm b/code/modules/antagonists/zombie/zombie_spells.dm index 819460975fb..2ed86b1ab4d 100644 --- a/code/modules/antagonists/zombie/zombie_spells.dm +++ b/code/modules/antagonists/zombie/zombie_spells.dm @@ -92,7 +92,7 @@ /obj/item/zombie_claw/customised_abstract_text(mob/living/carbon/owner) return "[owner.p_they(TRUE)] [owner.p_have(FALSE)] dull claws extending from [owner.p_their(FALSE)] [owner.l_hand == src ? "left hand" : "right hand"]." -/obj/item/zombie_claw/pre_attack(atom/A, mob/living/user, params) +/obj/item/zombie_claw/pre_attack(atom/target, mob/living/user, params) . = ..() if(!HAS_TRAIT(user, TRAIT_PLAGUE_ZOMBIE)) if(user.reagents.has_reagent("zombiecure2")) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 73b174a2812..14028a22270 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -46,17 +46,17 @@ if(user.a_intent != INTENT_HARM) return ..() -/obj/item/reagent_containers/drinks/bottle/pre_attack(atom/A, mob/living/user, params) +/obj/item/reagent_containers/drinks/bottle/pre_attack(atom/target, mob/living/user, params) if(..()) return FINISH_ATTACK - if(isliving(A)) + if(isliving(target)) if(!is_glass) - mob_act(A, user) + mob_act(target, user) return FINISH_ATTACK if(HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "You don't want to harm [A]!") + to_chat(user, "You don't want to harm [target]!") return FINISH_ATTACK /obj/item/reagent_containers/drinks/bottle/attack(mob/living/target, mob/living/user, params) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 8a88ba71110..4a6c71527f9 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -164,12 +164,12 @@ playsound(loc, pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg'), 50, TRUE, -1) return BRUTELOSS -/obj/item/scythe/pre_attack(atom/A, mob/living/user, params) - if(swiping || !istype(A, /obj/structure/spacevine) || get_turf(A) == get_turf(user)) +/obj/item/scythe/pre_attack(atom/target, mob/living/user, params) + if(swiping || !istype(target, /obj/structure/spacevine) || get_turf(target) == get_turf(user)) return ..() else var/turf/user_turf = get_turf(user) - var/dir_to_target = get_dir(user_turf, get_turf(A)) + var/dir_to_target = get_dir(user_turf, get_turf(target)) swiping = TRUE var/static/list/scythe_slash_angles = list(0, 45, 90, -45, -90) for(var/i in scythe_slash_angles) diff --git a/code/modules/mod/mod_paint.dm b/code/modules/mod/mod_paint.dm index 785af97ca77..7454c94b44c 100644 --- a/code/modules/mod/mod_paint.dm +++ b/code/modules/mod/mod_paint.dm @@ -10,10 +10,10 @@ . = ..() name = "MOD [skin] skin applier" -/obj/item/mod/skin_applier/pre_attack(atom/attacked_atom, mob/living/user, params) - if(!ismodcontrol(attacked_atom)) +/obj/item/mod/skin_applier/pre_attack(atom/target, mob/living/user, params) + if(!ismodcontrol(target)) return ..() - var/obj/item/mod/control/mod = attacked_atom + var/obj/item/mod/control/mod = target if(mod.active || mod.activating) to_chat(user, "Deactivate the suit!") return FINISH_ATTACK diff --git a/code/modules/projectiles/guns/energy/special_eguns.dm b/code/modules/projectiles/guns/energy/special_eguns.dm index 02581a9c5b3..ff8cc433e71 100644 --- a/code/modules/projectiles/guns/energy/special_eguns.dm +++ b/code/modules/projectiles/guns/energy/special_eguns.dm @@ -134,10 +134,10 @@ selfcharge = TRUE can_holster = TRUE -/obj/item/gun/energy/floragun/pre_attack(atom/A, mob/living/user, params) - if(istype(A, /obj/machinery/hydroponics)) +/obj/item/gun/energy/floragun/pre_attack(atom/target, mob/living/user, params) + if(istype(target, /obj/machinery/hydroponics)) // Calling afterattack from pre_attack looks stupid, but afterattack with proximity FALSE is what makes the gun fire, and we're returning FALSE to cancel the melee attack. - afterattack__legacy__attackchain(A, user, FALSE, params) + afterattack__legacy__attackchain(target, user, FALSE, params) return CONTINUE_ATTACK return ..() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 10050cb5767..1847af5d4ce 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -150,22 +150,22 @@ resistance_flags = FLAMMABLE var/static/list/no_wrap = list(/obj/item/small_delivery, /obj/structure/big_delivery, /obj/item/evidencebag, /obj/structure/closet/body_bag) -/obj/item/stack/package_wrap/pre_attack(atom/A, mob/living/user, params) +/obj/item/stack/package_wrap/pre_attack(atom/atom_target, mob/living/user, params) . = ..() - if(!in_range(A, user)) + if(!in_range(atom_target, user)) return - if(!isobj(A)) + if(!isobj(atom_target)) return - var/obj/target = A + var/obj/target = atom_target if(is_type_in_list(target, no_wrap)) return if(istype(target, /obj/item/stack/package_wrap) && user.a_intent != INTENT_HARM) return - if(is_type_in_list(A.loc, list(/obj/item/small_delivery, /obj/structure/big_delivery))) + if(is_type_in_list(atom_target.loc, list(/obj/item/small_delivery, /obj/structure/big_delivery))) return if(target.anchored)