Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

code/game/events/EventProcs/ninja_abilities.dm

@@ -213,7 +213,7 @@ This could be a lot better but I'm too tired atm.*/
 			A.yo = targloc.y - curloc.y
 			A.xo = targloc.x - curloc.x
 			cell.charge-=(C*10)
-			A.process()
+			A.fired()
 		else
 			U << "\red There are no targets in view."
 	return

code/game/machinery/portable_turret.dm

@@ -567,7 +567,7 @@ Neutralize All Unidentified Life Signs: []<BR>"},
 	A.yo = U.y - T.y
 	A.xo = U.x - T.x
 	spawn( 1 )
-		A.process()
+		A.fired()
 	return