Fixed SpiderOS chemical injections to work a lot better. Thanks to Muskets and Darem.

Added a new reagent proc (trans_id_to) to transfer a specific reagent from a list to the target.
Finished SpiderOS. If anyone plans to revise PDA code, or maybe do something similar, I highly recommend looking at the SpiderOS verb first.
Ninjas may now drain energy from exposed wires, ala a powersink. It takes longer than APCs to begin charging and drains slower.
Misc bug fixes and improvements.

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

code/WorkInProgress/Chemistry-Holder.dm

@@ -79,6 +79,31 @@ datum
 				src.handle_reactions()
 				return amount
 
+			trans_id_to(var/obj/target, var/reagent, var/amount=1, var/preserve_data=1)//Not sure why this proc didn't exist before. It does now! /N
+				if (!target)
+					return
+				if (!target.reagents || src.total_volume<=0 || !src.get_reagent_amount(reagent))
+					return
+
+				var/datum/reagents/R = target.reagents
+				if(src.get_reagent_amount(reagent)<amount)
+					amount = src.get_reagent_amount(reagent)
+				amount = min(amount, R.maximum_volume-R.total_volume)
+				var/trans_data = null
+				for (var/datum/reagent/current_reagent in src.reagent_list)
+					if(current_reagent.id == reagent)
+						if(preserve_data)
+							trans_data = current_reagent.data
+						R.add_reagent(current_reagent.id, amount, trans_data)
+						src.remove_reagent(current_reagent.id, amount)
+						break
+
+				src.update_total()
+				R.update_total()
+				R.handle_reactions()
+				src.handle_reactions()
+				return amount
+
 /*
 				if (!target) return
 				var/total_transfered = 0

code/WorkInProgress/Chemistry-Readme.dm

@@ -34,6 +34,11 @@ About the Holder:
 			to transfer to and the amount you want to transfer. Its return value is the
 			actual amount transfered (if one of the objects is full/empty)
 
+		trans_id_to(var/obj/target, var/reagent, var/amount)
+			Same as above but only for a specific reagent in the reagent list.
+			If the specified amount is greater than what is available, it will use
+			the amount of the reagent that is available. If no reagent exists, returns null.
+
 		metabolize(var/mob/M)
 			This proc is called by the mobs life proc. It simply calls on_mob_life for
 			all contained reagents. You shouldnt have to use this one directly.

code/defines/obj/clothing/suit.dm

@@ -363,17 +363,15 @@
 	slowdown = 1
 	radiation_protection = 0.75
 	var/affecting = null
-	var/active = 0
+	var/active = 0//Stealth off.
 	var/charge = 9000.0//Starts at 90% of normal capacity.
 	var/maxcharge = 30000.0//I want the suit upgradable if the ninja is able to find the parts but for now this'll do.
-	var/initialize = 0
-	var/spideros = 1//Mode of SpiderOS. 1=main menu||2=medical screen||3=atmos check||4=notes/misc
+	var/initialize = 0//Suit starts off.
+	var/spideros = 0//Mode of SpiderOS. This can change so I won't bother listing the modes here (0 is hub). Check clothing.dm for how it all works.
 	var/sbombs = 10.0//Number of starting ninja smoke bombs.
-	var/aboost = 3.0//Number of adrenaline boosts.
-	var/chem1 = 3.0//Dylovene/Anti Tox
-	var/chem2 = 3.0//Dexalin Plus
-	var/chem3 = 3.0//Tricordazine
-	var/chem4 = 3.0//Spacelin
+	var/aboost = 3.0//Number of adrenaline boosters.
+	var/amount_per_transfer_from_this = 20//How much reagent is transferred.
+	var/datum/effects/system/spark_spread/spark_system
 
 /obj/item/clothing/suit/space/pirate
 	name = "pirate coat"

code/defines/obj/weapon.dm

@@ -1265,7 +1265,6 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
 	throw_range = 1
 	w_class = 4.0//So you can't hide it in your pocket or some such.
 	flags = FPRINT | TABLEPASS | NOSHIELD
-	var/affecting = null
 	var/datum/effects/system/spark_spread/spark_system
 
 /obj/item/weapon/table_parts

code/game/mecha/mecha.dm

@@ -311,7 +311,7 @@
 				var/drain = 0
 				var/maxcapacity = 0
 				var/totaldrain = 0
-				while(cell.charge>0&&!maxcapacity)
+				while(G.candrain&&cell.charge>0&&!maxcapacity)
 					drain = rand(100,300)
 					if(cell.charge<drain)
 						drain = cell.charge

code/game/objects/items/clothing.dm

@@ -312,7 +312,18 @@ NINJA MASK
 //SPESS NINJA STUFF
 
 /obj/item/clothing/suit/space/space_ninja/New()
-	src.verbs += /obj/item/clothing/suit/space/space_ninja/proc/init
+	..()
+	src.verbs += /obj/item/clothing/suit/space/space_ninja/proc/init//suit initialize verb
+	spark_system = new /datum/effects/system/spark_spread()//spark initialize
+	spark_system.set_up(5, 0, src)
+	spark_system.attach(src)
+	var/datum/reagents/R = new/datum/reagents(480)//reagent initialize
+	reagents = R
+	R.my_atom = src
+	reagents.add_reagent("tricordrazine", 80)
+	reagents.add_reagent("dexalinp", 80)
+	reagents.add_reagent("spaceacillin", 80)
+	reagents.add_reagent("anti_toxin", 80)
 
 /obj/item/clothing/suit/space/space_ninja/proc/ntick(var/mob/living/carbon/human/U as mob)
 	set hidden = 1
@@ -330,7 +341,7 @@ NINJA MASK
 				U.swap_hand()//swap hand
 				U.drop_item()//drop sword
 			else	A += 20
-		else if(active)
+		if(active)
 			A += 25
 		charge-=A
 		if(charge<0)
@@ -399,6 +410,7 @@ NINJA MASK
 		verbs -= /obj/item/clothing/suit/space/space_ninja/proc/init
 		verbs += /obj/item/clothing/suit/space/space_ninja/proc/deinit
 		verbs += /obj/item/clothing/suit/space/space_ninja/proc/spideros
+		U.gloves.verbs += /obj/item/clothing/gloves/space_ninja/proc/drain_wire
 		U.gloves.verbs += /obj/item/clothing/gloves/space_ninja/proc/toggled
 		initialize=1
 		affecting=U
@@ -476,6 +488,8 @@ NINJA MASK
 	if(istype(U.gloves, /obj/item/clothing/gloves/space_ninja))
 		U.gloves:canremove=1
 		U.gloves:candrain=0
+		U.gloves:draining=0
+		U.gloves.verbs -= /obj/item/clothing/gloves/space_ninja/proc/drain_wire
 		U.gloves.verbs -= /obj/item/clothing/gloves/space_ninja/proc/toggled
 	canremove=1
 	U << "\blue Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: <B>FINISHED</B>."
@@ -493,15 +507,17 @@ NINJA MASK
 
 	var/mob/living/carbon/human/U = usr
 	var/dat = "<html><head><title>SpiderOS</title></head><body bgcolor=\"#3D5B43\" text=\"#DB2929\"><style>a, a:link, a:visited, a:active, a:hover { color: #DB2929; }img {border-style:none;}</style>"
-	if(spideros==1)
-		dat += "<a href='byond://?src=\ref[src];choice=1'><img src=sos_7.png> Refresh</a>"
-		dat += " | <a href='byond://?src=\ref[src];choice=0'><img src=sos_8.png> Close</a>"
+	/*Here is where you would create a link for the cartridge used if the item has one.
+	As noted below, it's not worth the effort to make the cartridge removable unless it's done from the hub.*/
+	if(spideros==0)
+		dat += "<a href='byond://?src=\ref[src];choice=Refresh'><img src=sos_7.png> Refresh</a>"
+		dat += " | <a href='byond://?src=\ref[src];choice=Close'><img src=sos_8.png> Close</a>"
 	else
-		dat += "<a href='byond://?src=\ref[src];choice=1'><img src=sos_7.png> Refresh</a>"
-		dat += " | <a href='byond://?src=\ref[src];choice=2'><img src=sos_1.png> Main Menu</a>"
-		dat += " | <a href='byond://?src=\ref[src];choice=0'><img src=sos_8.png> Close</a>"
+		dat += "<a href='byond://?src=\ref[src];choice=Refresh'><img src=sos_7.png> Refresh</a>"
+		dat += " | <a href='byond://?src=\ref[src];choice=Return'><img src=sos_1.png> Return</a>"
+		dat += " | <a href='byond://?src=\ref[src];choice=Close'><img src=sos_8.png> Close</a>"
 	dat += "<br>"
-	dat += "<h2 ALIGN=CENTER>SpiderOS v.1.34</h2>"
+	dat += "<h2 ALIGN=CENTER>SpiderOS v.1.337</h2>"
 	dat += "Welcome, <b>[U.real_name]</b>.<br>"
 	dat += "<br>"
 	dat += "<img src=sos_10.png> Current Time: [round(world.time / 36000)+12]:[(world.time / 600 % 60) < 10 ? add_zero(world.time / 600 % 60, 1) : world.time / 600 % 60]<br>"
@@ -509,17 +525,34 @@ NINJA MASK
 	dat += "<img src=sos_11.png> Smoke Bombs: [sbombs]<br>"
 	dat += "<br>"
 
-	switch(spideros)//Should be easy to add new functions or windows.
-		if(1)
+	/*
+	HOW TO USE OR ADAPT THIS CODE:
+	The menu structure should not need to be altered to add new entries. Simply place them after what is already there.
+	As an exception, if there are multiple-tiered windows, for instance, going into medical alerts and then to DNA testing or something,
+	those menus should be added below their parents but have a greater value. The second sub-menu of menu 2 would have the number 22.
+	Another sub-menu of menu 2 would be 23, then 24, and up to 29. If those menus have their own sub-menus a similar format follows.
+	Sub-menu 1 of sub-menu 2(of menu 2) would be 221. Sub-menu 5 of sub-menu 2(of menu 2) would be 225. Menu 0 is a special case (it's the menu hub); you are free to use menus 1-9
+	to create your own data paths.
+	The Return button, when used, simply removes the final number and navigates to the menu prior. Menu 334, the fourth sub-menu of sub-menu
+	3, in menu 3, would navigate to sub menu 3 in menu 3. Or 33. Currently, only up to 6 digits are supported but this can be easily changed.
+	It is possible to go to a different menu/sub-menu from anywhere. When creating new menus don't forget to add them to Topic proc or else the game
+	will interpret you using the messenger function (the else clause in the switch).
+	Other buttons and functions should be named according to what they do.*/
+	switch(spideros)
+		if(0)
+			/*
+			For items that use cartridges (PDAs), simply switch() their hub function based on the cartridge inserted.
+			For ease of use, allow the removal of the cartidge only on the hub.
+			*/
 			dat += "<h4><img src=sos_1.png> Available Functions:</h4>"
 			dat += "<ul>"
-			dat += "<li><a href='byond://?src=\ref[src];choice=3'><img src=sos_4.png> Toggle Stealth: [active == 1 ? "Disable" : "Enable"]</a></li>"
-			dat += "<li><a href='byond://?src=\ref[src];choice=4'><img src=sos_3.png> Medical Screen</a></li>"
-			dat += "<li><a href='byond://?src=\ref[src];choice=5'><img src=sos_5.png> Atmos Scan</a></li>"
-			dat += "<li><a href='byond://?src=\ref[src];choice=6'><img src=sos_12.png> Messenger</a></li>"
-			dat += "<li><a href='byond://?src=\ref[src];choice=7'><img src=sos_6.png> Other</a></li>"
+			dat += "<li><a href='byond://?src=\ref[src];choice=Stealth'><img src=sos_4.png> Toggle Stealth: [active == 1 ? "Disable" : "Enable"]</a></li>"
+			dat += "<li><a href='byond://?src=\ref[src];choice=1'><img src=sos_3.png> Medical Screen</a></li>"
+			dat += "<li><a href='byond://?src=\ref[src];choice=2'><img src=sos_5.png> Atmos Scan</a></li>"
+			dat += "<li><a href='byond://?src=\ref[src];choice=3'><img src=sos_12.png> Messenger</a></li>"
+			dat += "<li><a href='byond://?src=\ref[src];choice=4'><img src=sos_6.png> Other</a></li>"
 			dat += "</ul>"
-		if(2)
+		if(1)
 			dat += "<h4><img src=sos_3.png> Medical Report:</h4>"
 			if(U.dna)
 				dat += "<b>Fingerprints</b>: <i>[md5(U.dna.uni_identity)]</i><br>"
@@ -533,16 +566,16 @@ NINJA MASK
 			if(U.virus)
 				dat += "Warning Virus Detected. Name: [U.virus.name].Type: [U.virus.spread]. Stage: [U.virus.stage]/[U.virus.max_stages]. Possible Cure: [U.virus.cure].<br>"
 			dat += "<ul>"
-			dat += "<li><a href='byond://?src=\ref[src];choice=Dylovene'><img src=sos_2.png> Inject Dylovene: [chem1] left</a></li>"
-			dat += "<li><a href='byond://?src=\ref[src];choice=Dexalin Plus'><img src=sos_2.png> Inject Dexalin Plus: [chem2] left</a></li>"
-			dat += "<li><a href='byond://?src=\ref[src];choice=Tricordazine'><img src=sos_2.png> Inject Tricordazine: [chem3] left</a></li>"
-			dat += "<li><a href='byond://?src=\ref[src];choice=Spacelin'><img src=sos_2.png> Inject Spacelin: [chem4] left</a></li>"
+			dat += "<li><a href='byond://?src=\ref[src];choice=Dylovene'><img src=sos_2.png> Inject Dylovene: [reagents.get_reagent_amount("anti_toxin")/20] left</a></li>"
+			dat += "<li><a href='byond://?src=\ref[src];choice=Dexalin Plus'><img src=sos_2.png> Inject Dexalin Plus: [reagents.get_reagent_amount("dexalinp")/20] left</a></li>"
+			dat += "<li><a href='byond://?src=\ref[src];choice=Tricordazine'><img src=sos_2.png> Inject Tricordazine: [reagents.get_reagent_amount("tricordrazine")/20] left</a></li>"
+			dat += "<li><a href='byond://?src=\ref[src];choice=Spacelin'><img src=sos_2.png> Inject Spacelin: [reagents.get_reagent_amount("spaceacillin")/20] left</a></li>"
 			dat += "</ul>"
-		if(3)
-			dat += "<h4><img src=sos_5.png>Atmospheric Scan:</h4>"
+		if(2)
+			dat += "<h4><img src=sos_5.png>Atmospheric Scan:</h4>"//Headers don't need breaks. They are automatically placed.
 			var/turf/T = get_turf_or_move(U.loc)
 			if (isnull(T))
-				dat += "Unable to obtain a reading.<br>"
+				dat += "Unable to obtain a reading."
 			else
 				var/datum/gas_mixture/environment = T.return_air()
 
@@ -567,7 +600,7 @@ NINJA MASK
 						dat += "OTHER: [round(unknown_level)]%<br>"
 
 					dat += "Temperature: [round(environment.temperature-T0C)]&deg;C"
-		if(4)
+		if(3)
 			dat += "<h4><img src=sos_12.png> Anonymous Messenger:</h4>"//Anonymous because the receiver will not know the sender's identity.
 			dat += "<h4><img src=sos_6.png> Detected PDAs:</h4>"
 			dat += "<ul>"
@@ -581,12 +614,37 @@ NINJA MASK
 			dat += "</ul>"
 			if (count == 0)
 				dat += "None detected.<br>"
-		if(5)
+			//dat += "<a href='byond://?src=\ref[src];choice=31'> Send Virus</a>"
+		if(4)
 			dat += "<h4><img src=sos_6.png> Other Functions:</h4>"
-
+/*
+			//Sub-menu testing stuff.
+			dat += "<li><a href='byond://?src=\ref[src];choice=49'> To sub-menu 49</a></li>"
+		if(31)
+			dat += "<h4><img src=sos_12.png> Send Virus:</h4>"
+			dat += "<h4><img src=sos_6.png> Detected PDAs:</h4>"
+			dat += "<ul>"
+			var/count = 0
+			for (var/obj/item/device/pda/P in world)
+				if (!P.owner||P.toff)
+					continue
+				dat += "<li><a href='byond://?src=\ref[src];choice=\ref[P]'><i>[P]</i></a>"
+				dat += "</li>"
+				count++
+			dat += "</ul>"
+			if (count == 0)
+				dat += "None detected.<br>"
+		if(49)
+			dat += "<h4><img src=sos_6.png> Other Functions 49:</h4>"
+			dat += "<a href='byond://?src=\ref[src];choice=491'> To sub-menu 491</a>"
+		if(491)
+			dat += "<h4><img src=sos_6.png> Other Functions 491:</h4>"
+			dat += "<a href='byond://?src=\ref[src];choice=0'> To main menu</a>"
+*/
 	dat += "</body></html>"
 
 	U << browse(dat,"window=spideros;size=400x444;border=1;can_resize=0;can_close=0;can_minimize=0")
+	//Setting the can>resize etc to 0 remove them from the drag bar but still allows the window to be draggable.
 
 /obj/item/clothing/suit/space/space_ninja/Topic(href, href_list)
 	..()
@@ -597,13 +655,19 @@ NINJA MASK
 		return
 
 	switch(href_list["choice"])
-		if("0")
+		if("Close")
 			U << browse(null, "window=spideros")
 			return
-		if("1")//Refresh, goes to the end of the proc.
-		if("2")//Back to main menu
-			spideros=1
-		if("3")
+		if("Refresh")//Refresh, goes to the end of the proc.
+		if("Return")//Return
+			if(spideros<=9)
+				spideros=0
+			else
+				spideros = round(spideros/10)//Best way to do this, flooring to nearest integer. As an example, another way of doing it is attached below:
+	//			var/temp = num2text(spideros)
+	//			var/return_to = copytext(temp, 1, (length(temp)))//length has to be to the length of the thing because by default it's length+1
+	//			spideros = text2num(return_to)//Maximum length here is 6. Use (return_to, X) to specify larger strings if needed.
+		if("Stealth")
 			if(active)
 				spawn(0)
 					anim(usr.loc,'mob.dmi',usr,"uncloak")
@@ -618,43 +682,61 @@ NINJA MASK
 				U << "\blue You are now invisible to normal detection."
 				for(var/mob/O in oviewers(usr, null))
 					O << "[usr.name] vanishes into thin air!"
-		if("4")
+		if("0")//Menus are numbers, see note above. 0 is the hub.
+			spideros=0
+		if("1")//Begin normal menus.
+			spideros=1
+		if("2")
 			spideros=2
-		if("5")
+		if("3")
 			spideros=3
-		if("6")
+		if("4")
 			spideros=4
-		if("7")
-			spideros=5
+		/*Sub-menu testing stuff.
+		if("31")
+			spideros=31
+		if("49")
+			spideros=49
+		if("491")
+			spideros=491 */
 		if("Dylovene")//These names really don't matter for specific functions but it's easier to use descriptive names.
-			if(chem1<=0)
-				U << "\red Error: the suit cannot perform this function."
+			if(!reagents.get_reagent_amount("anti_toxin"))
+				U << "\red Error: the suit cannot perform this function. Out of reagent."
 			else
-				U.reagents.add_reagent("anti_toxin", 15)
-				chem1--
+				reagents.reaction(U, 2)
+				reagents.trans_id_to(U, "anti_toxin", amount_per_transfer_from_this)
 				U << "You feel a tiny prick and a sudden rush of liquid in to your veins."
 		if("Dexalin Plus")
-			if(chem2<=0)
-				U << "\red Error: the suit cannot perform this function."
+			if(!reagents.get_reagent_amount("dexalinp"))
+				U << "\red Error: the suit cannot perform this function. Out of reagent."
 			else
-				U.reagents.add_reagent("dexalinp", 15)
-				chem2--
+				reagents.reaction(U, 2)
+				reagents.trans_id_to(U, "dexalinp", amount_per_transfer_from_this)
 				U << "You feel a tiny prick and a sudden rush of liquid in to your veins."
 		if("Tricordazine")
-			if(chem3<=0)
-				U << "\red Error: the suit cannot perform this function."
+			if(!reagents.get_reagent_amount("tricordrazine"))
+				U << "\red Error: the suit cannot perform this function. Out of reagent."
 			else
-				U.reagents.add_reagent("tricordrazine", 15)
-				chem3--
+				reagents.reaction(U, 2)
+				reagents.trans_id_to(U, "tricordrazine", amount_per_transfer_from_this)
 				U << "You feel a tiny prick and a sudden rush of liquid in to your veins."
 		if("Spacelin")
-			if(chem4<=0)
-				U << "\red Error: the suit cannot perform this function."
+			if(!reagents.get_reagent_amount("spaceacillin"))
+				U << "\red Error: the suit cannot perform this function. Out of reagent."
 			else
-				U.reagents.add_reagent("spaceacillin", 15)
-				chem4--
+				reagents.reaction(U, 2)
+				reagents.trans_id_to(U, "spaceacillin", amount_per_transfer_from_this)
 				U << "You feel a tiny prick and a sudden rush of liquid in to your veins."
-		else//Leaving this for the messenger because it's an awesome solution.
+
+		else
+		/*Leaving this for the messenger because it's an awesome solution. For switch to work, the variable has to be static.
+		Not the case when P is a specific object. The downside, of course, is that there is only one slot.
+		The following switch moves data to the appropriate function based on what screen it was clicked on. For now only uses screen 3.
+		As an example, I added screen 31 to send the silence virus to people in the commented bits.
+		You can do the same with functions that require dynamic tracking.
+		*/
+			switch(spideros)
+				if(3)
 					var/obj/item/device/pda/P = locate(href_list["choice"])
 					var/t = input(U, "Please enter untraceable message.") as text
 					t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
@@ -671,7 +753,13 @@ NINJA MASK
 							O.show_message(text("\icon[P] *[P.ttone]*"))
 					P.overlays = null
 					P.overlays += image('pda.dmi', "pda-r")
-	spideros()//Refreshes the screen.
+			/*	if(31)
+					var/obj/item/device/pda/P = locate(href_list["choice"])
+					if (!P.toff)
+						U.show_message("\blue Virus sent!", 1)
+						P.silent = 1
+						P.ttone = "silence" */
+	spideros()//Refreshes the screen by calling it again (which replaces current screen with new screen).
 	return
 
 /obj/item/clothing/suit/space/space_ninja/examine()
@@ -686,6 +774,7 @@ NINJA MASK
 		usr << "There are <B>[src.sbombs]</B> smoke bombs remaining."
 		usr << "There are <B>[src.aboost]</B> adrenaline injectors remaining."
 
+//GLOVES
 /obj/item/clothing/gloves/space_ninja/proc/toggled()
 	set name = "Toggle Drain"
 	set desc = "Toggles the energy drain mechanism on or off."
@@ -697,6 +786,62 @@ NINJA MASK
 		candrain=0
 		usr << "You disable the energy drain mechanism."
 
+/obj/item/clothing/gloves/space_ninja/proc/drain_wire()
+	set name = "Drain From Wire"
+	set desc = "Drain energy directly from an exposed wire."
+	set category = "Object"
+
+	var/obj/cable/attached
+	var/mob/living/carbon/human/U = usr
+	if(candrain&&!draining)
+		var/turf/T = U.loc
+		if(isturf(T) && !T.intact)
+			attached = locate() in T
+			if(!attached)
+				U << "\red Warning: no exposed cable available."
+			else
+				U << "\blue Now charging battery, stand still..."
+				draining = 1
+				if(do_after(U,100)&&!isnull(attached))
+					processp(attached)
+				else
+					draining = 0
+					U << "\red Procedure interrupted. Protocol terminated."
+	return
+
+/obj/item/clothing/gloves/space_ninja/proc/processp(var/obj/cable/attached)
+//A lot of this comes from the powersink code.
+	var/mob/living/carbon/human/U = usr
+	var/obj/item/clothing/suit/space/space_ninja/S = U.wear_suit
+	var/maxcapacity = 0
+	var/totaldrain = 0
+	var/datum/powernet/PN = attached.get_powernet()
+	while(candrain&&!maxcapacity&&!isnull(attached))
+		var/drain = rand(50,100)
+		var/drained = 0
+		if(PN&&do_after(U,10))
+			drained = min (drain, PN.avail)
+			PN.newload += drained
+			if(drained < drain)//if no power on net, drain apcs
+				for(var/obj/machinery/power/terminal/T in PN.nodes)
+					if(istype(T.master, /obj/machinery/power/apc))
+						var/obj/machinery/power/apc/A = T.master
+						if(A.operating && A.cell && A.cell.charge>0)
+							A.cell.charge = max(0, A.cell.charge - 5)
+							drained += 5
+		else	break
+		S.charge += drained
+		if(S.charge>S.maxcharge)
+			totaldrain += (drained-(S.charge-S.maxcharge))
+			S.charge = S.maxcharge
+			maxcapacity = 1
+		else
+			totaldrain += drained
+		S.spark_system.start()
+		if(drained==0)	break
+	draining = 0
+	U << "\blue Gained <B>[totaldrain]</B> energy from the power network."
+	return
 
 /obj/item/clothing/gloves/space_ninja/examine()
 	set src in view()
@@ -707,6 +852,7 @@ NINJA MASK
 		else
 			usr << "The energy drain mechanism is: <B>inactive</B>."
 
+//MASK
 /obj/item/clothing/mask/gas/voice/space_ninja/New()
 	verbs += /obj/item/clothing/mask/gas/voice/space_ninja/proc/togglev
 	verbs += /obj/item/clothing/mask/gas/voice/space_ninja/proc/switchm

code/modules/admin/verbs/striketeam.dm

@@ -360,9 +360,7 @@ Useful for copy pasta since I'm lazy.*/
 	src.loc = picked
 
 	spawn(0)
-		var/datum/effects/system/spark_spread/spark_system = new /datum/effects/system/spark_spread()
-		spark_system.set_up(5, 0, src.loc)
-		spark_system.start()
+		src:wear_suit:spark_system.start()
 		playsound(src.loc, 'Deconstruct.ogg', 50, 1)
 		playsound(src.loc, "sparks", 50, 1)
 		anim(src.loc,'mob.dmi',src,"phasein")
@@ -397,9 +395,7 @@ Useful for copy pasta since I'm lazy.*/
 	src.loc = T
 
 	spawn(0)
-		var/datum/effects/system/spark_spread/spark_system = new /datum/effects/system/spark_spread()
-		spark_system.set_up(5, 0, src.loc)
-		spark_system.start()
+		src:wear_suit:spark_system.start()
 		playsound(src.loc, 'Deconstruct.ogg', 50, 1)
 		playsound(src.loc, 'sparks2.ogg', 50, 1)
 		anim(src.loc,'mob.dmi',src,"phasein")
@@ -483,7 +479,7 @@ Useful for copy pasta since I'm lazy.*/
 
 //Adrenaline Boost
 //Wakes the user so they are able to do their thing. Also injects a decent dose of radium.
-//Movement impairing would indicate drugs and the like
+//Movement impairing would indicate drugs and the like.
 /mob/proc/ninjaboost()
 	set name = "Adrenaline Boost"
 	set desc = "Inject a secret chemical that will counteract all movement-impairing effects."
@@ -499,10 +495,10 @@ Useful for copy pasta since I'm lazy.*/
 	src.paralysis = 0
 	src.stunned = 0
 	src.weakened = 0
-	spawn(10)
+	spawn(30)
 		src.say("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!")
 	spawn(70)
-		src.reagents.add_reagent("radium", 15)
+		src.reagents.add_reagent("radium", 20)
 		src << "red You are beginning to feal the after-effects of the injection."
 
 	src:wear_suit:aboost--

code/modules/mob/living/silicon/robot/robot.dm

@@ -605,7 +605,7 @@
 				var/drain = 0
 				var/maxcapacity = 0
 				var/totaldrain = 0
-				while(cell.charge>0&&!maxcapacity)
+				while(G.candrain&&cell.charge>0&&!maxcapacity)
 					drain = rand(100,300)
 					if(cell.charge<drain)
 						drain = cell.charge

code/modules/power/apc.dm

@@ -464,7 +464,7 @@
 				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&&!maxcapacity)
+				while(G.candrain&&cell.charge>0&&!maxcapacity)
 					drain = rand(100,300)
 					if(cell.charge<drain)
 						drain = cell.charge

code/modules/power/cell.dm

@@ -72,7 +72,7 @@
 			if(charge)
 				user << "\blue Now charging battery..."
 				G.draining = 1
-				if (do_after(user,30))
+				if (G.candrain&&do_after(user,30))
 					U << "\blue Gained <B>[charge]</B> energy from the cell."
 					if(S.charge+charge>S.maxcharge)
 						S.charge=S.maxcharge

code/modules/power/smes.dm

@@ -196,7 +196,7 @@
 				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&&!maxcapacity)
+				while(G.candrain&&charge>0&&!maxcapacity)
 					drain = rand(100,300)
 					if(charge<drain)
 						drain = charge