Merge branch 'master' of github.com:Baystation12/Baystation12 into dev

code/modules/admin/admin_verbs.dm

@@ -68,10 +68,8 @@ var/list/admin_verbs_admin = list(
 	/datum/admins/proc/show_skills,
 	/client/proc/check_customitem_activity,
 	/client/proc/man_up,
-	/client/proc/global_man_up
-	/* Currently unticked.
-	/client/proc/response_team
-	*/
+	/client/proc/global_man_up,
+	/client/proc/response_team // Response Teams admin verb
 )
 var/list/admin_verbs_ban = list(
 	/client/proc/unban_panel,
@@ -764,4 +762,4 @@ var/list/admin_verbs_mod = list(
 		T << 'sound/voice/ManUp1.ogg'
 
 	log_admin("[key_name(usr)] told everyone to man up and deal with it.")
-	message_admins("\blue [key_name_admin(usr)] told everyone to man up and deal with it.", 1)
+	message_admins("\blue [key_name_admin(usr)] told everyone to man up and deal with it.", 1)

code/modules/admin/verbs/cinematic.dm

@@ -3,6 +3,7 @@
 	set category = "Fun"
 	set desc = "Shows a cinematic."	// Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted.
 	set hidden = 1
+	if(alert("Are you sure you want to run [cinematic]?","Confirmation","Yes","No")=="No") return
 	if(!ticker)	return
 	switch(cinematic)
 		if("explosion")

code/modules/events/prison_break.dm

@@ -10,6 +10,9 @@
 	announceWhen = rand(50, 60)
 	releaseWhen = rand(20, 30)
 
+	src.startWhen = src.releaseWhen-1
+	src.endWhen = src.releaseWhen+1
+
 
 /datum/event/prison_break/announce()
 	if(prisonAreas && prisonAreas.len > 0)