Merge branch 'master' of https://github.com/ZomgPonies/Baystation12

Conflicts:
	baystation12.int

code/datums/diseases/robotic_transformation.dm

@@ -55,11 +55,11 @@
 				if(src.gibbed != 0) return 0
 				var/turf/T = find_loc(affected_mob)
 				gibs(T)
-				src.cure(0)
 				gibbed = 1
 				var/mob/living/carbon/human/H = affected_mob
 				if(istype(H) && !jobban_isbanned(affected_mob, "Cyborg"))
 					H.Robotize()
 				else
+					src.cure(0)
 					affected_mob.death(1)
 

code/game/gamemodes/events/ninja_equipment.dm

@@ -398,7 +398,7 @@ ________________________________________________________________________________
 					<li>*<b>Energy Net</b> (<i>2000E</i>) is a non-lethal solution to incapacitating humanoids. The net is made of non-harmful phase energy and will halt movement as long as it remains in effect--it can be destroyed. If the net is not destroyed, after a certain time it will teleport the target to a holding facility for the Spider Clan and then vanish. You will be notified if the net fails or succeeds in capturing a target in this manner. Combine with energy stars or stripping to ensure success. Abduction never looked this leet.</li>
 					<li>*<b>Adrenaline Boost</b> (<i>1 E. Boost/3</i>) recovers the user from stun, weakness, and paralysis. Also injects 20 units of radium into the bloodstream.</li>
 					<li>*<b>Smoke Bomb</b> (<i>1 Sm.Bomb/10</i>) is a weak but potentially useful ability. It creates harmful smoke and can be used in tandem with other powers to confuse enemies.</li>
-					<li>*<b>???</b>: unleash the <b>True Ultimate Power!</b></li>
+					<li>*<b><a href='byond://?src=\ref[src];choice=32'>???</a></b>: unleash the <b>True Ultimate Power!</b></li>
 					<h4>IMPORTANT:</h4>
 					<ul>
 					<li>*Make sure to toggle Special Interaction from the Ninja Equipment menu to interact differently with certain objects.</li>
@@ -577,7 +577,7 @@ ________________________________________________________________________________
 				A << "There are no potential [href_list["name"]=="Phase Shift"?"destinations" : "targets"] in view."
 
 		if("Unlock Kamikaze")
-			if(input(U)=="Divine Wind")
+			if(input(U)=="Divine Wind" && kamikaze_allowed == 1)
 				if( !(U.stat||U.wear_suit!=src||!s_initialized) )
 					if( !(cell.charge<=1||s_busy) )
 						s_busy = 1
@@ -604,7 +604,10 @@ ________________________________________________________________________________
 					s_busy = 0
 					return
 			else
-				U << "\red ERROR: WRONG PASSWORD!"
+				if(kamikaze_allowed == 0)
+					U << "\red ERROR: FUNCTION DISABLED!"
+				else
+					U << "\red ERROR: WRONG PASSWORD!"
 				k_unlock = 0
 				spideros = 0
 			s_busy = 0

code/modules/admin/admin_verbs.dm

@@ -98,7 +98,8 @@ var/list/admin_verbs_fun = list(
 	/client/proc/make_sound,
 	/client/proc/toggle_random_events,
 	/client/proc/set_ooc,
-	/client/proc/editappear
+	/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

@@ -836,3 +836,18 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		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."