Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums

Conflicts: code/modules/admin/topic.dm
2026-07-21 13:12:40 +01:00 · 2015-08-20 14:16:35 +02:00
parent 39825d6810 c8b6813426
commit 120ce3f20c
755 changed files with 20873 additions and 19061 deletions
@@ -302,7 +302,11 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
 		output += "<option value='[j]'>[j]</option>"
 	for(var/j in nonhuman_positions)
 		output += "<option value='[j]'>[j]</option>"
-	for(var/j in list("traitor","changeling","operative","revolutionary","cultist","wizard"))
+	var/list/bantypes = list("traitor","changeling","operative","revolutionary","cultist","wizard") //For legacy bans.
+	for(var/antag_type in all_antag_types) // Grab other bans.
+		var/datum/antagonist/antag = all_antag_types[antag_type]
+		bantypes |= antag.bantype
+	for(var/j in bantypes)
 		output += "<option value='[j]'>[j]</option>"
 	output += "</select></td></tr></table>"
 	output += "<b>Reason:<br></b><textarea name='dbbanreason' cols='50'></textarea><br>"
@@ -23,7 +23,7 @@
 /proc/ToRban_update()
 	spawn(0)
 		log_misc("Downloading updated ToR data...")
-		var/http[] = world.Export("http://exitlist.torproject.org/exit-addresses")
+		var/http[] = world.Export("https://check.torproject.org/exit-addresses")

 		var/list/rawlist = file2list(http["CONTENT"])
 		if(rawlist.len)
@@ -1004,7 +1004,7 @@ proc/admin_notice(var/message, var/rights)
 	else
 		new chosen(usr.loc)

-	log_admin("[key_name(usr)] spawned [chosen] at ([usr.x],[usr.y],[usr.z])")
+	log_and_message_admins("spawned [chosen] at ([usr.x],[usr.y],[usr.z])")
 	feedback_add_details("admin_verb","SA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!


@@ -4,7 +4,7 @@

 proc/log_and_message_admins(var/message as text, var/mob/user = usr)
 	log_admin(user ? "[key_name(user)] [message]" : "EVENT [message]")
-	message_admins(user ? "[key_name(user)] [message]" : "EVENT [message]")
+	message_admins(user ? "[key_name_admin(user)] [message]" : "EVENT [message]")

 proc/log_and_message_admins_many(var/list/mob/users, var/message)
 	if(!users || !users.len)
@@ -17,10 +17,6 @@ proc/log_and_message_admins_many(var/list/mob/users, var/message)
 	log_admin("[english_list(user_keys)] [message]")
 	message_admins("[english_list(user_keys)] [message]")

-proc/admin_log_and_message_admins(var/message as text)
-	log_admin(usr ? "[key_name_admin(usr)] [message]" : "EVENT [message]")
-	message_admins(usr ? "[key_name_admin(usr)] [message]" : "EVENT [message]", 1)
-
 proc/admin_attack_log(var/mob/attacker, var/mob/victim, var/attacker_message, var/victim_message, var/admin_message)
 	if(victim)
 		victim.attack_log += text("\[[time_stamp()]\] <font color='orange'>[key_name(attacker)] - [victim_message]</font>")
@@ -83,10 +83,13 @@ var/list/admin_verbs_admin = list(
 	/client/proc/allow_character_respawn,    /* Allows a ghost to respawn */
 	/client/proc/event_manager_panel,
 	/client/proc/empty_ai_core_toggle_latejoin,
+	/client/proc/empty_ai_core_toggle_latejoin,
 	/client/proc/aooc,
 	/client/proc/change_human_appearance_admin,	/* Allows an admin to change the basic appearance of human-based mobs */
 	/client/proc/change_human_appearance_self,	/* Allows the human-based mob itself change its basic appearance */
-	/client/proc/change_security_level
+	/client/proc/change_security_level,
+	/client/proc/view_chemical_reaction_logs,
+	/client/proc/makePAI
 )
 var/list/admin_verbs_ban = list(
 	/client/proc/unban_panel,
@@ -127,6 +130,7 @@ var/list/admin_verbs_spawn = list(
 	/client/proc/spawn_chemdisp_cartridge
 	)
 var/list/admin_verbs_server = list(
+	/datum/admins/proc/capture_map,
 	/client/proc/Set_Holiday,
 	/client/proc/ToRban,
 	/datum/admins/proc/startnow,
@@ -398,8 +402,10 @@ var/list/admin_verbs_mentor = list(
 		var/mob/body = mob
 		var/mob/dead/observer/ghost = body.ghostize(1)
 		ghost.admin_ghosted = 1
-		if(body && !body.key)
-			body.key = "@[key]"	//Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus
+		if(body)
+			body.aghosted = ghost
+			if(!body.key)
+				body.key = "@[key]"	//Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus
 		feedback_add_details("admin_verb","O") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!


@@ -726,7 +732,7 @@ var/list/admin_verbs_mentor = list(

 	var/new_name = sanitizeSafe(input(src, "Enter new name. Leave blank or as is to cancel.", "[S.real_name] - Enter new silicon name", S.real_name))
 	if(new_name && new_name != S.real_name)
-		admin_log_and_message_admins("has renamed the silicon '[S.real_name]' to '[new_name]'")
+		log_and_message_admins("has renamed the silicon '[S.real_name]' to '[new_name]'")
 		S.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!

@@ -741,7 +747,7 @@ var/list/admin_verbs_mentor = list(

 	var/datum/nano_module/law_manager/L = new(S)
 	L.ui_interact(usr, state = admin_state)
-	admin_log_and_message_admins("has opened [S]'s law manager.")
+	log_and_message_admins("has opened [S]'s law manager.")
 	feedback_add_details("admin_verb","MSL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

 /client/proc/change_human_appearance_admin()
@@ -754,7 +760,7 @@ var/list/admin_verbs_mentor = list(
 	var/mob/living/carbon/human/H = input("Select mob.", "Change Mob Appearance - Admin") as null|anything in human_mob_list
 	if(!H) return

-	admin_log_and_message_admins("is altering the appearance of [H].")
+	log_and_message_admins("is altering the appearance of [H].")
 	H.change_appearance(APPEARANCE_ALL, usr, usr, check_species_whitelist = 0, state = admin_state)
 	feedback_add_details("admin_verb","CHAA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

@@ -774,10 +780,10 @@ var/list/admin_verbs_mentor = list(

 	switch(alert("Do you wish for [H] to be allowed to select non-whitelisted races?","Alter Mob Appearance","Yes","No","Cancel"))
 		if("Yes")
-			admin_log_and_message_admins("has allowed [H] to change \his appearance, without whitelisting of races.")
+			log_and_message_admins("has allowed [H] to change \his appearance, without whitelisting of races.")
 			H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 0)
 		if("No")
-			admin_log_and_message_admins("has allowed [H] to change \his appearance, with whitelisting of races.")
+			log_and_message_admins("has allowed [H] to change \his appearance, with whitelisting of races.")
 			H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 1)
 	feedback_add_details("admin_verb","CMAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

@@ -0,0 +1,49 @@
+/datum/admins/proc/capture_map(tx as num, ty as num, tz as num, range as num)
+	set category = "Server"
+	set name = "Capture Map Part"
+
+	if(!check_rights(R_ADMIN|R_DEBUG|R_SERVER))
+		return
+
+	if(range > 32 || range <= 0)
+		usr << "Capturing range is incorrect, it must be within 1-32."
+		return
+
+	if(locate(tx,ty,tz))
+		var/list/turfstocapture = list()
+		var/hasasked = 0
+		for(var/xoff = 0 to range)
+			for(var/yoff = 0 to range)
+				var/turf/T = locate(tx + xoff,ty + yoff,tz)
+				if(T)
+					turfstocapture.Add(T)
+				else
+					if(!hasasked)
+						var/answer = alert("Capture includes non existant turf, Continue capture?","Continue capture?", "No", "Yes")
+						hasasked = 1
+						if(answer == "No")
+							return
+
+		var/list/atoms = list()
+		for(var/turf/T in turfstocapture)
+			atoms.Add(T)
+			for(var/atom/A in T)
+				if(A.invisibility) continue
+				atoms.Add(A)
+
+		atoms = sort_atoms_by_layer(atoms)
+		var/icon/cap = icon('icons/effects/96x96.dmi', "")
+		cap.Scale(range*32, range*32)
+		cap.Blend("#000", ICON_OVERLAY)
+		for(var/atom/A in atoms)
+			if(A)
+				var/icon/img = getFlatIcon(A)
+				if(istype(img, /icon))
+					if(istype(A, /mob/living) && A:lying)
+						img.BecomeLying()
+					var/xoff = (A.x - tx) * 32
+					var/yoff = (A.y - ty) * 32
+					cap.Blend(img, blendMode2iconMode(A.blend_mode),  A.pixel_x + xoff, A.pixel_y + yoff)
+
+
+		usr << browse_rsc(cap, "map_capture_x[tx]_y[ty]_z[tz]_r[range].png")
@@ -1,147 +1,147 @@
-//This stuff was originally intended to be integrated into the ban-system I was working on
-//but it's safe to say that'll never be finished. So I've merged it into the current player panel.
-//enjoy				~Carn
-/*
-#define NOTESFILE "data/player_notes.sav"	//where the player notes are saved
-
-datum/admins/proc/notes_show(var/ckey)
-	usr << browse("<head><title>Player Notes</title></head><body>[notes_gethtml(ckey)]</body>","window=player_notes;size=700x400")
-
-
-datum/admins/proc/notes_gethtml(var/ckey)
-	var/savefile/notesfile = new(NOTESFILE)
-	if(!notesfile)	return "<font color='red'>Error: Cannot access [NOTESFILE]</font>"
-	if(ckey)
-		. = "<b>Notes for <a href='?src=\ref[src];notes=show'>[ckey]</a>:</b> <a href='?src=\ref[src];notes=add;ckey=[ckey]'>\[+\]</a> <a href='?src=\ref[src];notes=remove;ckey=[ckey]'>\[-\]</a><br>"
-		notesfile.cd = "/[ckey]"
-		var/index = 1
-		while( !notesfile.eof )
-			var/note
-			notesfile >> note
-			. += "[note] <a href='?src=\ref[src];notes=remove;ckey=[ckey];from=[index]'>\[-\]</a><br>"
-			index++
-	else
-		. = "<b>All Notes:</b> <a href='?src=\ref[src];notes=add'>\[+\]</a> <a href='?src=\ref[src];notes=remove'>\[-\]</a><br>"
-		notesfile.cd = "/"
-		for(var/dir in notesfile.dir)
-			. += "<a href='?src=\ref[src];notes=show;ckey=[dir]'>[dir]</a><br>"
-	return
-
-//handles removing entries from the buffer, or removing the entire directory if no start_index is given
-/proc/notes_remove(var/ckey, var/start_index, var/end_index)
-	var/savefile/notesfile = new(NOTESFILE)
-	if(!notesfile)	return
-
-	if(!ckey)
-		notesfile.cd = "/"
-		ckey = ckey(input(usr,"Who would you like to remove notes for?","Enter a ckey",null) as null|anything in notesfile.dir)
-		if(!ckey)	return
-
-	if(start_index)
-		notesfile.cd = "/[ckey]"
-		var/list/noteslist = list()
-		if(!end_index)	end_index = start_index
-		var/index = 0
-		while( !notesfile.eof )
-			index++
-			var/temp
-			notesfile >> temp
-			if( (start_index <= index) && (index <= end_index) )
-				continue
-			noteslist += temp
-
-		notesfile.eof = -2		//Move to the start of the buffer and then erase.
-
-		for( var/note in noteslist )
-			notesfile << note
-	else
-		notesfile.cd = "/"
-		if(alert(usr,"Are you sure you want to remove all their notes?","Confirmation","No","Yes - Remove all notes") == "Yes - Remove all notes")
-			notesfile.dir.Remove(ckey)
-	return
-
-#undef NOTESFILE
-*/
-
-//Hijacking this file for BS12 playernotes functions. I like this ^ one systemm alright, but converting sounds too bothersome~ Chinsky.
-
+//This stuff was originally intended to be integrated into the ban-system I was working on
+//but it's safe to say that'll never be finished. So I've merged it into the current player panel.
+//enjoy				~Carn
+/*
+#define NOTESFILE "data/player_notes.sav"	//where the player notes are saved
+
+datum/admins/proc/notes_show(var/ckey)
+	usr << browse("<head><title>Player Notes</title></head><body>[notes_gethtml(ckey)]</body>","window=player_notes;size=700x400")
+
+
+datum/admins/proc/notes_gethtml(var/ckey)
+	var/savefile/notesfile = new(NOTESFILE)
+	if(!notesfile)	return "<font color='red'>Error: Cannot access [NOTESFILE]</font>"
+	if(ckey)
+		. = "<b>Notes for <a href='?src=\ref[src];notes=show'>[ckey]</a>:</b> <a href='?src=\ref[src];notes=add;ckey=[ckey]'>\[+\]</a> <a href='?src=\ref[src];notes=remove;ckey=[ckey]'>\[-\]</a><br>"
+		notesfile.cd = "/[ckey]"
+		var/index = 1
+		while( !notesfile.eof )
+			var/note
+			notesfile >> note
+			. += "[note] <a href='?src=\ref[src];notes=remove;ckey=[ckey];from=[index]'>\[-\]</a><br>"
+			index++
+	else
+		. = "<b>All Notes:</b> <a href='?src=\ref[src];notes=add'>\[+\]</a> <a href='?src=\ref[src];notes=remove'>\[-\]</a><br>"
+		notesfile.cd = "/"
+		for(var/dir in notesfile.dir)
+			. += "<a href='?src=\ref[src];notes=show;ckey=[dir]'>[dir]</a><br>"
+	return
+
+//handles removing entries from the buffer, or removing the entire directory if no start_index is given
+/proc/notes_remove(var/ckey, var/start_index, var/end_index)
+	var/savefile/notesfile = new(NOTESFILE)
+	if(!notesfile)	return
+
+	if(!ckey)
+		notesfile.cd = "/"
+		ckey = ckey(input(usr,"Who would you like to remove notes for?","Enter a ckey",null) as null|anything in notesfile.dir)
+		if(!ckey)	return
+
+	if(start_index)
+		notesfile.cd = "/[ckey]"
+		var/list/noteslist = list()
+		if(!end_index)	end_index = start_index
+		var/index = 0
+		while( !notesfile.eof )
+			index++
+			var/temp
+			notesfile >> temp
+			if( (start_index <= index) && (index <= end_index) )
+				continue
+			noteslist += temp
+
+		notesfile.eof = -2		//Move to the start of the buffer and then erase.
+
+		for( var/note in noteslist )
+			notesfile << note
+	else
+		notesfile.cd = "/"
+		if(alert(usr,"Are you sure you want to remove all their notes?","Confirmation","No","Yes - Remove all notes") == "Yes - Remove all notes")
+			notesfile.dir.Remove(ckey)
+	return
+
+#undef NOTESFILE
+*/
+
+//Hijacking this file for BS12 playernotes functions. I like this ^ one systemm alright, but converting sounds too bothersome~ Chinsky.
+
 /proc/notes_add(var/key, var/note, var/mob/user)
-	if (!key || !note)
-		return
-
-	//Loading list of notes for this key
-	var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav")
-	var/list/infos
-	info >> infos
-	if(!infos) infos = list()
-
-	//Overly complex timestamp creation
-	var/modifyer = "th"
-	switch(time2text(world.timeofday, "DD"))
-		if("01","21","31")
-			modifyer = "st"
-		if("02","22",)
-			modifyer = "nd"
-		if("03","23")
-			modifyer = "rd"
-	var/day_string = "[time2text(world.timeofday, "DD")][modifyer]"
-	if(copytext(day_string,1,2) == "0")
-		day_string = copytext(day_string,2)
-	var/full_date = time2text(world.timeofday, "DDD, Month DD of YYYY")
-	var/day_loc = findtext(full_date, time2text(world.timeofday, "DD"))
-
-	var/datum/player_info/P = new
+	if (!key || !note)
+		return
+
+	//Loading list of notes for this key
+	var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav")
+	var/list/infos
+	info >> infos
+	if(!infos) infos = list()
+
+	//Overly complex timestamp creation
+	var/modifyer = "th"
+	switch(time2text(world.timeofday, "DD"))
+		if("01","21","31")
+			modifyer = "st"
+		if("02","22",)
+			modifyer = "nd"
+		if("03","23")
+			modifyer = "rd"
+	var/day_string = "[time2text(world.timeofday, "DD")][modifyer]"
+	if(copytext(day_string,1,2) == "0")
+		day_string = copytext(day_string,2)
+	var/full_date = time2text(world.timeofday, "DDD, Month DD of YYYY")
+	var/day_loc = findtext(full_date, time2text(world.timeofday, "DD"))
+
+	var/datum/player_info/P = new
 	if (user)
 		P.author = user.key
 		P.rank = user.client.holder.rank
-	else
-		P.author = "Adminbot"
-		P.rank = "Friendly Robot"
-	P.content = note
-	P.timestamp = "[copytext(full_date,1,day_loc)][day_string][copytext(full_date,day_loc+2)]"
-
-	infos += P
-	info << infos
-
+	else
+		P.author = "Adminbot"
+		P.rank = "Friendly Robot"
+	P.content = note
+	P.timestamp = "[copytext(full_date,1,day_loc)][day_string][copytext(full_date,day_loc+2)]"
+
+	infos += P
+	info << infos
+
 	message_admins("\blue [key_name_admin(user)] has edited [key]'s notes.")
 	log_admin("[key_name(user)] has edited [key]'s notes.")
-
-	qdel(info)
-
-	//Updating list of keys with notes on them
-	var/savefile/note_list = new("data/player_notes.sav")
-	var/list/note_keys
-	note_list >> note_keys
-	if(!note_keys) note_keys = list()
-	if(!note_keys.Find(key)) note_keys += key
-	note_list << note_keys
-	qdel(note_list)
-
-
-/proc/notes_del(var/key, var/index)
-	var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav")
-	var/list/infos
-	info >> infos
-	if(!infos || infos.len < index) return
-
-	var/datum/player_info/item = infos[index]
-	infos.Remove(item)
-	info << infos
-
-	message_admins("\blue [key_name_admin(usr)] deleted one of [key]'s notes.")
-	log_admin("[key_name(usr)] deleted one of [key]'s notes.")
-
-	qdel(info)
-
-/proc/show_player_info_irc(var/key as text)
-	var/dat = "          Info on [key]%0D%0A"
-	var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav")
-	var/list/infos
-	info >> infos
-	if(!infos)
-		dat = "No information found on the given key."
-	else
-		for(var/datum/player_info/I in infos)
-			dat += "[I.content]%0D%0Aby [I.author] ([I.rank]) on [I.timestamp]%0D%0A%0D%0A"
-
-	return dat
+
+	qdel(info)
+
+	//Updating list of keys with notes on them
+	var/savefile/note_list = new("data/player_notes.sav")
+	var/list/note_keys
+	note_list >> note_keys
+	if(!note_keys) note_keys = list()
+	if(!note_keys.Find(key)) note_keys += key
+	note_list << note_keys
+	qdel(note_list)
+
+
+/proc/notes_del(var/key, var/index)
+	var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav")
+	var/list/infos
+	info >> infos
+	if(!infos || infos.len < index) return
+
+	var/datum/player_info/item = infos[index]
+	infos.Remove(item)
+	info << infos
+
+	message_admins("\blue [key_name_admin(usr)] deleted one of [key]'s notes.")
+	log_admin("[key_name(usr)] deleted one of [key]'s notes.")
+
+	qdel(info)
+
+/proc/show_player_info_irc(var/key as text)
+	var/dat = "          Info on [key]\n"
+	var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav")
+	var/list/infos
+	info >> infos
+	if(!infos)
+		dat = "No information found on the given key."
+	else
+		for(var/datum/player_info/I in infos)
+			dat += "[I.content]\nby [I.author] ([I.rank]) on [I.timestamp]\n\n"
+
+	return list2params(list(dat))
@@ -358,7 +358,7 @@
 			dat += "<td>NA</td>"


-		dat += {"<td>[(M.client ? "[M.client]" : "No client")]</td>
+		dat += {"<td>[M.key ? (M.client ? M.key : "[M.key] (DC)") : "No key"]</td>
 		<td align=center><A HREF='?src=\ref[src];adminplayeropts=\ref[M]'>X</A></td>
 		<td align=center><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>
 		"}
@@ -574,7 +574,13 @@

 	//JOBBAN'S INNARDS
 	else if(href_list["jobban3"])
-		if(!check_rights(R_MOD,0) && !check_rights(R_ADMIN))  return
+		if(!check_rights(R_MOD,0) && !check_rights(R_ADMIN,0))
+			usr << "<span class='warning'>You do not have the appropriate permissions to add job bans!</span>"
+			return
+
+		if(check_rights(R_MOD,0) && !check_rights(R_ADMIN,0) && !config.mods_can_job_tempban) // If mod and tempban disabled
+			usr << "<span class='warning'>Mod jobbanning is disabled!</span>"
+			return

 		var/mob/M = locate(href_list["jobban4"])
 		if(!ismob(M))
@@ -649,13 +655,18 @@
 		if(notbannedlist.len) //at least 1 unbanned job exists in joblist so we have stuff to ban.
 			switch(alert("Temporary Ban?",,"Yes","No", "Cancel"))
 				if("Yes")
-					if(!check_rights(R_MOD,0) && !check_rights(R_BAN))  return
+					if(!check_rights(R_MOD,0) && !check_rights(R_BAN, 0))
+						usr << "<span class='warning'> You Cannot issue temporary job-bans!</span>"
+						return
 					if(config.ban_legacy_system)
 						usr << "\red Your server is using the legacy banning system, which does not support temporary job bans. Consider upgrading. Aborting ban."
 						return
 					var/mins = input(usr,"How long (in minutes)?","Ban time",1440) as num|null
 					if(!mins)
 						return
+					if(check_rights(R_MOD, 0) && !check_rights(R_BAN, 0) && mins > config.mod_job_tempban_max)
+						usr << "<span class='warning'> Moderators can only job tempban up to [config.mod_job_tempban_max] minutes!</span>"
+						return
 					var/reason = sanitize(input(usr,"Reason?","Please State Reason","") as text|null)
 					if(!reason)
 						return
@@ -764,7 +775,13 @@
 				DB_ban_unban(ckey(key), BANTYPE_JOB_PERMA, job)

 	else if(href_list["newban"])
-		if(!check_rights(R_MOD,0) && !check_rights(R_BAN))  return
+		if(!check_rights(R_MOD,0) && !check_rights(R_BAN, 0))
+			usr << "<span class='warning'>You do not have the appropriate permissions to add bans!</span>"
+			return
+
+		if(check_rights(R_MOD,0) && !check_rights(R_ADMIN, 0) && !config.mods_can_job_tempban) // If mod and tempban disabled
+			usr << "<span class='warning'>Mod jobbanning is disabled!</span>"
+			return

 		var/mob/M = locate(href_list["newban"])
 		if(!ismob(M)) return
@@ -776,6 +793,9 @@
 				var/mins = input(usr,"How long (in minutes)?","Ban time",1440) as num|null
 				if(!mins)
 					return
+				if(check_rights(R_MOD, 0) && !check_rights(R_BAN, 0) && mins > config.mod_tempban_max)
+					usr << "<span class='warning'>Moderators can only job tempban up to [config.mod_tempban_max] minutes!</span>"
+					return
 				if(mins >= 525600) mins = 525599
 				var/reason = sanitize(input(usr,"Reason?","reason","Griefer") as text|null)
 				if(!reason)
@@ -1314,7 +1334,7 @@
 			src.owner << "You sent [input] to [L] via a secure channel."
 			log_admin("[src.owner] replied to [key_name(L)]'s Centcomm message with the message [input].")
 			message_admins("[src.owner] replied to [key_name(L)]'s Centcom message with: \"[input]\"")
-			if(!L.isAI())
+			if(!L.isMobAI())
 				L << "<span class='info'>You hear something crackle in your headset for a moment before a voice speaks.</span>"
 			L << "<span class='info'>Please stand by for a message from Central Command.</span>"
 			L << "<span class='info'>Message as follows.</span>"
@@ -1344,7 +1364,7 @@
 		var/obj/item/fax = locate(href_list["AdminFaxView"])
 		if (istype(fax, /obj/item/weapon/paper))
 			var/obj/item/weapon/paper/P = fax
-			P.show_content(usr)
+			P.show_content(usr,1)
 		else if (istype(fax, /obj/item/weapon/photo))
 			var/obj/item/weapon/photo/H = fax
 			H.show(usr)
@@ -1631,18 +1651,7 @@
 									var/mob/M = O
 									M.real_name = obj_name

-		if (number == 1)
-			log_admin("[key_name(usr)] created a [english_list(paths)]")
-			for(var/path in paths)
-				if(ispath(path, /mob))
-					message_admins("[key_name_admin(usr)] created a [english_list(paths)]", 1)
-					break
-		else
-			log_admin("[key_name(usr)] created [number]ea [english_list(paths)]")
-			for(var/path in paths)
-				if(ispath(path, /mob))
-					message_admins("[key_name_admin(usr)] created [number]ea [english_list(paths)]", 1)
-					break
+		log_and_message_admins("created [number] [english_list(paths)]")
 		return

 	else if(href_list["admin_secrets"])
@@ -118,30 +118,31 @@
 		if(X.key != key && X.key != C.key && (X.holder.rights & R_ADMIN|R_MOD|R_MENTOR))
 			X << "<span class='pm'><span class='other'>" + create_text_tag("pm_other", "PM:", X) + " <span class='name'>[key_name(src, X, 0)]</span> to <span class='name'>[key_name(C, X, 0)]</span>: <span class='message'>[msg]</span></span></span>"

-/client/proc/cmd_admin_irc_pm()
+/client/proc/cmd_admin_irc_pm(sender)
 	if(prefs.muted & MUTE_ADMINHELP)
 		src << "<font color='red'>Error: Private-Message: You are unable to use PM-s (muted).</font>"
 		return

-	var/msg = input(src,"Message:", "Private message to admins on IRC / 400 character limit") as text|null
+	var/msg = input(src,"Message:", "Reply private message to [sender] on IRC / 400 character limit") as text|null

 	if(!msg)
 		return

 	sanitize(msg)

-	if(length(msg) > 400) // TODO: if message length is over 400, divide it up into seperate messages, the message length restriction is based on IRC limitations.  Probably easier to do this on the bots ends.
-		src << "\red Your message was not sent because it was more then 400 characters find your message below for ease of copy/pasting"
-		src << "\blue [msg]"
-		return
+	// Handled on Bot32's end, unsure about other bots
+//	if(length(msg) > 400) // TODO: if message length is over 400, divide it up into seperate messages, the message length restriction is based on IRC limitations.  Probably easier to do this on the bots ends.
+//		src << "<span class='warning'>Your message was not sent because it was more then 400 characters find your message below for ease of copy/pasting</span>"
+//		src << "<span class='notice'>[msg]</span>"
+//		return

-	send2adminirc("PlayerPM from [key_name(src)]: [html_decode(msg)]")
+	send2adminirc("PlayerPM to [sender] from [key_name(src)]: [html_decode(msg)]")

-	src << "<span class='pm'><span class='out'>" + create_text_tag("pm_out_alt", "", src) + " to <span class='name'>Admin IRC</span>: <span class='message'>[msg]</span></span></span>"
+	src << "<span class='pm'><span class='out'>" + create_text_tag("pm_out_alt", "", src) + " to <span class='name'>IRC-[sender]</span>: <span class='message'>[msg]</span></span></span>"

-	log_admin("PM: [key_name(src)]->IRC: [msg]")
+	log_admin("PM: [key_name(src)]->IRC-[sender]: [msg]")
 	for(var/client/X in admins)
 		if(X == src)
 			continue
 		if(X.holder.rights & R_ADMIN|R_MOD)
-			X << "<span class='pm'><span class='other'>" + create_text_tag("pm_other", "PM:", X) + " <span class='name'>[key_name(src, X, 0)]</span> to <span class='name'>Admin IRC</span>: <span class='message'>[msg]</span></span></span>"
+			X << "<span class='pm'><span class='other'>" + create_text_tag("pm_other", "PM:", X) + " <span class='name'>[key_name(src, X, 0)]</span> to <span class='name'>IRC-[sender]</span>: <span class='message'>[msg]</span></span></span>"
@@ -42,6 +42,12 @@
 	icon = 'icons/misc/buildmode.dmi'
 	var/obj/effect/bmode/buildholder/master = null

+/obj/effect/bmode/Destroy()
+	if(master && master.cl)
+		master.cl.screen -= src
+	master = null
+	return ..()
+
 /obj/effect/bmode/builddir
 	icon_state = "build"
 	screen_loc = "NORTH,WEST"
@@ -117,6 +123,19 @@
 	var/obj/effect/bmode/buildquit/buildquit = null
 	var/atom/movable/throw_atom = null

+/obj/effect/bmode/buildholder/Destroy()
+	qdel(builddir)
+	builddir = null
+	qdel(buildhelp)
+	buildhelp = null
+	qdel(buildmode)
+	buildmode = null
+	qdel(buildquit)
+	buildquit = null
+	throw_atom = null
+	cl = null
+	return ..()
+
 /obj/effect/bmode/buildmode
 	icon_state = "buildmode1"
 	screen_loc = "NORTH,WEST+2"
@@ -64,6 +64,28 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that

 		var/procname = input("Proc path, eg: /proc/fake_blood","Path:", null) as text|null
 		if(!procname)	return
+	
+		if(targetselected)
+			if(!target)
+				usr << "<span class='danger'>Your target no longer exists.</span>"
+				return
+			if(!hascall(target,procname))
+				usr << "<font color='red'>Error: callproc(): target has no such call [procname].</font>"
+				return
+		else
+			if(copytext(procname, 1, 7) == "/proc/")
+				// nothing
+			else if(copytext(procname, 1, 6) == "proc/")
+				procname = "/[procname]"
+			else if(copytext(procname, 1, 2) == "/")
+				procname = "/proc[procname]"
+			else
+				procname = "/proc/[procname]"
+			// Procs have the strange property that text2path will return non-null, but ispath() will return false.
+			var/path = text2path(procname)
+			if(!path || ispath(path))
+				usr << "<span class='danger'>Invalid proc [procname]</span>"
+				return

 		var/argnum = input("Number of arguments","Number:",0) as num|null
 		if(!argnum && (argnum!=0))	return
@@ -117,13 +139,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			if(!target)
 				usr << "<font color='red'>Error: callproc(): owner of proc no longer exists.</font>"
 				return
-			if(!hascall(target,procname))
-				usr << "<font color='red'>Error: callproc(): target has no such call [procname].</font>"
-				return
 			log_admin("[key_name(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].")
 			returnval = call(target,procname)(arglist(lst)) // Pass the lst as an argument list to the proc
 		else
-			//this currently has no hascall protection. wasn't able to get it working.
 			log_admin("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].")
 			returnval = call(procname)(arglist(lst)) // Pass the lst as an argument list to the proc

@@ -200,7 +218,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	if(!choice)
 		return 0
 	if(!istype(choice, /mob/dead/observer))
-		var/confirm = input("[choice.key] isn't ghosting right now. Are you sure you want to yank him out of them out of their body and place them in this pAI?", "Spawn pAI Confirmation", "No") in list("Yes", "No")
+		var/confirm = input("[choice.key] isn't ghosting right now. Are you sure you want to yank them out of them out of their body and place them in this pAI?", "Spawn pAI Confirmation", "No") in list("Yes", "No")
 		if(confirm != "Yes")
 			return 0
 	var/obj/item/device/paicard/card = new(T)
@@ -641,13 +659,13 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that

 			M.equip_to_slot_or_del(new /obj/item/weapon/grenade/chem_grenade/cleaner(M), slot_r_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/grenade/chem_grenade/cleaner(M), slot_l_store)
-			M.equip_to_slot_or_del(new /obj/item/stack/tile/steel(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/stack/tile/steel(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/stack/tile/steel(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/stack/tile/steel(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/stack/tile/steel(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/stack/tile/steel(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/stack/tile/steel(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/stack/tile/floor(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/stack/tile/floor(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/stack/tile/floor(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/stack/tile/floor(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/stack/tile/floor(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/stack/tile/floor(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/stack/tile/floor(M), slot_in_backpack)

 		if ("pirate")
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(M), slot_w_uniform)
@@ -4,7 +4,7 @@
 	set category = "Fun"

 	var/turf/target = get_turf(src.mob)
-	admin_log_and_message_admins("has fired the Icarus point defense laser at [target.x]-[target.y]-[target.z]")
+	log_and_message_admins("has fired the Icarus point defense laser at [target.x]-[target.y]-[target.z]")
 	if(!src.holder)
 		src << "Only administrators may use this command."
 		return
@@ -18,7 +18,7 @@
 	set category = "Fun"

 	var/turf/target = get_turf(src.mob)
-	admin_log_and_message_admins("has fired the Icarus main gun projectile at [target.x]-[target.y]-[target.z]")
+	log_and_message_admins("has fired the Icarus main gun projectile at [target.x]-[target.y]-[target.z]")
 	if(!src.holder)
 		src << "Only administrators may use this command."
 		return
@@ -31,7 +31,7 @@
 	set desc = "Lets you chose the position of the Icarus in regards to the map."
 	set category = "Fun"

-	admin_log_and_message_admins("is changing the Icarus position.")
+	log_and_message_admins("is changing the Icarus position.")
 	if(!src.holder)
 		src << "Only administrators may use this command."
 		return
@@ -441,13 +441,13 @@ Traitors and the like can also be revived with the previous role mostly intact.

 	//Announces the character on all the systems, based on the record.
 	if(!issilicon(new_character))//If they are not a cyborg/AI.
-		if(!record_found&&new_character.mind.assigned_role!="MODE")//If there are no records for them. If they have a record, this info is already in there. MODE people are not announced anyway.
+		if(!record_found && !player_is_antag(new_character.mind, only_offstation_roles = 1)) //If there are no records for them. If they have a record, this info is already in there. MODE people are not announced anyway.
 			//Power to the user!
 			if(alert(new_character,"Warning: No data core entry detected. Would you like to announce the arrival of this character by adding them to various databases, such as medical records?",,"No","Yes")=="Yes")
 				data_core.manifest_inject(new_character)

 			if(alert(new_character,"Would you like an active AI to announce this character?",,"No","Yes")=="Yes")
-				call(/mob/new_player/proc/AnnounceArrival)(new_character, new_character.mind.assigned_role)
+				call(/proc/AnnounceArrival)(new_character, new_character.mind.assigned_role)

 	message_admins("\blue [admin] has respawned [player_key] as [new_character.real_name].", 1)

@@ -52,4 +52,4 @@ var/const/commandos_possible = 6 //if more Commandos are needed in the future
 		usr << "Looks like someone beat you to it."
 		return

-	team.attempt_spawn(1)
+	team.attempt_random_spawn()