Merge github.com:Baystation12/Baystation12

Conflicts:
	code/modules/mob/mob.dm
	code/modules/projectiles/projectile/change.dm

code/modules/admin/admin.dm

@@ -968,11 +968,10 @@ var/global/BSACooldown = 0
 		if ((src.rank in list( "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/mob/M = locate(href_list["forcespeech"])
 			if (ismob(M))
-				var/speech = input("What will [key_name(M)] say?.", "Force speech", "")
+				var/speech = copytext(sanitize(input("What will [key_name(M)] say?.", "Force speech", "")),1,MAX_MESSAGE_LEN)
 				if(!speech)
 					return
 				M.say(speech)
-				speech = copytext(sanitize(speech), 1, MAX_MESSAGE_LEN)
 				log_admin("[key_name(usr)] forced [key_name(M)] to say: [speech]")
 				message_admins("\blue [key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]")
 		else
@@ -1883,7 +1882,7 @@ var/global/BSACooldown = 0
 						if(!ticker)
 							alert("The game hasn't started yet!")
 							return
-						var/objective = input("Enter an objective")
+						var/objective = copytext(sanitize(input("Enter an objective")),1,MAX_MESSAGE_LEN)
 						if(!objective)
 							return
 						//feedback_inc("admin_secrets_fun_used",1)

code/modules/admin/admin_memo.dm

@@ -0,0 +1,54 @@
+#define MEMOFILE "data/memo.sav"	//where the memos are saved
+#define ENABLE_MEMOS 1				//using a define because screw making a config variable for it. This is more efficient and purty.
+
+//switch verb so we don't spam up the verb lists with like, 3 verbs for this feature.
+/client/proc/admin_memo(task in list("write","show","delete"))
+	set name = "Memo"
+	set category = "Server"
+	if(!holder)	return
+	switch(task)
+		if("write")
+			admin_memo_write()
+		if("show")
+			admin_memo_show()
+		if("delete")
+			admin_memo_delete()
+
+
+//write a message
+/client/proc/admin_memo_write()
+	var/savefile/F = new(MEMOFILE)
+	if(F)
+		var/memo = input(src,"Type your memo\n(Leaving it blank will delete your current memo):","Write Memo",null) as null|message
+		switch(memo)
+			if(null)
+				return
+			if("")
+				F.dir.Remove(ckey)
+				src << "<b>Memo removed</b>"
+				return
+		if( findtext(memo,"<script",1,0) )
+			return
+		F[ckey] << "[key] on [time2text(world.realtime,"(DDD) DD MMM hh:mm")]<br>[memo]"
+		message_admins("[key] set an admin memo:<br>[memo]")
+
+//show all memos
+/client/proc/admin_memo_show()
+	if(ENABLE_MEMOS)
+		var/savefile/F = new(MEMOFILE)
+		if(F)
+			for(var/ckey in F.dir)
+				src << "<center><span class='motd'><b>Admin Memo</b><i> by [F[ckey]]</i></span></center>"
+
+//delete your own or somebody else's memo
+/client/proc/admin_memo_delete()
+	var/savefile/F = new(MEMOFILE)
+	if(F)
+		var/ckey
+		if( holder.rank == "Game Master" )
+			ckey = input(src,"Whose memo shall we remove?","Remove Memo",null) as null|anything in F.dir
+		else
+			ckey = src.ckey
+		if(ckey)
+			F.dir.Remove(ckey)
+			src << "<b>Removed Memo created by [ckey].</b>"

code/modules/admin/admin_verbs.dm

@@ -144,7 +144,7 @@
 			verbs += /client/proc/voting
 			verbs += /client/proc/hide_verbs
 			verbs += /client/proc/general_report
-			verbs += /client/proc/air_report
+			//verbs += /client/proc/air_report
 			verbs += /client/proc/deadmin_self
 			//verbs += /client/proc/cmd_admin_prison 					--Merged with player panel
 			//verbs += /obj/admins/proc/unprison  						--Merged with player panel
@@ -248,7 +248,7 @@
 //			verbs += /client/proc/mapload
 			verbs += /client/proc/check_words
 			verbs += /client/proc/drop_bomb
-			verbs += /client/proc/kill_airgroup
+			//verbs += /client/proc/kill_airgroup
 			//verbs += /client/proc/cmd_admin_drop_everything			--Merged with view variables
 			verbs += /client/proc/make_sound
 			verbs += /client/proc/play_local_sound
@@ -260,6 +260,7 @@
 			verbs += /client/proc/toggle_gravity_off
 			verbs += /client/proc/toggle_random_events
 			verbs += /client/proc/deadmin_self
+			if(ENABLE_MEMOS)	verbs += /client/proc/admin_memo
 			//verbs += /client/proc/cmd_mass_modify_object_variables 	--Merged with view variables
 			//verbs += /client/proc/cmd_admin_explosion					--Merged with view variables
 			//verbs += /client/proc/cmd_admin_emp						--Merged with view variables
@@ -278,7 +279,7 @@
 			verbs += /client/proc/Force_Event_admin
 			verbs += /client/proc/radioalert
 			verbs += /client/proc/CarbonCopy
-			verbs += /client/proc/jump_to_dead_group
+			//verbs += /client/proc/jump_to_dead_group
 		else	return
 
 		//Game Master
@@ -403,7 +404,7 @@
 	verbs -= /client/proc/voting
 	verbs -= /client/proc/hide_verbs
 	verbs -= /client/proc/general_report
-	verbs -= /client/proc/air_report
+	//verbs -= /client/proc/air_report
 	verbs -= /client/proc/cmd_admin_say
 	verbs -= /client/proc/cmd_admin_gib_self
 	verbs -= /client/proc/restartcontroller
@@ -425,6 +426,7 @@
 	verbs -= /client/proc/giveruntimelog									//used by coders to retrieve runtime logs
 	verbs -= /client/proc/getserverlog
 	verbs -= /client/proc/cinematic										//show a cinematic sequence
+	verbs -= /client/proc/admin_memo
 	verbs -= /client/proc/cmd_admin_change_custom_event
 	verbs -= /client/proc/admin_invis
 	verbs -= /client/proc/callprocgen
@@ -452,13 +454,13 @@
 	//verbs -= /obj/admins/proc/unprison 								--Merged with player panel
 	//verbs -= /client/proc/cmd_switch_radio							--removed because tcommsat is staying
 	verbs -= /client/proc/togglebuildmodeself
-	verbs -= /client/proc/kill_airgroup
+	//verbs -= /client/proc/kill_airgroup
 	verbs -= /client/proc/debug_master_controller
 	verbs -= /client/proc/make_tajaran
 	verbs -= /client/proc/admin_deny_shuttle
 	verbs -= /client/proc/cmd_admin_christmas
 	verbs -= /client/proc/editappear
-	verbs -= /client/proc/jump_to_dead_group
+	//verbs -= /client/proc/jump_to_dead_group
 	verbs -= /client/proc/playernotes
 	verbs -= /obj/admins/proc/show_skills
 	verbs -= /client/proc/enable_debug_verbs

code/modules/admin/verbs/diagnostics.dm

@@ -22,7 +22,7 @@
 		usr << browse(output,"window=generalreport")
 		//feedback_add_details("admin_verb","SGR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-	air_report()
+/*	air_report()
 		set category = "Debug"
 		set name = "Show Air Report"
 
@@ -83,7 +83,7 @@
 		for(var/datum/gas/trace_gas in GM.trace_gases)
 			usr << "[trace_gas.type]: [trace_gas.moles]"
 		//feedback_add_details("admin_verb","DAST") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
+*/
 	fix_next_move()
 		set category = "Debug"
 		set name = "Unfreeze Everyone"
@@ -183,7 +183,7 @@
 		//feedback_add_details("admin_verb","RLDA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
-	jump_to_dead_group()
+	/*jump_to_dead_group()
 		set name = "Jump to dead group"
 		set category = "Debug"
 		if(!holder)
@@ -221,7 +221,7 @@
 		else
 			usr << "Local airgroup is unsimulated!"
 		//feedback_add_details("admin_verb","KLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
+*/
 
 	tension_report()
 		set category = "Debug"

code/modules/admin/verbs/mapping.dm

@@ -130,14 +130,14 @@ var/intercom_range_display_status = 0
 		src.verbs += /client/proc/camera_view 				//-errorage
 		src.verbs += /client/proc/sec_camera_report 		//-errorage
 		src.verbs += /client/proc/intercom_view 			//-errorage
-		src.verbs += /client/proc/air_status //Air things
+		//src.verbs += /client/proc/air_status //Air things
 		src.verbs += /client/proc/Cell //More air things
 		src.verbs += /client/proc/atmosscan //check plumbing
 		src.verbs += /client/proc/powerdebug //check power
 		src.verbs += /client/proc/count_objects_on_z_level
 		src.verbs += /client/proc/count_objects_all
 		src.verbs += /client/proc/cmd_assume_direct_control	//-errorage
-		src.verbs += /client/proc/jump_to_dead_group
+		//src.verbs += /client/proc/jump_to_dead_group
 		src.verbs += /client/proc/startSinglo
 		src.verbs += /client/proc/ticklag	//allows you to set the ticklag.
 		src.verbs += /client/proc/cmd_admin_grantfullaccess

code/modules/admin/verbs/randomverbs.dm

@@ -621,10 +621,13 @@ Traitors and the like can also be revived with the previous role mostly intact.
 /client/proc/cmd_admin_gib_self()
 	set name = "Gibself"
 	set category = "Fun"
-	if (istype(mob, /mob/dead/observer)) // so they don't spam gibs everywhere
-		return
-	else
-		mob.gib()
+
+	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
+	if(confirm == "Yes")
+		if (istype(mob, /mob/dead/observer)) // so they don't spam gibs everywhere
+			return
+		else
+			mob.gib()
 
 		log_admin("[key_name(usr)] used gibself.")
 		message_admins("\blue [key_name_admin(usr)] used gibself.", 1)

code/modules/admin/verbs/striketeam.dm

@@ -24,7 +24,7 @@ var/global/sent_strike_team = 0
 
 	var/input = null
 	while(!input)
-		input = input(src, "Please specify which mission the death commando squad shall undertake.", "Specify Mission", "") as text|null
+		input = copytext(sanitize(input(src, "Please specify which mission the death commando squad shall undertake.", "Specify Mission", "")),1,MAX_MESSAGE_LEN)
 		if(!input)
 			if(alert("Error, no mission set. Do you want to exit the setup process?",,"Yes","No")=="Yes")
 				return

code/modules/admin/verbs/striketeam_syndicate.dm

@@ -24,7 +24,7 @@ var/global/sent_syndicate_strike_team = 0
 
 	var/input = null
 	while(!input)
-		input = input(src, "Please specify which mission the syndicate strike team shall undertake.", "Specify Mission", "")
+		input = copytext(sanitize(input(src, "Please specify which mission the syndicate strike team shall undertake.", "Specify Mission", "")),1,MAX_MESSAGE_LEN)
 		if(!input)
 			if(alert("Error, no mission set. Do you want to exit the setup process?",,"Yes","No")=="Yes")
 				return