Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

code/game/objects/effects/aliens.dm

@@ -125,7 +125,7 @@
 	healthcheck()
 
 
-/obj/structure/alien/resin/attackby(obj/item/I, mob/living/user)
+/obj/structure/alien/resin/attackby(obj/item/I, mob/living/user, params)
 	user.changeNext_move(CLICK_CD_MELEE)
 	health -= I.force
 	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
@@ -206,7 +206,7 @@
 	del(src)
 
 
-/obj/structure/alien/weeds/attackby(obj/item/I, mob/user)
+/obj/structure/alien/weeds/attackby(obj/item/I, mob/user, params)
 	if(I.attack_verb.len)
 		visible_message("<span class='danger'>[user] has [pick(I.attack_verb)] [src] with [I]!</span>")
 	else
@@ -359,7 +359,7 @@
 	healthcheck()
 
 
-/obj/structure/alien/egg/attackby(obj/item/I, mob/user)
+/obj/structure/alien/egg/attackby(obj/item/I, mob/user, params)
 	if(I.attack_verb.len)
 		visible_message("<span class='danger'>[user] has [pick(I.attack_verb)] [src] with [I]!</span>")
 	else

code/game/objects/effects/anomalies.dm

@@ -35,7 +35,7 @@
 	qdel(src)
 
 
-/obj/effect/anomaly/attackby(obj/item/I, mob/user)
+/obj/effect/anomaly/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/device/analyzer))
 		user << "<span class='notice'>Analyzing... [src]'s unstable field is fluctuating along frequency [aSignal.code]:[format_frequency(aSignal.frequency)].</span>"
 

code/game/objects/effects/decals/contraband.dm

@@ -48,7 +48,7 @@ obj/structure/sign/poster/New(var/serial)
 	icon_state = design.icon_state // poster[serial_number]
 	..()
 
-obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
+obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/wirecutters))
 		playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
 		if(ruined)
@@ -89,7 +89,7 @@ obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	del(src)
 
 
-//seperated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby()
+//seperated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby(, params)
 /turf/simulated/wall/proc/place_poster(var/obj/item/weapon/contraband/poster/P, var/mob/user)
 
 	if(!istype(src,/turf/simulated/wall))

code/game/objects/effects/effect_system.dm

@@ -1086,7 +1086,7 @@ steam.start() -- spawns the effect
 		return
 
 
-	attackby(var/obj/item/I, var/mob/user)
+	attackby(var/obj/item/I, var/mob/user, params)
 
 		if (istype(I, /obj/item/weapon/grab))
 			var/obj/item/weapon/grab/G = I

code/game/objects/effects/glowshroom.dm

@@ -133,7 +133,7 @@
 	floor = 1
 	return 1
 
-/obj/effect/glowshroom/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/effect/glowshroom/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 
 	endurance -= W.force

code/game/objects/effects/spiders.dm

@@ -20,7 +20,7 @@
 				qdel(src)
 	return
 
-/obj/effect/spider/attackby(var/obj/item/weapon/W, var/mob/user)
+/obj/effect/spider/attackby(var/obj/item/weapon/W, var/mob/user, params)
 	if(W.attack_verb.len)
 		visible_message("\red <B>\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]")
 	else

code/game/objects/items.dm

@@ -211,7 +211,7 @@
 
 // Due to storage type consolidation this should get used more now.
 // I have cleaned it up a little, but it could probably use more.  -Sayu
-/obj/item/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W,/obj/item/weapon/storage))
 		var/obj/item/weapon/storage/S = W
 		if(S.use_to_pickup)

code/game/objects/items/apc_frame.dm

@@ -7,7 +7,7 @@
 	icon_state = "apc_frame"
 	flags = CONDUCT
 
-/obj/item/apc_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/apc_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	if (istype(W, /obj/item/weapon/wrench))
 		new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 )

code/game/objects/items/ashtray.dm

@@ -14,7 +14,7 @@
 	src.pixel_x = rand(-6, 6)
 	return
 
-/obj/item/ashtray/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/ashtray/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if (health < 1)
 		return
 	if (istype(W,/obj/item/weapon/cigbutt) || istype(W,/obj/item/clothing/mask/cigarette) || istype(W, /obj/item/weapon/match))

code/game/objects/items/bodybag.dm

@@ -40,7 +40,7 @@
 	density = 0
 
 
-	attackby(W as obj, mob/user as mob)
+	attackby(W as obj, mob/user as mob, params)
 		if (istype(W, /obj/item/weapon/pen))
 			var/t = input(user, "What would you like the label to be?", text("[]", src.name), null)  as text
 			if (user.get_active_hand() != W)
@@ -127,7 +127,7 @@
 			usr << "\red You can't fold that up anymore.."
 		..()
 
-	attackby(W as obj, mob/user as mob)
+	attackby(W as obj, mob/user as mob, params)
 		if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
 			if(src.allowed(user))
 				src.locked = !src.locked

code/game/objects/items/candle.dm

@@ -22,7 +22,7 @@
 		icon_state = "candle[i][lit ? "_lit" : ""]"
 
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
+	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 		..()
 		if(istype(W, /obj/item/weapon/weldingtool))
 			var/obj/item/weapon/weldingtool/WT = W

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

@@ -1055,7 +1055,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	return
 
 // access to status display signals
-/obj/item/device/pda/attackby(obj/item/C as obj, mob/user as mob)
+/obj/item/device/pda/attackby(obj/item/C as obj, mob/user as mob, params)
 	..()
 	if(istype(C, /obj/item/weapon/cartridge) && !cartridge)
 		cartridge = C

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

@@ -45,7 +45,7 @@
 /obj/item/device/laser_pointer/attack(mob/living/M, mob/user)
 	laser_act(M, user)
 
-/obj/item/device/laser_pointer/attackby(obj/item/W, mob/user)
+/obj/item/device/laser_pointer/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/stock_parts/micro_laser))
 		if(!diode)
 			user.drop_item()

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

@@ -71,7 +71,7 @@
 	..()
 	usr << "It has [uses] lights remaining."
 
-/obj/item/device/lightreplacer/attackby(obj/item/W, mob/user)
+/obj/item/device/lightreplacer/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/stack/sheet/glass))
 		var/obj/item/stack/sheet/glass/G = W
 		if(G.amount - decrement >= 0 && uses < max_uses)

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

@@ -21,7 +21,7 @@
 
 	var/obj/structure/cable/attached		// the attached cable
 
-	attackby(var/obj/item/I, var/mob/user)
+	attackby(var/obj/item/I, var/mob/user, params)
 		if(istype(I, /obj/item/weapon/screwdriver))
 			if(mode == 0)
 				var/turf/T = loc

code/game/objects/items/devices/radio/electropack.dm

@@ -26,7 +26,7 @@
 			S.part2 = null
 		master = null
 
-/obj/item/device/radio/electropack/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/radio/electropack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	if(istype(W, /obj/item/clothing/head/helmet))
 		if(!b_stat)

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -13,7 +13,7 @@
 
 /obj/item/device/encryptionkey/New()
 
-/obj/item/device/encryptionkey/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/encryptionkey/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 
 /obj/item/device/encryptionkey/syndicate
 	icon_state = "cypherkey"

code/game/objects/items/devices/radio/headset.dm

@@ -254,7 +254,7 @@
 		return -1 //Transciever Disabled.
 	return ..(freq, level, 1)
 
-/obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 //	..()
 	user.set_machine(src)
 	if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ ))))

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

@@ -476,7 +476,7 @@
 			user.show_message("\blue \the [src] can not be modified or attached!")
 	return
 
-/obj/item/device/radio/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/radio/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	user.set_machine(src)
 	if (!( istype(W, /obj/item/weapon/screwdriver) ))
@@ -535,7 +535,7 @@
 		var/datum/robot_component/C = R.components["radio"]
 		R.use_power(C.energy_consumption)
 
-/obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 //	..()
 	user.set_machine(src)
 	if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ ))))

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

@@ -121,7 +121,7 @@
 		if (on)
 			user << "You switch on the [src]."
 
-/obj/item/device/suit_cooling_unit/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/suit_cooling_unit/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if (istype(W, /obj/item/weapon/screwdriver))
 		if(cover_open)
 			cover_open = 0

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

@@ -15,7 +15,7 @@
 /obj/item/device/transfer_valve/IsAssemblyHolder()
 	return 1
 
-/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user)
+/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params)
 	if(istype(item, /obj/item/weapon/tank))
 		if(tank_one && tank_two)
 			user << "<span class='warning'>There are already two tanks attached, remove one first.</span>"

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

@@ -251,7 +251,7 @@ var/list/world_uplinks = list()
 	return 0
 	
 //Refund proc for the borg teleporter (later I'll make a general refund proc if there is demand for it)
-/obj/item/device/radio/headset/syndicate/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/radio/headset/syndicate/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/antag_spawner/borg_tele))
 		var/obj/item/weapon/antag_spawner/borg_tele/S = W
 		if(!S.used && !S.checking)
@@ -261,7 +261,7 @@ var/list/world_uplinks = list()
 		else
 			user << "<span class='notice'>This teleporter is already used, or is currently being used.</span>"
 			
-/obj/item/device/radio/uplink/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/radio/uplink/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/antag_spawner/borg_tele))
 		var/obj/item/weapon/antag_spawner/borg_tele/S = W
 		if(!S.used && !S.checking)

code/game/objects/items/flag.dm

@@ -35,7 +35,7 @@
 			del(src)
 			return
 
-/obj/item/flag/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/flag/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	if(istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W

code/game/objects/items/latexballoon.dm

@@ -43,6 +43,6 @@
 		burst()
 	return
 
-/obj/item/latexballon/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/latexballon/attackby(obj/item/W as obj, mob/user as mob, params)
 	if (can_puncture(W))
 		burst()

code/game/objects/items/policetape.dm

@@ -119,7 +119,7 @@
 	else
 		return 0
 
-/obj/item/tape/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/tape/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	breaktape(W, user)
 
 /obj/item/tape/attack_hand(mob/user as mob)

code/game/objects/items/random_items.dm

@@ -269,7 +269,7 @@
 	name = "\improper Mysterious Crate"
 	desc = "What could it be?"
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
+	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 		if(istype(W, /obj/item/weapon/crowbar))
 			var/list/menace = pick(	/mob/living/simple_animal/hostile/carp,/mob/living/simple_animal/hostile/faithless,/mob/living/simple_animal/hostile/pirate,
 									/mob/living/simple_animal/hostile/creature,/mob/living/simple_animal/hostile/pirate/ranged,
@@ -299,7 +299,7 @@
 	name = "Schrodinger's Crate"
 	desc = "What happens if you open it?"
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
+	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 		if(istype(W, /obj/item/weapon/crowbar))
 			var/mob/living/simple_animal/cat/Cat1 = new(loc)
 			Cat1.apply_damage(250)//,TOX)

code/game/objects/items/robot/robot_parts.dm

@@ -101,7 +101,7 @@
 				return 1
 	return 0
 
-/obj/item/robot_parts/robot_suit/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/robot_parts/robot_suit/attackby(obj/item/W as obj, mob/user as mob, params)
 	..()
 	if(istype(W, /obj/item/stack/sheet/metal) && !l_arm && !r_arm && !l_leg && !r_leg && !chest && !head)
 		var/obj/item/weapon/ed209_assembly/B = new /obj/item/weapon/ed209_assembly
@@ -249,7 +249,7 @@
 
 	return
 
-/obj/item/robot_parts/chest/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/robot_parts/chest/attackby(obj/item/W as obj, mob/user as mob, params)
 	..()
 	if(istype(W, /obj/item/weapon/stock_parts/cell))
 		if(src.cell)
@@ -271,7 +271,7 @@
 			user << "\blue You insert the wire!"
 	return
 
-/obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob, params)
 	..()
 	if(istype(W, /obj/item/device/flash))
 		if(istype(user,/mob/living/silicon/robot))
@@ -299,7 +299,7 @@
 		return
 	return
 
-/obj/item/robot_parts/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/robot_parts/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W,/obj/item/weapon/card/emag))
 		if(sabotaged)
 			user << "\red [src] is already sabotaged!"

code/game/objects/items/shooting_range.dm

@@ -32,7 +32,7 @@
 
 
 
-	attackby(obj/item/W as obj, mob/user as mob)
+	attackby(obj/item/W as obj, mob/user as mob, params)
 		if (istype(W, /obj/item/weapon/weldingtool))
 			var/obj/item/weapon/weldingtool/WT = W
 			if(WT.remove_fuel(0, user))

code/game/objects/items/stacks/rods.dm

@@ -13,7 +13,7 @@
 	max_amount = 60
 	attack_verb = list("hit", "bludgeoned", "whacked")
 
-/obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob, params)
 	..()
 	if (istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W

code/game/objects/items/stacks/sheets/glass.dm

@@ -34,7 +34,7 @@
 /obj/item/stack/sheet/glass/attack_self(mob/user as mob)
 	construct_window(user)
 
-/obj/item/stack/sheet/glass/attackby(obj/item/W, mob/user)
+/obj/item/stack/sheet/glass/attackby(obj/item/W, mob/user, params)
 	..()
 	if(istype(W,/obj/item/stack/cable_coil))
 		var/obj/item/stack/cable_coil/CC = W
@@ -255,7 +255,7 @@
 /obj/item/stack/sheet/plasmaglass/attack_self(mob/user as mob)
 	construct_window(user)
 
-/obj/item/stack/sheet/plasmaglass/attackby(obj/item/W, mob/user)
+/obj/item/stack/sheet/plasmaglass/attackby(obj/item/W, mob/user, params)
 	..()
 	if( istype(W, /obj/item/stack/rods) )
 		var/obj/item/stack/rods/V  = W

code/game/objects/items/stacks/sheets/leather.dm

@@ -90,7 +90,7 @@
 
 //Step one - dehairing.
 
-/obj/item/stack/sheet/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/stack/sheet/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(	istype(W, /obj/item/weapon/kitchenknife) || \
 		istype(W, /obj/item/weapon/kitchen/utensil/knife) || \
 		istype(W, /obj/item/weapon/twohanded/fireaxe) || \

code/game/objects/items/stacks/sheets/light.dm

@@ -11,7 +11,7 @@
 	flags = CONDUCT
 	max_amount = 60
 
-/obj/item/stack/light_w/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/item/stack/light_w/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
 	..()
 	if(istype(O,/obj/item/weapon/wirecutters))
 		var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc)

code/game/objects/items/stacks/sheets/sheets.dm

@@ -14,7 +14,7 @@
 // Since the sheetsnatcher was consolidated into weapon/storage/bag we now use
 // item/attackby() properly, making this unnecessary
 
-/*/obj/item/stack/sheet/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/*/obj/item/stack/sheet/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if (istype(W, /obj/item/weapon/storage/bag/sheetsnatcher))
 		var/obj/item/weapon/storage/bag/sheetsnatcher/S = W
 		if(!S.mode)

code/game/objects/items/stacks/stack.dm

@@ -203,7 +203,7 @@
 		..()
 	return
 
-/obj/item/stack/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/stack/attackby(obj/item/W as obj, mob/user as mob, params)
 	..()
 	if (istype(W, src.type))
 		var/obj/item/stack/S = W

code/game/objects/items/stacks/tiles/light.dm

@@ -25,7 +25,7 @@
 	else
 		state = 0 //fine
 
-/obj/item/stack/tile/light/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/item/stack/tile/light/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
 	..()
 	if(istype(O,/obj/item/weapon/crowbar))
 		new/obj/item/stack/sheet/metal(user.loc)

code/game/objects/items/toys.dm

@@ -56,7 +56,7 @@
 		src.update_icon()
 	return
 
-/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob)
+/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob, params)
 	if(istype(O, /obj/item/weapon/reagent_containers/glass))
 		if(O.reagents)
 			if(O.reagents.total_volume < 1)
@@ -148,7 +148,7 @@
 		..()
 		return
 
-	attackby(obj/item/toy/ammo/gun/A as obj, mob/user as mob)
+	attackby(obj/item/toy/ammo/gun/A as obj, mob/user as mob, params)
 
 		if (istype(A, /obj/item/toy/ammo/gun))
 			if (src.bullets >= 7)
@@ -221,7 +221,7 @@
 		if (bullets)
 			usr << "\blue It is loaded with [bullets] foam darts!"
 
-	attackby(obj/item/I as obj, mob/user as mob)
+	attackby(obj/item/I as obj, mob/user as mob, params)
 		if(istype(I, /obj/item/toy/ammo/crossbow))
 			if(bullets <= 4)
 				user.drop_item()
@@ -330,7 +330,7 @@
     attack_verb = list("struck", "hammered", "hit", "bashed")
     bullets = 20.0
 
-/obj/item/toy/crossbow/tommygun/attackby(obj/item/I as obj, mob/user as mob)
+/obj/item/toy/crossbow/tommygun/attackby(obj/item/I as obj, mob/user as mob, params)
 	if(istype(I, /obj/item/toy/ammo/crossbow))
 		if(bullets <= 19)
 			user.drop_item()
@@ -377,7 +377,7 @@
 		return
 
 // Copied from /obj/item/weapon/melee/energy/sword/attackby
-/obj/item/toy/sword/attackby(obj/item/weapon/W, mob/living/user)
+/obj/item/toy/sword/attackby(obj/item/weapon/W, mob/living/user, params)
 	..()
 	if(istype(W, /obj/item/toy/sword))
 		if(W == src)
@@ -703,7 +703,7 @@ obj/item/toy/cards/deck/attack_self(mob/user as mob)
 		user.visible_message("<span class='notice'>[user] shuffles the deck.</span>", "<span class='notice'>You shuffle the deck.</span>")
 		cooldown = world.time
 
-obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/user)
+obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
 	..()
 	if(istype(C))
 		if(C.parentdeck == src)
@@ -723,7 +723,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/use
 			src.icon_state = "deck_[deckstyle]_low"
 
 
-obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user)
+obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, params)
 	..()
 	if(istype(C))
 		if(C.parentdeck == src)
@@ -827,7 +827,7 @@ obj/item/toy/cards/cardhand/Topic(href, href_list)
 				del(src)
 		return
 
-obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user)
+obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
 	if(istype(C))
 		if(C.parentdeck == src.parentdeck)
 			src.currenthand += C.cardname
@@ -898,7 +898,7 @@ obj/item/toy/cards/singlecard/verb/Flip()
 		src.name = "card"
 		src.pixel_x = -5
 
-obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user)
+obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
 	if(istype(I, /obj/item/toy/cards/singlecard/))
 		var/obj/item/toy/cards/singlecard/C = I
 		if(C.parentdeck == src.parentdeck)

code/game/objects/items/weapons/RCD.dm

@@ -36,7 +36,7 @@ RCD
 		return
 
 
-	attackby(obj/item/weapon/W, mob/user)
+	attackby(obj/item/weapon/W, mob/user, params)
 		..()
 		if(istype(W, /obj/item/weapon/rcd_ammo))
 			if((matter + 20) > 100)

code/game/objects/items/weapons/RSF.dm

@@ -19,7 +19,7 @@ RSF
 	desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 	return
 
-/obj/item/weapon/rsf/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/rsf/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	if (istype(W, /obj/item/weapon/rcd_ammo))
 		if ((matter + 10) > 30)

code/game/objects/items/weapons/cards_ids.dm

@@ -161,7 +161,7 @@
 /obj/item/weapon/card/id/GetID()
 	return src
 
-/obj/item/weapon/card/id/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/card/id/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	if(istype(W,/obj/item/weapon/id_wallet))
 		user << "You slip [src] into [W]."

code/game/objects/items/weapons/cigs_lighters.dm

@@ -78,7 +78,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	..()
 	del(reagents)
 
-/obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	if(istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
@@ -287,7 +287,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	icon_state = "cigarbutt"
 
 
-/obj/item/clothing/mask/cigarette/cigar/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/clothing/mask/cigarette/cigar/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/match))
 		..()
 	else
@@ -359,7 +359,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		smoketime = initial(smoketime)
 	return
 
-/obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/match))
 		..()
 	else

code/game/objects/items/weapons/defib.dm

@@ -78,7 +78,7 @@
 		usr << "<span class='warning'>Put the defibrillator on your back first!</span>"
 	return
 
-/obj/item/weapon/defibrillator/attackby(obj/item/weapon/W, mob/user)
+/obj/item/weapon/defibrillator/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/stock_parts/cell))
 		var/obj/item/weapon/stock_parts/cell/C = W
 		if(bcell)
@@ -231,7 +231,7 @@
 	update_icon()
 	return
 
-/obj/item/weapon/defibrillator/compact/combat/attackby(obj/item/weapon/W, mob/user)
+/obj/item/weapon/defibrillator/compact/combat/attackby(obj/item/weapon/W, mob/user, params)
 	if(W == paddles)
 		paddles.unwield()
 		toggle_paddles()

code/game/objects/items/weapons/explosives.dm

@@ -44,7 +44,7 @@
 	explode(get_turf(user))
 	return .
 
-/obj/item/weapon/plastique/attackby(var/obj/item/I, var/mob/user)
+/obj/item/weapon/plastique/attackby(var/obj/item/I, var/mob/user, params)
 	if(istype(I, /obj/item/weapon/screwdriver))
 		open_panel = !open_panel
 		user << "<span class='notice'>You [open_panel ? "open" : "close"] the wire panel.</span>"

code/game/objects/items/weapons/extinguisher.dm

@@ -64,7 +64,7 @@
 	return
 
 /*
-/obj/item/weapon/extinguisher/attackby(obj/item/W, mob/user)
+/obj/item/weapon/extinguisher/attackby(obj/item/W, mob/user, params)
 	if(user.stat || user.restrained() || user.lying)  return
 
 	if (istype(W, /obj/item/weapon/wrench))

code/game/objects/items/weapons/fireworks.dm

@@ -4,7 +4,7 @@ obj/item/weapon/firework
 	icon_state = "rocket_0"
 	var/litzor = 0
 	var/datum/effects/system/sparkel_spread/S
-obj/item/weapon/firework/attackby(obj/item/weapon/W,mob/user)
+obj/item/weapon/firework/attackby(obj/item/weapon/W,mob/user, params)
 	if(litzor)
 		return
 	if (istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit)
@@ -26,7 +26,7 @@ obj/item/weapon/sparkler
 	icon_state = "sparkler_0"
 	var/litzor = 0
 	var/datum/effect/effect/system/spark_spread/S
-obj/item/weapon/sparkler/attackby(obj/item/weapon/W,mob/user)
+obj/item/weapon/sparkler/attackby(obj/item/weapon/W,mob/user, params)
 	if(litzor)
 		return
 	if (istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit)

code/game/objects/items/weapons/flamethrower.dm

@@ -69,7 +69,7 @@
 			var/turflist = getline(user, target_turf)
 			flame_turf(turflist)
 
-/obj/item/weapon/flamethrower/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/weapon/flamethrower/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(user.stat || user.restrained() || user.lying)	return
 	if(iswrench(W) && !status)//Taking this apart
 		var/turf/T = get_turf(src)

code/game/objects/items/weapons/gift_wrappaper.dm

@@ -43,7 +43,7 @@
 		return
 	user << "\blue You cant move."
 
-/obj/effect/spresent/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/effect/spresent/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 
 	if (!istype(W, /obj/item/weapon/wirecutters))

code/game/objects/items/weapons/grenades/bananade.dm

@@ -38,7 +38,7 @@ var/turf/T
 	var/fillamt = 0
 
 
-/obj/item/weapon/grenade/bananade/casing/attackby(var/obj/item/I, mob/user as mob)
+/obj/item/weapon/grenade/bananade/casing/attackby(var/obj/item/I, mob/user as mob, params)
 	if(istype(I, /obj/item/weapon/bananapeel))
 		if(fillamt < 9)
 			usr << "<span  class='notice'>You add another banana peel to the assembly.</span>"

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -103,7 +103,7 @@
 				prime()
 
 
-/obj/item/weapon/grenade/chem_grenade/attackby(obj/item/I, mob/user)
+/obj/item/weapon/grenade/chem_grenade/attackby(obj/item/I, mob/user, params)
 	if(istype(I,/obj/item/weapon/hand_labeler))
 		var/obj/item/weapon/hand_labeler/HL = I
 		if(length(HL.label))
@@ -368,7 +368,7 @@
 	//I tried to just put it in the allowed_containers list but
 	//if you do that it must have reagents.  If you're going to
 	//make a special case you might as well do it explicitly. -Sayu
-/obj/item/weapon/grenade/chem_grenade/large/attackby(obj/item/I, mob/user)
+/obj/item/weapon/grenade/chem_grenade/large/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/slime_extract) && stage == WIRED)
 		user << "<span class='notice'>You add [I] to the assembly.</span>"
 		user.drop_item()

code/game/objects/items/weapons/grenades/grenade.dm

@@ -81,7 +81,7 @@
 		M.unEquip(src)
 
 
-/obj/item/weapon/grenade/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/grenade/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/screwdriver))
 		switch(det_time)
 			if ("1")

code/game/objects/items/weapons/handcuffs.dm

@@ -122,7 +122,7 @@ var/last_chew = 0
 	desc = "Use this to keep prisoners in line. Or you know, your significant other."
 	icon_state = "pinkcuffs"
 
-/obj/item/weapon/restraints/handcuffs/cable/attackby(var/obj/item/I, mob/user as mob)
+/obj/item/weapon/restraints/handcuffs/cable/attackby(var/obj/item/I, mob/user as mob, params)
 	..()
 	if(istype(I, /obj/item/stack/rods))
 		var/obj/item/stack/rods/R = I

code/game/objects/items/weapons/hydroponics.dm

@@ -39,7 +39,7 @@
 		if(0)
 			usr << "The bag now picks up one seed pouch at a time."
 
-/obj/item/seeds/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/item/seeds/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
 	..()
 	if (istype(O, /obj/item/weapon/seedbag))
 		var/obj/item/weapon/seedbag/S = O
@@ -230,7 +230,7 @@
 /*
  * Corncob
  */
-/obj/item/weapon/corncob/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/corncob/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/kitchen/utensil/knife) || istype(W, /obj/item/weapon/kitchenknife) || istype(W, /obj/item/weapon/kitchenknife/ritual))
 		user << "<span class='notice'>You use [W] to fashion a pipe out of the corn cob!</span>"

code/game/objects/items/weapons/implants/implantcase.dm

@@ -21,7 +21,7 @@
 		return
 
 
-	attackby(obj/item/weapon/I as obj, mob/user as mob)
+	attackby(obj/item/weapon/I as obj, mob/user as mob, params)
 		..()
 		if (istype(I, /obj/item/weapon/pen))
 			var/t = input(user, "What would you like the label to be?", text("[]", src.name), null)  as text

code/game/objects/items/weapons/implants/implantchair.dm

@@ -74,7 +74,7 @@
 			return
 
 
-	attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
+	attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params)
 		if(istype(G, /obj/item/weapon/grab))
 			if(!ismob(G:affecting))
 				return

code/game/objects/items/weapons/implants/implantpad.dm

@@ -38,7 +38,7 @@
 		return
 
 
-	attackby(obj/item/weapon/implantcase/C as obj, mob/user as mob)
+	attackby(obj/item/weapon/implantcase/C as obj, mob/user as mob, params)
 		..()
 		if(istype(C, /obj/item/weapon/implantcase))
 			if(!( src.case ))

code/game/objects/items/weapons/kitchen.dm

@@ -411,7 +411,7 @@
 
 /obj/item/weapon/tray/var/cooldown = 0	//shield bash cooldown. based on world.time
 
-/obj/item/weapon/tray/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/tray/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/kitchen/rollingpin))
 		if(cooldown < world.time - 25)
 			user.visible_message("<span class='warning'>[user] bashes [src] with [W]!</span>")

code/game/objects/items/weapons/mop.dm

@@ -49,7 +49,7 @@
 			user << "<span class='notice'>You have finished mopping!</span>"
 
 
-/obj/effect/attackby(obj/item/I, mob/user)
+/obj/effect/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap))
 		return
 	..()

code/game/objects/items/weapons/shards.dm

@@ -50,7 +50,7 @@
 		else
 	return
 
-/obj/item/weapon/shard/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/shard/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	if ( istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
@@ -61,7 +61,7 @@
 					continue
 				if(G.amount>=G.max_amount)
 					continue
-				G.attackby(NG, user)
+				G.attackby(NG, user, params)
 				usr << "You add the newly-formed glass to the stack. It now contains [NG.amount] sheets."
 			//SN src = null
 			del(src)

code/game/objects/items/weapons/shields.dm

@@ -22,7 +22,7 @@
 	IsShield()
 		return 1
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
+	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 		if(istype(W, /obj/item/weapon/melee/baton))
 			if(cooldown < world.time - 25)
 				user.visible_message("<span class='warning'>[user] bashes [src] with [W]!</span>")

code/game/objects/items/weapons/storage/backpack.dm

@@ -13,7 +13,7 @@
 	max_w_class = 3
 	max_combined_w_class = 21
 
-/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	playsound(src.loc, "rustle", 50, 1, -5)
 	..()
 
@@ -33,7 +33,7 @@
 		..()
 		return
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
+	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 		if(crit_fail)
 			user << "\red The Bluespace generator isn't working."
 			return

code/game/objects/items/weapons/storage/bible.dm

@@ -115,6 +115,6 @@
 			A.reagents.del_reagent("water")
 			A.reagents.add_reagent("holywater",water2holy)
 
-/obj/item/weapon/storage/bible/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/storage/bible/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	playsound(src.loc, "rustle", 50, 1, -5)
 	..()

code/game/objects/items/weapons/storage/boxes.dm

@@ -562,7 +562,7 @@
 		for(var/i=1; i <= storage_slots; i++)
 			new /obj/item/weapon/match(src)
 
-	attackby(obj/item/weapon/match/W as obj, mob/user as mob)
+	attackby(obj/item/weapon/match/W as obj, mob/user as mob, params)
 		if(istype(W, /obj/item/weapon/match) && W.lit == 0)
 			W.lit = 1
 			W.icon_state = "match_lit"

code/game/objects/items/weapons/storage/fancy.dm

@@ -129,7 +129,7 @@
 	for(var/obj/item/toy/crayon/crayon in contents)
 		overlays += image('icons/obj/crayons.dmi',crayon.colourName)
 
-/obj/item/weapon/storage/fancy/crayons/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/weapon/storage/fancy/crayons/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W,/obj/item/toy/crayon))
 		switch(W:colourName)
 			if("mime")
@@ -319,7 +319,7 @@
 		overlays += image(icon, src, "ledb")
 	return
 
-/obj/item/weapon/storage/lockbox/vials/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/storage/lockbox/vials/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	update_icon()
 

code/game/objects/items/weapons/storage/lockbox.dm

@@ -17,7 +17,7 @@
 	var/icon_broken = "lockbox+b"
 
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
+	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 		if (istype(W, /obj/item/weapon/card/id))
 			if(src.broken)
 				user << "\red It appears to be broken."

code/game/objects/items/weapons/storage/secure.dm

@@ -32,7 +32,7 @@
 		..()
 		usr << text("The service panel is [src.open ? "open" : "closed"].")
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
+	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 		if(locked)
 			if ((istype(W, /obj/item/weapon/melee/energy/blade)) && (!src.emagged))
 				emag_act(user, W)

code/game/objects/items/weapons/storage/storage.dm

@@ -1,6 +1,6 @@
 // To clarify:
 // For use_to_pickup and allow_quick_gather functionality,
-// see item/attackby() (/game/objects/items.dm)
+// see item/attackby() (/game/objects/items.dm, params)
 // Do not remove this functionality without good reason, cough reagent_containers cough.
 // -Sayu
 
@@ -326,7 +326,7 @@
 	return 1
 
 //This proc is called when you want to place an item into the storage item.
-/obj/item/weapon/storage/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/weapon/storage/attackby(obj/item/W as obj, mob/user as mob, params)
 	..()
 
 	if(isrobot(user))

code/game/objects/items/weapons/stunbaton.dm

@@ -59,7 +59,7 @@
 	if(!bcell)
 		user <<"<span class='warning'>The baton does not have a power source installed.</span>"
 
-/obj/item/weapon/melee/baton/attackby(obj/item/weapon/W, mob/user)
+/obj/item/weapon/melee/baton/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/stock_parts/cell))
 		var/obj/item/weapon/stock_parts/cell/C = W
 		if(bcell)
@@ -177,7 +177,7 @@
 		bcell = R.cell
 	return ..()
 
-/obj/item/weapon/melee/baton/robot/attackby(obj/item/weapon/W, mob/user)
+/obj/item/weapon/melee/baton/robot/attackby(obj/item/weapon/W, mob/user, params)
 	return
 
 /obj/item/weapon/melee/baton/loaded/ntcane

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -60,7 +60,7 @@
 	add_fingerprint(user)
 	return
 
-/obj/item/weapon/melee/energy/sword/attackby(obj/item/weapon/W, mob/living/user)
+/obj/item/weapon/melee/energy/sword/attackby(obj/item/weapon/W, mob/living/user, params)
 	..()
 	if(istype(W, /obj/item/weapon/melee/energy/sword))
 		if(W == src)

code/game/objects/items/weapons/table_rack_parts.dm

@@ -11,7 +11,7 @@
 /*
  * Table Parts
  */
-/obj/item/weapon/table_parts/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/table_parts/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	if (istype(W, /obj/item/weapon/wrench))
 		new /obj/item/stack/sheet/metal( user.loc )
@@ -36,7 +36,7 @@
 /*
  * Reinforced Table Parts
  */
-/obj/item/weapon/table_parts/reinforced/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/table_parts/reinforced/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if (istype(W, /obj/item/weapon/wrench))
 		new /obj/item/stack/sheet/metal( user.loc )
 		new /obj/item/stack/rods( user.loc )
@@ -51,7 +51,7 @@
 /*
  * Wooden Table Parts
  */
-/obj/item/weapon/table_parts/wood/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/table_parts/wood/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if (istype(W, /obj/item/weapon/wrench))
 		new /obj/item/stack/sheet/wood( user.loc )
 		del(src)
@@ -65,7 +65,7 @@
 /*
  * Rack Parts
  */
-/obj/item/weapon/rack_parts/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/rack_parts/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	if (istype(W, /obj/item/weapon/wrench))
 		new /obj/item/stack/sheet/metal( user.loc )

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -110,7 +110,7 @@
 	src.air_contents.update_values()
 	return
 
-/obj/item/weapon/tank/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/tank/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 
 	if (istype(W, /obj/item/weapon/flamethrower))

code/game/objects/items/weapons/tanks/tanks.dm

@@ -78,7 +78,7 @@
 
 		del(src)
 
-/obj/item/weapon/tank/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/tank/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	var/obj/icon = src
 

code/game/objects/items/weapons/tools.dm

@@ -172,7 +172,7 @@
 	return
 
 
-/obj/item/weapon/weldingtool/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/weapon/weldingtool/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W,/obj/item/weapon/screwdriver))
 		if(welding)
 			user << "\red Stop welding first!"

code/game/objects/items/weapons/twohanded.dm

@@ -267,7 +267,7 @@ obj/item/weapon/twohanded/
 	..()
 	hitsound = 'sound/weapons/blade1.ogg'
 
-/obj/item/weapon/twohanded/dualsaber/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/twohanded/dualsaber/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	if(istype(W, /obj/item/device/multitool))
 		if(hacked == 0)

code/game/objects/items/weapons/weaponry.dm

@@ -165,7 +165,7 @@ obj/item/weapon/wirerod
 	m_amt = 1875
 	attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
 
-obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob)
+obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
 	..()
 	if(istype(I, /obj/item/weapon/shard))
 		var/obj/item/weapon/twohanded/spear/S = new /obj/item/weapon/twohanded/spear

code/game/objects/structures/bedsheet_bin.dm

@@ -178,7 +178,7 @@ LINEN BINS
 		else				icon_state = "linenbin-full"
 
 
-/obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob)
+/obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob, params)
 	if(istype(I, /obj/item/weapon/bedsheet))
 		user.drop_item()
 		I.loc = src

code/game/objects/structures/coathanger.dm

@@ -13,7 +13,7 @@
 	coat = null
 	update_icon()
 
-/obj/structure/coatrack/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/coatrack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	var/can_hang = 0
 	for (var/T in allowed)
 		if(istype(W,T))

code/game/objects/structures/crates_lockers/closets.dm

@@ -182,7 +182,7 @@
 		src.dump_contents()
 		del(src)
 
-/obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/rcs) && !src.opened)
 		var/obj/item/weapon/rcs/E = W
 		if(E.rcharges != 0)

code/game/objects/structures/crates_lockers/closets/secure/personal.dm

@@ -58,7 +58,7 @@
 		new /obj/item/device/radio/headset( src )
 	return
 
-/obj/structure/closet/secure_closet/personal/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/closet/secure_closet/personal/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if (src.opened)
 		if (istype(W, /obj/item/weapon/grab))
 			src.MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet

code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm

@@ -65,7 +65,7 @@
 	else
 		user << "<span class='notice'>Access Denied</span>"
 
-/obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(src.opened)
 		if(istype(W, /obj/item/weapon/grab))
 			if(src.large)

code/game/objects/structures/crates_lockers/closets/statue.dm

@@ -122,7 +122,7 @@
 			M.meteorhit(O)
 			shatter(M)
 
-/obj/structure/closet/statue/attackby(obj/item/I as obj, mob/user as mob)
+/obj/structure/closet/statue/attackby(obj/item/I as obj, mob/user as mob, params)
 	health -= I.force
 	visible_message("\red [user] strikes [src] with [I].")
 	if(health <= 0)

code/game/objects/structures/crates_lockers/crates.dm

@@ -67,7 +67,7 @@
 	src.opened = 0
 	return 1
 
-/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/rcs) && !src.opened)
 		var/obj/item/weapon/rcs/E = W
 		if(E.rcharges != 0)
@@ -246,7 +246,7 @@
 	else
 		src.toggle(user)
 
-/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(is_type_in_list(W, list(/obj/item/stack/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/wirecutters)))
 		return ..()
 	if(locked && (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)))

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -9,7 +9,7 @@
 	user << "<span class='notice'>You need a crowbar to pry this open!</span>"
 	return
 
-/obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/crowbar))
 		new /obj/item/stack/sheet/wood(src)
 		var/turf/T = get_turf(src)
@@ -37,7 +37,7 @@
 	name = "cow crate"
 	icon_state = "lisacrate"
 
-/obj/structure/largecrate/cow/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/largecrate/cow/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/crowbar))
 		new /mob/living/simple_animal/cow(loc)
 	..()
@@ -46,7 +46,7 @@
 	name = "goat crate"
 	icon_state = "lisacrate"
 
-/obj/structure/largecrate/goat/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/largecrate/goat/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/crowbar))
 		new /mob/living/simple_animal/hostile/retaliate/goat(loc)
 	..()
@@ -55,7 +55,7 @@
 	name = "chicken crate"
 	icon_state = "lisacrate"
 
-/obj/structure/largecrate/chick/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/largecrate/chick/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/crowbar))
 		var/num = rand(4, 6)
 		for(var/i = 0, i < num, i++)
@@ -66,7 +66,7 @@
 	name = "Mysterious Crate"
 	icon_state = "lisacrate"
 
-/obj/structure/largecrate/ninja/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/largecrate/ninja/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/crowbar))
 		new /obj/item/clothing/gloves/space_ninja(loc)
 		new /obj/item/clothing/mask/gas/voice/space_ninja(loc)
@@ -80,7 +80,7 @@
 	name = "cat crate"
 	icon_state = "lisacrate"
 
-/obj/structure/largecrate/cat/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/largecrate/cat/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/crowbar))
 		new /mob/living/simple_animal/cat(loc)
 	..()

code/game/objects/structures/displaycase.dm

@@ -5,7 +5,7 @@
 	var/obj/item/weapon/airlock_electronics/circuit = null
 	var/state=0
 
-/obj/structure/displaycase_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/displaycase_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	var/pstate=state
 	var/turf/T=get_turf(src)
 	switch(state)
@@ -162,7 +162,7 @@
 	return
 
 
-/obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/card))
 		var/obj/item/weapon/card/id/I=W
 		if(!check_access(I))

code/game/objects/structures/door_assembly.dm

@@ -135,7 +135,7 @@ obj/structure/door_assembly
 
 
 
-/obj/structure/door_assembly/attackby(obj/item/W as obj, mob/user as mob)
+/obj/structure/door_assembly/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/pen))
 		var/t = copytext(stripped_input(user, "Enter the name for the door.", src.name, src.created_name),1,MAX_NAME_LEN)
 		if(!t)	return

code/game/objects/structures/electricchair.dm

@@ -12,7 +12,7 @@
 	overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir)
 	return
 
-/obj/structure/stool/bed/chair/e_chair/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/stool/bed/chair/e_chair/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/wrench))
 		var/obj/structure/stool/bed/chair/C = new /obj/structure/stool/bed/chair(loc)
 		playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)

code/game/objects/structures/engicart.dm

@@ -20,7 +20,7 @@
 	updateUsrDialog()
 	user << "<span class='notice'>You put [I] into [src].</span>"
 	return
-/obj/structure/engineeringcart/attackby(obj/item/I, mob/user)
+/obj/structure/engineeringcart/attackby(obj/item/I, mob/user, params)
 	var/fail_msg = "<span class='notice'>There is already one of those in [src].</span>"
 	if(!I.is_robot_module())
 		if(istype(I, /obj/item/stack/sheet/glass))

code/game/objects/structures/extinguisher.dm

@@ -9,7 +9,7 @@
 	var/opened = 0
 
 
-/obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user)
+/obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user, params)
 	if(isrobot(user) || isalien(user))
 		return
 	if(istype(O, /obj/item/weapon/extinguisher))

code/game/objects/structures/false_walls.dm

@@ -165,7 +165,7 @@
 		qdel(src)
 	return T
 
-/obj/structure/falsewall/attackby(obj/item/weapon/W, mob/user)
+/obj/structure/falsewall/attackby(obj/item/weapon/W, mob/user, params)
 	if(opening)
 		user << "<span class='warning'>You must wait until the door has stopped moving.</span>"
 		return
@@ -271,7 +271,7 @@
 	var/active = null
 	var/last_event = 0
 
-/obj/structure/falsewall/uranium/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/falsewall/uranium/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	radiate()
 	..()
 

code/game/objects/structures/foodcart.dm

@@ -29,7 +29,7 @@
 	user << "<span class='notice'>You put [I] into [src].</span>"
 	return
 
-/obj/structure/foodcart/attackby(obj/item/I, mob/user)
+/obj/structure/foodcart/attackby(obj/item/I, mob/user, params)
 	var/fail_msg = "<span class='notice'>There are no open spaces for this in [src].</span>"
 	if(!I.is_robot_module())
 		if(istype(I, /obj/item/weapon/reagent_containers/food/snacks))

code/game/objects/structures/girders.dm

@@ -6,7 +6,7 @@
 	var/state = 0
 	var/health = 200
 
-/obj/structure/girder/attackby(obj/item/W as obj, mob/user as mob)
+/obj/structure/girder/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/wrench) && state == 0)
 		if(anchored && !istype(src,/obj/structure/girder/displaced))
 			playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
@@ -231,7 +231,7 @@
 	layer = 2
 	var/health = 250
 
-/obj/structure/cultgirder/attackby(obj/item/W as obj, mob/user as mob)
+/obj/structure/cultgirder/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/wrench))
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
 		user << "\blue Now disassembling the girder"

code/game/objects/structures/grille.dm

@@ -142,7 +142,7 @@
 		healthcheck()
 	return
 
-/obj/structure/grille/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/grille/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	user.changeNext_move(CLICK_CD_MELEE)
 	if(iswirecutter(W))
 		if(!shock(user, 100))

code/game/objects/structures/inflatable.dm

@@ -101,7 +101,7 @@
 		attack_generic(user, rand(10, 15))
 
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
+	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 		if(!istype(W)) return
 
 		if (can_puncture(W))

code/game/objects/structures/janicart.dm

@@ -38,7 +38,7 @@
 		if((INFINITY * -1) to 0)
 			usr << "It appears completely unsalvageable"
 
-/obj/structure/stool/bed/chair/cart/attackby(obj/item/W, mob/user)
+/obj/structure/stool/bed/chair/cart/attackby(obj/item/W, mob/user, params)
 	if (istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
 		if (WT.remove_fuel(0))
@@ -287,7 +287,7 @@
 	if(mybag)
 		usr << "\A [mybag] is hanging on the [name]."
 
-/obj/structure/stool/bed/chair/cart/janicart/attackby(obj/item/W, mob/user)
+/obj/structure/stool/bed/chair/cart/janicart/attackby(obj/item/W, mob/user, params)
 	..()
 	if(istype(W, /obj/item/weapon/mop))
 		if(reagents.total_volume >= 2)
@@ -442,7 +442,7 @@
 	return
 
 
-/obj/structure/janitorialcart/attackby(obj/item/I, mob/user)
+/obj/structure/janitorialcart/attackby(obj/item/I, mob/user, params)
 	var/fail_msg = "<span class='notice'>There is already one of those in [src].</span>"
 
 	if(!I.is_robot_module())
@@ -504,7 +504,7 @@
 					"You hear ratchet.")
 				anchored = 0
 		else if(mybag)
-			mybag.attackby(I, user)
+			mybag.attackby(I, user, params)
 	else
 		usr << "<span class='warning'>You cannot interface your modules [src]!</span>"
 

code/game/objects/structures/kitchen_spike.dm

@@ -15,7 +15,7 @@
 	attack_paw(mob/user as mob)
 		return src.attack_hand(usr)
 
-	attackby(obj/item/weapon/grab/G as obj, mob/user as mob)
+	attackby(obj/item/weapon/grab/G as obj, mob/user as mob, params)
 		if(!istype(G, /obj/item/weapon/grab))
 			return
 		if(istype(G.affecting, /mob/living/carbon/monkey))

code/game/objects/structures/ladders.dm

@@ -69,5 +69,5 @@
 /obj/structure/ladder/attack_paw(mob/user as mob)
 	return attack_hand(user)
 
-/obj/structure/ladder/attackby(obj/item/weapon/W, mob/user as mob)
+/obj/structure/ladder/attackby(obj/item/weapon/W, mob/user as mob, params)
 	return attack_hand(user)

code/game/objects/structures/lamarr_cage.dm

@@ -66,7 +66,7 @@
 	return
 
 
-/obj/structure/lamarr/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/lamarr/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	src.health -= W.force
 	src.healthcheck()
 	..()

code/game/objects/structures/lattice.dm

@@ -49,7 +49,7 @@
 		else
 	return
 
-/obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob)
+/obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob, params)
 
 	if (istype(C, /obj/item/stack/tile/plasteel) || istype(C, /obj/item/stack/rods))
 		var/turf/T = get_turf(src)

code/game/objects/structures/mineral_doors.dm

@@ -102,7 +102,7 @@
 		else
 			icon_state = mineralType
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
+	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 		if(istype(W,/obj/item/weapon/pickaxe))
 			var/obj/item/weapon/pickaxe/digTool = W
 			user << "You start digging the [name]."
@@ -187,7 +187,7 @@
 /obj/structure/mineral_door/transparent/plasma
 	mineralType = "plasma"
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
+	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 		if(istype(W,/obj/item/weapon/weldingtool))
 			var/obj/item/weapon/weldingtool/WT = W
 			if(WT.remove_fuel(0, user))

code/game/objects/structures/mirror.dm

@@ -71,7 +71,7 @@
 	..()
 
 
-/obj/structure/mirror/attackby(obj/item/I as obj, mob/living/user as mob)
+/obj/structure/mirror/attackby(obj/item/I as obj, mob/living/user as mob, params)
 	user.do_attack_animation(src)
 	if(shattered)
 		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)

code/game/objects/structures/mop_bucket.dm

@@ -19,7 +19,7 @@
 	usr << text("\icon[] [] contains [] units of water left!", src, src.name, src.reagents.total_volume)
 	..()
 
-/obj/structure/mopbucket/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/mopbucket/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if (istype(W, /obj/item/weapon/mop))
 		if (src.reagents.total_volume >= 2)
 			src.reagents.trans_to(W, 2)

code/game/objects/structures/morgue.dm

@@ -104,7 +104,7 @@
 	update()
 	return
 
-/obj/structure/morgue/attackby(P as obj, mob/user as mob)
+/obj/structure/morgue/attackby(P as obj, mob/user as mob, params)
 	if (istype(P, /obj/item/weapon/pen))
 		var/t = input(user, "What would you like the label to be?", text("[]", src.name), null)  as text
 		if (user.get_active_hand() != P)
@@ -278,7 +278,7 @@
 	src.add_fingerprint(user)
 	update()
 
-/obj/structure/crematorium/attackby(P as obj, mob/user as mob)
+/obj/structure/crematorium/attackby(P as obj, mob/user as mob, params)
 	if (istype(P, /obj/item/weapon/pen))
 		var/t = input(user, "What would you like the label to be?", text("[]", src.name), null)  as text
 		if (user.get_active_hand() != P)