diff --git a/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm b/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm index 265fa6e7df4..6cd753eb760 100644 --- a/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm @@ -124,10 +124,8 @@ . = ..() . += "You can use your tendril hammer arm to deliver a devastating blow against mining fauna, but only once every two seconds." -/obj/item/goliath_infuser_hammer/attack(mob/living/target, mob/living/carbon/human/user, proximity_flag, click_parameters) +/obj/item/goliath_infuser_hammer/attack(mob/living/target, mob/living/carbon/human/user, click_parameters) . = ..() - if(!proximity_flag) - return //If we're on cooldown, we'll do a normal attack. if(!COOLDOWN_FINISHED(src, tendril_hammer_cd)) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 51bf6c35113..2cc0f536e4b 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -869,8 +869,8 @@ return ..() -/obj/item/toy/crayon/spraycan/afterattack_secondary(atom/target, mob/user, proximity, params) - if(!proximity) +/obj/item/toy/crayon/spraycan/afterattack_secondary(atom/target, mob/user, proximity_flag, click_parameters) + if(!proximity_flag) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN if(is_capped) balloon_alert(user, "take the cap off first!") diff --git a/code/modules/basketball/basketball.dm b/code/modules/basketball/basketball.dm index e9ccc180537..232b65d8e1c 100644 --- a/code/modules/basketball/basketball.dm +++ b/code/modules/basketball/basketball.dm @@ -181,7 +181,7 @@ if(!user.combat_mode) user.throw_item(target) -/obj/item/toy/basketball/afterattack_secondary(atom/aim_target, mob/living/baller, params) +/obj/item/toy/basketball/afterattack_secondary(atom/aim_target, mob/living/baller, proximity_flag, click_parameters) // dunking negates shooting if(istype(aim_target, /obj/structure/hoop) && baller.Adjacent(aim_target)) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN diff --git a/code/modules/capture_the_flag/ctf_game.dm b/code/modules/capture_the_flag/ctf_game.dm index b489ae48ec1..84e5d35264c 100644 --- a/code/modules/capture_the_flag/ctf_game.dm +++ b/code/modules/capture_the_flag/ctf_game.dm @@ -349,7 +349,7 @@ scores += UNLINT("[ctf_team.team_color] - [ctf_team.points]/[ctf_game.points_to_win]\n") balloon_alert_to_viewers(scores) -/obj/machinery/ctf/control_point/attackby(mob/user, params) +/obj/machinery/ctf/control_point/attackby(obj/item/item, mob/user, params) capture(user) /obj/machinery/ctf/control_point/attack_hand(mob/user, list/modifiers) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 23786b6e64c..f07d31847d7 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -120,21 +120,21 @@ /obj/item/kinetic_crusher/attack_secondary(atom/target, mob/living/user, clickparams) return SECONDARY_ATTACK_CONTINUE_CHAIN -/obj/item/kinetic_crusher/afterattack_secondary(atom/target, mob/living/user, clickparams) +/obj/item/kinetic_crusher/afterattack_secondary(atom/target, mob/living/user, proximity_flag, click_parameters) if(!HAS_TRAIT(src, TRAIT_WIELDED)) balloon_alert(user, "wield it first!") return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN if(target == user) balloon_alert(user, "can't aim at yourself!") return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN - fire_kinetic_blast(target, user, clickparams) + fire_kinetic_blast(target, user, click_parameters) user.changeNext_move(CLICK_CD_MELEE) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN -/obj/item/kinetic_crusher/proc/fire_kinetic_blast(atom/target, mob/living/user, clickparams) +/obj/item/kinetic_crusher/proc/fire_kinetic_blast(atom/target, mob/living/user, click_parameters) if(!charged) return - var/modifiers = params2list(clickparams) + var/modifiers = params2list(click_parameters) var/turf/proj_turf = user.loc if(!isturf(proj_turf)) return diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index bdaaff84cf8..80d2e0a655a 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -200,7 +200,7 @@ for(var/obj/O in contents) O.emp_act(severity) -/obj/item/gun/afterattack_secondary(mob/living/victim, mob/living/user, params) +/obj/item/gun/afterattack_secondary(mob/living/victim, mob/living/user, proximity_flag, click_parameters) if(!isliving(victim) || !IN_GIVEN_RANGE(user, victim, GUNPOINT_SHOOTER_STRAY_RANGE)) return ..() //if they're out of range, just shootem. if(!can_hold_up) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 0d3de81025e..652060a3ab3 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -182,8 +182,8 @@ underbarrel = new /obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted(src) update_appearance() -/obj/item/gun/ballistic/automatic/m90/afterattack_secondary(atom/target, mob/living/user, flag, params) - underbarrel.afterattack(target, user, flag, params) +/obj/item/gun/ballistic/automatic/m90/afterattack_secondary(atom/target, mob/living/user, proximity_flag, click_parameters) + underbarrel.afterattack(target, user, proximity_flag, click_parameters) return SECONDARY_ATTACK_CONTINUE_CHAIN /obj/item/gun/ballistic/automatic/m90/attackby(obj/item/A, mob/user, params) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index c3526159367..a5f2ac1908a 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -205,7 +205,7 @@ toggle_magazine() return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN -/obj/item/gun/ballistic/shotgun/bulldog/afterattack_secondary(mob/living/victim, mob/living/user, params) +/obj/item/gun/ballistic/shotgun/bulldog/afterattack_secondary(mob/living/victim, mob/living/user, proximity_flag, click_parameters) if(secondary_magazine) toggle_magazine() return SECONDARY_ATTACK_CALL_NORMAL