Fixes proc arguments

code/modules/assembly/assembly.dm

@@ -50,7 +50,7 @@
 
 
 //Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
-/obj/item/device/assembly/proc/pulsed(var/radio = 0)
+/obj/item/device/assembly/proc/pulsed(radio = 0)
 	if(holder && (wires & WIRE_RECEIVE))
 		activate()
 	if(radio && (wires & WIRE_RADIO_RECEIVE))
@@ -59,7 +59,7 @@
 
 
 //Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct
-/obj/item/device/assembly/proc/pulse(var/radio = 0)
+/obj/item/device/assembly/proc/pulse(radio = 0)
 	if(src.connected && src.wires)
 		connected.Pulse(src)
 		return 1
@@ -86,7 +86,7 @@
 	return secured
 
 
-/obj/item/device/assembly/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/item/device/assembly/attackby(obj/item/weapon/W, mob/user, params)
 	if(isassembly(W))
 		var/obj/item/device/assembly/A = W
 		if((!A.secured) && (!secured))
@@ -119,7 +119,7 @@
 		user << "\The [src] can be attached to other things."
 
 
-/obj/item/device/assembly/attack_self(mob/user as mob)
+/obj/item/device/assembly/attack_self(mob/user)
 	if(!user)
 		return 0
 	user.set_machine(src)
@@ -127,6 +127,6 @@
 	return 1
 
 
-/obj/item/device/assembly/interact(mob/user as mob)
+/obj/item/device/assembly/interact(mob/user)
 	return //HTML MENU FOR WIRES GOES HERE
 

code/modules/assembly/bomb.dm

@@ -23,7 +23,7 @@
 		overlays += bombassembly.overlays
 		overlays += "bomb_assembly"
 
-/obj/item/device/onetankbomb/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/item/device/onetankbomb/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/device/analyzer))
 		bombtank.attackby(W, user)
 		return
@@ -54,7 +54,7 @@
 	add_fingerprint(user)
 	..()
 
-/obj/item/device/onetankbomb/attack_self(mob/user as mob) //pressing the bomb accesses its assembly
+/obj/item/device/onetankbomb/attack_self(mob/user) //pressing the bomb accesses its assembly
 	bombassembly.attack_self(user, 1)
 	add_fingerprint(user)
 	return
@@ -77,7 +77,7 @@
 	if(bombassembly)
 		bombassembly.Crossed(AM)
 
-/obj/item/device/onetankbomb/on_found(mob/finder as mob) //for mousetraps
+/obj/item/device/onetankbomb/on_found(mob/finder) //for mousetraps
 	if(bombassembly)
 		bombassembly.on_found(finder)
 

code/modules/assembly/holder.dm

@@ -16,14 +16,14 @@
 	return 1
 
 
-/obj/item/device/assembly_holder/proc/assemble(var/obj/item/device/assembly/A, var/obj/item/device/assembly/A2, var/mob/user)
+/obj/item/device/assembly_holder/proc/assemble(obj/item/device/assembly/A, obj/item/device/assembly/A2, mob/user)
 	attach(A,user)
 	attach(A2,user)
 	name = "[A.name]-[A2.name] assembly"
 	update_icon()
 	feedback_add_details("assembly_made","[name]")
 
-/obj/item/device/assembly_holder/proc/attach(var/obj/item/device/assembly/A, var/mob/user)
+/obj/item/device/assembly_holder/proc/attach(obj/item/device/assembly/A, mob/user)
 	if(!A.remove_item_from_storage(src))
 		if(user)
 			user.remove_from_mob(A)
@@ -61,7 +61,7 @@
 	if(a_right)
 		a_right.Crossed(AM)
 
-/obj/item/device/assembly_holder/on_found(mob/finder as mob)
+/obj/item/device/assembly_holder/on_found(mob/finder)
 	if(a_left)
 		a_left.on_found(finder)
 	if(a_right)
@@ -81,7 +81,7 @@
 	..()
 	return
 
-/obj/item/device/assembly_holder/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/item/device/assembly_holder/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/screwdriver))
 		var/turf/T = get_turf(src)
 		if(!T)
@@ -96,7 +96,7 @@
 	else
 		..()
 
-/obj/item/device/assembly_holder/attack_self(mob/user as mob)
+/obj/item/device/assembly_holder/attack_self(mob/user)
 	src.add_fingerprint(user)
 	if(!a_left || !a_right)
 		user << "<span class='danger'>Assembly part missing!</span>"
@@ -111,7 +111,7 @@
 		a_right.attack_self(user)
 
 
-/obj/item/device/assembly_holder/proc/process_activation(var/obj/D, var/normal = 1, var/special = 1)
+/obj/item/device/assembly_holder/proc/process_activation(obj/D, normal = 1, special = 1)
 	if(!D)
 		return 0
 	if((normal) && (a_right) && (a_left))

code/modules/assembly/igniter.dm

@@ -21,7 +21,7 @@
 	return 1
 
 
-/obj/item/device/assembly/igniter/attack_self(mob/user as mob)
+/obj/item/device/assembly/igniter/attack_self(mob/user)
 	activate()
 	add_fingerprint(user)
 	return

code/modules/assembly/infrared.dm

@@ -93,7 +93,7 @@
 		process_cooldown()
 	return
 
-/obj/item/device/assembly/infra/interact(mob/user as mob)//TODO: change this this to the wire control panel
+/obj/item/device/assembly/infra/interact(mob/user)//TODO: change this this to the wire control panel
 	if(is_secured(user))
 		user.set_machine(src)
 		var/dat = text("<TT><B>Infrared Laser</B>\n<B>Status</B>: []<BR>\n<B>Visibility</B>: []<BR>\n</TT>", (on ? text("<A href='?src=\ref[];state=0'>On</A>", src) : text("<A href='?src=\ref[];state=1'>Off</A>", src)), (src.visible ? text("<A href='?src=\ref[];visible=0'>Visible</A>", src) : text("<A href='?src=\ref[];visible=1'>Invisible</A>", src)))

code/modules/assembly/mousetrap.dm

@@ -36,7 +36,7 @@
 	if(holder)
 		holder.update_icon()
 
-/obj/item/device/assembly/mousetrap/proc/triggered(mob/target as mob, var/type = "feet")
+/obj/item/device/assembly/mousetrap/proc/triggered(mob/target, type = "feet")
 	if(!armed)
 		return
 	var/obj/item/organ/limb/affecting = null
@@ -71,7 +71,7 @@
 	pulse(0)
 
 
-/obj/item/device/assembly/mousetrap/attack_self(mob/living/carbon/human/user as mob)
+/obj/item/device/assembly/mousetrap/attack_self(mob/living/carbon/human/user)
 	if(!armed)
 		user << "<span class='notice'>You arm [src].</span>"
 	else
@@ -89,7 +89,7 @@
 	playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
 
 
-/obj/item/device/assembly/mousetrap/attack_hand(mob/living/carbon/human/user as mob)
+/obj/item/device/assembly/mousetrap/attack_hand(mob/living/carbon/human/user)
 	if(armed)
 		if(((user.getBrainLoss() >= 60) || user.disabilities & CLUMSY) && prob(50))
 			var/which_hand = "l_hand"
@@ -102,7 +102,7 @@
 	..()
 
 
-/obj/item/device/assembly/mousetrap/Crossed(var/atom/movable/AM as mob|obj)
+/obj/item/device/assembly/mousetrap/Crossed(atom/movable/AM as mob|obj)
 	if(armed)
 		if(ishuman(AM))
 			var/mob/living/carbon/H = AM
@@ -119,7 +119,7 @@
 	..()
 
 
-/obj/item/device/assembly/mousetrap/on_found(mob/finder as mob)
+/obj/item/device/assembly/mousetrap/on_found(mob/finder)
 	if(armed)
 		finder.visible_message("<span class='warning'>[finder] accidentally sets off [src], breaking their fingers.</span>", \
 							   "<span class='warning'>You accidentally trigger [src]!</span>")

code/modules/assembly/proximity.dm

@@ -98,7 +98,7 @@
 	return
 
 
-/obj/item/device/assembly/prox_sensor/interact(mob/user as mob)//TODO: Change this to the wires thingy
+/obj/item/device/assembly/prox_sensor/interact(mob/user)//TODO: Change this to the wires thingy
 	if(is_secured(user))
 		var/second = time % 60
 		var/minute = (time - second) / 60

code/modules/assembly/shock_kit.dm

@@ -14,7 +14,7 @@
 	..()
 	return
 
-/obj/item/assembly/shock_kit/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/item/assembly/shock_kit/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/wrench))
 		var/turf/T = loc
 		if(ismob(T))
@@ -30,7 +30,7 @@
 	add_fingerprint(user)
 	return
 
-/obj/item/assembly/shock_kit/attack_self(mob/user as mob)
+/obj/item/assembly/shock_kit/attack_self(mob/user)
 	part1.attack_self(user)
 	part2.attack_self(user)
 	add_fingerprint(user)

code/modules/assembly/signaler.dm

@@ -38,7 +38,7 @@
 		holder.update_icon()
 	return
 
-/obj/item/device/assembly/signaler/interact(mob/user as mob, flag1)
+/obj/item/device/assembly/signaler/interact(mob/user, flag1)
 	if(is_secured(user))
 		var/t1 = "-------"
 	//	if ((src.b_stat && !( flag1 )))

code/modules/assembly/timer.dm

@@ -66,7 +66,7 @@
 	return
 
 
-/obj/item/device/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires
+/obj/item/device/assembly/timer/interact(mob/user)//TODO: Have this use the wires
 	if(is_secured(user))
 		var/second = time % 60
 		var/minute = (time - second) / 60