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

Conflicts:
	baystation12.int

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."