Merge pull request #99 from SamCroswell/master

Space Ninja Spawn and Stealth Glove Fix

code/modules/admin/admin_verbs.dm

@@ -94,7 +94,6 @@ var/list/admin_verbs_fun = list(
 	/client/proc/toggle_random_events,
 	/client/proc/set_ooc,
 	/client/proc/editappear,
-	/client/proc/toggle_kamikaze
 	)
 var/list/admin_verbs_spawn = list(
 	/datum/admins/proc/spawn_atom,		/*allows us to spawn instances*/

code/modules/admin/verbs/randomverbs.dm

@@ -918,19 +918,4 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		config.allow_random_events = 0
 		usr << "Random events disabled"
 		message_admins("Admin [key_name_admin(usr)] has disabled random events.", 1)
-	feedback_add_details("admin_verb","TRE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-var/global/kamikaze_allowed = 0
-/client/proc/toggle_kamikaze()
-
-	set category = "Fun"
-	set name = "Toggle Kamikaze"
-	set desc = "Toggles the ability for Ninjas to use Kamikaze mode."
-
-	if (kamikaze_allowed == 0)
-		kamikaze_allowed = 1
-		usr << "Kamikaze mode globally enabled."
-	else
-		kamikaze_allowed = 0
-		usr << "Kamikaze mode globally disabled."
+	feedback_add_details("admin_verb","TRE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/clothing/gloves/ninja.dm

@@ -95,8 +95,6 @@
 		drain("MECHA",A,suit)
 		return 1
 		/*
-		Commented out for further tweaks, at the moment it instantly drains everything the cell
-		has with no regard for how large the cell in your suit is. This is silly.
 	if(istype(A,/obj/item/weapon/cell))
 		A.add_fingerprint(H)
 		drain("CELL",A,suit)

code/modules/events/tgevents/ninja.dm

@@ -2336,17 +2336,32 @@ ________________________________________________________________________________
 
 		if("CELL")
 			var/obj/item/weapon/cell/A = target
+			var/drainrate
 			if(A.charge)
+				var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
+				spark_system.set_up(5, 0, A.loc)
 				if (G.candrain&&do_after(U,30))
-					U << "\blue Gained <B>[A.charge]</B> energy from the cell."
-					if(S.cell.charge+A.charge>S.cell.maxcharge)
-						S.cell.charge=S.cell.maxcharge
+					drain = rand(G.mindrain,G.maxdrain)
+					if(S.cell.charge+A.charge<S.cell.maxcharge)
+						while(S.cell.charge!=S.cell.maxcharge)
+							while(S.cell.maxcharge-S.cell.charge > drain)
+								S.cell.charge+=drain
+								totaldrain+=drain
+								A.charge-=drain
+								spark_system.start()
+								playsound(A.loc, "sparks", 50, 1)
+							S.cell.charge = S.cell.maxcharge
 					else
-						S.cell.charge+=A.charge
-					A.charge = 0
+						while(A.charge)
+							S.cell.charge+=drain
+							totaldrain+=drain
+							A.charge-=drain
+							spark_system.start()
+							playsound(A.loc, "sparks", 50, 1)
 					G.draining = 0
 					A.corrupt()
 					A.updateicon()
+					U << "\blue Gained <B>[totaldrain]</B> energy from the cell."
 				else
 					U << "\red Procedure interrupted. Protocol terminated."
 			else