-New sprites APC sprites by TankNut!

-New wraith sprites by TankNut!
-Decreased flare duration, again(!)
-Made a based interact proc and changed the updateDialog to call that instead of attack_hand. This caused issues with the APC and getting the power cell out of it. I then changed all machines that had their own defined proc (that was everywhere)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5001 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/assembly/assembly.dm

@@ -46,7 +46,7 @@
 	proc/holder_movement()							//Called when the holder is moved
 		return
 
-	proc/interact(mob/user as mob)					//Called when attack_self is called
+	interact(mob/user as mob)					//Called when attack_self is called
 		return
 
 

code/modules/power/antimatter/control.dm

@@ -260,7 +260,7 @@
 	return
 
 
-/obj/machinery/power/am_control_unit/proc/interact(mob/user)
+/obj/machinery/power/am_control_unit/interact(mob/user)
 	if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
 		if(!istype(user, /mob/living/silicon/ai))
 			user.unset_machine()

code/modules/power/apc.dm

@@ -438,10 +438,12 @@
 /obj/machinery/power/apc/attack_hand(mob/user)
 //	if (!can_use(user)) This already gets called in interact() and in topic()
 //		return
+	if(!user)
+		return
 	src.add_fingerprint(user)
-	if(opened && (!issilicon(user)))
+	if(usr == user && opened && (!issilicon(user)))
 		if(cell)
-			usr.put_in_hands(cell)
+			user.put_in_hands(cell)
 			cell.add_fingerprint(user)
 			cell.updateicon()
 
@@ -450,7 +452,7 @@
 			//user << "You remove the power cell."
 			charging = 0
 			src.updateicon()
-			return
+		return
 	if(stat & (BROKEN|MAINT))
 		return
 
@@ -488,7 +490,7 @@
 
 
 
-/obj/machinery/power/apc/proc/interact(mob/user)
+/obj/machinery/power/apc/interact(mob/user)
 	if(!user)
 		return
 

code/modules/power/generator.dm

@@ -121,7 +121,7 @@
 	interact(user)
 
 
-/obj/machinery/power/generator/proc/interact(mob/user)
+/obj/machinery/power/generator/interact(mob/user)
 	if ( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai)))
 		user.unset_machine()
 		user << browse(null, "window=teg")

code/modules/power/generator_type2.dm

@@ -98,7 +98,7 @@
 	interact(user)
 
 
-/obj/machinery/power/generator_type2/proc/interact(mob/user)
+/obj/machinery/power/generator_type2/interact(mob/user)
 	if ( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai)))
 		user.unset_machine()
 		user << browse(null, "window=teg")

code/modules/power/port_gen.dm

@@ -236,7 +236,7 @@ display round(lastgen) and plasmatank amount
 /obj/machinery/power/port_gen/pacman/attack_paw(mob/user as mob)
 	interact(user)
 
-/obj/machinery/power/port_gen/pacman/proc/interact(mob/user)
+/obj/machinery/power/port_gen/pacman/interact(mob/user)
 	if (get_dist(src, user) > 1 )
 		if (!istype(user, /mob/living/silicon/ai))
 			user.unset_machine()

code/modules/power/singularity/particle_accelerator/particle_control.dm

@@ -202,7 +202,7 @@
 	return 1
 
 
-/obj/machinery/particle_accelerator/control_box/proc/interact(mob/user)
+/obj/machinery/particle_accelerator/control_box/interact(mob/user)
 	if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
 		if(!istype(user, /mob/living/silicon))
 			user.unset_machine()

code/modules/power/smes.dm

@@ -178,7 +178,7 @@
 	interact(user)
 
 
-/obj/machinery/power/smes/proc/interact(mob/user)
+/obj/machinery/power/smes/interact(mob/user)
 	if(get_dist(src, user) > 1 && !istype(user, /mob/living/silicon/ai))
 		user.unset_machine()
 		user << browse(null, "window=smes")

code/modules/power/solar.dm

@@ -171,7 +171,6 @@
 		tracker_update(var/angle)
 		set_panels(var/cdir)
 		broken()
-		interact(mob/user)
 
 
 	New()

code/modules/reagents/Chemistry-Machinery.dm

@@ -828,7 +828,7 @@
 	user.set_machine(src)
 	interact(user)
 
-/obj/machinery/reagentgrinder/proc/interact(mob/user as mob) // The microwave Menu
+/obj/machinery/reagentgrinder/interact(mob/user as mob) // The microwave Menu
 	var/is_chamber_empty = 0
 	var/is_beaker_ready = 0
 	var/processing_chamber = ""

code/modules/recycling/disposal.dm

@@ -215,7 +215,7 @@
 		interact(user, 0)
 
 	// user interaction
-	proc/interact(mob/user, var/ai=0)
+	interact(mob/user, var/ai=0)
 
 		src.add_fingerprint(user)
 		if(stat & BROKEN)