Merge remote-tracking branch 'upstream/dev' into viro

Conflicts: code/modules/virus2/disease2.dm
2025-12-13 11:43:31 +00:00 · 2015-02-03 15:33:37 +00:00
parent 1b08463b7e c3559556a0
commit c4788ad6f5
581 changed files with 3139 additions and 18688 deletions
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -949,7 +949,7 @@ var/global/floorIsLava = 0
 			return 2
 		return 1
 	if(M.mind in ticker.mode.syndicates)
-		if (ticker.mode.config_tag == "nuclear")
+		if (ticker.mode.config_tag == "mercenary")
 			return 2
 		return 1
 	if(M.mind in ticker.mode.wizards)
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -46,6 +46,7 @@ var/list/admin_verbs_admin = list(
 	/client/proc/cmd_admin_create_centcom_report,
 	/client/proc/check_words,			/*displays cult-words*/
 	/client/proc/check_ai_laws,			/*shows AI and borg laws*/
+	/client/proc/rename_ai,				/*properly renames the AI*/
 	/client/proc/check_antagonists,
 	/client/proc/admin_memo,			/*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/
 	/client/proc/dsay,					/*talk in deadchat using our ckey/fakekey*/
@@ -77,7 +78,8 @@ var/list/admin_verbs_admin = list(
 	/client/proc/toggle_antagHUD_use,
 	/client/proc/toggle_antagHUD_restrictions,
 	/client/proc/allow_character_respawn,    /* Allows a ghost to respawn */
-	/client/proc/event_manager_panel
+	/client/proc/event_manager_panel,
+	/client/proc/empty_ai_core_toggle_latejoin
 )
 var/list/admin_verbs_ban = list(
 	/client/proc/unban_panel,
@@ -309,24 +311,7 @@ var/list/admin_verbs_mentor = list(
 		admin_verbs_rejuv,
 		admin_verbs_sounds,
 		admin_verbs_spawn,
-		/*Debug verbs added by "show debug verbs"*/
-		/client/proc/Cell,
-		/client/proc/do_not_use_these,
-		/client/proc/camera_view,
-		/client/proc/sec_camera_report,
-		/client/proc/intercom_view,
-		/client/proc/atmosscan,
-		/client/proc/powerdebug,
-		/client/proc/count_objects_on_z_level,
-		/client/proc/count_objects_all,
-		/client/proc/cmd_assume_direct_control,
-		/client/proc/jump_to_dead_group,
-		/client/proc/startSinglo,
-		/client/proc/ticklag,
-		/client/proc/cmd_admin_grantfullaccess,
-		/client/proc/kaboom,
-		/client/proc/splash,
-		/client/proc/cmd_admin_areatest
+		debug_verbs
 		)

 /client/proc/hide_most_verbs()//Allows you to keep some functionality while hiding some verbs
@@ -709,6 +694,17 @@ var/list/admin_verbs_mentor = list(
 	if(holder)
 		src.holder.output_ai_laws()

+/client/proc/rename_ai(mob/living/silicon/ai/AI in world)
+	set name = "Rename AI"
+	set category = "Admin"
+
+	if(holder)
+		var/new_name = trim_strip_input(src, "Enter new AI name. Leave blank or as is to cancel.", "Enter new AI Name", AI.name)
+		if(new_name && new_name != AI.name)
+			admin_log_and_message_admins("has renamed the AI '[AI.name]' to '[new_name]'")
+			AI.SetName(new_name)
+	feedback_add_details("admin_verb","RAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+

 //---- bs12 verbs ----

--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1980,7 +1980,7 @@
 				if(!ticker)
 					alert("The game hasn't started yet!")
 					return
-				var/objective = copytext(sanitize(input("Enter an objective")),1,MAX_MESSAGE_LEN)
+				var/objective = sanitize(copytext(input("Enter an objective"),1,MAX_MESSAGE_LEN))
 				if(!objective)
 					return
 				feedback_inc("admin_secrets_fun_used",1)
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -1,18 +1,8 @@
-#define AHELP_ADMIN 1
-#define AHELP_MENTOR 2
-#define AHELP_DEV 3

 //This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE!
 var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","alien","as")

-var/list/adminhelp_categories = list("Mentor - Gameplay/Roleplay question" = AHELP_MENTOR,\
-									 "Admin - Rule/Gameplay issue" = AHELP_ADMIN,\
-									 "Dev - Bug report" = AHELP_DEV)
-
-/client/proc/adminhelp_admin(message)
-	adminhelp("Admin - Rule/Gameplay issue", message)
-
-/client/verb/adminhelp(selected_type in adminhelp_categories, msg as text)
+/client/verb/adminhelp(msg as text)
 	set category = "Admin"
 	set name = "Adminhelp"

@@ -27,18 +17,6 @@ var/list/adminhelp_categories = list("Mentor - Gameplay/Roleplay question" = AHE

 	adminhelped = 1 //Determines if they get the message to reply by clicking the name.

-	/**src.verbs -= /client/verb/adminhelp
-
-	spawn(1200)
-		src.verbs += /client/verb/adminhelp	// 2 minute cool-down for adminhelps
-		src.verbs += /client/verb/adminhelp	// 2 minute cool-down for adminhelps//Go to hell
-	**/
-
-	if(!msg || alert("The following message will be sent to staff that administers\n the '[selected_type]' category:\n\n[msg]\n", "Admin Help", "Ok", "Cancel") == "Cancel")
-		return
-
-	var/selected_upper = uppertext(selected_type)
-
 	if(src.handle_spam_prevention(msg,MUTE_ADMINHELP))
 		return

@@ -109,62 +87,12 @@ var/list/adminhelp_categories = list("Mentor - Gameplay/Roleplay question" = AHE
 	var/ai_cl
 	if(ai_found)
 		ai_cl = " (<A HREF='?_src_=holder;adminchecklaws=\ref[mob]'>CL</A>)"
-	var/mentor_msg = "\blue <b><font color=red>[selected_upper]: </font>[get_options_bar(mob, 0, 0, 1, 0)][ai_cl]:</b> [msg]"
-	var/dev_msg = "\blue <b><font color=red>[selected_upper]: </font>[get_options_bar(mob, 3, 0, 1, 0)][ai_cl]:</b> [msg]"
-	msg = "\blue <b><font color=red>[selected_upper]: </font>[get_options_bar(mob, 2, 1, 1)][ai_cl]:</b> [msg]"
+	var/mentor_msg = "\blue <b><font color=red>Request for Help: </font>[get_options_bar(mob, 0, 0, 1, 0)][ai_cl]:</b> [msg]"
+	msg = "\blue <b><font color=red>Request for Help:: </font>[get_options_bar(mob, 2, 1, 1)][ai_cl]:</b> [msg]"

 	var/admin_number_afk = 0

-	var/list/mentorholders = list()
-	var/list/debugholders = list()
-	var/list/adminholders = list()
 	for(var/client/X in admins)
-		if(R_MENTOR & X.holder.rights && !(R_ADMIN & X.holder.rights)) // we don't want to count admins twice. This list should be JUST mentors
-			mentorholders += X
-			if(X.is_afk())
-				admin_number_afk++
-		if(R_DEBUG & X.holder.rights) // Looking for anyone with +Debug which will be admins, developers, and developer mentors
-			debugholders += X
-			if(!(R_ADMIN & X.holder.rights))
-				if(X.is_afk())
-					admin_number_afk++
-		if(R_ADMIN | R_MOD & X.holder.rights) // just admins here please
-			adminholders += X
-			if(X.is_afk())
-				admin_number_afk++
-
-	switch(adminhelp_categories[selected_type])
-		if(AHELP_MENTOR)
-			if(mentorholders.len)
-				for(var/client/X in mentorholders) // Mentors get a message without buttons and no character name
-					if(X.prefs.toggles & SOUND_ADMINHELP)
-						X << 'sound/effects/adminhelp.ogg'
-					X << mentor_msg
-			if(adminholders.len)
-				for(var/client/X in adminholders) // Admins get the full monty
-					if(X.prefs.toggles & SOUND_ADMINHELP)
-						X << 'sound/effects/adminhelp.ogg'
-					X << msg
-		if(AHELP_ADMIN)
-			if(adminholders.len)
-				for(var/client/X in adminholders) // Admins of course get everything in their helps
-					if(X.prefs.toggles & SOUND_ADMINHELP)
-						X << 'sound/effects/adminhelp.ogg'
-					X << msg
-		if(AHELP_DEV)
-			if(debugholders.len)
-				for(var/client/X in debugholders)
-					if(R_ADMIN | R_MOD & X.holder.rights) // Admins get every button & special highlights in theirs
-						if(X.prefs.toggles & SOUND_ADMINHELP)
-							X << 'sound/effects/adminhelp.ogg'
-						X << msg
-					else
-						if (R_DEBUG & X.holder.rights) // Just devs or devmentors get non-highlighted names, but they do get JMP and VV for their bug reports.
-							if(X.prefs.toggles & SOUND_ADMINHELP)
-								X << 'sound/effects/adminhelp.ogg'
-						X << dev_msg
-
-	/*for(var/client/X in admins)
 		if((R_ADMIN|R_MOD|R_MENTOR) & X.holder.rights)
 			if(X.is_afk())
 				admin_number_afk++
@@ -173,20 +101,17 @@ var/list/adminhelp_categories = list("Mentor - Gameplay/Roleplay question" = AHE
 			if(X.holder.rights == R_MENTOR)
 				X << mentor_msg		// Mentors won't see coloring of names on people with special_roles (Antags, etc.)
 			else
-				X << msg*/
+				X << msg

 	//show it to the person adminhelping too
-	src << "<font color='blue'>PM to-<b>Staff ([selected_type])</b>: [original_msg]</font>"
+	src << "<font color='blue'>PM to-<b>Staff </b>: [original_msg]</font>"

 	var/admin_number_present = admins.len - admin_number_afk
 	log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
 	if(admin_number_present <= 0)
-		send2adminirc("[selected_upper] from [key_name(src)]: [html_decode(original_msg)] - !![admin_number_afk ? "All admins AFK ([admin_number_afk])" : "No admins online"]!!")
+		send2adminirc("Request for Help from [key_name(src)]: [html_decode(original_msg)] - !![admin_number_afk ? "All admins AFK ([admin_number_afk])" : "No admins online"]!!")
 	else
-		send2adminirc("[selected_upper] from [key_name(src)]: [html_decode(original_msg)]")
+		send2adminirc("Request for Help from [key_name(src)]: [html_decode(original_msg)]")
 	feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return

-#undef AHELP_ADMIN
-#undef AHELP_MENTOR
-#undef AHELP_DEV
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -96,7 +96,7 @@
 					if(sender)
 						C.cmd_admin_pm(sender,reply)										//sender is still about, let's reply to them
 					else
-						adminhelp_admin(reply)													//sender has left, adminhelp instead
+						adminhelp(reply)													//sender has left, adminhelp instead
 				return
 	src << "<span class='pm'><span class='out'>" + create_text_tag("pm_out_alt", "PM", src) + " to <span class='name'>[get_options_bar(C, holder ? 1 : 0, holder ? 1 : 0, 1)]</span>: <span class='message'>[msg]</span></span></span>"
 	C << "<span class='pm'><span class='in'>" + create_text_tag("pm_in", "", C) + " <b>\[[recieve_pm_type] PM\]</b> <span class='name'>[get_options_bar(src, C.holder ? 1 : 0, C.holder ? 1 : 0, 1)]</span>: <span class='message'>[msg]</span></span></span>"
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -4,7 +4,7 @@
 	set hidden = 1
 	if(!check_rights(R_ADMIN))	return

-	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
+	msg = sanitize(copytext(msg, 1, MAX_MESSAGE_LEN))
 	if(!msg)	return

 	log_admin("[key_name(src)] : [msg]")
@@ -23,7 +23,7 @@

 	if(!check_rights(R_ADMIN|R_MOD|R_MENTOR))	return

-	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
+	msg = sanitize(copytext(msg, 1, MAX_MESSAGE_LEN))
 	log_admin("MOD: [key_name(src)] : [msg]")

 	if (!msg)
--- a/code/modules/admin/verbs/buildmode.dm
+++ b/code/modules/admin/verbs/buildmode.dm
@@ -0,0 +1,267 @@
+/proc/togglebuildmode(mob/M as mob in player_list)
+	set name = "Toggle Build Mode"
+	set category = "Special Verbs"
+	if(M.client)
+		if(M.client.buildmode)
+			log_admin("[key_name(usr)] has left build mode.")
+			M.client.buildmode = 0
+			M.client.show_popup_menus = 1
+			for(var/obj/effect/bmode/buildholder/H)
+				if(H.cl == M.client)
+					del(H)
+		else
+			log_admin("[key_name(usr)] has entered build mode.")
+			M.client.buildmode = 1
+			M.client.show_popup_menus = 0
+
+			var/obj/effect/bmode/buildholder/H = new/obj/effect/bmode/buildholder()
+			var/obj/effect/bmode/builddir/A = new/obj/effect/bmode/builddir(H)
+			A.master = H
+			var/obj/effect/bmode/buildhelp/B = new/obj/effect/bmode/buildhelp(H)
+			B.master = H
+			var/obj/effect/bmode/buildmode/C = new/obj/effect/bmode/buildmode(H)
+			C.master = H
+			var/obj/effect/bmode/buildquit/D = new/obj/effect/bmode/buildquit(H)
+			D.master = H
+
+			H.builddir = A
+			H.buildhelp = B
+			H.buildmode = C
+			H.buildquit = D
+			M.client.screen += A
+			M.client.screen += B
+			M.client.screen += C
+			M.client.screen += D
+			H.cl = M.client
+
+/obj/effect/bmode//Cleaning up the tree a bit
+	density = 1
+	anchored = 1
+	layer = 20
+	dir = NORTH
+	icon = 'icons/misc/buildmode.dmi'
+	var/obj/effect/bmode/buildholder/master = null
+
+/obj/effect/bmode/builddir
+	icon_state = "build"
+	screen_loc = "NORTH,WEST"
+	Click()
+		switch(dir)
+			if(NORTH)
+				set_dir(EAST)
+			if(EAST)
+				set_dir(SOUTH)
+			if(SOUTH)
+				set_dir(WEST)
+			if(WEST)
+				set_dir(NORTHWEST)
+			if(NORTHWEST)
+				set_dir(NORTH)
+		return 1
+
+/obj/effect/bmode/buildhelp
+	icon = 'icons/misc/buildmode.dmi'
+	icon_state = "buildhelp"
+	screen_loc = "NORTH,WEST+1"
+	Click()
+		switch(master.cl.buildmode)
+			if(1)
+				usr << "\blue ***********************************************************"
+				usr << "\blue Left Mouse Button        = Construct / Upgrade"
+				usr << "\blue Right Mouse Button       = Deconstruct / Delete / Downgrade"
+				usr << "\blue Left Mouse Button + ctrl = R-Window"
+				usr << "\blue Left Mouse Button + alt  = Airlock"
+				usr << ""
+				usr << "\blue Use the button in the upper left corner to"
+				usr << "\blue change the direction of built objects."
+				usr << "\blue ***********************************************************"
+			if(2)
+				usr << "\blue ***********************************************************"
+				usr << "\blue Right Mouse Button on buildmode button = Set object type"
+				usr << "\blue Left Mouse Button on turf/obj          = Place objects"
+				usr << "\blue Right Mouse Button                     = Delete objects"
+				usr << ""
+				usr << "\blue Use the button in the upper left corner to"
+				usr << "\blue change the direction of built objects."
+				usr << "\blue ***********************************************************"
+			if(3)
+				usr << "\blue ***********************************************************"
+				usr << "\blue Right Mouse Button on buildmode button = Select var(type) & value"
+				usr << "\blue Left Mouse Button on turf/obj/mob      = Set var(type) & value"
+				usr << "\blue Right Mouse Button on turf/obj/mob     = Reset var's value"
+				usr << "\blue ***********************************************************"
+			if(4)
+				usr << "\blue ***********************************************************"
+				usr << "\blue Left Mouse Button on turf/obj/mob      = Select"
+				usr << "\blue Right Mouse Button on turf/obj/mob     = Throw"
+				usr << "\blue ***********************************************************"
+		return 1
+
+/obj/effect/bmode/buildquit
+	icon_state = "buildquit"
+	screen_loc = "NORTH,WEST+3"
+
+	Click()
+		togglebuildmode(master.cl.mob)
+		return 1
+
+/obj/effect/bmode/buildholder
+	density = 0
+	anchored = 1
+	var/client/cl = null
+	var/obj/effect/bmode/builddir/builddir = null
+	var/obj/effect/bmode/buildhelp/buildhelp = null
+	var/obj/effect/bmode/buildmode/buildmode = null
+	var/obj/effect/bmode/buildquit/buildquit = null
+	var/atom/movable/throw_atom = null
+
+/obj/effect/bmode/buildmode
+	icon_state = "buildmode1"
+	screen_loc = "NORTH,WEST+2"
+	var/varholder = "name"
+	var/valueholder = "derp"
+	var/objholder = /obj/structure/closet
+
+	Click(location, control, params)
+		var/list/pa = params2list(params)
+
+		if(pa.Find("left"))
+			switch(master.cl.buildmode)
+				if(1)
+					master.cl.buildmode = 2
+					src.icon_state = "buildmode2"
+				if(2)
+					master.cl.buildmode = 3
+					src.icon_state = "buildmode3"
+				if(3)
+					master.cl.buildmode = 4
+					src.icon_state = "buildmode4"
+				if(4)
+					master.cl.buildmode = 1
+					src.icon_state = "buildmode1"
+
+		else if(pa.Find("right"))
+			switch(master.cl.buildmode)
+				if(1)
+					return 1
+				if(2)
+					objholder = text2path(input(usr,"Enter typepath:" ,"Typepath","/obj/structure/closet"))
+					if(!ispath(objholder))
+						objholder = /obj/structure/closet
+						alert("That path is not allowed.")
+					else
+						if(ispath(objholder,/mob) && !check_rights(R_DEBUG,0))
+							objholder = /obj/structure/closet
+				if(3)
+					var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine")
+
+					master.buildmode.varholder = input(usr,"Enter variable name:" ,"Name", "name")
+					if(master.buildmode.varholder in locked && !check_rights(R_DEBUG,0))
+						return 1
+					var/thetype = input(usr,"Select variable type:" ,"Type") in list("text","number","mob-reference","obj-reference","turf-reference")
+					if(!thetype) return 1
+					switch(thetype)
+						if("text")
+							master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value", "value") as text
+						if("number")
+							master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value", 123) as num
+						if("mob-reference")
+							master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value") as mob in mob_list
+						if("obj-reference")
+							master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value") as obj in world
+						if("turf-reference")
+							master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value") as turf in world
+    	return 1
+
+/proc/build_click(var/mob/user, buildmode, params, var/obj/object)
+	var/obj/effect/bmode/buildholder/holder = null
+	for(var/obj/effect/bmode/buildholder/H)
+		if(H.cl == user.client)
+			holder = H
+			break
+	if(!holder) return
+	var/list/pa = params2list(params)
+
+	switch(buildmode)
+		if(1)
+			if(istype(object,/turf) && pa.Find("left") && !pa.Find("alt") && !pa.Find("ctrl") )
+				if(istype(object,/turf/space))
+					var/turf/T = object
+					T.ChangeTurf(/turf/simulated/floor)
+					return
+				else if(istype(object,/turf/simulated/floor))
+					var/turf/T = object
+					T.ChangeTurf(/turf/simulated/wall)
+					return
+				else if(istype(object,/turf/simulated/wall))
+					var/turf/T = object
+					T.ChangeTurf(/turf/simulated/wall/r_wall)
+					return
+			else if(pa.Find("right"))
+				if(istype(object,/turf/simulated/wall))
+					var/turf/T = object
+					T.ChangeTurf(/turf/simulated/floor)
+					return
+				else if(istype(object,/turf/simulated/floor))
+					var/turf/T = object
+					T.ChangeTurf(/turf/space)
+					return
+				else if(istype(object,/turf/simulated/wall/r_wall))
+					var/turf/T = object
+					T.ChangeTurf(/turf/simulated/wall)
+					return
+				else if(istype(object,/obj))
+					del(object)
+					return
+			else if(istype(object,/turf) && pa.Find("alt") && pa.Find("left"))
+				new/obj/machinery/door/airlock(get_turf(object))
+			else if(istype(object,/turf) && pa.Find("ctrl") && pa.Find("left"))
+				switch(holder.builddir.dir)
+					if(NORTH)
+						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
+						WIN.set_dir(NORTH)
+					if(SOUTH)
+						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
+						WIN.set_dir(SOUTH)
+					if(EAST)
+						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
+						WIN.set_dir(EAST)
+					if(WEST)
+						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
+						WIN.set_dir(WEST)
+					if(NORTHWEST)
+						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
+						WIN.set_dir(NORTHWEST)
+		if(2)
+			if(pa.Find("left"))
+				if(ispath(holder.buildmode.objholder,/turf))
+					var/turf/T = get_turf(object)
+					T.ChangeTurf(holder.buildmode.objholder)
+				else
+					var/obj/A = new holder.buildmode.objholder (get_turf(object))
+					A.set_dir(holder.builddir.dir)
+			else if(pa.Find("right"))
+				if(isobj(object)) del(object)
+
+		if(3)
+			if(pa.Find("left")) //I cant believe this shit actually compiles.
+				if(object.vars.Find(holder.buildmode.varholder))
+					log_admin("[key_name(usr)] modified [object.name]'s [holder.buildmode.varholder] to [holder.buildmode.valueholder]")
+					object.vars[holder.buildmode.varholder] = holder.buildmode.valueholder
+				else
+					usr << "\red [initial(object.name)] does not have a var called '[holder.buildmode.varholder]'"
+			if(pa.Find("right"))
+				if(object.vars.Find(holder.buildmode.varholder))
+					log_admin("[key_name(usr)] modified [object.name]'s [holder.buildmode.varholder] to [holder.buildmode.valueholder]")
+					object.vars[holder.buildmode.varholder] = initial(object.vars[holder.buildmode.varholder])
+				else
+					usr << "\red [initial(object.name)] does not have a var called '[holder.buildmode.varholder]'"
+
+		if(4)
+			if(pa.Find("left"))
+				if(istype(object, /atom/movable))
+					holder.throw_atom = object
+			if(pa.Find("right"))
+				if(holder.throw_atom)
+					holder.throw_atom.throw_at(object, 10, 1)
+
--- a/code/modules/admin/verbs/deadsay.dm
+++ b/code/modules/admin/verbs/deadsay.dm
@@ -25,11 +25,11 @@

 	if (src.holder.rights & R_MENTOR)
 		stafftype = "MENTOR"
-		
+
 	if (src.holder.rights & R_ADMIN)
 		stafftype = "ADMIN"

-	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
+	msg = sanitize(copytext(msg, 1, MAX_MESSAGE_LEN))
 	log_admin("[key_name(src)] : [msg]")

 	if (!msg)
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -736,8 +736,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_syndicate_commando()

 		if("nanotrasen representative")
-			M.equip_if_possible(new /obj/item/clothing/under/rank/centcom/representative(M), slot_w_uniform)
-			M.equip_if_possible(new /obj/item/clothing/shoes/centcom(M), slot_shoes)
+			M.equip_if_possible(new /obj/item/clothing/under/rank/centcom(M), slot_w_uniform)
+			M.equip_if_possible(new /obj/item/clothing/shoes/laceup(M), slot_shoes)
 			M.equip_if_possible(new /obj/item/clothing/gloves/white(M), slot_gloves)
 			M.equip_if_possible(new /obj/item/device/radio/headset/heads/hop(M), slot_l_ear)

@@ -761,8 +761,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_if_possible(W, slot_wear_id)

 		if("nanotrasen officer")
-			M.equip_if_possible(new /obj/item/clothing/under/rank/centcom/officer(M), slot_w_uniform)
-			M.equip_if_possible(new /obj/item/clothing/shoes/centcom(M), slot_shoes)
+			M.equip_if_possible(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform)
+			M.equip_if_possible(new /obj/item/clothing/shoes/laceup(M), slot_shoes)
 			M.equip_if_possible(new /obj/item/clothing/gloves/white(M), slot_gloves)
 			M.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(M), slot_l_ear)
 			M.equip_if_possible(new /obj/item/clothing/head/beret/centcom/officer(M), slot_head)
@@ -786,8 +786,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that


 		if("nanotrasen captain")
-			M.equip_if_possible(new /obj/item/clothing/under/rank/centcom/captain(M), slot_w_uniform)
-			M.equip_if_possible(new /obj/item/clothing/shoes/centcom(M), slot_shoes)
+			M.equip_if_possible(new /obj/item/clothing/under/rank/centcom_captain(M), slot_w_uniform)
+			M.equip_if_possible(new /obj/item/clothing/shoes/laceup(M), slot_shoes)
 			M.equip_if_possible(new /obj/item/clothing/gloves/white(M), slot_gloves)
 			M.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(M), slot_l_ear)
 			M.equip_if_possible(new /obj/item/clothing/head/beret/centcom/captain(M), slot_head)
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -6,7 +6,7 @@
 		usr << "\red Speech is currently admin-disabled."
 		return

-	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
+	msg = sanitize(copytext(msg, 1, MAX_MESSAGE_LEN))
 	if(!msg)	return

 	if(usr.client)
@@ -29,14 +29,14 @@
 	//log_admin("HELP: [key_name(src)]: [msg]")

 /proc/Centcomm_announce(var/text , var/mob/Sender , var/iamessage)
-	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
+	var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
 	msg = "\blue <b><font color=orange>CENTCOMM[iamessage ? " IA" : ""]:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
 	for(var/client/C in admins)
 		if(R_ADMIN & C.holder.rights)
 			C << msg

 /proc/Syndicate_announce(var/text , var/mob/Sender)
-	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
+	var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
 	msg = "\blue <b><font color=crimson>ILLEGAL:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;SyndicateReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
 	for(var/client/C in admins)
 		if(R_ADMIN & C.holder.rights)
--- a/code/modules/admin/verbs/striketeam.dm
+++ b/code/modules/admin/verbs/striketeam.dm
@@ -19,7 +19,7 @@ var/global/sent_strike_team = 0

 	var/input = null
 	while(!input)
-		input = copytext(sanitize(input(src, "Please specify which mission the death commando squad shall undertake.", "Specify Mission", "")),1,MAX_MESSAGE_LEN)
+		input = sanitize(copytext(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
--- a/code/modules/admin/verbs/striketeam_syndicate.dm
+++ b/code/modules/admin/verbs/striketeam_syndicate.dm
@@ -24,7 +24,7 @@ var/global/sent_syndicate_strike_team = 0

 	var/input = null
 	while(!input)
-		input = copytext(sanitize(input(src, "Please specify which mission the strike team shall undertake.", "Specify Mission", "")),1,MAX_MESSAGE_LEN)
+		input = sanitize(copytext(input(src, "Please specify which mission the 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