Map Bugfixes, some past due Ninja changes

code/game/gamemodes/events/ninja_equipment.dm

@@ -141,7 +141,8 @@ ________________________________________________________________________________
 
 		//Now let's do the normal processing.
 		if(s_coold)	s_coold--//Checks for ability s_cooldown first.
-		var/A = s_cost//s_cost is the default energy cost each ntick, usually 5.
+		var/A = 0 - s_regen//s_regen is the default energy regen each ntick, usually 5.
+
 		if(U.stat == 2)
 			U << browse(null, "window=spideros")
 			explosion(U.loc, 0, 1, 3, 4)
@@ -153,15 +154,20 @@ ________________________________________________________________________________
 			return
 		if(!kamikaze)
 			if(blade_check(U))//If there is a blade held in hand.
-				A += s_acost
+				A += s_cost
 			if(s_active)//If stealth is active.
-				A += s_acost
+				A += s_cost
 
 		else
 			if(prob(s_delay))//Suit delay is used as probability. May change later.
 				U.adjustBruteLoss(k_damage)//Default damage done, usually 1.
 			A = k_cost//kamikaze cost.
+
 		cell.charge-=A
+
+		if(src.cell.maxcharge < src.cell.charge)
+			src.cell.charge = src.cell.maxcharge
+
 		if(cell.charge<=0)
 			if(kamikaze)
 				U.say("I DIE TO LIVE AGAIN!")

code/game/gamemodes/events/space_ninja.dm

@@ -564,10 +564,10 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 
 //Randomizes suit parameters.
 /obj/item/clothing/suit/space/space_ninja/proc/randomize_param()
-	s_cost = rand(1,20)
-	s_acost = rand(20,100)
+	s_regen = rand(1,15)
+	s_cost = rand(20,100)
 	k_cost = rand(100,500)
-	k_damage = rand(1,20)
+	k_damage = rand(1,10)
 	s_delay = rand(10,100)
 	s_bombs = rand(5,20)
 	a_boost = rand(1,7)

code/modules/clothing/masks/gasmask.dm

@@ -59,6 +59,7 @@
 	icon_state = "s-ninja(norm)"
 	item_state = "s-ninja_mask"
 	vchange = 1
+	unacidable = 1
 	siemens_coefficient = 0.2
 
 /obj/item/clothing/mask/gas/voice/space_ninja/scar

code/modules/clothing/spacesuits/ninja.dm

@@ -36,8 +36,8 @@
 		//Main function variables.
 	var/s_initialized = 0//Suit starts off.
 	var/s_coold = 0//If the suit is on cooldown. Can be used to attach different cooldowns to abilities. Ticks down every second based on suit ntick().
-	var/s_cost = 5.0//Base energy cost each ntick.
-	var/s_acost = 25.0//Additional cost for additional powers active.
+	var/s_regen = 5.0//Base energy regen each ntick.
+	var/s_cost = 25.0//Additional cost for additional powers active.
 	var/k_cost = 200.0//Kamikaze energy cost each ntick.
 	var/k_damage = 1.0//Brute damage potentially done by Kamikaze each ntick.
 	var/s_delay = 40.0//How fast the suit does certain things, lower is faster. Can be overridden in specific procs. Also determines adverse probability.

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -545,4 +545,10 @@
 	New()
 		..()
 		reagents.add_reagent("cola", 50)
-		on_reagent_change()
+		on_reagent_change()
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/devilskiss
+	New()
+		..()
+		reagents.add_reagent("devilskiss", 50)
+		on_reagent_change()