attack_self refactor (#6754)

Changes proc header

code/game/click/telekinesis.dm

@@ -80,7 +80,7 @@ var/const/tk_maxrange = 15
 	if(slot != SLOT_ID_HANDS)
 		qdel(src)
 
-/obj/item/tk_grab/attack_self(mob/user)
+/obj/item/tk_grab/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/content/enigmas/unsorted/deadringer.dm

@@ -28,7 +28,7 @@
 		reveal()
 		watchowner = null
 
-/obj/item/deadringer/attack_self(mob/user)
+/obj/item/deadringer/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/gamemodes/changeling/powers/armor.dm

@@ -67,7 +67,7 @@
 	encumbrance = ITEM_ENCUMBRANCE_CHANGELING_MAGBOOTS
 	encumbrance_on = ITEM_ENCUMBRANCE_CHANGELING_MAGBOOTS_PULSE
 
-/obj/item/clothing/shoes/magboots/changeling/attack_self(mob/user)
+/obj/item/clothing/shoes/magboots/changeling/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/gamemodes/cult/ritual.dm

@@ -308,7 +308,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
 		O.show_message("<span class='warning'>\The [user] beats \the [L] with \the [src]!</span>", 1)
 	to_chat(target, "<span class='danger'>You feel searing heat inside!</span>")
 
-/obj/item/book/tome/attack_self(mob/user)
+/obj/item/book/tome/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return
@@ -426,7 +426,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
 	w_class = WEIGHT_CLASS_SMALL
 	var/cultistsonly = 1
 
-/obj/item/book/tome/imbued/attack_self(mob/user)
+/obj/item/book/tome/imbued/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/gamemodes/cult/soulstone.dm

@@ -36,7 +36,7 @@
 
 ///////////////////Options for using captured souls///////////////////////////////////////
 
-/obj/item/soulstone/attack_self(mob/user)
+/obj/item/soulstone/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/gamemodes/cult/talisman.dm

@@ -5,7 +5,7 @@
 	var/uses = 0
 	info = "<center><img src='talisman.png'></center><br/><br/>"
 
-/obj/item/paper/talisman/attack_self(mob/user)
+/obj/item/paper/talisman/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/gamemodes/nuclear/pinpointer.dm

@@ -13,7 +13,7 @@
 	var/active = 0
 
 
-/obj/item/pinpointer/attack_self(mob/user)
+/obj/item/pinpointer/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return
@@ -64,7 +64,7 @@
 	var/turf/location = null
 	var/obj/target = null
 
-/obj/item/pinpointer/advpinpointer/attack_self(mob/user)
+/obj/item/pinpointer/advpinpointer/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return
@@ -189,7 +189,7 @@
 	var/mode = 0	//Mode 0 locates disk, mode 1 locates the shuttle
 	var/obj/machinery/computer/shuttle_control/multi/syndicate/home = null
 
-/obj/item/pinpointer/nukeop/attack_self(mob/user)
+/obj/item/pinpointer/nukeop/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return
@@ -278,7 +278,7 @@
 	var/shuttle_comp_id = null
 	var/obj/machinery/computer/shuttle_control/our_shuttle = null
 
-/obj/item/pinpointer/shuttle/attack_self(mob/user)
+/obj/item/pinpointer/shuttle/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/gamemodes/technomancer/catalog.dm

@@ -97,7 +97,7 @@
 // Proc: attack_self()
 // Parameters: 1 (user - the mob clicking on the catalog)
 // Description: Shows an HTML window, to buy equipment and spells, if the user is the legitimate owner.  Otherwise it cannot be used.
-/obj/item/technomancer_catalog/attack_self(mob/user)
+/obj/item/technomancer_catalog/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/gamemodes/technomancer/devices/disposable_teleporter.dm

@@ -26,7 +26,7 @@
 	. = ..()
 	. += "<span class = 'notice'>There are [uses] uses remaining.</span>"
 
-/obj/item/disposable_teleporter/attack_self(mob/user)
+/obj/item/disposable_teleporter/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/gamemodes/technomancer/devices/shield_armor.dm

@@ -89,7 +89,7 @@
 	spark_system.start()
 	playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)
 
-/obj/item/clothing/suit/armor/shield/attack_self(mob/user)
+/obj/item/clothing/suit/armor/shield/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/gamemodes/technomancer/devices/tesla_armor.dm

@@ -72,7 +72,7 @@
 			return 1
 	return 0
 
-/obj/item/clothing/suit/armor/tesla/attack_self(mob/user)
+/obj/item/clothing/suit/armor/tesla/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/gamemodes/technomancer/equipment.dm

@@ -193,7 +193,7 @@
 	slot_flags = SLOT_BELT
 	attack_verb = list("beaten", "smashed", "struck", "whacked")
 
-/obj/item/scepter/attack_self(mob/user)
+/obj/item/scepter/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/gamemodes/technomancer/spell_objs.dm

@@ -197,7 +197,7 @@
 // Proc: attack_self()
 // Parameters: 1 (user - the Technomancer that invoked this proc)
 // Description: Tries to call on_use_cast() if it is allowed to do so.  Don't override this, override on_use_cast() instead.
-/obj/item/spell/attack_self(mob/user)
+/obj/item/spell/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/machinery/cell_charger.dm

@@ -145,7 +145,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	materials_base = list(MAT_STEEL = 4000, MAT_GLASS = 1000)
 
-/obj/item/cell_charger_kit/attack_self(mob/user)
+/obj/item/cell_charger_kit/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/machinery/cloning.dm

@@ -525,7 +525,7 @@
 	var/diskcolor = pick(0,1,2)
 	icon_state = "datadisk[diskcolor]"
 
-/obj/item/disk/data/attack_self(mob/user)
+/obj/item/disk/data/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/machinery/computer/arcade/orion.dm

@@ -504,7 +504,7 @@ GLOBAL_LIST_INIT(orion_events, generate_orion_events())
 	else
 		. += SPAN_NOTICE("There's a little switch on the bottom. It's flipped up.")
 
-/obj/item/orion_ship/attack_self(mob/user)
+/obj/item/orion_ship/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/machinery/newscaster.dm

@@ -811,7 +811,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 	drop_sound = 'sound/items/drop/wrapper.ogg'
 	pickup_sound = 'sound/items/pickup/wrapper.ogg'
 
-/obj/item/newspaper/attack_self(mob/user)
+/obj/item/newspaper/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/machinery/pipe/construction.dm

@@ -158,7 +158,7 @@ Buildable meters
 	if(dir in GLOB.cornerdirs)
 		setDir(turn(dir, 45))
 
-/obj/item/pipe/attack_self(mob/user)
+/obj/item/pipe/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/machinery/supplybeacon.dm

@@ -11,7 +11,7 @@
 	name = "inactive supermatter supply beacon"
 	deploy_path = /obj/machinery/power/supply_beacon/supermatter
 
-/obj/item/supply_beacon/attack_self(mob/user)
+/obj/item/supply_beacon/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/machinery/wall_frames.dm

@@ -23,7 +23,7 @@
 		return
 	..()
 
-/obj/item/frame/attack_self(mob/user)
+/obj/item/frame/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/objects/effects/mines.dm

@@ -226,7 +226,7 @@
 	var/countdown = 10
 	var/minetype = /obj/effect/mine		//This MUST be an /obj/effect/mine type, or it'll runtime.
 
-/obj/item/mine/attack_self(mob/user)
+/obj/item/mine/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return	// You do not want to move or throw a land mine while priming it... Explosives + Sudden Movement = Bad Times

code/game/objects/items-interaction.dm

@@ -1,6 +1,8 @@
 //* This file is explicitly licensed under the MIT license. *//
 //* Copyright (c) 2024 silicons                             *//
 
+//* ----- Click Triggers ----- */
+
 //* Attack Hand *//
 
 /obj/item/on_attack_hand(datum/event_args/actor/clickchain/e_args)
@@ -160,7 +162,9 @@
 /mob/observer/dead/CanSlideItem(obj/item/I, turf/over)
 	return is_spooky
 
-//* Inhand Triggers *//
+//* ------ Inhand Triggers ------ *//
+
+//* Attack Self *//
 
 /**
  * Called when the item is in the active hand, and clicked; alternately, there is an 'activate held object' verb or you can hit pagedown.
@@ -170,14 +174,15 @@
  * todo: please stop overriding this, use on_attack_self.
  * todo: nuke mob/user.
  * todo: rename this to like /activate_inhand, /on_activate_inhand
+ * todo: actor is not currently always given.
  *
  * @params
- * * actor - the event_args that spawned this call
  * * user - The person using us in hand; stop using this, this is deprecated
+ * * actor - the event_args that spawned this call
  *
  * @return TRUE to signal to overrides to stop the chain and do nothing.
  */
-/obj/item/proc/attack_self(mob/user, datum/event_args/actor/actor = new /datum/event_args/actor(user))
+/obj/item/proc/attack_self(mob/user, datum/event_args/actor/actor)
 	// todo: this should realistically be SHOULD_NOT_OVERRIDE but there's a massive number of overrides (some unnecessary), so this is for a later date
 	// SHOULD_NOT_OVERRIDE(TRUE) // may be re-evaluated later
 	SEND_SIGNAL(src, COMSIG_ITEM_ACTIVATE_INHAND, actor)
@@ -213,6 +218,8 @@
 		return TRUE
 	return FALSE
 
+//* Unique Action *//
+
 /**
  * Called when a mob uses our unique aciton.
  *
@@ -237,6 +244,8 @@
 /obj/item/proc/on_unique_action(datum/event_args/actor/e_args)
 	return FALSE
 
+//* Defensive Toggle *//
+
 /**
  * Called when a mob uses our defensive toggle action.
  *
@@ -261,6 +270,8 @@
 /obj/item/proc/on_defensive_toggle(datum/event_args/actor/e_args)
 	return FALSE
 
+//* Defensive Trigger *//
+
 /**
  * Called when a mob uses our defensive trigger action.
  *

code/game/objects/items/antag_spawners.dm

@@ -48,7 +48,7 @@
 	icon_state = "oldshieldoff"
 	ghost_query_type = /datum/ghost_query/apprentice
 
-/obj/item/antag_spawner/technomancer_apprentice/attack_self(mob/user)
+/obj/item/antag_spawner/technomancer_apprentice/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return
@@ -97,7 +97,7 @@
 	ghost_query_type = /datum/ghost_query/syndicate_drone
 	var/drone_type = null
 
-/obj/item/antag_spawner/syndicate_drone/attack_self(mob/user)
+/obj/item/antag_spawner/syndicate_drone/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/objects/items/balls.dm

@@ -27,7 +27,7 @@
 		'sound/items/toysqueak3.ogg'
 		)
 
-/obj/item/toy/tennis/rainbow/attack_self(mob/user)
+/obj/item/toy/tennis/rainbow/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/objects/items/blueprints.dm

@@ -46,7 +46,7 @@
 	var/can_expand_areas_into = AREA_SPACE	// Can expand station areas only into space.
 	var/can_rename_areas_in = AREA_STATION	// Only station areas can be reanamed
 
-/obj/item/blueprints/attack_self(mob/user)
+/obj/item/blueprints/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/objects/items/bodybag.dm

@@ -9,7 +9,7 @@
 
 	var/bag_type = /obj/structure/closet/body_bag
 
-/obj/item/bodybag/attack_self(mob/user)
+/obj/item/bodybag/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/objects/items/contraband.dm

@@ -50,7 +50,7 @@
 	worth_intrinsic = 200
 	w_class = WEIGHT_CLASS_HUGE
 
-/obj/item/stolenpackage/attack_self(mob/user)
+/obj/item/stolenpackage/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return
@@ -179,7 +179,7 @@
 	worth_intrinsic = 350
 	w_class = WEIGHT_CLASS_HUGE
 
-/obj/item/stolenpackageplus/attack_self(mob/user)
+/obj/item/stolenpackageplus/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return
@@ -245,7 +245,7 @@
 	w_class = WEIGHT_CLASS_HUGE
 	worth_intrinsic = 400
 
-/obj/item/mechasalvage/attack_self(mob/user)
+/obj/item/mechasalvage/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/objects/items/devices/PDA/PDA.dm

@@ -322,7 +322,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	return 1
 
 
-/obj/item/pda/ai/attack_self(mob/user)
+/obj/item/pda/ai/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return
@@ -674,7 +674,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	ui.set_auto_update(auto_update)
 
 //NOTE: graphic resources are loaded on client login
-/obj/item/pda/attack_self(mob/user)
+/obj/item/pda/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/objects/items/devices/aicard.dm

@@ -21,7 +21,7 @@
 	to_chat(user, "<b>ERROR ERROR ERROR</b>")
 	return CLICKCHAIN_DO_NOT_PROPAGATE
 
-/obj/item/aicard/attack_self(mob/user)
+/obj/item/aicard/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return

code/game/objects/items/devices/binoculars.dm

@@ -12,7 +12,7 @@
 	//materials_base = list("metal" = 50, MAT_GLASS = 50)
 
 
-/obj/item/binoculars/attack_self(mob/user)
+/obj/item/binoculars/attack_self(mob/user, datum/event_args/actor/actor)
 	. = ..()
 	if(.)
 		return