#Added mechs as chargables for ninjas.

#Private lockers can now be sliced open with the ninja sword.
#Added a SpiderOS verb to the ninja suit when initialized. It acts as a lite PDA with some unique features. If I had more time, I would revise the existing PDA system to follow the format of SpiderOS which would make the former run a lot faster.
#Added an adrenaline boost ability for the ninja suit. It will near instantly remove paralysis/stun/etc but has only three uses.
#Added ninja stars ability. Ranged projectiles, the user randomly picks a target from nearby living enemies. Projectile itself is wip.
#Maximum charge for the suit is 30000, or 300%.
#More names for ninja name gen.

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

code/modules/power/apc.dm

@@ -459,14 +459,18 @@
 			user << "\blue Now charging battery..."
 			G.draining = 1
 			if(cell&&cell.charge)
-				var/drain = 0
-				var/totaldrain = 0
+				var/drain = 0//To drain from battery.
+				var/maxcapacity = 0//Safety check for full battery.
+				var/totaldrain = 0//Total energy drained.
 				var/datum/effects/system/spark_spread/spark_system = new /datum/effects/system/spark_spread()
 				spark_system.set_up(5, 0, src.loc)
-				while(cell.charge>0)
+				while(cell.charge>0&&!maxcapacity)
 					drain = rand(100,300)
 					if(cell.charge<drain)
 						drain = cell.charge
+					if(S.charge+drain>S.maxcharge)
+						drain = S.maxcharge-S.charge
+						maxcapacity = 1//Reached maximum battery capacity.
 					if (do_after(U,10))
 						spark_system.start()
 						playsound(src.loc, "sparks", 50, 1)

code/modules/power/cell.dm

@@ -72,10 +72,13 @@
 			if(charge)
 				user << "\blue Now charging battery..."
 				G.draining = 1
-				if (do_after(user,50))
+				if (do_after(user,30))
 					U << "\blue Gained <B>[charge]</B> energy from the cell."
+					if(S.charge+charge>S.maxcharge)
+						S.charge=S.maxcharge
+					else
+						S.charge+=charge
 					charge = 0
-					S.charge+=charge
 					G.draining = 0
 					corrupt()
 					updateicon()

code/modules/power/smes.dm

@@ -192,13 +192,17 @@
 			G.draining = 1
 			if(charge)
 				var/drain = 0
+				var/maxcapacity = 0
 				var/totaldrain = 0
 				var/datum/effects/system/spark_spread/spark_system = new /datum/effects/system/spark_spread()
 				spark_system.set_up(5, 0, src.loc)
-				while(charge>0)
+				while(charge>0&&!maxcapacity)
 					drain = rand(100,300)
 					if(charge<drain)
 						drain = charge
+					if(S.charge+drain>S.maxcharge)
+						drain = S.maxcharge-S.charge
+						maxcapacity = 1
 					if (do_after(U,10))
 						spark_system.start()
 						playsound(src.loc, "sparks", 50, 1)