Merge branch 'incremental_tg' r5067 into bs12_with_tgport

removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates) Conflicts: baystation12.dme code/__HELPERS/type2type.dm code/controllers/configuration.dm code/datums/datumvars.dm code/datums/helper_datums/getrev.dm code/defines/obj.dm code/game/gamemodes/events/black_hole.dm code/game/gamemodes/events/space_ninja.dm code/game/gamemodes/wizard/rightandwrong.dm code/game/jobs/job/captain.dm code/game/jobs/job/job.dm code/game/jobs/job_controller.dm code/game/machinery/bots/medbot.dm code/game/machinery/computer/card.dm code/game/machinery/telecomms/traffic_control.dm code/game/machinery/turrets.dm code/game/machinery/wishgranter.dm code/game/objects/items/blueprints.dm code/game/objects/items/devices/uplinks.dm code/game/objects/items/stacks/stack.dm code/game/objects/items/weapons/surgery_tools.dm code/game/turfs/turf.dm code/game/verbs/ooc.dm code/global.dm code/modules/admin/IsBanned.dm code/modules/admin/admin.dm code/modules/admin/admin_memo.dm code/modules/admin/admin_verbs.dm code/modules/admin/holder2.dm code/modules/admin/player_panel.dm code/modules/admin/verbs/adminpm.dm code/modules/admin/verbs/diagnostics.dm code/modules/assembly/igniter.dm code/modules/client/client defines.dm code/modules/client/client procs.dm code/modules/clothing/spacesuits/miscellaneous.dm code/modules/clothing/suits/armor.dm code/modules/clothing/suits/jobs.dm code/modules/mining/mine_turfs.dm code/modules/mob/living/carbon/human/say.dm code/modules/mob/living/carbon/human/update_icons.dm code/modules/mob/living/living.dm code/modules/mob/living/living_defense.dm code/modules/mob/living/silicon/robot/emote.dm code/modules/mob/living/silicon/robot/life.dm code/modules/mob/mob_cleanup.dm code/modules/mob/new_player/new_player.dm code/modules/mob/new_player/preferences.dm code/modules/paperwork/paper.dm code/modules/paperwork/photocopier.dm code/modules/projectiles/guns/projectile/automatic.dm code/modules/reagents/Chemistry-Machinery.dm code/setup.dm code/stylesheet.dm code/world.dm config/admins.txt config/config.txt html/changelog.html icons/mob/items_lefthand.dmi icons/mob/items_righthand.dmi icons/mob/suit.dmi icons/obj/clothing/suits.dmi icons/turf/areas.dmi Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2026-08-23 12:08:28 +01:00 · 2012-12-28 14:13:11 +10:00
parent 29ff212265 15e001d19d
commit 31349fb7d3
341 changed files with 17940 additions and 16947 deletions
@@ -26,9 +26,9 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali
 	var/original_msg = msg

 	//The symbol × (fancy multiplication sign) will be used to mark where to put replacements, so the original message must not contain it.
-	msg = dd_replacetext(msg, "×", "")
-	msg = dd_replacetext(msg, "HOLDERREF", "HOLDER-REF") //HOLDERREF is a key word which gets replaced with the admin's holder ref later on, so it mustn't be in the original message
-	msg = dd_replacetext(msg, "ADMINREF", "ADMIN-REF") //ADMINREF is a key word which gets replaced with the admin's client's ref. So it mustn't be in the original message.
+	msg = replacetext(msg, "×", "")
+	msg = replacetext(msg, "HOLDERREF", "HOLDER-REF") //HOLDERREF is a key word which gets replaced with the admin's holder ref later on, so it mustn't be in the original message
+	msg = replacetext(msg, "ADMINREF", "ADMIN-REF") //ADMINREF is a key word which gets replaced with the admin's client's ref. So it mustn't be in the original message.

 	var/list/msglist = text2list(msg, " ")

@@ -51,14 +51,14 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali
 	for(var/i = 1; i <= msglist.len; i++)
 		var/word = msglist[i]
 		var/original_word = word
-		word = dd_replacetext(word, ".", "")
-		word = dd_replacetext(word, ",", "")
-		word = dd_replacetext(word, "!", "")
-		word = dd_replacetext(word, "?", "")	//Strips some common punctuation characters so the actual word can be better compared.
-		word = dd_replacetext(word, ";", "")
-		word = dd_replacetext(word, ":", "")
-		word = dd_replacetext(word, "(", "")
-		word = dd_replacetext(word, ")", "")
+		word = replacetext(word, ".", "")
+		word = replacetext(word, ",", "")
+		word = replacetext(word, "!", "")
+		word = replacetext(word, "?", "")	//Strips some common punctuation characters so the actual word can be better compared.
+		word = replacetext(word, ";", "")
+		word = replacetext(word, ":", "")
+		word = replacetext(word, "(", "")
+		word = replacetext(word, ")", "")
 		if(lowertext(word) in adminhelp_ignored_words)
 			continue
 		if(lowertext(word) == "ai")
@@ -88,43 +88,38 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali
 			j++

 	msg = dd_list2text(msglist, " ")
-	var/admin_number = 0
 	var/admin_number_afk = 0

 	if(mob)
 		var/ref_mob = "\ref[src.mob]"
-		for (var/client/X)
-			if (X.holder)
-				admin_number++
-				if( X.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one.
-					admin_number_afk++
-				if(X.holder.sound_adminhelp)
-					X << 'sound/effects/adminhelp.ogg'
-				var/check_laws_text = ""
-				if(ai_found)
-					check_laws_text = (" (<A HREF='?src=\ref[X.holder];adminchecklaws=[ref_mob]'>CL</A>)")
+		for(var/client/X in admins)
+			if( X.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one.
+				admin_number_afk++
+			if(X.holder.sound_adminhelp)
+				X << 'sound/effects/adminhelp.ogg'
+			var/check_laws_text = ""
+			if(ai_found)
+				check_laws_text = (" (<A HREF='?src=\ref[X.holder];adminchecklaws=[ref_mob]'>CL</A>)")

-				var/msg_to_send = "\blue <b><font color=red>HELP: </font>[key_name(src, X)] (<A HREF='?src=\ref[X.holder];adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?src=\ref[X.holder];adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?src=\ref[X.holder];adminplayervars=[ref_mob]'>VV</A>) (<A HREF='?src=\ref[X.holder];adminplayersubtlemessage=[ref_mob]'>SM</A>) (<A HREF='?src=\ref[X.holder];adminplayerobservejump=[ref_mob]'>JMP</A>) (<A HREF='?src=\ref[X.holder];secretsadmin=check_antagonist'>CA</A>) [check_laws_text]:</b> [msg]"
-				msg_to_send = dd_replacetext(msg_to_send, "HOLDERREF", "\ref[X.holder]")
-				msg_to_send = dd_replacetext(msg_to_send, "ADMINREF", "\ref[X]")
-				X << msg_to_send
+			var/msg_to_send = "\blue <b><font color=red>HELP: </font>[key_name(src, X)] (<A HREF='?src=\ref[X.holder];adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?src=\ref[X.holder];adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?src=\ref[X.holder];adminplayervars=[ref_mob]'>VV</A>) (<A HREF='?src=\ref[X.holder];subtlemessage=[ref_mob]'>SM</A>) (<A HREF='?src=\ref[X.holder];adminplayerobservejump=[ref_mob]'>JMP</A>) (<A HREF='?src=\ref[X.holder];secretsadmin=check_antagonist'>CA</A>) [check_laws_text]:</b> [msg]"
+			msg_to_send = replacetext(msg_to_send, "HOLDERREF", "\ref[X.holder]")
+			msg_to_send = replacetext(msg_to_send, "ADMINREF", "\ref[X]")
+			X << msg_to_send
 	else
 		var/ref_client = "\ref[src]"
-		for (var/client/X)
-			if (X.holder)
-				admin_number++
-				if( X.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one.
-					admin_number_afk++
-				if(X.holder.sound_adminhelp)
-					X << 'sound/effects/adminhelp.ogg'
-				var/msg_to_send = "\blue <b><font color=red>HELP: </font>[key_name(src, X)] (<A HREF='?src=\ref[X.holder];adminplayervars=[ref_client]'>VV</A>) (<A HREF='?src=\ref[X.holder];secretsadmin=check_antagonist'>CA</A>):</b> [msg]"
-				msg_to_send = dd_replacetext(msg_to_send, "HOLDERREF", "\ref[X.holder]")
-				msg_to_send = dd_replacetext(msg_to_send, "ADMINREF", "\ref[X]")
-				X << msg_to_send
-
+		for(var/client/X in admins)
+			if( X.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one.
+				admin_number_afk++
+			if(X.holder.sound_adminhelp)
+				X << 'sound/effects/adminhelp.ogg'
+			var/msg_to_send = "\blue <b><font color=red>HELP: </font>[key_name(src, X)] (<A HREF='?src=\ref[X.holder];adminplayervars=[ref_client]'>VV</A>) (<A HREF='?src=\ref[X.holder];secretsadmin=check_antagonist'>CA</A>):</b> [msg]"
+			msg_to_send = replacetext(msg_to_send, "HOLDERREF", "\ref[X.holder]")
+			msg_to_send = replacetext(msg_to_send, "ADMINREF", "\ref[X]")
+			X << msg_to_send
+	var/admin_number_present = admins.len - admin_number_afk
 	src << "<font color='blue'>PM to-<b>Admins</b>: [original_msg]</font>"
-	log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number] non-AFK admins.")
-	if((admin_number - admin_number_afk) <= 0)
+	log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
+	if(admin_number_present <= 0)
 		if(!admin_number_afk)
 			send2irc(ckey, "[original_msg] - No admins online")
 		else
@@ -30,7 +30,7 @@
 		alert("Admin jumping disabled")
 	return

-/client/proc/jumptomob(var/mob/M in sortmobs())
+/client/proc/jumptomob(var/mob/M in mob_list)
 	set category = "Admin"
 	set name = "Jump to Mob"

@@ -40,9 +40,9 @@
 		src << "<font color='red'>Error: Admin-PM: You are unable to use admin PM-s (muted).</font>"
 		return

-	if( !C || !istype(C,/client) )
-		if(holder)		src << "<font color='red'>Error: Admin-PM: Client not found.</font>"
-		else			adminhelp(msg)	//admin we are replying to left. adminhelp instead
+	if(!istype(C,/client))
+		if(holder)	src << "<font color='red'>Error: Admin-PM: Client not found.</font>"
+		else		adminhelp(msg)	//admin we are replying to left. adminhelp instead
 		return

 	//get message text, limit it's length.and clean/escape html
@@ -58,8 +58,8 @@
 	if (src.handle_spam_prevention(msg,MUTE_ADMINHELP))
 		return

-	//clean the message if it's not sent by a GA or GM
-	if( !holder || !(holder.rank in list("Game Admin", "Game Master")) )
+	//clean the message if it's not sent by a high-rank admin
+	if(!check_rights(R_SERVER|R_DEBUG,0))
 		msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
 		if(!msg)	return

@@ -115,7 +115,7 @@
 	log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")

 	//we don't use message_admins here because the sender/receiver might get it too
-	for(var/client/X)									//there are fewer clients than mobs
-		if(X.holder && X.key!=key && X.key!=C.key)	//check client/X is an admin and isn't the sender or recipient
+	for(var/client/X in admins)
+		if(X.key!=key && X.key!=C.key)	//check client/X is an admin and isn't the sender or recipient
 			X << "<B><font color='blue'>PM: [key_name(src, X, 0)]-&gt;[key_name(C, X, 0)]:</B> \blue [msg]</font>" //inform X

@@ -2,32 +2,20 @@
 	set category = "Special Verbs"
 	set name = "Asay" //Gave this shit a shorter name so you only have to time out "asay" rather than "admin say" to use it --NeoFite
 	set hidden = 1
-
-	if (!src.holder)
-		src << "Only administrators may use this command."
-		return
-
-	if (src.muted & MUTE_ADMINHELP)
-		src << "You cannot send ASAY messages (muted)."
-		return
-
-	if (src.handle_spam_prevention(msg,MUTE_ADMINHELP))
-		return
+	if(!check_rights(0))	return

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

-
-	if (!msg)
-		return
-	feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-	if(holder.rank == "Admin Observer")
-		for(var/client/C in admins)
-			C << "<span class='adminobserver'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, C)]:</EM> <span class='message'>[msg]</span></span>"
-	else
+	if(check_rights(R_ADMIN,0))
 		for(var/client/C in admins)
 			C << "<span class='admin'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, C)]</EM> (<A HREF='?src=\ref[C.holder];adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>"
+	else
+		for(var/client/C in admins)
+			C << "<span class='adminobserver'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, C)]:</EM> <span class='message'>[msg]</span></span>"
+
+	log_admin("[key_name(src)] : [msg]")
+	feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

 /client/proc/cmd_mod_say(msg as text)
 	set category = "Special Verbs"
@@ -1,22 +1,17 @@
 /client/proc/Debug2()
 	set category = "Debug"
 	set name = "Debug-Game"
-	if(!holder)
-		src << "Only administrators may use this command."
-		return
-	if(holder.rank == "Game Admin")
-		Debug2 = !Debug2
+	if(!check_rights(R_DEBUG))	return

-		world << "Debugging [Debug2 ? "On" : "Off"]"
-		log_admin("[key_name(src)] toggled debugging to [Debug2]")
-	else if(holder.rank == "Game Master")
-		Debug2 = !Debug2
-
-		world << "Debugging [Debug2 ? "On" : "Off"]"
-		log_admin("[key_name(src)] toggled debugging to [Debug2]")
+	if(Debug2)
+		Debug2 = 0
+		message_admins("[key_name(src)] toggled debugging off.")
+		log_admin("[key_name(src)] toggled debugging off.")
 	else
-		alert("Coders only baby")
-		return
+		Debug2 = 1
+		message_admins("[key_name(src)] toggled debugging on.")
+		log_admin("[key_name(src)] toggled debugging on.")
+
 	feedback_add_details("admin_verb","DG2") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!


@@ -34,9 +29,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	set category = "Debug"
 	set name = "Advanced ProcCall"

-	if(!holder)
-		src << "Only administrators may use this command."
-		return
+	if(!check_rights(R_DEBUG)) return

 	spawn(0)
 		var/target = null
@@ -345,6 +338,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			src << "Made [M] a cultist."
 */

+//TODO: merge the vievars version into this or something maybe mayhaps
 /client/proc/cmd_debug_del_all()
 	set category = "Debug"
 	set name = "Del-All"
@@ -419,13 +413,13 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		else
 			var/mob/dead/observer/ghost = new/mob/dead/observer(M,1)
 			ghost.ckey = M.ckey
+	message_admins("\blue [key_name_admin(usr)] assumed direct control of [M].", 1)
+	log_admin("[key_name(usr)] assumed direct control of [M].")
 	var/mob/adminmob = src.mob
 	M.ckey = src.ckey
 	if( isobserver(adminmob) )
 		del(adminmob)
 	feedback_add_details("admin_verb","ADC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-	log_admin("[key_name(usr)] assumed direct control of [M].")
-	message_admins("\blue [key_name_admin(usr)] assumed direct control of [M].", 1)



@@ -1,53 +1,26 @@
-/client/proc
-	general_report()
-		set category = "Debug"
-		set name = "Show General Report"
+/client/proc/air_report()
+	set category = "Debug"
+	set name = "Show Air Report"

-		if(!master_controller)
-			usr << alert("Master_controller not found.")
+	/*(!master_controller || !air_master)
+		alert(usr,"Master_controller or air_master not found.","Air Report")
+		return 0

-		var/mobs = 0
-		for(var/mob/M in mob_list)
-			mobs++
+	var/active_groups = 0
+	var/inactive_groups = 0
+	var/active_tiles = 0
+	for(var/datum/air_group/group in air_master.air_groups)
+		if(group.group_processing)
+			active_groups++
+		else
+			inactive_groups++
+			active_tiles += group.members.len

-		var/output = {"<B>GENERAL SYSTEMS REPORT</B><HR>
-<B>General Processing Data</B><BR>
-<B># of Machines:</B> [machines.len]<BR>
-<B># of Pipe Networks:</B> [pipe_networks.len]<BR>
-<B># of Processing Items:</B> [processing_objects.len]<BR>
-<B># of Power Nets:</B> [powernets.len]<BR>
-<B># of Mobs:</B> [mobs]<BR>
-"}
+	var/hotspots = 0
+	for(var/obj/effect/hotspot/hotspot in world)
+		hotspots++

-		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!
-
-//todo:
-	air_report()
-		set category = "Debug"
-		set name = "Show Air Report"
-
-		usr << "\red This proc is unavailable."
-		/*
-		if(!master_controller || !air_master)
-			alert(usr,"Master_controller or air_master not found.","Air Report")
-			return 0
-
-		var/active_groups = 0
-		var/inactive_groups = 0
-		var/active_tiles = 0
-		for(var/datum/air_group/group in air_master.air_groups)
-			if(group.group_processing)
-				active_groups++
-			else
-				inactive_groups++
-				active_tiles += group.members.len
-
-		var/hotspots = 0
-		for(var/obj/effect/hotspot/hotspot in world)
-			hotspots++
-
-		var/output = {"<B>AIR SYSTEMS REPORT</B><HR>
+	var/output = {"<B>AIR SYSTEMS REPORT</B><HR>
 <B>General Processing Data</B><BR>
 <B># of Groups:</B> [air_master.air_groups.len]<BR>
 ---- <I>Active:</I> [active_groups]<BR>
@@ -65,159 +38,148 @@
 <B>Tile Update:</B> [air_master.tiles_to_update.len]<BR>
 "}

-		usr << browse(output,"window=airreport")
-		feedback_add_details("admin_verb","SAR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-		*/
+	usr << browse(output,"window=airreport")
+	feedback_add_details("admin_verb","SAR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+*/
+/client/proc/air_status(turf/target as turf)
+	set category = "Debug"
+	set name = "Display Air Status"

-//todo:
-	air_status(turf/target as turf)
-		set category = "Debug"
-		set name = "Display Air Status"
-
-		usr << "\red This proc is unavailable."
-		/*
-		if(!isturf(target))
-			return
-
-		var/datum/gas_mixture/GM = target.return_air()
-		var/burning = 0
-		if(istype(target, /turf/simulated))
-			var/turf/simulated/T = target
-			if(T.active_hotspot)
-				burning = 1
-
-		usr << "\blue @[target.x],[target.y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]"
-		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"
-		var/largest_move_time = 0
-		var/largest_click_time = 0
-		var/mob/largest_move_mob = null
-		var/mob/largest_click_mob = null
-		for(var/mob/M in world)
-			if(!M.client)
-				continue
-			if(M.next_move >= largest_move_time)
-				largest_move_mob = M
-				if(M.next_move > world.time)
-					largest_move_time = M.next_move - world.time
-				else
-					largest_move_time = 1
-			if(M.lastDblClick >= largest_click_time)
-				largest_click_mob = M
-				if(M.lastDblClick > world.time)
-					largest_click_time = M.lastDblClick - world.time
-				else
-					largest_click_time = 0
-			log_admin("DEBUG: [key_name(M)]  next_move = [M.next_move]  lastDblClick = [M.lastDblClick]  world.time = [world.time]")
-			M.next_move = 1
-			M.lastDblClick = 0
-		message_admins("[key_name_admin(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [largest_move_time/10] seconds!", 1)
-		message_admins("[key_name_admin(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [largest_click_time/10] seconds!", 1)
-		message_admins("world.time = [world.time]", 1)
-		feedback_add_details("admin_verb","UFE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	/*(!isturf(target))
 		return

-	radio_report()
-		set category = "Debug"
-		set name = "Radio report"
+	var/datum/gas_mixture/GM = target.return_air()
+	var/burning = 0
+	if(istype(target, /turf/simulated))
+		var/turf/simulated/T = target
+		if(T.active_hotspot)
+			burning = 1

-		var/filters = list(
-			"1" = "RADIO_TO_AIRALARM",
-			"2" = "RADIO_FROM_AIRALARM",
-			"3" = "RADIO_CHAT",
-			"4" = "RADIO_ATMOSIA",
-			"5" = "RADIO_NAVBEACONS",
-			"6" = "RADIO_AIRLOCK",
-			"7" = "RADIO_SECBOT",
-			"8" = "RADIO_MULEBOT",
-			"_default" = "NO_FILTER"
-			)
-		var/output = "<b>Radio Report</b><hr>"
-		for (var/fq in radio_controller.frequencies)
-			output += "<b>Freq: [fq]</b><br>"
-			var/list/datum/radio_frequency/fqs = radio_controller.frequencies[fq]
-			if (!fqs)
-				output += "&nbsp;&nbsp;<b>ERROR</b><br>"
+	usr << "\blue @[target.x],[target.y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]"
+	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!
+	*/
+
+/client/proc/fix_next_move()
+	set category = "Debug"
+	set name = "Unfreeze Everyone"
+	var/largest_move_time = 0
+	var/largest_click_time = 0
+	var/mob/largest_move_mob = null
+	var/mob/largest_click_mob = null
+	for(var/mob/M in world)
+		if(!M.client)
+			continue
+		if(M.next_move >= largest_move_time)
+			largest_move_mob = M
+			if(M.next_move > world.time)
+				largest_move_time = M.next_move - world.time
+			else
+				largest_move_time = 1
+		if(M.lastDblClick >= largest_click_time)
+			largest_click_mob = M
+			if(M.lastDblClick > world.time)
+				largest_click_time = M.lastDblClick - world.time
+			else
+				largest_click_time = 0
+		log_admin("DEBUG: [key_name(M)]  next_move = [M.next_move]  lastDblClick = [M.lastDblClick]  world.time = [world.time]")
+		M.next_move = 1
+		M.lastDblClick = 0
+	message_admins("[key_name_admin(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [largest_move_time/10] seconds!", 1)
+	message_admins("[key_name_admin(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [largest_click_time/10] seconds!", 1)
+	message_admins("world.time = [world.time]", 1)
+	feedback_add_details("admin_verb","UFE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	return
+
+/client/proc/radio_report()
+	set category = "Debug"
+	set name = "Radio report"
+
+	var/filters = list(
+		"1" = "RADIO_TO_AIRALARM",
+		"2" = "RADIO_FROM_AIRALARM",
+		"3" = "RADIO_CHAT",
+		"4" = "RADIO_ATMOSIA",
+		"5" = "RADIO_NAVBEACONS",
+		"6" = "RADIO_AIRLOCK",
+		"7" = "RADIO_SECBOT",
+		"8" = "RADIO_MULEBOT",
+		"_default" = "NO_FILTER"
+		)
+	var/output = "<b>Radio Report</b><hr>"
+	for (var/fq in radio_controller.frequencies)
+		output += "<b>Freq: [fq]</b><br>"
+		var/list/datum/radio_frequency/fqs = radio_controller.frequencies[fq]
+		if (!fqs)
+			output += "&nbsp;&nbsp;<b>ERROR</b><br>"
+			continue
+		for (var/filter in fqs.devices)
+			var/list/f = fqs.devices[filter]
+			if (!f)
+				output += "&nbsp;&nbsp;[filters[filter]]: ERROR<br>"
 				continue
-			for (var/filter in fqs.devices)
-				var/list/f = fqs.devices[filter]
-				if (!f)
-					output += "&nbsp;&nbsp;[filters[filter]]: ERROR<br>"
-					continue
-				output += "&nbsp;&nbsp;[filters[filter]]: [f.len]<br>"
-				for (var/device in f)
-					if (isobj(device))
-						output += "&nbsp;&nbsp;&nbsp;&nbsp;[device] ([device:x],[device:y],[device:z] in area [get_area(device:loc)])<br>"
-					else
-						output += "&nbsp;&nbsp;&nbsp;&nbsp;[device]<br>"
+			output += "&nbsp;&nbsp;[filters[filter]]: [f.len]<br>"
+			for (var/device in f)
+				if (isobj(device))
+					output += "&nbsp;&nbsp;&nbsp;&nbsp;[device] ([device:x],[device:y],[device:z] in area [get_area(device:loc)])<br>"
+				else
+					output += "&nbsp;&nbsp;&nbsp;&nbsp;[device]<br>"

-		usr << browse(output,"window=radioreport")
-		feedback_add_details("admin_verb","RR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	usr << browse(output,"window=radioreport")
+	feedback_add_details("admin_verb","RR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

-	reload_admins()
-		set name = "Reload Admins"
-		set category = "Debug"
+/client/proc/reload_admins()
+	set name = "Reload Admins"
+	set category = "Debug"

-		if(!(usr.client.holder && usr.client.holder.level >= 6)) // protect and prevent
-			usr << "\red Not a good cop"
-			return
+	if(!check_rights(R_SERVER))	return

-		message_admins("[usr] manually reloaded admins.txt and moderators.txt")
-		usr << "You reload admins.txt and moderators.txt"
-		world.load_admins()
-		world.load_mods()
-		feedback_add_details("admin_verb","RLDA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	message_admins("[usr] manually reloaded admins")
+	load_admins()
+	feedback_add_details("admin_verb","RLDA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

 //todo:
-	jump_to_dead_group()
-		set name = "Jump to dead group"
-		set category = "Debug"
-
-		usr << "\red This proc is unavailable."
+/client/proc/jump_to_dead_group()
+	set name = "Jump to dead group"
+	set category = "Debug"
 		/*
-		if(!holder)
-			src << "Only administrators may use this command."
-			return
-
-		if(!air_master)
-			usr << "Cannot find air_system"
-			return
-		var/datum/air_group/dead_groups = list()
-		for(var/datum/air_group/group in air_master.air_groups)
-			if (!group.group_processing)
-				dead_groups += group
-		var/datum/air_group/dest_group = pick(dead_groups)
-		usr.loc = pick(dest_group.members)
-		feedback_add_details("admin_verb","JDAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	if(!holder)
+		src << "Only administrators may use this command."
 		return
-		*/

-	kill_airgroup()
-		set name = "Kill Local Airgroup"
-		set desc = "Use this to allow manual manupliation of atmospherics."
-		set category = "Debug"
-		usr << "\red This proc is unavailable."
-		/*
-		if(!holder)
-			src << "Only administrators may use this command."
-			return
+	if(!air_master)
+		usr << "Cannot find air_system"
+		return
+	var/datum/air_group/dead_groups = list()
+	for(var/datum/air_group/group in air_master.air_groups)
+		if (!group.group_processing)
+			dead_groups += group
+	var/datum/air_group/dest_group = pick(dead_groups)
+	usr.loc = pick(dest_group.members)
+	feedback_add_details("admin_verb","JDAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	return
+	*/

-		if(!air_master)
-			usr << "Cannot find air_system"
-			return
+/client/proc/kill_airgroup()
+	set name = "Kill Local Airgroup"
+	set desc = "Use this to allow manual manupliation of atmospherics."
+	set category = "Debug"
+	/*
+	if(!holder)
+		src << "Only administrators may use this command."
+		return

-		var/turf/T = get_turf(usr)
-		if(istype(T, /turf/simulated))
-			var/datum/air_group/AG = T:parent
-			AG.next_check = 30
-			AG.group_processing = 0
-		else
-			usr << "Local airgroup is unsimulated!"
-		feedback_add_detail("admin_verb","KLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-		*/
+	if(!air_master)
+		usr << "Cannot find air_system"
+		return
+
+	var/turf/T = get_turf(usr)
+	if(istype(T, /turf/simulated))
+		var/datum/air_group/AG = T:parent
+		AG.next_check = 30
+		AG.group_processing = 0
+	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!
+	*/
@@ -127,6 +127,9 @@ var/intercom_range_display_status = 0
 /client/proc/enable_debug_verbs()
 	set category = "Debug"
 	set name = "Debug verbs"
+
+	if(!check_rights(R_DEBUG)) return
+
 	src.verbs += /client/proc/do_not_use_these 			//-errorage
 	src.verbs += /client/proc/camera_view 				//-errorage
 	src.verbs += /client/proc/sec_camera_report 		//-errorage
@@ -5,7 +5,7 @@

 	var/method = 0	//0 means strict type detection while 1 means this type and all subtypes (IE: /obj/item with this set to 1 will set it to ALL itms)

-	if(!admin_rank_check(src.holder.level, 3)) return
+	if(!check_rights(R_VAREDIT))	return

 	if(A && A.type)
 		if(typesof(A.type))
@@ -24,11 +24,9 @@


 /client/proc/massmodify_variables(var/atom/O, var/var_name = "", var/method = 0)
-	var/list/locked = list("vars", "key", "ckey", "client")
+	if(!check_rights(R_VAREDIT))	return

-	if(!src.holder)
-		src << "Only administrators may use this command."
-		return
+	var/list/locked = list("vars", "key", "ckey", "client")

 	for(var/p in forbidden_varedit_object_types)
 		if( istype(O,p) )
@@ -48,17 +46,13 @@
 	else
 		variable = var_name

-	if(!variable)
-		return
+	if(!variable)	return
 	var/default
 	var/var_value = O.vars[variable]
 	var/dir

-	if (locked.Find(variable) && !(src.holder.rank in list("Game Master", "Game Admin")))
-		return
-
-	if (variable == "holder" && holder.rank != "Game Master") //Hotfix, a bit ugly but that exploit has been there for ages and now somebody just had to go and tell everyone of it bluh bluh - U
-		return
+	if(variable == "holder" || (variable in locked))
+		if(!check_rights(R_DEBUG))	return

 	if(isnull(var_value))
 		usr << "Unable to determine variable type."
@@ -126,6 +126,8 @@ var/list/forbidden_varedit_object_types = list(
 			L += var_value

 /client/proc/mod_list(var/list/L)
+	if(!check_rights(R_VAREDIT))	return
+
 	if(!istype(L,/list)) src << "Not a List."

 	var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine", "poo", "icon", "icon_state")
@@ -144,8 +146,8 @@ var/list/forbidden_varedit_object_types = list(

 	var/dir

-	if (locked.Find(variable) && !(src.holder.rank in list("Game Master", "Game Admin")))
-		return
+	if(variable in locked)
+		if(!check_rights(R_DEBUG))	return

 	if(isnull(variable))
 		usr << "Unable to determine variable type."
@@ -264,12 +266,9 @@ var/list/forbidden_varedit_object_types = list(


 /client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0)
-	var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "cuffed", "ka", "last_eaten", "icon", "icon_state", "mutantrace")
+	if(!check_rights(R_VAREDIT))	return

-	if(!src.holder)
-		src << "Only administrators may use this command."
-		return
-	if(!admin_rank_check(src.holder.level, 3)) return
+	var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "cuffed", "ka", "last_eaten", "icon", "icon_state", "mutantrace")

 	for(var/p in forbidden_varedit_object_types)
 		if( istype(O,p) )
@@ -285,13 +284,8 @@ var/list/forbidden_varedit_object_types = list(
 			src << "A variable with this name ([param_var_name]) doesn't exist in this atom ([O])"
 			return

-		if (param_var_name == "holder" && holder.rank != "Game Master")
-			src << "No. Stop being stupid."
-			return
-
-		if (locked.Find(param_var_name) && !(src.holder.rank in list("Game Master", "Game Admin")))
-			src << "Editing this variable requires you to be a game master or game admin."
-			return
+		if(param_var_name == "holder" || (param_var_name in locked))
+			if(!check_rights(R_DEBUG))	return

 		variable = param_var_name

@@ -345,15 +339,11 @@ var/list/forbidden_varedit_object_types = list(
 		names = sortList(names)

 		variable = input("Which var?","Var") as null|anything in names
-		if(!variable)
-			return
+		if(!variable)	return
 		var_value = O.vars[variable]

-		if (locked.Find(variable) && !(src.holder.rank in list("Game Master", "Game Admin")))
-			return
-
-		if (variable == "holder" && holder.rank != "Game Master") //Hotfix, a bit ugly but that exploit has been there for ages and now somebody just had to go and tell everyone of it bluh bluh - U
-			return
+		if(variable == "holder" || (variable in locked))
+			if(!check_rights(R_DEBUG))	return

 	if(!autodetect_class)

@@ -1,47 +1,28 @@
 /client/proc/play_sound(S as sound)
 	set category = "Fun"
 	set name = "Play Global Sound"
-
-	if(!src.holder)
-		src << "Only administrators may use this command."
-		return
+	if(!check_rights(R_SOUNDS))	return

 	var/sound/uploaded_sound = sound(S, repeat = 0, wait = 1, channel = 777)
 	uploaded_sound.priority = 250

-	if(src.holder.rank == "Game Master" || src.holder.rank == "Game Admin" || src.holder.rank == "Badmin")
-		log_admin("[key_name(src)] played sound [S]")
-		message_admins("[key_name_admin(src)] played sound [S]", 1)
-		for(var/mob/M in player_list)
-			if(M.client.midis)
-				M << uploaded_sound
-	else
-		if(usr.client.canplaysound)
-			usr.client.canplaysound = 0
-			log_admin("[key_name(src)] played sound [S]")
-			message_admins("[key_name_admin(src)] played sound [S]", 1)
-			for(var/mob/M in player_list)
-				if(M.client.midis)
-					M << uploaded_sound
-		else
-			usr << "You already used up your jukebox monies this round!"
-			del(uploaded_sound)
+	log_admin("[key_name(src)] played sound [S]")
+	message_admins("[key_name_admin(src)] played sound [S]", 1)
+	for(var/mob/M in player_list)
+		if(M.client.midis)
+			M << uploaded_sound
+
 	feedback_add_details("admin_verb","PGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!


 /client/proc/play_local_sound(S as sound)
 	set category = "Fun"
 	set name = "Play Local Sound"
+	if(!check_rights(R_SOUNDS))	return

-	if(!src.holder)
-		src << "Only administrators may use this command."
-		return
-
-	if(src.holder.rank == "Game Master" || src.holder.rank == "Game Admin")
-		log_admin("[key_name(src)] played a local sound [S]")
-		message_admins("[key_name_admin(src)] played a local sound [S]", 1)
-		playsound(get_turf_loc(src.mob), S, 50, 0, 0)
-		return
+	log_admin("[key_name(src)] played a local sound [S]")
+	message_admins("[key_name_admin(src)] played a local sound [S]", 1)
+	playsound(get_turf_loc(src.mob), S, 50, 0, 0)
 	feedback_add_details("admin_verb","PLS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!


@@ -19,7 +19,7 @@

 	for(var/client/C in admins)
 		if(C.seeprayers)
-			C << "\blue \icon[cross] <b><font color=purple>PRAY: </font>[key_name(src, C)] (<A HREF='?src=\ref[C.holder];adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?src=\ref[C.holder];adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?src=\ref[C.holder];adminplayervars=\ref[src]'>VV</A>) (<A HREF='?src=\ref[C.holder];adminplayersubtlemessage=\ref[src]'>SM</A>) (<A HREF='?src=\ref[C.holder];adminplayerobservejump=\ref[src]'>JMP</A>) (<A HREF='?src=\ref[C.holder];secretsadmin=check_antagonist'>CA</A>) (<A HREF='?src=\ref[C.holder];adminspawncookie=\ref[src]'>SC</a>):</b> [msg]"
+			C << "\blue \icon[cross] <b><font color=purple>PRAY: </font>[key_name(src, C)] (<A HREF='?src=\ref[C.holder];adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?src=\ref[C.holder];adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?src=\ref[C.holder];adminplayervars=\ref[src]'>VV</A>) (<A HREF='?src=\ref[C.holder];subtlemessage=\ref[src]'>SM</A>) (<A HREF='?src=\ref[C.holder];adminplayerobservejump=\ref[src]'>JMP</A>) (<A HREF='?src=\ref[C.holder];secretsadmin=check_antagonist'>CA</A>) (<A HREF='?src=\ref[C.holder];adminspawncookie=\ref[src]'>SC</a>):</b> [msg]"

 	usr << "Your prayers have been received by the gods."
 	feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -29,10 +29,10 @@
 /proc/Centcomm_announce(var/text , var/mob/Sender)
 	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
 	for(var/client/C in admins)
-		C << "\blue <b><font color=orange>CENTCOMM:</font>[key_name(Sender, C)] (<A HREF='?src=\ref[C.holder];adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?src=\ref[C.holder];adminplayervars=\ref[Sender]'>VV</A>) (<A HREF='?src=\ref[C.holder];adminplayersubtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?src=\ref[C.holder];adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?src=\ref[C.holder];secretsadmin=check_antagonist'>CA</A>) (<A HREF='?src=\ref[C.holder];BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?src=\ref[C.holder];CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
+		C << "\blue <b><font color=orange>CENTCOMM:</font>[key_name(Sender, C)] (<A HREF='?src=\ref[C.holder];adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?src=\ref[C.holder];adminplayervars=\ref[Sender]'>VV</A>) (<A HREF='?src=\ref[C.holder];subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?src=\ref[C.holder];adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?src=\ref[C.holder];secretsadmin=check_antagonist'>CA</A>) (<A HREF='?src=\ref[C.holder];BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?src=\ref[C.holder];CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]"

 /proc/Syndicate_announce(var/text , var/mob/Sender)
 	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
 	for(var/client/C in admins)
-		C << "\blue <b><font color=crimson>SYNDICATE:</font>[key_name(Sender, C)] (<A HREF='?src=\ref[C.holder];adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?src=\ref[C.holder];adminplayervars=\ref[Sender]'>VV</A>) (<A HREF='?src=\ref[C.holder];adminplayersubtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?src=\ref[C.holder];adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?src=\ref[C.holder];secretsadmin=check_antagonist'>CA</A>) (<A HREF='?src=\ref[C.holder];BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?src=\ref[C.holder];SyndicateReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
+		C << "\blue <b><font color=crimson>SYNDICATE:</font>[key_name(Sender, C)] (<A HREF='?src=\ref[C.holder];adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?src=\ref[C.holder];adminplayervars=\ref[Sender]'>VV</A>) (<A HREF='?src=\ref[C.holder];subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?src=\ref[C.holder];adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?src=\ref[C.holder];secretsadmin=check_antagonist'>CA</A>) (<A HREF='?src=\ref[C.holder];BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?src=\ref[C.holder];SyndicateReply=\ref[Sender]'>RPLY</A>):</b> [msg]"

@@ -193,69 +193,37 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
 	IonStorm(0)
 	feedback_add_details("admin_verb","ION") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

- /*
- Stealth spawns xenos
- Changed to accomodate specific spawning. It was annoying before. /N
-  */
-/client/proc/spawn_xeno()
-	set category = "Fun"
-	set name = "Spawn Xeno"
-	set desc = "Spawns a xenomorph for all those boring rounds, without having you to do so manually."
-	set popup_menu = 0
-
-	if(!holder)
-		src << "Only administrators may use this command."
-		return
-	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
-	if(confirm != "Yes") return
-
-	if(create_xeno())
-		feedback_add_details("admin_verb","X") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-		log_admin("[key_name(usr)] spawned a xeno.")
-		message_admins("\blue [key_name_admin(usr)] spawned a xeno.", 1)
-	return
-
-

 //I use this proc for respawn character too. /N
-/proc/create_xeno(mob/dead/observer/G)
-	var/alien_caste = alert(src, "Please choose which caste to spawn.",,"Hunter","Sentinel","Drone")
-
-	var/obj/effect/landmark/spawn_here = xeno_spawn.len ? pick(xeno_spawn) : pick(latejoin)
-
-	var/mob/living/carbon/alien/humanoid/new_xeno
-	switch(alien_caste)
-		if("Hunter")
-			new_xeno = new /mob/living/carbon/alien/humanoid/hunter(spawn_here)
-		if("Sentinel")
-			new_xeno = new /mob/living/carbon/alien/humanoid/sentinel(spawn_here)
-		if("Drone")
-			new_xeno = new /mob/living/carbon/alien/humanoid/drone(spawn_here)
-		else
-			return 0
-
-	var/selected_key
-	if(G && G.key)
-		selected_key = G.key
-	else
-		var/list/candidates = list() //List of candidate KEYS to assume control of the new larva ~Carn
-		for(G in player_list)
-			if(G.client.be_alien)
-				if(((G.client.inactivity/10)/60) <= 5)
-					if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
-						candidates += G.key
+/proc/create_xeno(ckey)
+	if(!ckey)
+		var/list/candidates = list()
+		for(var/mob/M in player_list)
+			if(M.stat != DEAD)		continue	//we are not dead!
+			if(!M.client.be_alien)	continue	//we don't want to be an alium
+			if(M.client.is_afk())	continue	//we are afk
+			if(M.mind && M.mind.current && M.mind.current.stat != DEAD)	continue	//we have a live body we are tied to
+			candidates += M.ckey
 		if(candidates.len)
-			selected_key = input("Pick the client you want to respawn as a xeno.", "Suitable Candidates") as null|anything in candidates
+			ckey = input("Pick the player you want to respawn as a xeno.", "Suitable Candidates") as null|anything in candidates
+		else
+			usr << "<font color='red'>Error: create_xeno(): no suitable candidates.</font>"
+	if(!istext(ckey))	return 0

-	if(selected_key)
-		new_xeno.key = selected_key
-		message_admins("\blue [key_name_admin(usr)] has spawned [selected_key] as a filthy xeno.", 1)
-		return 1
-	else
-		//we couldn't find a candidate
-		usr << "<font color='red'>Error: create_xeno(): no suitable players.</font>"
-		del(new_xeno)
-		return 0
+	var/alien_caste = input(usr, "Please choose which caste to spawn.","Pick a caste",null) as null|anything in list("Queen","Hunter","Sentinel","Drone","Larva")
+	var/obj/effect/landmark/spawn_here = xeno_spawn.len ? pick(xeno_spawn) : pick(latejoin)
+	var/mob/living/carbon/alien/new_xeno
+	switch(alien_caste)
+		if("Queen")		new_xeno = new /mob/living/carbon/alien/humanoid/queen(spawn_here)
+		if("Hunter")	new_xeno = new /mob/living/carbon/alien/humanoid/hunter(spawn_here)
+		if("Sentinel")	new_xeno = new /mob/living/carbon/alien/humanoid/sentinel(spawn_here)
+		if("Drone")		new_xeno = new /mob/living/carbon/alien/humanoid/drone(spawn_here)
+		if("Larva")		new_xeno = new /mob/living/carbon/alien/larva(spawn_here)
+		else			return 0
+
+	new_xeno.ckey = ckey
+	message_admins("\blue [key_name_admin(usr)] has spawned [ckey] as a filthy xeno [alien_caste].", 1)
+	return 1

 /*
 If a guy was gibbed and you want to revive him, this is a good way to do so.
@@ -298,7 +266,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 					if("Drone")		new_xeno = new /mob/living/carbon/alien/humanoid/drone(T)
 					if("Queen")		new_xeno = new /mob/living/carbon/alien/humanoid/queen(T)
 					else//If we don't know what special role they have, for whatever reason, or they're a larva.
-						create_xeno(G_found)
+						create_xeno(G_found.ckey)
 						return

 				//Now to give them their mind back.
@@ -673,7 +641,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			M << "\red To try to resolve this matter head to http://ss13.donglabs.com/forum/"
 			log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
 			message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
-			world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=[mins]&server=[dd_replacetext(config.server_name, "#", "")]")
+			world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=[mins]&server=[replacetext(config.server_name, "#", "")]")
 			del(M.client)
 			del(M)
 		else
@@ -688,7 +656,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		M << "\red To try to resolve this matter head to http://ss13.donglabs.com/forum/"
 		log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
 		message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
-		world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=perma&server=[dd_replacetext(config.server_name, "#", "")]")
+		world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=perma&server=[replacetext(config.server_name, "#", "")]")
 		del(M.client)
 		del(M)
 */
@@ -784,20 +752,14 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	return

 /client/proc/admin_cancel_shuttle()
-
 	set category = "Admin"
 	set name = "Cancel Shuttle"
+	if(!check_rights(0))	return
+	if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes") return

-	if ((!( ticker ) || emergency_shuttle.location || emergency_shuttle.direction == 0))
+	if(!ticker || emergency_shuttle.location || emergency_shuttle.direction == 0)
 		return

-	if (!holder)
-		src << "Only administrators may use this command."
-		return
-
-	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
-	if(confirm != "Yes") return
-
 	emergency_shuttle.recall()
 	feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] admin-recalled the emergency shuttle.")
@@ -862,38 +824,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	ticker.random_players = 1
 	feedback_add_details("admin_verb","MER") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

-/client/proc/toggle_gravity_on()
-	set category = "Debug"
-	set name = "Toggle station gravity on"
-	set desc = "Toggles all gravity to active on the station."
-
-	if (!(ticker && ticker.mode))
-		usr << "Please wait until the game starts!  Not sure how it will work otherwise."
-		return
-
-
-	for(var/area/A in world)
-		A.gravitychange(1,A)
-
-	command_alert("CentComm is now beaming gravitons to your station.  We appoligize for any inconvience.")
-	feedback_add_details("admin_verb","TSGON") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/toggle_gravity_off()
-	set category = "Debug"
-	set name = "Toggle station gravity off"
-	set desc = "Toggles all gravity to inactive on the station."
-
-	if (!(ticker && ticker.mode))
-		usr << "Please wait until the game starts!  Not sure how it will work otherwise."
-		return
-
-
-	for(var/area/A in world)
-		A.gravitychange(0,A)
-
-	command_alert("For budget reasons, Centcomm is no longer beaming gravitons to your station.  We appoligize for any inconvience.")
-	feedback_add_details("admin_verb","TSGOFF") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-

 /client/proc/toggle_random_events()
 	set category = "Server"
@@ -3,22 +3,16 @@
 var/const/commandos_possible = 6 //if more Commandos are needed in the future
 var/global/sent_strike_team = 0
 /client/proc/strike_team()
-	set category = "Fun"
-	set name = "Spawn Death Squad"
-	set desc = "Spawns a squad of commandos in CentCom if you want to run an admin event."
-	if(!src.holder)
-		src << "Only administrators may use this command."
-		return
 	if(!ticker)
-		alert("The game hasn't started yet!")
+		usr << "<font color='red'>The game hasn't started yet!</font>"
 		return
 	if(world.time < 6000)
-		alert("Not so fast, buddy. Wait a few minutes until the game gets going. There are [(6000-world.time)/10] seconds remaining.")
+		usr << "<font color='red'>There are [(6000-world.time)/10] seconds remaining before it may be called.</font>"
 		return
 	if(sent_strike_team == 1)
-		alert("CentCom is already sending a team, Mr. Dumbass.")
+		usr << "<font color='red'>CentCom is already sending a team.</font>"
 		return
-	if(alert("Do you want to send in the CentCom death squad? Once enabled, this is irreversible.",,"Yes","No")=="No")
+	if(alert("Do you want to send in the CentCom death squad? Once enabled, this is irreversible.",,"Yes","No")!="Yes")
 		return
 	alert("This 'mode' will go on until everyone is dead or the station is destroyed. You may also admin-call the evac shuttle when appropriate. Spawned commandos have internals cameras which are viewable through a monitor inside the Spec. Ops. Office. Assigning the team's detailed task is recommended from there. While you will be able to manually pick the candidates from active ghosts, their assignment in the squad will be random.")

@@ -30,7 +24,7 @@ var/global/sent_strike_team = 0
 				return

 	if(sent_strike_team)
-		src << "Looks like someone beat you to it."
+		usr << "Looks like someone beat you to it."
 		return

 	sent_strike_team = 1
@@ -100,7 +94,7 @@ var/global/sent_strike_team = 0

 	message_admins("\blue [key_name_admin(usr)] has spawned a CentCom strike squad.", 1)
 	log_admin("[key_name(usr)] used Spawn Death Squad.")
-	feedback_add_details("admin_verb","DTHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	return 1

 /client/proc/create_death_commando(obj/spawn_location, leader_selected = 0)
 	var/mob/living/carbon/human/new_commando = new(spawn_location.loc)
@@ -181,5 +175,4 @@ var/global/sent_strike_team = 0
 	W.registered_name = real_name
 	equip_to_slot_or_del(W, slot_wear_id)

-	resistances += "alien_embryo"
 	return 1
@@ -178,5 +178,4 @@ var/global/sent_syndicate_strike_team = 0
 	W.registered_name = real_name
 	equip_to_slot_or_del(W, slot_wear_id)

-	resistances += "alien_embryo"
 	return 1
@@ -5,28 +5,20 @@
 	set name = "Set Ticklag"
 	set desc = "Sets a new tick lag. Recommend you don't mess with this too much! Stable, time-tested ticklag value is 0.9"

-	if(src.holder)
-		if(!src.mob)	return
+	if(!check_rights(R_DEBUG))	return

-		if(src.holder.rank in list("Game Admin", "Game Master"))
-			var/newtick = input("Sets a new tick lag. Please don't mess with this too much! The stable, time-tested ticklag value is 0.9","Lag of Tick", world.tick_lag) as num|null
-			//I've used ticks of 2 before to help with serious singulo lags
-			if(newtick && newtick <= 2 && newtick > 0)
-				log_admin("[key_name(src)] has modified world.tick_lag to [newtick]", 0)
-				message_admins("[key_name(src)] has modified world.tick_lag to [newtick]", 0)
-				world.tick_lag = newtick
-				feedback_add_details("admin_verb","TICKLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	var/newtick = input("Sets a new tick lag. Please don't mess with this too much! The stable, time-tested ticklag value is 0.9","Lag of Tick", world.tick_lag) as num|null
+	//I've used ticks of 2 before to help with serious singulo lags
+	if(newtick && newtick <= 2 && newtick > 0)
+		log_admin("[key_name(src)] has modified world.tick_lag to [newtick]", 0)
+		message_admins("[key_name(src)] has modified world.tick_lag to [newtick]", 0)
+		world.tick_lag = newtick
+		feedback_add_details("admin_verb","TICKLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

-				switch(alert("Enable Tick Compensation?","Tick Comp is currently: [config.Tickcomp]","Yes","No"))
-					if("Yes")
-						config.Tickcomp = 1
-					else
-						config.Tickcomp = 0
+		switch(alert("Enable Tick Compensation?","Tick Comp is currently: [config.Tickcomp]","Yes","No"))
+			if("Yes")	config.Tickcomp = 1
+			else		config.Tickcomp = 0
+	else
+		src << "\red Error: ticklag(): Invalid world.ticklag value. No changes made."

-				return

-			src << "\red Error: ticklag(): Invalid world.ticklag value. No changes made."
-			return
-
-		src << "\red Error: ticklag(): You are not authorised to use this. Game Admins and higher only."
-		return
@@ -6,9 +6,6 @@
 		usr << "This option is currently only usable during pregame. This may change at a later date."
 		return

-	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
-	if(confirm != "Yes") return
-
 	if(job_master && ticker)
 		var/datum/job/job = job_master.GetJob("AI")
 		if(!job)
@@ -22,5 +19,4 @@
 			ticker.triai = 1
 			usr << "There will be an AI Triumvirate at round start."
 			message_admins("\blue [key_name_admin(usr)] has toggled on triple AIs at round start.", 1)
-	feedback_add_details("admin_verb","CAIT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return