[MIRROR] Converts many proc overrides to properly use list/modifiers, lots of other smaller things (#3433)

* Converts many proc overrides to properly use list/modifiers, lots of other smaller things * Update human_defense.dm Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2026-08-23 05:00:55 +01:00 · 2021-02-17 14:18:21 +00:00
parent 6f01502b33
commit 43febe3145
254 changed files with 837 additions and 837 deletions
@@ -88,7 +88,7 @@
 	The below is only really for safety, or you can alter the way
 	it functions and re-insert it above.
 */
-/mob/living/silicon/ai/UnarmedAttack(atom/A)
+/mob/living/silicon/ai/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
 	A.attack_ai(src)
 /mob/living/silicon/ai/RangedAttack(atom/A)
 	A.attack_ai(src)
@@ -269,9 +269,10 @@
 * proximity_flag is not currently passed to attack_hand, and is instead used
 * in human click code to allow glove touches only at melee range.
 *
- * modifiers is the click modifiers this attack had, used for
+ * modifiers is a lazy list of click modifiers this attack had,
+ * used for figuring out different properties of the click, mostly right vs left and such.
 */
-/mob/proc/UnarmedAttack(atom/A, proximity_flag, modifiers)
+/mob/proc/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
 	if(ismob(A))
 		changeNext_move(CLICK_CD_MELEE)
 	return
@@ -159,7 +159,7 @@
 	clicks, you can do so here, but you will have to
 	change attack_robot() above to the proper function
 */
-/mob/living/silicon/robot/UnarmedAttack(atom/A)
+/mob/living/silicon/robot/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
 	if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
 		return
 	A.attack_robot(src)
@@ -4,7 +4,7 @@

 	Otherwise pretty standard.
 */
-/mob/living/carbon/human/UnarmedAttack(atom/A, proximity, modifiers)
+/mob/living/carbon/human/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
 	if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
 		if(src == A)
 			check_self_for_injuries()
@@ -22,12 +22,12 @@
 	// If the gloves do anything, have them return 1 to stop
 	// normal attack_hand() here.
 	var/obj/item/clothing/gloves/G = gloves // not typecast specifically enough in defines
-	if(proximity && istype(G) && G.Touch(A,1))
+	if(proximity_flag && istype(G) && G.Touch(A,1))
 		return
 	//This signal is needed to prevent gloves of the north star + hulk.
-	if(SEND_SIGNAL(src, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, A, proximity, modifiers) & COMPONENT_CANCEL_ATTACK_CHAIN)
+	if(SEND_SIGNAL(src, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, A, proximity_flag, modifiers) & COMPONENT_CANCEL_ATTACK_CHAIN)
 		return
-	SEND_SIGNAL(src, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, A, proximity, modifiers)
+	SEND_SIGNAL(src, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, A, proximity_flag, modifiers)

 	if(dna?.species?.spec_unarmedattack(src, A, modifiers)) //Because species like monkeys dont use attack hand
 		return
@@ -43,7 +43,7 @@
 	A.attack_hand(src, modifiers)

 /// Return TRUE to cancel other attack hand effects that respect it. Modifiers is the assoc list for click info such as if it was a right click.
-/atom/proc/attack_hand(mob/user, modifiers)
+/atom/proc/attack_hand(mob/user, list/modifiers)
 	. = FALSE
 	if(!(interaction_flags_atom & INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND))
 		add_fingerprint(user)
@@ -113,16 +113,16 @@
 /*
 	Animals & All Unspecified
 */
-/mob/living/UnarmedAttack(atom/A, proximity, modifiers)
+/mob/living/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
 	if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
 		return
 	A.attack_animal(src, modifiers)

-/atom/proc/attack_animal(mob/user, modifiers)
+/atom/proc/attack_animal(mob/user, list/modifiers)
 	SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_ANIMAL, user)

 ///Attacked by monkey
-/atom/proc/attack_paw(mob/user, modifiers)
+/atom/proc/attack_paw(mob/user, list/modifiers)
 	if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_PAW, user) & COMPONENT_CANCEL_ATTACK_CHAIN)
 		return TRUE
 	return FALSE
@@ -132,18 +132,18 @@
 	Aliens
 	Defaults to same as monkey in most places
 */
-/mob/living/carbon/alien/UnarmedAttack(atom/A, proximity, modifiers)
+/mob/living/carbon/alien/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
 	if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
 		return
 	A.attack_alien(src, modifiers)

-/atom/proc/attack_alien(mob/living/carbon/alien/user, modifiers)
-	attack_paw(user)
+/atom/proc/attack_alien(mob/living/carbon/alien/user, list/modifiers)
+	attack_paw(user, modifiers)
 	return


 // Babby aliens
-/mob/living/carbon/alien/larva/UnarmedAttack(atom/A)
+/mob/living/carbon/alien/larva/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
 	if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
 		return
 	A.attack_larva(src)
@@ -156,7 +156,7 @@
 	Slimes
 	Nothing happening here
 */
-/mob/living/simple_animal/slime/UnarmedAttack(atom/A)
+/mob/living/simple_animal/slime/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
 	if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
 		return
 	if(isturf(A))
@@ -170,7 +170,7 @@
 /*
 	Drones
 */
-/mob/living/simple_animal/drone/UnarmedAttack(atom/A)
+/mob/living/simple_animal/drone/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
 	if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
 		return
 	A.attack_drone(src)
@@ -183,7 +183,7 @@
 	Brain
 */

-/mob/living/brain/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default
+/mob/living/brain/UnarmedAttack(atom/A, proximity_flag, list/modifiers)//Stops runtimes due to attack_animal being the default
 	return


@@ -191,7 +191,7 @@
 	pAI
 */

-/mob/living/silicon/pai/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default
+/mob/living/silicon/pai/UnarmedAttack(atom/A, proximity_flag, list/modifiers)//Stops runtimes due to attack_animal being the default
 	return


@@ -199,7 +199,7 @@
 	Simple animals
 */

-/mob/living/simple_animal/UnarmedAttack(atom/A, proximity, modifiers)
+/mob/living/simple_animal/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
 	if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
 		return
 	if(!dextrous)
@@ -213,7 +213,7 @@
 	Hostile animals
 */

-/mob/living/simple_animal/hostile/UnarmedAttack(atom/A)
+/mob/living/simple_animal/hostile/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
 	if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
 		return
 	target = A
@@ -104,7 +104,7 @@
 	QDEL_IN(src, 300)

 //ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/effect/hallucination/simple/bluespace_stream/attack_hand(mob/user)
+/obj/effect/hallucination/simple/bluespace_stream/attack_hand(mob/user, list/modifiers)
 	if(user != seer || !linked_to)
 		return
 	var/slip_in_message = pick("slides sideways in an odd way, and disappears", "jumps into an unseen dimension",\
@@ -7,7 +7,7 @@
 /obj/structure/door_assembly
 	var/datum/airlock_maker/maker = null

-/obj/structure/door_assembly/attack_hand()
+/obj/structure/door_assembly/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -103,7 +103,7 @@
 /obj/machinery/pdapainter/deconstruct(disassembled = TRUE)
 	obj_break()

-/obj/machinery/pdapainter/attack_hand(mob/user)
+/obj/machinery/pdapainter/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -420,7 +420,7 @@

 ////////////////////////////////////////////////////////////////////////////////////////////

-/obj/machinery/attack_paw(mob/living/user)
+/obj/machinery/attack_paw(mob/living/user, list/modifiers)
 	if(!user.combat_mode)
 		return attack_hand(user)
 	else
@@ -35,7 +35,7 @@
 	return ..()


-/obj/machinery/accounting/attack_hand(mob/user)
+/obj/machinery/accounting/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -120,7 +120,7 @@
 	else
 		icon_state = "airlock_sensor_off"

-/obj/machinery/airlock_sensor/attack_hand(mob/user)
+/obj/machinery/airlock_sensor/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -94,7 +94,7 @@
 	else
 		return ..()

-/obj/machinery/aug_manipulator/attack_hand(mob/user)
+/obj/machinery/aug_manipulator/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -132,7 +132,7 @@
 		id = "[port.id]_[id]"
 		setup_device()

-/obj/machinery/button/attack_hand(mob/user)
+/obj/machinery/button/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -79,7 +79,7 @@
 	charging = null
 	update_icon()

-/obj/machinery/cell_charger/attack_hand(mob/user)
+/obj/machinery/cell_charger/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -1539,7 +1539,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
 	icon_state = "arcade"
 	circuit = /obj/item/circuitboard/computer/arcade/amputation

-/obj/machinery/computer/arcade/amputation/attack_hand(mob/user)
+/obj/machinery/computer/arcade/amputation/attack_hand(mob/user, list/modifiers)
 	if(!iscarbon(user))
 		return
 	var/mob/living/carbon/c_user = user
@@ -120,7 +120,7 @@
 		return FALSE
 	return ..()

-/obj/machinery/computer/camera_advanced/attack_hand(mob/user)
+/obj/machinery/computer/camera_advanced/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -13,7 +13,7 @@
 	launchpads = list()
 	. = ..()

-/obj/machinery/computer/launchpad/attack_paw(mob/user)
+/obj/machinery/computer/launchpad/attack_paw(mob/user, list/modifiers)
 	to_chat(user, "<span class='warning'>You are too primitive to use this computer!</span>")
 	return

@@ -65,7 +65,7 @@
 		return defib.get_cell()

 //defib interaction
-/obj/machinery/defibrillator_mount/attack_hand(mob/living/user)
+/obj/machinery/defibrillator_mount/attack_hand(mob/living/user, list/modifiers)
 	if(!defib)
 		to_chat(user, "<span class='warning'>There's no defibrillator unit loaded!</span>")
 		return
@@ -39,7 +39,7 @@
 	if(user.Adjacent(src))
 		. += "<span class='notice'>Alt-click it to beam its contents to any nearby disposal bins.</span>"

-/obj/machinery/dish_drive/attack_hand(mob/living/user)
+/obj/machinery/dish_drive/attack_hand(mob/living/user, list/modifiers)
 	if(!LAZYLEN(dish_drive_contents))
 		to_chat(user, "<span class='warning'>There's nothing in [src]!</span>")
 		return
@@ -761,15 +761,15 @@
 		if(user)
 			attack_ai(user)

-/obj/machinery/door/airlock/attack_animal(mob/user)
+/obj/machinery/door/airlock/attack_animal(mob/user, list/modifiers)
 	if(isElectrified() && shock(user, 100))
 		return
 	return ..()

-/obj/machinery/door/airlock/attack_paw(mob/user)
-	return attack_hand(user)
+/obj/machinery/door/airlock/attack_paw(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

-/obj/machinery/door/airlock/attack_hand(mob/user)
+/obj/machinery/door/airlock/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -1306,7 +1306,7 @@
 		loseMainPower()
 		loseBackupPower()

-/obj/machinery/door/airlock/attack_alien(mob/living/carbon/alien/humanoid/user)
+/obj/machinery/door/airlock/attack_alien(mob/living/carbon/alien/humanoid/user, list/modifiers)
 	if(isElectrified() && shock(user, 100)) //Mmm, fried xeno!
 		add_fingerprint(user)
 		return
@@ -168,7 +168,7 @@
 		else
 			do_animate("deny")

-/obj/machinery/door/attack_hand(mob/user)
+/obj/machinery/door/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -78,7 +78,7 @@
 	. = ..()
 	INVOKE_ASYNC(src, .proc/latetoggle)

-/obj/machinery/door/firedoor/attack_hand(mob/user)
+/obj/machinery/door/firedoor/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -152,7 +152,7 @@
 /obj/machinery/door/firedoor/attack_robot(mob/user)
 	return attack_ai(user)

-/obj/machinery/door/firedoor/attack_alien(mob/user)
+/obj/machinery/door/firedoor/attack_alien(mob/user, list/modifiers)
 	add_fingerprint(user)
 	if(welded)
 		to_chat(user, "<span class='warning'>[src] refuses to budge!</span>")
@@ -37,7 +37,7 @@
 			var/change_id = input("Set the shutters/blast door/blast door controllers ID. It must be a number between 1 and 100.", "ID", id) as num|null
 			if(change_id)
 				id = clamp(round(change_id, 1), 1, 100)
-				to_chat(user, "<span class='notice'>You change the ID to [id].</span>") 
+				to_chat(user, "<span class='notice'>You change the ID to [id].</span>")

 		if(W.tool_behaviour == TOOL_CROWBAR && deconstruction == INTACT)
 			to_chat(user, "<span class='notice'>You start to remove the airlock electronics.</span>")
@@ -169,7 +169,7 @@
 	if(machine_stat & NOPOWER)
 		open(TRUE)

-/obj/machinery/door/poddoor/attack_alien(mob/living/carbon/alien/humanoid/user)
+/obj/machinery/door/poddoor/attack_alien(mob/living/carbon/alien/humanoid/user, list/modifiers)
 	if(density & !(resistance_flags & INDESTRUCTIBLE))
 		add_fingerprint(user)
 		user.visible_message("<span class='warning'>[user] begins prying open [src].</span>",\
@@ -170,7 +170,7 @@
 	if(user)
 		log_game("[user] reset a fire alarm at [COORD(src)]")

-/obj/machinery/firealarm/attack_hand(mob/user)
+/obj/machinery/firealarm/attack_hand(mob/user, list/modifiers)
 	if(buildstage != 2)
 		return ..()
 	add_fingerprint(user)
@@ -45,7 +45,7 @@
 	warming_up = FALSE
 	harvesting = FALSE

-/obj/machinery/harvester/attack_hand(mob/user)
+/obj/machinery/harvester/attack_hand(mob/user, list/modifiers)
 	if(state_open)
 		close_machine()
 	else if(!harvesting)
@@ -106,7 +106,7 @@ Possible to do for anyone motivated enough:
 			new_disk.forceMove(src)
 			disk = new_disk

-/obj/machinery/holopad/tutorial/attack_hand(mob/user)
+/obj/machinery/holopad/tutorial/attack_hand(mob/user, list/modifiers)
 	if(!istype(user))
 		return
 	if(user.incapacitated() || !is_operational)
@@ -26,7 +26,7 @@
 	on = TRUE
 	icon_state = "igniter1"

-/obj/machinery/igniter/attack_hand(mob/user)
+/obj/machinery/igniter/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -170,7 +170,7 @@
 			attached.transfer_blood_to(target, amount)
 			update_icon()

-/obj/machinery/iv_drip/attack_hand(mob/user)
+/obj/machinery/iv_drip/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -120,7 +120,7 @@
 /obj/machinery/navbeacon/attack_ai(mob/user)
 	interact(user, 1)

-/obj/machinery/navbeacon/attack_paw()
+/obj/machinery/navbeacon/attack_paw(mob/user, list/modifiers)
 	return

 /obj/machinery/navbeacon/ui_interact(mob/user)
@@ -778,7 +778,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 		playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE)


-/obj/machinery/newscaster/attack_paw(mob/living/user)
+/obj/machinery/newscaster/attack_paw(mob/living/user, list/modifiers)
 	if(!user.combat_mode)
 		to_chat(user, "<span class='warning'>The newscaster controls are far too complicated for your tiny brain!</span>")
 	else
@@ -8,8 +8,8 @@
 	var/wait = 0
 	var/piping_layer = PIPING_LAYER_DEFAULT

-/obj/machinery/pipedispenser/attack_paw(mob/user)
-	return attack_hand(user)
+/obj/machinery/pipedispenser/attack_paw(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

 /obj/machinery/pipedispenser/ui_interact(mob/user)
 	. = ..()
@@ -169,7 +169,7 @@
 	return ..()


-/obj/machinery/porta_turret_construct/attack_hand(mob/user)
+/obj/machinery/porta_turret_construct/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -29,7 +29,7 @@
 /obj/machinery/porta_turret_cover/attack_robot(mob/user)
 	return ..() || parent_turret.attack_robot(user)

-/obj/machinery/porta_turret_cover/attack_hand(mob/user, modifiers)
+/obj/machinery/porta_turret_cover/attack_hand(mob/user, list/modifiers)
 	return ..() || parent_turret.attack_hand(user, modifiers)

 /obj/machinery/porta_turret_cover/attack_ghost(mob/user)
@@ -70,11 +70,11 @@
 /obj/machinery/porta_turret_cover/attacked_by(obj/item/I, mob/user)
 	parent_turret.attacked_by(I, user)

-/obj/machinery/porta_turret_cover/attack_alien(mob/living/carbon/alien/humanoid/user)
-	parent_turret.attack_alien(user)
+/obj/machinery/porta_turret_cover/attack_alien(mob/living/carbon/alien/humanoid/user, list/modifiers)
+	parent_turret.attack_alien(user, modifiers)

-/obj/machinery/porta_turret_cover/attack_animal(mob/living/simple_animal/user)
-	parent_turret.attack_animal(user)
+/obj/machinery/porta_turret_cover/attack_animal(mob/living/simple_animal/user, list/modifiers)
+	parent_turret.attack_animal(user, modifiers)

 /obj/machinery/porta_turret_cover/attack_hulk(mob/living/carbon/human/user)
 	return parent_turret.attack_hulk(user)
@@ -39,7 +39,7 @@
 	else
 		return ..()

-/obj/machinery/plate_press/attack_hand(mob/living/user)
+/obj/machinery/plate_press/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
 	if(!pressing && current_plate)
 		work_press(user)
@@ -101,7 +101,7 @@

 	return ..()

-/obj/machinery/recharger/attack_hand(mob/user)
+/obj/machinery/recharger/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -76,10 +76,10 @@
 	///The rune that created the shield itself. Used to delete the rune when the shield is destroyed.
 	var/obj/effect/rune/parent_rune

-/obj/structure/emergency_shield/cult/barrier/attack_hand(mob/living/user, modifiers)
+/obj/structure/emergency_shield/cult/barrier/attack_hand(mob/living/user, list/modifiers)
 	parent_rune.attack_hand(user, modifiers)

-/obj/structure/emergency_shield/cult/barrier/attack_animal(mob/living/simple_animal/user)
+/obj/structure/emergency_shield/cult/barrier/attack_animal(mob/living/simple_animal/user, list/modifiers)
 	if(iscultist(user))
 		parent_rune.attack_animal(user)
 	else
@@ -48,7 +48,7 @@
 	return


-/obj/machinery/power/singularity_beacon/attack_hand(mob/user)
+/obj/machinery/power/singularity_beacon/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -21,7 +21,7 @@
 	. = ..()
 	stored = new /obj/item/blackbox(src)

-/obj/machinery/blackbox_recorder/attack_hand(mob/living/user)
+/obj/machinery/blackbox_recorder/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
 	if(stored)
 		stored.forceMove(drop_location())
@@ -324,7 +324,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
 	else
 		return ..()

-/obj/machinery/washing_machine/attack_hand(mob/living/user)
+/obj/machinery/washing_machine/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -10,7 +10,7 @@
 	var/charges = 1
 	var/insisting = 0

-/obj/machinery/wish_granter/attack_hand(mob/living/carbon/user)
+/obj/machinery/wish_granter/attack_hand(mob/living/carbon/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -13,7 +13,7 @@
 	var/buckle_prevents_pull = FALSE

 //Interaction
-/atom/movable/attack_hand(mob/living/user)
+/atom/movable/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -100,7 +100,7 @@
 			to_chat(user, "<span class='notice'>You carefully remove the poster from the wall.</span>")
 			roll_and_drop(user.loc)

-/obj/structure/sign/poster/attack_hand(mob/user)
+/obj/structure/sign/poster/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -137,7 +137,7 @@
 	random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
 	beauty = -150

-/obj/effect/decal/cleanable/vomit/attack_hand(mob/user)
+/obj/effect/decal/cleanable/vomit/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -282,13 +282,13 @@
 	. = ..()
 	move_update_air(T)

-/obj/structure/foamedmetal/attack_paw(mob/user)
-	return attack_hand(user)
+/obj/structure/foamedmetal/attack_paw(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

 /obj/structure/foamedmetal/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
 	playsound(src.loc, 'sound/weapons/tap.ogg', 100, TRUE)

-/obj/structure/foamedmetal/attack_hand(mob/user)
+/obj/structure/foamedmetal/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -62,7 +62,7 @@
 /obj/effect/portal/attack_tk(mob/user)
 	return

-/obj/effect/portal/attack_hand(mob/user)
+/obj/effect/portal/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -342,7 +342,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	add_fingerprint(usr)
 	return ..()

-/obj/item/attack_hand(mob/user, modifiers)
+/obj/item/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -406,7 +406,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 /obj/item/proc/allow_attack_hand_drop(mob/user)
 	return TRUE

-/obj/item/attack_paw(mob/user)
+/obj/item/attack_paw(mob/user, list/modifiers)
 	if(!user)
 		return
 	if(anchored)
@@ -425,15 +425,15 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	if(!user.put_in_active_hand(src, FALSE, FALSE))
 		user.dropItemToGround(src)

-/obj/item/attack_alien(mob/user)
-	var/mob/living/carbon/alien/A = user
+/obj/item/attack_alien(mob/user, list/modifiers)
+	var/mob/living/carbon/alien/ayy = user

 	if(!user.can_hold_items(src))
-		if(src in A.contents) // To stop Aliens having items stuck in their pockets
-			A.dropItemToGround(src)
+		if(src in ayy.contents) // To stop Aliens having items stuck in their pockets
+			ayy.dropItemToGround(src)
 		to_chat(user, "<span class='warning'>Your claws aren't capable of such fine manipulation!</span>")
 		return
-	attack_paw(A)
+	attack_paw(ayy, modifiers)

 /obj/item/attack_ai(mob/user)
 	if(istype(src.loc, /obj/item/robot_model))
@@ -757,7 +757,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 /obj/item/attack_hulk(mob/living/carbon/human/user)
 	return FALSE

-/obj/item/attack_animal(mob/living/simple_animal/M)
+/obj/item/attack_animal(mob/living/simple_animal/user, list/modifiers)
 	if (obj_flags & CAN_BE_HIT)
 		return ..()
 	return 0
@@ -38,7 +38,7 @@
 	))

 //ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/item/cardboard_cutout/attack_hand(mob/living/user)
+/obj/item/cardboard_cutout/attack_hand(mob/living/user, list/modifiers)
 	if(!user.combat_mode || pushed_over)
 		return ..()
 	user.visible_message("<span class='warning'>[user] pushes over [src]!</span>", "<span class='danger'>You push over [src]!</span>")
@@ -85,7 +85,7 @@
 	toggle_paddles()

 //ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/item/defibrillator/attack_hand(mob/user)
+/obj/item/defibrillator/attack_hand(mob/user, list/modifiers)
 	if(loc == user)
 		if(slot_flags == ITEM_SLOT_BACK)
 			if(user.get_item_by_slot(ITEM_SLOT_BACK) == src)
@@ -131,16 +131,16 @@
 	master.disrupt()

 //ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/effect/dummy/chameleon/attack_hand()
+/obj/effect/dummy/chameleon/attack_hand(mob/user, list/modifiers)
 	master.disrupt()

-/obj/effect/dummy/chameleon/attack_animal()
+/obj/effect/dummy/chameleon/attack_animal(mob/user, list/modifiers)
 	master.disrupt()

 /obj/effect/dummy/chameleon/attack_slime()
 	master.disrupt()

-/obj/effect/dummy/chameleon/attack_alien()
+/obj/effect/dummy/chameleon/attack_alien(mob/user, list/modifiers)
 	master.disrupt()

 /obj/effect/dummy/chameleon/ex_act(S, T)
@@ -12,7 +12,7 @@
 /obj/item/stack/circuit_stack/attack_self(mob/user)// Prevents the crafting menu, and tells you how to use it.
 	to_chat(user, "<span class='warning'>You can't use [src] by itself, you'll have to try and remove one of these circuits by hand... carefully.</span>")

-/obj/item/stack/circuit_stack/attack_hand(mob/user)
+/obj/item/stack/circuit_stack/attack_hand(mob/user, list/modifiers)
 	var/mob/living/carbon/human/H = user
 	if(user.get_inactive_held_item() != src)
 		return ..()
@@ -117,7 +117,7 @@
 		beaker = new_beaker
 	return TRUE

-/obj/item/storage/portable_chem_mixer/attack_hand(mob/user)
+/obj/item/storage/portable_chem_mixer/attack_hand(mob/user, list/modifiers)
 	if (loc != user)
 		return ..()
 	else
@@ -90,13 +90,13 @@
 	else
 		return ..()

-/obj/item/powersink/attack_paw()
+/obj/item/powersink/attack_paw(mob/user, list/modifiers)
 	return

 /obj/item/powersink/attack_ai()
 	return

-/obj/item/powersink/attack_hand(mob/user)
+/obj/item/powersink/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -29,7 +29,7 @@
 	return (FIRELOSS)

 //ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/item/electropack/attack_hand(mob/user)
+/obj/item/electropack/attack_hand(mob/user, list/modifiers)
 	if(iscarbon(user))
 		var/mob/living/carbon/C = user
 		if(src == C.back)
@@ -68,7 +68,7 @@
 /obj/item/radio/intercom/attack_ai(mob/user)
 	interact(user)

-/obj/item/radio/intercom/attack_hand(mob/user)
+/obj/item/radio/intercom/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -45,7 +45,7 @@
 		to_chat(loc, "<span class='userdanger'>*ding*</span>")
 		addtimer(CALLBACK(src, .proc/snap), 2)

-/obj/item/reverse_bear_trap/attack_hand(mob/user)
+/obj/item/reverse_bear_trap/attack_hand(mob/user, list/modifiers)
 	if(iscarbon(user))
 		var/mob/living/carbon/C = user
 		if(C.get_item_by_slot(ITEM_SLOT_HEAD) == src)
@@ -105,7 +105,7 @@
 	..()

 //ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/item/taperecorder/attack_hand(mob/user)
+/obj/item/taperecorder/attack_hand(mob/user, list/modifiers)
 	if(loc != user || !mytape || !user.is_holding(src))
 		return ..()
 	eject(user)
@@ -76,7 +76,7 @@
 		attached_device.Crossed(AM)

 //Triggers mousetraps
-/obj/item/transfer_valve/attack_hand()
+/obj/item/transfer_valve/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -17,8 +17,8 @@

 	var/used = 0

-/obj/item/dnainjector/attack_paw(mob/user)
-	return attack_hand(user)
+/obj/item/dnainjector/attack_paw(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

 /obj/item/dnainjector/proc/inject(mob/living/carbon/M, mob/user)
 	if(M.has_dna() && !HAS_TRAIT(M, TRAIT_GENELESS) && !HAS_TRAIT(M, TRAIT_BADDNA))
@@ -27,7 +27,7 @@
 	. = ..()
 	update_icon()

-/obj/structure/etherealball/attack_hand(mob/living/carbon/human/user)
+/obj/structure/etherealball/attack_hand(mob/living/carbon/human/user, list/modifiers)
 	. = ..()
 	if(TurnedOn)
 		TurnOff()
@@ -163,8 +163,8 @@
 		if(det_time == previous_time)
 			det_time = 50

-/obj/item/grenade/attack_paw(mob/user)
-	return attack_hand(user)
+/obj/item/grenade/attack_paw(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

 /obj/item/grenade/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	var/obj/projectile/P = hitby
@@ -305,7 +305,7 @@
 		do_sparks(1, TRUE, src)
 		qdel(src)

-/obj/item/restraints/legcuffs/beartrap/energy/attack_hand(mob/user)
+/obj/item/restraints/legcuffs/beartrap/energy/attack_hand(mob/user, list/modifiers)
 	Crossed(user) //honk
 	return ..()

@@ -70,7 +70,7 @@
 	anchored = TRUE
 	hand_activated = FALSE

-/obj/item/hourglass/admin/attack_hand(mob/user)
+/obj/item/hourglass/admin/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(user.client && user.client.holder)
 		toggle(user)
@@ -611,7 +611,7 @@
 			to_chat(user, "<span class='warning'>[target] doesn't seem to want to get on [src]!</span>")
 	update_icon()

-/obj/item/melee/roastingstick/attack_hand(mob/user)
+/obj/item/melee/roastingstick/attack_hand(mob/user, list/modifiers)
 	..()
 	if (held_sausage)
 		user.put_in_hands(held_sausage)
@@ -82,7 +82,7 @@
 	to_chat(user, "<span class='warning'>You cannot crush the polycrystal in-hand, try breaking one off.</span>")

 //ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/item/stack/sheet/bluespace_crystal/attack_hand(mob/user)
+/obj/item/stack/sheet/bluespace_crystal/attack_hand(mob/user, list/modifiers)
 	if(user.get_inactive_held_item() == src)
 		if(zero_amount())
 			return
@@ -312,7 +312,7 @@
 		return
 	return ..()

-/obj/item/stack/medical/mesh/attack_hand(mob/user)
+/obj/item/stack/medical/mesh/attack_hand(mob/user, list/modifiers)
 	if(!is_open && user.get_inactive_held_item() == src)
 		to_chat(user, "<span class='warning'>You need to open [src] first.</span>")
 		return
@@ -446,7 +446,7 @@
 	. = ..()

 //ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/item/stack/attack_hand(mob/user)
+/obj/item/stack/attack_hand(mob/user, list/modifiers)
 	if(user.get_inactive_held_item() == src)
 		if(zero_amount())
 			return
@@ -85,7 +85,7 @@
 	inhand_icon_state = null
 	alpha = 0

-/obj/item/storage/box/mime/attack_hand(mob/user)
+/obj/item/storage/box/mime/attack_hand(mob/user, list/modifiers)
 	..()
 	if(user.mind.miming)
 		alpha = 255
@@ -1337,7 +1337,7 @@
 	for(var/i in 1 to 3)
 		new /obj/item/poster/tail_board(src)
 		new /obj/item/tail_pin(src)
-		
+
 /obj/item/storage/box/emergencytank
 	name = "emergency oxygen tank box"
 	desc = "A box of emergency oxygen tanks."
@@ -1347,7 +1347,7 @@
 	..()
 	for(var/i in 1 to 7)
 		new /obj/item/tank/internals/emergency_oxygen(src) //in case anyone ever wants to do anything with spawning them, apart from crafting the box
-		
+
 /obj/item/storage/box/engitank
 	name = "extended-capacity emergency oxygen tank box"
 	desc = "A box of extended-capacity emergency oxygen tanks."
@@ -179,7 +179,7 @@
 	new /obj/item/paper(src)
 	new /obj/item/pen(src)

-/obj/item/storage/secure/safe/attack_hand(mob/user)
+/obj/item/storage/secure/safe/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -76,7 +76,7 @@
 			M.temporarilyRemoveItemFromInventory(noz, TRUE)
 		noz.forceMove(src)

-/obj/item/watertank/attack_hand(mob/user)
+/obj/item/watertank/attack_hand(mob/user, list/modifiers)
 	if (user.get_item_by_slot(user.getBackSlot()) == src)
 		toggle_mister(user)
 	else
@@ -73,7 +73,7 @@ GLOBAL_LIST_EMPTY(cached_cards)

 GLOBAL_LIST_EMPTY(tcgcard_radial_choices)

-/obj/item/tcgcard/attack_hand(mob/user)
+/obj/item/tcgcard/attack_hand(mob/user, list/modifiers)
 	if(!isturf(loc))
 		return ..()
 	var/list/choices = GLOB.tcgcard_radial_choices
@@ -198,7 +198,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
 	. = ..()
 	. += "<span class='notice'>\The [src] has [contents.len] cards inside.</span>"

-/obj/item/tcgcard_deck/attack_hand(mob/user)
+/obj/item/tcgcard_deck/attack_hand(mob/user, list/modifiers)
 	var/list/choices = list(
 		"Draw" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_draw"),
 		"Shuffle" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_shuffle"),
@@ -132,7 +132,7 @@
 	else
 		. = ..()

-/obj/item/toy/prize/attack_hand(mob/user)
+/obj/item/toy/prize/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -550,8 +550,8 @@
 	var/phomeme

 // Talking toys are language universal, and thus all species can use them
-/obj/item/toy/talking/attack_alien(mob/user)
-	return attack_hand(user)
+/obj/item/toy/talking/attack_alien(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

 /obj/item/toy/talking/attack_self(mob/user)
 	if(!cooldown)
@@ -695,7 +695,7 @@

 //ATTACK HAND IGNORING PARENT RETURN VALUE
 //ATTACK HAND NOT CALLING PARENT
-/obj/item/toy/cards/deck/attack_hand(mob/user)
+/obj/item/toy/cards/deck/attack_hand(mob/user, list/modifiers)
 	draw_card(user)

 /obj/item/toy/cards/deck/proc/draw_card(mob/user)
@@ -99,7 +99,7 @@
 		explosion(get_turf(src), devastation_range = 0, heavy_impact_range = 0, light_impact_range = 1, flash_range = 3, flame_range = 1, smoke = TRUE)
 	return ..()

-/obj/machinery/pinpointer_dispenser/attack_hand(mob/living/user)
+/obj/machinery/pinpointer_dispenser/attack_hand(mob/living/user, list/modifiers)
 	. = ..()

 	if(machine_stat & (BROKEN|NOPOWER))
@@ -107,22 +107,22 @@
 	user.changeNext_move(CLICK_CD_MELEE)
 	return take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user), armor_penetration)

-/obj/attack_alien(mob/living/carbon/alien/humanoid/user)
+/obj/attack_alien(mob/living/carbon/alien/humanoid/user, list/modifiers)
 	if(attack_generic(user, 60, BRUTE, MELEE, 0))
 		playsound(src.loc, 'sound/weapons/slash.ogg', 100, TRUE)

-/obj/attack_animal(mob/living/simple_animal/M)
-	if(!M.melee_damage_upper && !M.obj_damage)
-		M.emote("custom", message = "[M.friendly_verb_continuous] [src].")
+/obj/attack_animal(mob/living/simple_animal/user, list/modifiers)
+	if(!user.melee_damage_upper && !user.obj_damage)
+		user.emote("custom", message = "[user.friendly_verb_continuous] [src].")
 		return FALSE
 	else
 		var/play_soundeffect = TRUE
-		if(M.environment_smash)
+		if(user.environment_smash)
 			play_soundeffect = FALSE
-		if(M.obj_damage)
-			. = attack_generic(M, M.obj_damage, M.melee_damage_type, MELEE, play_soundeffect, M.armour_penetration)
+		if(user.obj_damage)
+			. = attack_generic(user, user.obj_damage, user.melee_damage_type, MELEE, play_soundeffect, user.armour_penetration)
 		else
-			. = attack_generic(M, rand(M.melee_damage_lower,M.melee_damage_upper), M.melee_damage_type, MELEE, play_soundeffect, M.armour_penetration)
+			. = attack_generic(user, rand(user.melee_damage_lower,user.melee_damage_upper), user.melee_damage_type, MELEE, play_soundeffect, user.armour_penetration)
 		if(. && !play_soundeffect)
 			playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)

@@ -109,8 +109,8 @@
 	smoothing_groups = list(SMOOTH_GROUP_ALIEN_RESIN, SMOOTH_GROUP_ALIEN_WALLS)
 	canSmoothWith = list(SMOOTH_GROUP_ALIEN_WALLS)

-/obj/structure/alien/resin/attack_paw(mob/user)
-	return attack_hand(user)
+/obj/structure/alien/resin/attack_paw(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

 ///Used in the big derelict ruin exclusively.
 /obj/structure/alien/resin/membrane/creature
@@ -299,13 +299,13 @@
 		if(BURST)
 			icon_state = "[base_icon]_hatched"

-/obj/structure/alien/egg/attack_paw(mob/living/user)
-	return attack_hand(user)
+/obj/structure/alien/egg/attack_paw(mob/living/user, list/modifiers)
+	return attack_hand(user, modifiers)

-/obj/structure/alien/egg/attack_alien(mob/living/carbon/alien/user)
-	return attack_hand(user)
+/obj/structure/alien/egg/attack_alien(mob/living/carbon/alien/user, list/modifiers)
+	return attack_hand(user, modifiers)

-/obj/structure/alien/egg/attack_hand(mob/living/user)
+/obj/structure/alien/egg/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -61,7 +61,7 @@
 /obj/structure/sign/barsign/attack_ai(mob/user)
 	return attack_hand(user)

-/obj/structure/sign/barsign/attack_hand(mob/user)
+/obj/structure/sign/barsign/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -83,8 +83,8 @@
 		if(BURN)
 			playsound(loc, 'sound/items/welder.ogg', 100, TRUE)

-/obj/structure/bed/nest/attack_alien(mob/living/carbon/alien/user)
+/obj/structure/bed/nest/attack_alien(mob/living/carbon/alien/user, list/modifiers)
 	if(!user.combat_mode)
-		return attack_hand(user)
+		return attack_hand(user, modifiers)
 	else
 		return ..()
@@ -33,8 +33,8 @@
 			new buildstacktype(loc,buildstackamount)
 	..()

-/obj/structure/bed/attack_paw(mob/user)
-	return attack_hand(user)
+/obj/structure/bed/attack_paw(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

 /obj/structure/bed/attackby(obj/item/W, mob/user, params)
 	if(W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1))
@@ -66,8 +66,8 @@
 				new M.sheet_type(loc, FLOOR(custom_materials[M] / MINERAL_MATERIAL_AMOUNT, 1))
 	..()

-/obj/structure/chair/attack_paw(mob/user)
-	return attack_hand(user)
+/obj/structure/chair/attack_paw(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

 /obj/structure/chair/narsie_act()
 	var/obj/structure/chair/wood/W = new/obj/structure/chair/wood(get_turf(src))
@@ -363,10 +363,10 @@ LINEN BINS
 		to_chat(user, "<span class='notice'>You hide [I] among the sheets.</span>")


-/obj/structure/bedsheetbin/attack_paw(mob/user)
-	return attack_hand(user)
+/obj/structure/bedsheetbin/attack_paw(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

-/obj/structure/bedsheetbin/attack_hand(mob/user)
+/obj/structure/bedsheetbin/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -368,7 +368,7 @@
 	container_resist_act(user)


-/obj/structure/closet/attack_hand(mob/living/user)
+/obj/structure/closet/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -379,8 +379,8 @@
 		togglelock(user)


-/obj/structure/closet/attack_paw(mob/user)
-	return attack_hand(user)
+/obj/structure/closet/attack_paw(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

 /obj/structure/closet/attack_robot(mob/user)
 	if(user.Adjacent(src))
@@ -45,7 +45,7 @@
 	if(manifest)
 		. += "manifest"

-/obj/structure/closet/crate/attack_hand(mob/user)
+/obj/structure/closet/crate/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -15,7 +15,7 @@
 	// Stops people from "diving into" a crate you can't open normally
 	divable = FALSE

-/obj/structure/closet/crate/large/attack_hand(mob/user)
+/obj/structure/closet/crate/large/attack_hand(mob/user, list/modifiers)
 	add_fingerprint(user)
 	if(manifest)
 		tear_manifest(user)
@@ -174,10 +174,10 @@
 	open = !open
 	update_icon()

-/obj/structure/displaycase/attack_paw(mob/user)
-	return attack_hand(user)
+/obj/structure/displaycase/attack_paw(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

-/obj/structure/displaycase/attack_hand(mob/living/user)
+/obj/structure/displaycase/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -30,7 +30,7 @@
 	var/time_between_uses = 1800
 	var/last_process = 0

-/obj/structure/healingfountain/attack_hand(mob/living/user)
+/obj/structure/healingfountain/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -20,7 +20,7 @@
 		new /obj/item/stack/sheet/mineral/wood(drop_location(), 10)
 	qdel(src)

-/obj/structure/dresser/attack_hand(mob/user)
+/obj/structure/dresser/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -75,7 +75,7 @@
 		return ..()


-/obj/structure/extinguisher_cabinet/attack_hand(mob/user)
+/obj/structure/extinguisher_cabinet/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -106,8 +106,8 @@
 	toggle_cabinet(user)


-/obj/structure/extinguisher_cabinet/attack_paw(mob/user)
-	return attack_hand(user)
+/obj/structure/extinguisher_cabinet/attack_paw(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

 /obj/structure/extinguisher_cabinet/AltClick(mob/living/user)
 	if(!user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY, FALSE, TRUE))
@@ -31,7 +31,7 @@
 	. = ..()
 	air_update_turf(TRUE, TRUE)

-/obj/structure/falsewall/attack_hand(mob/user)
+/obj/structure/falsewall/attack_hand(mob/user, list/modifiers)
 	if(opening)
 		return
 	. = ..()
@@ -173,7 +173,7 @@
 	radiate()
 	return ..()

-/obj/structure/falsewall/uranium/attack_hand(mob/user)
+/obj/structure/falsewall/uranium/attack_hand(mob/user, list/modifiers)
 	radiate()
 	. = ..()

@@ -121,7 +121,7 @@
 	open = TRUE
 	density = TRUE

-/obj/structure/fence/door/attack_hand(mob/user)
+/obj/structure/fence/door/attack_hand(mob/user, list/modifiers)
 	if(can_open(user))
 		toggle(user)

@@ -104,7 +104,7 @@
 		fireaxe = null
 	qdel(src)

-/obj/structure/fireaxecabinet/attack_hand(mob/user)
+/obj/structure/fireaxecabinet/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -124,8 +124,8 @@
 		update_icon()
 		return

-/obj/structure/fireaxecabinet/attack_paw(mob/living/user)
-	return attack_hand(user)
+/obj/structure/fireaxecabinet/attack_paw(mob/living/user, list/modifiers)
+	return attack_hand(user, modifiers)

 /obj/structure/fireaxecabinet/attack_ai(mob/user)
 	toggle_lock(user)
@@ -70,7 +70,7 @@
 	if(!took_presents)
 		took_presents = list()

-/obj/structure/flora/tree/pine/xmas/presents/attack_hand(mob/living/user)
+/obj/structure/flora/tree/pine/xmas/presents/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -103,7 +103,7 @@
 	desc = "Space Jesus is my copilot."
 	icon_state = "driverseat"

-/obj/structure/fluff/bus/passable/seat/driver/attack_hand(mob/user)
+/obj/structure/fluff/bus/passable/seat/driver/attack_hand(mob/user, list/modifiers)
 	playsound(src, 'sound/items/carhorn.ogg', 50, TRUE)
 	. = ..()

@@ -237,7 +237,7 @@
 	else
 		new_spawn.mind.assigned_role = "Free Golem"

-/obj/effect/mob_spawn/human/golem/attack_hand(mob/user)
+/obj/effect/mob_spawn/human/golem/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -843,7 +843,7 @@
 	outfit = /datum/outfit/spacebartender
 	assignedrole = "Space Bar Patron"

-/obj/effect/mob_spawn/human/alive/space_bar_patron/attack_hand(mob/user)
+/obj/effect/mob_spawn/human/alive/space_bar_patron/attack_hand(mob/user, list/modifiers)
 	var/despawn = alert("Return to cryosleep? (Warning, Your mob will be deleted!)", null, "Yes", "No")
 	if(despawn == "No" || !loc || !Adjacent(user))
 		return
@@ -87,15 +87,15 @@
 	var/mob/M = AM
 	shock(M, 70)

-/obj/structure/grille/attack_animal(mob/user)
+/obj/structure/grille/attack_animal(mob/user, list/modifiers)
 	. = ..()
 	if(!.)
 		return
 	if(!shock(user, 70) && !QDELETED(src)) //Last hit still shocks but shouldn't deal damage to the grille
 		take_damage(rand(5,10), BRUTE, MELEE, 1)

-/obj/structure/grille/attack_paw(mob/user)
-	return attack_hand(user)
+/obj/structure/grille/attack_paw(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

 /obj/structure/grille/hulk_damage()
 	return 60
@@ -105,7 +105,7 @@
 		return
 	. = ..()

-/obj/structure/grille/attack_hand(mob/living/user)
+/obj/structure/grille/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -116,7 +116,7 @@
 	if(!shock(user, 70))
 		take_damage(rand(5,10), BRUTE, MELEE, 1)

-/obj/structure/grille/attack_alien(mob/living/user)
+/obj/structure/grille/attack_alien(mob/living/user, list/modifiers)
 	user.do_attack_animation(src)
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.visible_message("<span class='warning'>[user] mangles [src].</span>", null, null, COMBAT_MESSAGE_RANGE)
@@ -66,7 +66,7 @@
 	if (LAZYLEN(buckled_mobs))
 		. += "Someone appears to be strapped in. You can help them out, or you can harm them by activating the guillotine."

-/obj/structure/guillotine/attack_hand(mob/living/user)
+/obj/structure/guillotine/attack_hand(mob/living/user, list/modifiers)
 	add_fingerprint(user)

 	// Currently being used by something
@@ -53,7 +53,7 @@
 	else
 		return ..()

-/obj/structure/guncase/attack_hand(mob/user)
+/obj/structure/guncase/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -67,7 +67,7 @@
 		MA.pixel_x = pixel_x
 		. += victim

-/obj/structure/headpike/attack_hand(mob/user)
+/obj/structure/headpike/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -23,7 +23,7 @@
 		projector = null
 	return ..()

-/obj/structure/holosign/attack_hand(mob/living/user)
+/obj/structure/holosign/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -161,7 +161,7 @@
 		return FALSE
 	return TRUE

-/obj/structure/holosign/barrier/medical/attack_hand(mob/living/user)
+/obj/structure/holosign/barrier/medical/attack_hand(mob/living/user, list/modifiers)
 	if(CanPass(user) && !user.combat_mode)
 		force_allaccess = !force_allaccess
 		to_chat(user, "<span class='warning'>You [force_allaccess ? "deactivate" : "activate"] the biometric scanners.</span>") //warning spans because you can make the station sick!
@@ -181,7 +181,7 @@
 /obj/structure/holosign/barrier/cyborg/hacked/proc/cooldown()
 	shockcd = FALSE

-/obj/structure/holosign/barrier/cyborg/hacked/attack_hand(mob/living/user)
+/obj/structure/holosign/barrier/cyborg/hacked/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -246,7 +246,7 @@ GLOBAL_LIST_EMPTY(lifts)
 		return FALSE
 	return TRUE

-/obj/structure/industrial_lift/attack_hand(mob/user)
+/obj/structure/industrial_lift/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -260,7 +260,7 @@ GLOBAL_LIST_EMPTY(lifts)
 	if(isAdminGhostAI(user))
 		use(user)

-/obj/structure/industrial_lift/attack_paw(mob/user)
+/obj/structure/industrial_lift/attack_paw(mob/user, list/modifiers)
 	return use(user)

 /obj/structure/industrial_lift/attackby(obj/item/W, mob/user, params)
@@ -93,7 +93,7 @@
 	else
 		return ..()

-/obj/structure/janitorialcart/attack_hand(mob/user)
+/obj/structure/janitorialcart/attack_hand(mob/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -47,8 +47,8 @@
 	can_buckle = 1
 	max_integrity = 250

-/obj/structure/kitchenspike/attack_paw(mob/user)
-	return attack_hand(user)
+/obj/structure/kitchenspike/attack_paw(mob/user, list/modifiers)
+	return attack_hand(user, modifiers)

 /obj/structure/kitchenspike/crowbar_act(mob/living/user, obj/item/I)
 	if(has_buckled_mobs())
@@ -61,7 +61,7 @@
 	return TRUE

 //ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/structure/kitchenspike/attack_hand(mob/living/user)
+/obj/structure/kitchenspike/attack_hand(mob/living/user, list/modifiers)
 	if(VIABLE_MOB_CHECK(user.pulling) && user.combat_mode && !has_buckled_mobs())
 		var/mob/living/L = user.pulling
 		if(do_mob(user, src, 120))
--- a/Show More
+++ b/Show More