Merge branch 'master' into upstream-merge-26776

code/modules/admin/DB_ban/functions.dm

@@ -71,16 +71,13 @@
 		computerid = bancid
 		ip = banip
 
-	var/datum/DBQuery/query_add_ban_get_id = SSdbcore.NewQuery("SELECT id FROM [format_table_name("player")] WHERE ckey = '[ckey]'")
-	if(!query_add_ban_get_id.warn_execute())
+	var/datum/DBQuery/query_add_ban_get_ckey = SSdbcore.NewQuery("SELECT ckey FROM [format_table_name("player")] WHERE ckey = '[ckey]'")
+	if(!query_add_ban_get_ckey.warn_execute())
 		return
-	var/validckey = 0
-	if(query_add_ban_get_id.NextRow())
-		validckey = 1
-	if(!validckey)
+	if(!query_add_ban_get_ckey.NextRow())
 		if(!banned_mob || (banned_mob && !IsGuestKey(banned_mob.key)))
-			message_admins("<font color='red'>[key_name_admin(usr)] attempted to ban [ckey], but [ckey] has not been seen yet. Please only ban actual players.</font>",1)
-			return
+			if(alert(usr, "[ckey] has not been seen before, are you sure you want to create a ban for them?", "Unknown ckey", "Yes", "No", "Cancel") != "Yes")
+				return
 
 	var/a_ckey
 	var/a_computerid

code/modules/admin/IsBanned.dm

@@ -63,7 +63,7 @@
 
 		if(!SSdbcore.Connect())
 			log_world("Ban database connection failure. Key [ckeytext] not checked")
-			GLOB.diary << "Ban database connection failure. Key [ckeytext] not checked"
+			GLOB.world_game_log << "Ban database connection failure. Key [ckeytext] not checked"
 			return
 
 		var/ipquery = ""

code/modules/admin/admin.dm

@@ -37,6 +37,11 @@
 	else
 		body += " \[<A href='?_src_=holder;revive=\ref[M]'>Heal</A>\] "
 
+	if(M.client)
+		body += "<br>\[<b>First Seen:</b> [M.client.player_join_date]\]\[<b>Byond account registered on:</b> [M.client.account_join_date]\]"
+
+
+
 	body += "<br><br>\[ "
 	body += "<a href='?_src_=vars;Vars=\ref[M]'>VV</a> - "
 	body += "<a href='?_src_=holder;traitor=\ref[M]'>TP</a> - "
@@ -804,7 +809,7 @@
 	return 1
 
 /client/proc/adminGreet(logout)
-	if(SSticker.HasRoundStarted())
+	if(SSticker.HasRoundStarted())
 		var/string
 		if(logout && config && config.announce_admin_logout)
 			string = pick(

code/modules/admin/admin_investigate.dm

@@ -1,50 +1,21 @@
-//By Carnwennan
-
-//This system was made as an alternative to all the in-game lists and variables used to log stuff in-game.
-//lists and variables are great. However, they have several major flaws:
-//Firstly, they use memory. TGstation has one of the highest memory usage of all the ss13 branches.
-//Secondly, they are usually stored in an object. This means that they aren't centralised. It also means that
-//the data is lost when the object is deleted! This is especially annoying for things like the singulo engine!
-#define INVESTIGATE_DIR "data/investigate/"
-
-//SYSTEM
-/proc/investigate_subject2file(subject)
-	return file("[INVESTIGATE_DIR][subject].html")
-
-/proc/investigate_reset()
-	if(fdel(INVESTIGATE_DIR))
-		return 1
-	return 0
-
-/atom/proc/investigate_log(message, subject)
-	if(!message)
-		return
-	var/F = investigate_subject2file(subject)
-	if(!F)
+atom/proc/investigate_log(message, subject)
+	if(!message || !subject)
 		return
+	var/F = file("[GLOB.log_directory]/[subject].html")
 	F << "<small>[time_stamp()] \ref[src] ([x],[y],[z])</small> || [src] [message]<br>"
 
-//ADMINVERBS
-/client/proc/investigate_show( subject in list("hrefs","notes, memos, watchlist","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter", "atmos", "experimentor", "botany") )
+
+/client/proc/investigate_show( subject in list("hrefs","notes, memos, watchlist","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter", "atmos", "experimentor", "botany") )
 	set name = "Investigate"
 	set category = "Admin"
 	if(!holder)
 		return
 	switch(subject)
-		if("singulo", "wires", "telesci", "gravity", "records", "cargo", "supermatter", "atmos", "botany")			//general one-round-only stuff
-			var/F = investigate_subject2file(subject)
-			if(!F)
-				to_chat(src, "<font color='red'>Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.</font>")
-				return
-			src << browse(F,"window=investigate[subject];size=800x300")
-		if("hrefs")				//persistent logs and stuff
-			if(GLOB.href_logfile)
-				src << browse(GLOB.href_logfile,"window=investigate[subject];size=800x300")
-			else if(!config.log_hrefs)
-				to_chat(src, "<span class='danger'>Href logging is off and no logfile was found.</span>")
-				return
-			else
-				to_chat(src, "<span class='danger'>No href logfile was found.</span>")
-				return
 		if("notes, memos, watchlist")
 			browse_messages()
+		else
+			var/F = file("[GLOB.log_directory]/[subject].html")
+			if(!fexists(F))
+				to_chat(src, "<span class='danger'>No [subject] logfile was found.</span>")
+				return
+			src << browse(F,"window=investigate[subject];size=800x300")

code/modules/admin/admin_ranks.dm

@@ -127,7 +127,7 @@ GLOBAL_PROTECT(admin_ranks)
 	else
 		if(!SSdbcore.Connect())
 			log_world("Failed to connect to database in load_admin_ranks(). Reverting to legacy system.")
-			GLOB.diary << "Failed to connect to database in load_admin_ranks(). Reverting to legacy system."
+			GLOB.world_game_log << "Failed to connect to database in load_admin_ranks(). Reverting to legacy system."
 			config.admin_legacy_system = 1
 			load_admin_ranks()
 			return
@@ -202,7 +202,7 @@ GLOBAL_PROTECT(admin_ranks)
 	else
 		if(!SSdbcore.Connect())
 			log_world("Failed to connect to database in load_admins(). Reverting to legacy system.")
-			GLOB.diary << "Failed to connect to database in load_admins(). Reverting to legacy system."
+			GLOB.world_game_log << "Failed to connect to database in load_admins(). Reverting to legacy system."
 			config.admin_legacy_system = 1
 			load_admins()
 			return

code/modules/admin/admin_verbs.dm

@@ -4,18 +4,12 @@ GLOBAL_PROTECT(admin_verbs_default)
 GLOBAL_LIST_INIT(admin_verbs_default, world.AVerbsDefault())
 /world/proc/AVerbsDefault()
 	return list(
-	/client/proc/toggleadminhelpsound,	/*toggles whether we hear a sound when adminhelps/PMs are used*/
-	/client/proc/toggleannouncelogin, /*toggles if an admin's login is announced during a round*/
 	/client/proc/deadmin,				/*destroys our own admin datum so we can play as a regular player*/
 	/client/proc/cmd_admin_say,			/*admin-only ooc chat*/
 	/client/proc/hide_verbs,			/*hides all our adminverbs*/
 	/client/proc/hide_most_verbs,		/*hides all our hideable adminverbs*/
 	/client/proc/debug_variables,		/*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/
-	/client/proc/deadchat,				/*toggles deadchat on/off*/
 	/client/proc/dsay,					/*talk in deadchat using our ckey/fakekey*/
-	/client/proc/toggleprayers,			/*toggles prayers on/off*/
-	/client/verb/toggleprayersounds,	/*Toggles prayer sounds (HALLELUJAH!)*/
-	/client/proc/toggle_hear_radio,		/*toggles whether we hear the radio*/
 	/client/proc/investigate_show,		/*various admintools for investigation. Such as a singulo grief-log*/
 	/client/proc/secrets,
 	/client/proc/restart_controller,
@@ -32,7 +26,6 @@ GLOBAL_PROTECT(admin_verbs_admin)
 GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
 /world/proc/AVerbsAdmin()
 	return list(
-	/client/proc/player_panel_new,		/*shows an interface for all players, with links to various panels*/
 	/client/proc/invisimin,				/*allows our mob to go invisible/visible*/
 //	/datum/admins/proc/show_traitor_panel,	/*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage
 	/datum/admins/proc/show_player_panel,	/*shows an interface for individual players, with various links (links require additional flags*/
@@ -46,16 +39,14 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
 	/datum/admins/proc/set_admin_notice,/*announcement all clients see when joining the server.*/
 	/client/proc/admin_ghost,			/*allows us to ghost/reenter body at will*/
 	/client/proc/toggle_view_range,		/*changes how far we can see*/
-	/datum/admins/proc/view_txt_log,	/*shows the server log (diary) for today*/
+	/datum/admins/proc/view_txt_log,	/*shows the server log (world_game_log) for today*/
 	/datum/admins/proc/view_atk_log,	/*shows the server combat-log, doesn't do anything presently*/
 	/client/proc/cmd_admin_subtle_message,	/*send an message to somebody as a 'voice in their head'*/
 	/client/proc/cmd_admin_delete,		/*delete an instance/object/mob/etc*/
 	/client/proc/cmd_admin_check_contents,	/*displays the contents of an instance*/
 	/client/proc/check_antagonists,		/*shows all antags*/
 	/datum/admins/proc/access_news_network,	/*allows access of newscasters*/
-	/client/proc/giveruntimelog,		/*allows us to give access to runtime logs to somebody*/
-	/client/proc/getruntimelog,			/*allows us to access runtime logs to somebody*/
-	/client/proc/getserverlog,			/*allows us to fetch server logs (diary) for other days*/
+	/client/proc/getserverlog,			/*allows us to fetch server logs (world_game_log) for other days*/
 	/client/proc/jumptocoord,			/*we ghost and jump to a coordinate*/
 	/client/proc/Getmob,				/*teleports a mob to our location*/
 	/client/proc/Getkey,				/*teleports a mob with a certain ckey to our location*/
@@ -116,7 +107,6 @@ GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer())
 	/datum/admins/proc/end_round,
 	/datum/admins/proc/delay,
 	/datum/admins/proc/toggleaban,
-	/client/proc/toggle_log_hrefs,
 	/client/proc/everyone_random,
 	/datum/admins/proc/toggleAI,
 	/client/proc/cmd_admin_delete,		/*delete an instance/object/mob/etc*/
@@ -182,9 +172,6 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 	/client/proc/set_ooc,
 	/client/proc/reset_ooc,
 	/client/proc/deadmin,
-	/client/proc/deadchat,
-	/client/proc/toggleprayers,
-	/client/proc/toggle_hear_radio,
 	/datum/admins/proc/show_traitor_panel,
 	/datum/admins/proc/toggleenter,
 	/datum/admins/proc/toggleguests,
@@ -223,7 +210,6 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 	/datum/admins/proc/restart,
 	/datum/admins/proc/delay,
 	/datum/admins/proc/toggleaban,
-	/client/proc/toggle_log_hrefs,
 	/client/proc/everyone_random,
 	/datum/admins/proc/toggleAI,
 	/client/proc/restart_controller,
@@ -398,13 +384,6 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 			mob.invisibility = INVISIBILITY_OBSERVER
 			to_chat(mob, "<span class='adminnotice'><b>Invisimin on. You are now as invisible as a ghost.</b></span>")
 
-/client/proc/player_panel_new()
-	set name = "Player Panel"
-	set category = "Admin"
-	if(holder)
-		holder.player_panel_new()
-	SSblackbox.add_details("admin_verb","Player Panel New") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
 /client/proc/check_antagonists()
 	set name = "Check Antagonists"
 	set category = "Admin"
@@ -638,19 +617,6 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 		togglebuildmode(src.mob)
 	SSblackbox.add_details("admin_verb","Toggle Build Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/toggle_log_hrefs()
-	set name = "Toggle href logging"
-	set category = "Server"
-	if(!holder)
-		return
-	if(config)
-		if(config.log_hrefs)
-			config.log_hrefs = 0
-			to_chat(src, "<b>Stopped logging hrefs</b>")
-		else
-			config.log_hrefs = 1
-			to_chat(src, "<b>Started logging hrefs</b>")
-
 /client/proc/check_ai_laws()
 	set name = "Check AI Laws"
 	set category = "Admin"

code/modules/admin/adminmenu.dm

@@ -0,0 +1,11 @@
+/datum/menu/Admin/Generate_list(client/C)
+	if (C.holder)
+		. = ..()
+
+/datum/menu/Admin/verb/playerpanel()
+	set name = "Player Panel"
+	set desc = "Player Panel"
+	set category = "Admin"
+	usr.client.holder.player_panel_new()
+	SSblackbox.add_details("admin_verb","Player Panel New") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	return

code/modules/admin/topic.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm	(rejected hunks)
-@@ -8,7 +8,7 @@
- 	if(href_list["ahelp"])
- 		if(!check_rights(R_ADMIN))
- 			return
--		
-+
- 		var/ahelp_ref = href_list["ahelp"]
- 		var/datum/admin_help/AH = locate(ahelp_ref)
- 		if(AH)

code/modules/admin/verbs/SDQL2/SDQL_2.dm

@@ -71,7 +71,7 @@
 			if("select", "delete", "update")
 				select_types = query_tree[query_tree[1]]
 
-		from_objs = SDQL_from_objs(query_tree["from"])
+		from_objs = world.SDQL_from_objs(query_tree["from"])
 
 		var/list/objs = list()
 
@@ -101,7 +101,7 @@
 			if("call")
 				for(var/datum/d in objs)
 					try
-						SDQL_var(d, query_tree["call"][1], source = d)
+						world.SDQL_var(d, query_tree["call"][1], source = d)
 					catch(var/exception/e)
 						runtime_tracker += SDQL_parse_exception(e)
 						runtimes++
@@ -177,15 +177,6 @@
 	returning += "Description: [E.desc]<BR>"
 	return returning
 
-/proc/SDQL_callproc_global(procname,args_list)
-	set waitfor = FALSE
-	WrapAdminProcCall(GLOBAL_PROC, procname, args_list)
-
-/proc/SDQL_callproc(thing, procname, args_list)
-	set waitfor = FALSE
-	if(hascall(thing, procname))
-		WrapAdminProcCall(thing, procname, args_list)
-
 /proc/SDQL_parse(list/query_list)
 	var/datum/SDQL_parser/parser = new()
 	var/list/querys = list()
@@ -249,15 +240,10 @@
 
 
 
-/proc/SDQL_from_objs(list/tree)
+/world/proc/SDQL_from_objs(list/tree)
 	if("world" in tree)
-		if(IsAdminAdvancedProcCall())
-			var/msg = "WARNING: Attempt to retrieve world reference made by [usr]!"
-			log_admin(msg)
-			message_admins(msg)
-			return
-		return world
-	return SDQL_expression(world, tree)
+		return src
+	return SDQL_expression(src, tree)
 
 /proc/SDQL_get_all(type, location)
 	var/list/out = list()
@@ -417,12 +403,12 @@
 				result = dummy
 			val += result
 	else
-		val = SDQL_var(object, expression, i, object)
+		val = world.SDQL_var(object, expression, i, object)
 		i = expression.len
 
 	return list("val" = val, "i" = i)
 
-/proc/SDQL_var(datum/object, list/expression, start = 1, source)
+/world/proc/SDQL_var(datum/object, list/expression, start = 1, source)
 	var/v
 	var/long = start < expression.len
 	if(object == world && long && expression[start + 1] == ".")
@@ -456,11 +442,6 @@
 				else
 					return null
 			if("world")
-				if(IsAdminAdvancedProcCall())
-					var/msg = "WARNING: Attempt to retrieve world reference made by [usr]!"
-					log_admin(msg)
-					message_admins(msg)
-					return
 				v = world
 			if("global")
 				v = GLOB

code/modules/admin/verbs/adminhelp.dm

@@ -479,7 +479,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 				current_ticket.MessageNoRecipient(msg)
 				current_ticket.TimeoutVerb()
 				return
-			else
+			else
 				to_chat(usr, "<span class='warning'>Ticket not found, creating new one...</span>")
 		else
 			current_ticket.AddInteraction("[key_name_admin(usr)] opened a new ticket.")

code/modules/admin/verbs/adminpm.dm

@@ -103,6 +103,7 @@
 		if(!recipient)
 			if(holder)
 				to_chat(src, "<font color='red'>Error: Admin-PM: Client not found.</font>")
+				to_chat(src, msg)
 			else
 				current_ticket.MessageNoRecipient(msg)
 			return

code/modules/admin/verbs/deadsay.dm

@@ -19,7 +19,7 @@
 
 	if (!msg)
 		return
-	var/nicknames = world.file2list("config/admin_nicknames.txt")
+	var/static/nicknames = world.file2list("config/admin_nicknames.txt")
 
 	var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.holder.fakekey ? pick(nicknames) : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>"
 

code/modules/admin/verbs/getlogs.dm

@@ -1,62 +1,3 @@
-/*
-	HOW DO I LOG RUNTIMES?
-	Firstly, start dreamdeamon if it isn't already running. Then select "world>Log Session" (or press the F3 key)
-	navigate the popup window to the data/logs/runtimes/ folder from where your tgstation .dmb is located.
-	(you may have to make this folder yourself)
-
-	OPTIONAL: 	you can select the little checkbox down the bottom to make dreamdeamon save the log everytime you
-				start a world. Just remember to repeat these steps with a new name when you update to a new revision!
-
-	Save it with the name of the revision your server uses (e.g. r3459.txt).
-	Game Masters will now be able to grant access any runtime logs you have archived this way!
-	This will allow us to gather information on bugs across multiple servers and make maintaining the TG
-	codebase for the entire /TG/station commuity a TONNE easier :3 Thanks for your help!
-*/
-
-
-//This proc allows Game Masters to grant a client access to the .getruntimelog verb
-//Permissions expire at the end of each round.
-//Runtimes can be used to meta or spot game-crashing exploits so it's advised to only grant coders that
-//you trust access. Also, it may be wise to ensure that they are not going to play in the current round.
-/client/proc/giveruntimelog()
-	set name = ".giveruntimelog"
-	set desc = "Give somebody access to any session logfiles saved to the /log/runtime/ folder."
-	set category = null
-
-	if(!src.holder)
-		to_chat(src, "<font color='red'>Only Admins may use this command.</font>")
-		return
-
-	var/client/target = input(src,"Choose somebody to grant access to the server's runtime logs (permissions expire at the end of each round):","Grant Permissions",null) as null|anything in GLOB.clients
-	if(!istype(target,/client))
-		to_chat(src, "<font color='red'>Error: giveruntimelog(): Client not found.</font>")
-		return
-
-	target.verbs |= /client/proc/getruntimelog
-	to_chat(target, "<font color='red'>You have been granted access to runtime logs. Please use them responsibly or risk being banned.</font>")
-	return
-
-
-//This proc allows download of runtime logs saved within the data/logs/ folder by dreamdeamon.
-//It works similarly to show-server-log.
-/client/proc/getruntimelog()
-	set name = ".getruntimelog"
-	set desc = "Retrieve any session logfiles saved by dreamdeamon."
-	set category = null
-
-	var/path = browse_files("data/logs/runtimes/")
-	if(!path)
-		return
-
-	if(file_spam_check())
-		return
-
-	message_admins("[key_name_admin(src)] accessed file: [path]")
-	src << ftp(file(path))
-	to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.")
-	return
-
-
 //This proc allows download of past server logs saved within the data/logs/ folder.
 //It works similarly to show-server-log.
 /client/proc/getserverlog()
@@ -83,10 +24,10 @@
 /datum/admins/proc/view_txt_log()
 	set category = "Admin"
 	set name = "Show Server Log"
-	set desc = "Shows today's server log."
+	set desc = "Shows server log for this round."
 
-	if(fexists("[GLOB.diary]"))
-		src << ftp(GLOB.diary)
+	if(fexists("[GLOB.world_game_log]"))
+		src << ftp(GLOB.world_game_log)
 	else
 		to_chat(src, "<font color='red'>Server log not found, try using .getserverlog.</font>")
 		return
@@ -97,10 +38,10 @@
 /datum/admins/proc/view_atk_log()
 	set category = "Admin"
 	set name = "Show Server Attack Log"
-	set desc = "Shows today's server attack log."
+	set desc = "Shows server attack log for this round."
 
-	if(fexists("[GLOB.diaryofmeanpeople]"))
-		src << ftp(GLOB.diaryofmeanpeople)
+	if(fexists("[GLOB.world_attack_log]"))
+		src << ftp(GLOB.world_attack_log)
 	else
 		to_chat(src, "<font color='red'>Server attack log not found, try using .getserverlog.</font>")
 		return

code/modules/admin/verbs/map_template_loadverb.dm

@@ -19,7 +19,7 @@
 	usr.client.images += preview
 	if(alert(usr,"Confirm location.","Template Confirm","Yes","No") == "Yes")
 		if(template.load(T, centered = TRUE))
-			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has placed a map template ([template.name]) at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>(JMP)</a></span>")
+			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has placed a map template ([template.name]) at [ADMIN_COORDJMP(T)]</span>")
 		else
 			to_chat(usr, "Failed to place map")
 	usr.client.images -= preview

code/modules/admin/verbs/one_click_antag.dm

@@ -132,7 +132,7 @@
 
 /datum/admins/proc/makeWizard()
 
-	var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered for the position of a Wizard Foundation 'diplomat'?", "wizard", null)
+	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered for the position of a Wizard Foundation 'diplomat'?", "wizard", null)
 
 	var/mob/dead/observer/selected = pick_n_take(candidates)
 
@@ -215,7 +215,7 @@
 /datum/admins/proc/makeNukeTeam()
 
 	var/datum/game_mode/nuclear/temp = new
-	var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered for a nuke team being sent in?", "operative", temp)
+	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered for a nuke team being sent in?", "operative", temp)
 	var/list/mob/dead/observer/chosen = list()
 	var/mob/dead/observer/theghost = null
 
@@ -288,7 +288,7 @@
 // DEATH SQUADS
 /datum/admins/proc/makeDeathsquad()
 	var/mission = input("Assign a mission to the deathsquad", "Assign Mission", "Leave no witnesses.")
-	var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered for an elite Nanotrasen Strike Team?", "deathsquad", null)
+	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered for an elite Nanotrasen Strike Team?", "deathsquad", null)
 	var/squadSpawned = 0
 
 	if(candidates.len >= 2) //Minimum 2 to be considered a squad
@@ -396,7 +396,7 @@
 
 /datum/admins/proc/makeOfficial()
 	var/mission = input("Assign a task for the official", "Assign Task", "Conduct a routine preformance review of [station_name()] and its Captain.")
-	var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered to be a Centcom Official?", "deathsquad")
+	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered to be a Centcom Official?", "deathsquad")
 
 	if(candidates.len)
 		var/mob/dead/observer/chosen_candidate = pick(candidates)
@@ -457,7 +457,7 @@
 	var/mission = input("Assign a mission to the Emergency Response Team", "Assign Mission", "Assist the station.") as null|text
 	if(!mission)
 		return
-	var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered for a Code [alert] Nanotrasen Emergency Response Team?", "deathsquad", null)
+	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered for a Code [alert] Nanotrasen Emergency Response Team?", "deathsquad", null)
 	var/teamSpawned = 0
 
 	if(candidates.len > 0)

code/modules/admin/verbs/playsound.dm

@@ -21,7 +21,7 @@
 	var/res = alert(usr, "Show the title of this song to the players?",, "No", "Yes", "Cancel")
 	switch(res)
 		if("Yes")
-			to_chat(world, "An admin played: [S]")
+			to_chat(world, "<span class='boldannounce'>An admin played: [S]</span>")
 		if("Cancel")
 			return
 

code/modules/admin/verbs/randomverbs.dm

@@ -112,6 +112,7 @@
 	message_admins("<span class='adminnotice'><b> LocalNarrate: [key_name_admin(usr)] at [get_area(A)][ADMIN_JMP(A)]:</b> [msg]<BR></span>")
 	SSblackbox.add_details("admin_verb","Local Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+
 /client/proc/cmd_admin_godmode(mob/M in GLOB.mob_list)
 	set category = "Special Verbs"
 	set name = "Godmode"
@@ -350,7 +351,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	if(G_found.mind && !G_found.mind.active)
 		G_found.mind.transfer_to(new_character)	//be careful when doing stuff like this! I've already checked the mind isn't in use
-		new_character.mind.special_verbs = list()
 	else
 		new_character.mind_initialize()
 	if(!new_character.mind.assigned_role)
@@ -701,7 +701,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set name = "Make Everyone Random"
 	set desc = "Make everyone have a random appearance. You can only use this before rounds!"
 
-	if(SSticker.HasRoundStarted())
+	if(SSticker.HasRoundStarted())
 		to_chat(usr, "Nope you can't do this, the game's already started. This only works before rounds!")
 		return