everything but mob stuff

code/modules/admin/admin.dm

@@ -43,7 +43,6 @@
 		body += "<br><br><b>Show related accounts by:</b> "
 		body += "\[ <a href='?_src_=holder;[HrefToken()];showrelatedacc=cid;client=[REF(M.client)]'>CID</a> | "
 		body += "<a href='?_src_=holder;[HrefToken()];showrelatedacc=ip;client=[REF(M.client)]'>IP</a> \]"
-
 		var/rep = 0
 		rep += SSpersistence.antag_rep[M.ckey]
 		body += "<br><br>Antagonist reputation: [rep]"
@@ -52,12 +51,15 @@
 		body += "<a href='?_src_=holder;[HrefToken()];modantagrep=set;mob=[REF(M)]'>\[set\]</a> "
 		body += "<a href='?_src_=holder;[HrefToken()];modantagrep=zero;mob=[REF(M)]'>\[zero\]</a>"
 
+
 	body += "<br><br>\[ "
 	body += "<a href='?_src_=vars;[HrefToken()];Vars=[REF(M)]'>VV</a> - "
 	if(M.mind)
 		body += "<a href='?_src_=holder;[HrefToken()];traitor=[REF(M)]'>TP</a> - "
 	else
 		body += "<a href='?_src_=holder;[HrefToken()];initmind=[REF(M)]'>Init Mind</a> - "
+	if (iscyborg(M))
+		body += "<a href='?_src_=holder;[HrefToken()];borgpanel=[REF(M)]'>BP</a> - "
 	body += "<a href='?priv_msg=[M.ckey]'>PM</a> - "
 	body += "<a href='?_src_=holder;[HrefToken()];subtlemessage=[REF(M)]'>SM</a> - "
 	body += "<a href='?_src_=holder;[HrefToken()];adminplayerobservefollow=[REF(M)]'>FLW</a> - "
@@ -177,9 +179,9 @@
 		body += "<A href='?_src_=holder;[HrefToken()];tdome2=[REF(M)]'>Thunderdome 2</A> | "
 		body += "<A href='?_src_=holder;[HrefToken()];tdomeadmin=[REF(M)]'>Thunderdome Admin</A> | "
 		body += "<A href='?_src_=holder;[HrefToken()];tdomeobserve=[REF(M)]'>Thunderdome Observer</A> | "
-
+	
 	body += usr.client.citaPPoptions(M) // CITADEL
-
+	
 	body += "<br>"
 	body += "</body></html>"
 

code/modules/admin/admin_verbs.dm

@@ -1,4 +1,5 @@
 //admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless
+//admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless
 //the procs are cause you can't put the comments in the GLOB var define
 GLOBAL_PROTECT(admin_verbs_default)
 GLOBAL_LIST_INIT(admin_verbs_default, world.AVerbsDefault())
@@ -6,7 +7,6 @@ GLOBAL_LIST_INIT(admin_verbs_default, world.AVerbsDefault())
 	return list(
 	/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/cmd_admin_ticket_panel,
 	/client/proc/dsay,					/*talk in deadchat using our ckey/fakekey*/
 	/client/proc/deadchat,
 	/client/proc/investigate_show,		/*various admintools for investigation. Such as a singulo grief-log*/
@@ -39,6 +39,7 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
 	/client/proc/check_antagonists,		/*shows all antags*/
 	/datum/admins/proc/access_news_network,	/*allows access of newscasters*/
 	/client/proc/jumptocoord,			/*we ghost and jump to a coordinate*/
+	/client/proc/getcurrentlogs,		/*for accessing server logs for the current round*/
 	/client/proc/Getmob,				/*teleports a mob to our location*/
 	/client/proc/Getkey,				/*teleports a mob with a certain ckey to our location*/
 //	/client/proc/sendmob,				/*sends a mob somewhere*/ -Removed due to it needing two sorting procs to work, which were executed every time an admin right-clicked. ~Errorage
@@ -56,7 +57,6 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
 	/client/proc/cmd_admin_create_centcom_report,
 	/client/proc/cmd_change_command_name,
 	/client/proc/cmd_admin_check_player_exp, /* shows players by playtime */
-	/client/proc/toggle_antag_hud, 	/*toggle display of the admin antag hud*/
 	/client/proc/toggle_combo_hud, // toggle display of the combination pizza antag and taco sci/med/eng hud
 	/client/proc/toggle_AI_interact, /*toggle admin ability to interact with machines as an AI*/
 	/client/proc/open_shuttle_manipulator, /* Opens shuttle manipulator UI */
@@ -228,7 +228,6 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 	/client/proc/admin_change_sec_level,
 	/client/proc/toggle_nuke,
 	/client/proc/cmd_display_del_log,
-	/client/proc/toggle_antag_hud,
 	/client/proc/toggle_combo_hud,
 	/client/proc/debug_huds,
 	/client/proc/cmd_admin_man_up, //CIT CHANGE - adds man up verb
@@ -622,7 +621,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 		return
 
 	if(has_antag_hud())
-		toggle_antag_hud()
+		toggle_combo_hud()
 
 	holder.deactivate()
 

code/modules/admin/fun_balloon.dm

@@ -119,21 +119,13 @@
 
 /obj/effect/forcefield/arena_shuttle
 	name = "portal"
+	timeleft = 0
 	var/list/warp_points
 
 /obj/effect/forcefield/arena_shuttle/Initialize()
 	. = ..()
-	warp_points = get_area_turfs(/area/shuttle/escape)
-	for(var/thing in warp_points)
-		CHECK_TICK
-		var/turf/T = thing
-		if(istype(T.loc, /area/shuttle/escape/backup))
-			warp_points -= T
-			continue
-		for(var/atom/movable/TAM in T)
-			if(TAM.density && TAM.anchored)
-				warp_points -= T
-				break
+	for(var/obj/effect/landmark/shuttle_arena_safe/exit in GLOB.landmarks_list)
+		warp_points += exit
 
 /obj/effect/forcefield/arena_shuttle/CollidedWith(atom/movable/AM)
 	if(!isliving(AM))
@@ -143,7 +135,7 @@
 	if(L.pulling && istype(L.pulling, /obj/item/bodypart/head))
 		to_chat(L, "Your offering is accepted. You may pass.")
 		qdel(L.pulling)
-		var/turf/LA = pick(warp_points)
+		var/turf/LA = get_turf(pick(warp_points))
 		L.forceMove(LA)
 		L.hallucination = 0
 		to_chat(L, "<span class='reallybig redtext'>The battle is won. Your bloodlust subsides.</span>")
@@ -163,6 +155,7 @@
 
 /obj/effect/forcefield/arena_shuttle_entrance
 	name = "portal"
+	timeleft = 0
 	var/list/warp_points = list()
 
 /obj/effect/forcefield/arena_shuttle_entrance/CollidedWith(atom/movable/AM)

code/modules/admin/player_panel.dm

@@ -80,6 +80,8 @@
 					body += "<a href='?_src_=holder;[HrefToken()];showmessageckey="+ckey+"'>N</a> - "
 					body += "<a href='?_src_=vars;[HrefToken()];Vars="+ref+"'>VV</a> - "
 					body += "<a href='?_src_=holder;[HrefToken()];traitor="+ref+"'>TP</a> - "
+					if (job == "Cyborg")
+						body += "<a href='?_src_=holder;[HrefToken()];borgpanel="+ref+"'>BP</a> - "
 					body += "<a href='?priv_msg="+ckey+"'>PM</a> - "
 					body += "<a href='?_src_=holder;[HrefToken()];subtlemessage="+ref+"'>SM</a> - "
 					body += "<a href='?_src_=holder;[HrefToken()];adminplayerobservefollow="+ref+"'>FLW</a> - "

code/modules/admin/topic.dm

@@ -21,9 +21,9 @@
 
 	if(!CheckAdminHref(href, href_list))
 		return
-
+	
 	citaTopic(href, href_list) //CITADEL EDIT, MENTORS
-
+	
 	if(href_list["ahelp"])
 		if(!check_rights(R_ADMIN, TRUE))
 			return
@@ -1921,6 +1921,16 @@
 		else
 			show_traitor_panel(M)
 
+	else if(href_list["borgpanel"])
+		if(!check_rights(R_ADMIN))
+			return
+
+		var/mob/M = locate(href_list["borgpanel"])
+		if(!iscyborg(M))
+			to_chat(usr, "This can only be used on cyborgs")
+		else
+			open_borgopanel(M)
+
 	else if(href_list["initmind"])
 		if(!check_rights(R_ADMIN))
 			return

code/modules/admin/verbs/adminhelp.dm

@@ -398,7 +398,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	message_admins(msg)
 	log_admin_private(msg)
 	AddInteraction("Being handled by [key_name]")
-
+	
 //Show the ticket panel
 /datum/admin_help/proc/TicketPanel()
 	var/list/dat = list("<html><head><title>Ticket #[id]</title></head>")
@@ -534,28 +534,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 
 	new /datum/admin_help(msg, src, FALSE)
 
-//admin proc
-/client/proc/cmd_admin_ticket_panel()
-	set name = "Show Ticket List"
-	set category = "Admin"
-
-	if(!check_rights(R_ADMIN, TRUE))
-		return
-
-	var/browse_to
-
-	switch(input("Display which ticket list?") as null|anything in list("Active Tickets", "Closed Tickets", "Resolved Tickets"))
-		if("Active Tickets")
-			browse_to = AHELP_ACTIVE
-		if("Closed Tickets")
-			browse_to = AHELP_CLOSED
-		if("Resolved Tickets")
-			browse_to = AHELP_RESOLVED
-		else
-			return
-
-	GLOB.ahelp_tickets.BrowseTickets(browse_to)
-
 //
 // LOGGING
 //

code/modules/admin/verbs/adminjump.dm

@@ -10,11 +10,10 @@
 		return
 
 	var/list/turfs = list()
-	for(var/area/Ar in A.related)
-		for(var/turf/T in Ar)
-			if(T.density)
-				continue
-			turfs.Add(T)
+	for(var/turf/T in A)
+		if(T.density)
+			continue
+		turfs.Add(T)
 
 	var/turf/T = safepick(turfs)
 	if(!T)

code/modules/admin/verbs/borgpanel.dm

@@ -0,0 +1,217 @@
+/datum/admins/proc/open_borgopanel(borgo in GLOB.silicon_mobs)
+	set category = "Admin"
+	set name = "Show Borg Panel"
+	set desc = "Show borg panel"
+
+	if(!check_rights(R_ADMIN))
+		return
+
+	if (!istype(borgo, /mob/living/silicon/robot))
+		borgo = input("Select a borg", "Select a borg", null, null) as null|anything in GLOB.silicon_mobs
+	if (!istype(borgo, /mob/living/silicon/robot))
+		to_chat(usr, "<span class='warning'>Borg is required for borgpanel</span>")
+
+	var/datum/borgpanel/borgpanel = new(usr, borgo)
+
+	borgpanel.ui_interact(usr)
+
+
+
+/datum/borgpanel
+	var/mob/living/silicon/robot/borg
+	var/user
+
+/datum/borgpanel/New(user, mob/living/silicon/robot/borg)
+	if(!istype(borg))
+		CRASH("Borg panel is only available for borgs")
+		qdel(src)
+	if (istype(user, /mob))
+		var/mob/M = user
+		if (!M.client)
+			CRASH("Borg panel attempted to open to a mob without a client")
+		src.user = M.client
+	else
+		src.user = user
+	src.borg = borg
+
+/datum/borgpanel/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "borgopanel", "Borg Panel", 700, 700, master_ui, state)
+		ui.open()
+
+/datum/borgpanel/ui_data(mob/user)
+	. = list()
+	.["borg"] = list(
+		"ref" = REF(borg),
+		"name" = "[borg]",
+		"emagged" = borg.emagged,
+		"active_module" = "[borg.module.type]",
+		"lawupdate" = borg.lawupdate,
+		"lockdown" = borg.lockcharge,
+		"scrambledcodes" = borg.scrambledcodes
+	)
+	.["upgrades"] = list()
+	for (var/upgradetype in subtypesof(/obj/item/borg/upgrade)-/obj/item/borg/upgrade/hypospray) //hypospray is a dummy parent for hypospray upgrades
+		var/obj/item/borg/upgrade/upgrade = upgradetype
+		if (initial(upgrade.module_type) && !istype(borg.module, initial(upgrade.module_type))) // Upgrade requires a different module
+			continue
+		var/installed = FALSE
+		if (locate(upgradetype) in borg)
+			installed = TRUE
+		.["upgrades"] += list(list("name" = initial(upgrade.name), "installed" = installed, "type" = upgradetype))
+	.["laws"] = borg.laws ? borg.laws.get_law_list(include_zeroth = TRUE) : list()
+	.["channels"] = list()
+	for (var/k in GLOB.radiochannels)
+		if (k == "Common")
+			continue
+		.["channels"] += list(list("name" = k, "installed" = (k in borg.radio.channels)))
+	.["cell"] = borg.cell ? list("missing" = FALSE, "maxcharge" = borg.cell.maxcharge, "charge" = borg.cell.charge) : list("missing" = TRUE, "maxcharge" = 1, "charge" = 0)
+	.["modules"] = list()
+	for(var/moduletype in typesof(/obj/item/robot_module))
+		var/obj/item/robot_module/module = moduletype
+		.["modules"] += list(list(
+			"name" = initial(module.name),
+			"type" = "[module]"
+		))
+	.["ais"] = list(list("name" = "None", "ref" = "null", "connected" = isnull(borg.connected_ai)))
+	for(var/mob/living/silicon/ai/ai in GLOB.ai_list)
+		.["ais"] += list(list("name" = ai.name, "ref" = REF(ai), "connected" = (borg.connected_ai == ai)))
+
+
+/datum/borgpanel/ui_act(action, params)
+	if(..())
+		return
+	switch (action)
+		if ("set_charge")
+			var/newcharge = input("New charge (0-[borg.cell.maxcharge]):", borg.name, borg.cell.charge) as num|null
+			if (newcharge)
+				borg.cell.charge = CLAMP(newcharge, 0, borg.cell.maxcharge)
+				message_admins("[key_name_admin(user)] set the charge of [key_name_admin(borg)][ADMIN_FLW(borg)] to [borg.cell.charge].")
+				log_admin("[key_name(user)] set the charge of [key_name(borg)] to [borg.cell.charge].")
+		if ("remove_cell")
+			QDEL_NULL(borg.cell)
+			message_admins("[key_name_admin(user)] deleted the cell of [key_name_admin(borg)][ADMIN_FLW(borg)].")
+			log_admin("[key_name(user)] deleted the cell of [key_name(borg)].")
+		if ("change_cell")
+			var/chosen = pick_closest_path(null, make_types_fancy(typesof(/obj/item/stock_parts/cell)))
+			if (!ispath(chosen))
+				chosen = text2path(chosen)
+			if (chosen)
+				if (borg.cell)
+					QDEL_NULL(borg.cell)
+				var/new_cell = new chosen(borg)
+				borg.cell = new_cell
+				borg.cell.charge = borg.cell.maxcharge
+				borg.diag_hud_set_borgcell()
+				message_admins("[key_name_admin(user)] changed the cell of [key_name_admin(borg)][ADMIN_FLW(borg)] to [new_cell].")
+				log_admin("[key_name(user)] changed the cell of [key_name(borg)] to [new_cell].")
+		if ("toggle_emagged")
+			borg.SetEmagged(!borg.emagged)
+			if (borg.emagged)
+				message_admins("[key_name_admin(user)] emagged [key_name_admin(borg)][ADMIN_FLW(borg)].")
+				log_admin("[key_name(user)] emagged [key_name(borg)].")
+			else
+				message_admins("[key_name_admin(user)] un-emagged [key_name_admin(borg)][ADMIN_FLW(borg)].")
+				log_admin("[key_name(user)] un-emagged [key_name(borg)].")
+		if ("toggle_lawupdate")
+			borg.lawupdate = !borg.lawupdate
+			if (borg.lawupdate)
+				message_admins("[key_name_admin(user)] enabled lawsync on [key_name_admin(borg)][ADMIN_FLW(borg)].")
+				log_admin("[key_name(user)] enabled lawsync on [key_name(borg)].")
+			else
+				message_admins("[key_name_admin(user)] disabled lawsync on [key_name_admin(borg)][ADMIN_FLW(borg)].")
+				log_admin("[key_name(user)] disabled lawsync on [key_name(borg)].")
+		if ("toggle_lockdown")
+			borg.SetLockdown(!borg.lockcharge)
+			if (borg.lockcharge)
+				message_admins("[key_name_admin(user)] locked down [key_name_admin(borg)][ADMIN_FLW(borg)].")
+				log_admin("[key_name(user)] locked down [key_name(borg)].")
+			else
+				message_admins("[key_name_admin(user)] released [key_name_admin(borg)][ADMIN_FLW(borg)] from lockdown.")
+				log_admin("[key_name(user)] released [key_name(borg)] from lockdown.")
+		if ("toggle_scrambledcodes")
+			borg.scrambledcodes = !borg.scrambledcodes
+			if (borg.scrambledcodes)
+				message_admins("[key_name_admin(user)] enabled scrambled codes on [key_name_admin(borg)][ADMIN_FLW(borg)].")
+				log_admin("[key_name(user)] enabled scrambled codes on [key_name(borg)].")
+			else
+				message_admins("[key_name_admin(user)] disabled scrambled codes on [key_name_admin(borg)][ADMIN_FLW(borg)].")
+				log_admin("[key_name(user)] disabled scrambled codes on [key_name(borg)].")
+		if ("rename")
+			var/new_name = stripped_input(user,"What would you like to name this cyborg?","Input a name",borg.real_name,MAX_NAME_LEN)
+			if(!new_name)
+				return
+			message_admins("[key_name_admin(user)] renamed [key_name_admin(borg)][ADMIN_FLW(borg)] to [new_name].")
+			log_admin("[key_name(user)] renamed [key_name(borg)] to [new_name].")
+			borg.fully_replace_character_name(borg.real_name,new_name)
+		if ("toggle_upgrade")
+			var/upgradepath = text2path(params["upgrade"])
+			var/obj/item/borg/upgrade/installedupgrade = locate(upgradepath) in borg
+			if (installedupgrade)
+				installedupgrade.deactivate(borg, user)
+				borg.upgrades -= installedupgrade
+				message_admins("[key_name_admin(user)] removed the [installedupgrade] upgrade from [key_name_admin(borg)][ADMIN_FLW(borg)].")
+				log_admin("[key_name(user)] removed the [installedupgrade] upgrade from [key_name(borg)].")
+				qdel(installedupgrade)
+			else
+				var/obj/item/borg/upgrade/upgrade = new upgradepath(borg)
+				upgrade.action(borg, user)
+				borg.upgrades += upgrade
+				message_admins("[key_name_admin(user)] added the [upgrade] borg upgrade to [key_name_admin(borg)][ADMIN_FLW(borg)].")
+				log_admin("[key_name(user)] added the [upgrade] borg upgrade to [key_name(borg)].")
+		if ("toggle_radio")
+			var/channel = params["channel"]
+			if (channel in borg.radio.channels) // We're removing a channel
+				if (!borg.radio.keyslot) // There's no encryption key. This shouldn't happen but we can cope
+					borg.radio.channels -= channel
+					if (channel == "Syndicate")
+						borg.radio.syndie = FALSE
+					else if (channel == "CentCom")
+						borg.radio.independent = FALSE
+				else
+					borg.radio.keyslot.channels -= channel
+					if (channel == "Syndicate")
+						borg.radio.keyslot.syndie = FALSE
+					else if (channel == "CentCom")
+						borg.radio.keyslot.independent = FALSE
+				message_admins("[key_name_admin(user)] removed the [channel] radio channel from [key_name_admin(borg)][ADMIN_FLW(borg)].")
+				log_admin("[key_name(user)] removed the [channel] radio channel from [key_name(borg)].")
+			else	// We're adding a channel
+				if (!borg.radio.keyslot) // Assert that an encryption key exists
+					borg.radio.keyslot = new (borg.radio)
+				borg.radio.keyslot.channels[channel] = 1
+				if (channel == "Syndicate")
+					borg.radio.keyslot.syndie = TRUE
+				else if (channel == "CentCom")
+					borg.radio.keyslot.independent = TRUE
+				message_admins("[key_name_admin(user)] added the [channel] radio channel to [key_name_admin(borg)][ADMIN_FLW(borg)].")
+				log_admin("[key_name(user)] added the [channel] radio channel to [key_name(borg)].")
+			borg.radio.recalculateChannels()
+		if ("setmodule")
+			var/newmodulepath = text2path(params["module"])
+			if (ispath(newmodulepath))
+				borg.module.transform_to(newmodulepath)
+				message_admins("[key_name_admin(user)] changed the module of [key_name_admin(borg)][ADMIN_FLW(borg)] to [newmodulepath].")
+				log_admin("[key_name(user)] changed the module of [key_name(borg)] to [newmodulepath].")
+		if ("slavetoai")
+			var/mob/living/silicon/ai/newai = locate(params["slavetoai"]) in GLOB.ai_list
+			if (newai && newai != borg.connected_ai)
+				borg.notify_ai(DISCONNECT)
+				if(borg.shell)
+					borg.undeploy()
+				borg.connected_ai = newai
+				borg.notify_ai(TRUE)
+				message_admins("[key_name_admin(user)] slaved [key_name_admin(borg)][ADMIN_FLW(borg)] to the AI [key_name_admin(newai)][ADMIN_FLW(newai)].")
+				log_admin("[key_name(user)] slaved [key_name(borg)] to the AI [key_name(newai)].")
+			else if (params["slavetoai"] == "null")
+				borg.notify_ai(DISCONNECT)
+				if(borg.shell)
+					borg.undeploy()
+				borg.connected_ai = null
+				message_admins("[key_name_admin(user)] freed [key_name_admin(borg)][ADMIN_FLW(borg)] from being slaved to an AI.")
+				log_admin("[key_name(user)] freed [key_name(borg)] from being slaved to an AI.")
+			if (borg.lawupdate)
+				borg.lawsync()
+
+	. = TRUE

code/modules/admin/verbs/buildmode.dm

@@ -270,25 +270,20 @@
 			if(isturf(object) && left_click && !alt_click && !ctrl_click)
 				var/turf/T = object
 				if(isspaceturf(object))
-					T.ChangeTurf(/turf/open/floor/plasteel)
+					T.PlaceOnTop(/turf/open/floor/plating)
+				else if(isplatingturf(object))
+					T.PlaceOnTop(/turf/open/floor/plasteel)
 				else if(isfloorturf(object))
-					T.ChangeTurf(/turf/closed/wall)
+					T.PlaceOnTop(/turf/closed/wall)
 				else if(iswallturf(object))
-					T.ChangeTurf(/turf/closed/wall/r_wall)
-				T.assemble_baseturfs(initial(T.baseturfs))
+					T.PlaceOnTop(/turf/closed/wall/r_wall)
 				log_admin("Build Mode: [key_name(user)] built [T] at ([T.x],[T.y],[T.z])")
 				return
 			else if(right_click)
 				log_admin("Build Mode: [key_name(user)] deleted [object] at ([object.x],[object.y],[object.z])")
-				if(iswallturf(object))
+				if(isturf(object))
 					var/turf/T = object
-					T.ChangeTurf(/turf/open/floor/plasteel)
-				else if(isfloorturf(object))
-					var/turf/T = object
-					T.ChangeTurf(/turf/open/space)
-				else if(istype(object, /turf/closed/wall/r_wall))
-					var/turf/T = object
-					T.ChangeTurf(/turf/closed/wall)
+					T.ScrapeAway()
 				else if(isobj(object))
 					qdel(object)
 				return
@@ -296,29 +291,19 @@
 				log_admin("Build Mode: [key_name(user)] built an airlock at ([object.x],[object.y],[object.z])")
 				new/obj/machinery/door/airlock(get_turf(object))
 			else if(isturf(object) && ctrl_click && left_click)
-				switch(build_dir)
-					if(NORTH)
-						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
-						WIN.setDir(NORTH)
-					if(SOUTH)
-						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
-						WIN.setDir(SOUTH)
-					if(EAST)
-						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
-						WIN.setDir(EAST)
-					if(WEST)
-						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
-						WIN.setDir(WEST)
-					if(NORTHWEST)
-						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced/fulltile(get_turf(object))
-						WIN.setDir(NORTHWEST)
+				var/obj/structure/window/reinforced/window
+				if(build_dir == NORTHWEST)
+					window = new /obj/structure/window/reinforced/fulltile(get_turf(object))
+				else
+					window = new /obj/structure/window/reinforced(get_turf(object))
+				window.setDir(build_dir)
 				log_admin("Build Mode: [key_name(user)] built a window at ([object.x],[object.y],[object.z])")
 		if(ADV_BUILDMODE)
 			if(left_click)
 				if(ispath(objholder, /turf))
 					var/turf/T = get_turf(object)
 					log_admin("Build Mode: [key_name(user)] modified [T] ([T.x],[T.y],[T.z]) to [objholder]")
-					T.ChangeTurf(objholder)
+					T.PlaceOnTop(objholder)
 				else
 					var/obj/A = new objholder (get_turf(object))
 					A.setDir(build_dir)

code/modules/admin/verbs/getlogs.dm

@@ -4,7 +4,17 @@
 	set desc = "View/retrieve logfiles."
 	set category = "Admin"
 
-	var/path = browse_files("data/logs/")
+	browseserverlogs()
+
+/client/proc/getcurrentlogs()
+	set name = "Get Current Logs"
+	set desc = "View/retrieve logfiles for the current round."
+	set category = "Admin"
+
+	browseserverlogs("[GLOB.log_directory]/")
+
+/client/proc/browseserverlogs(path = "data/logs/")
+	path = browse_files(path)
 	if(!path)
 		return
 
@@ -22,4 +32,4 @@
 		else
 			return
 	to_chat(src, "Attempting to send [path], this may take a fair few minutes if the file is very large.")
-	return
+	return

code/modules/admin/verbs/randomverbs.dm

@@ -1001,25 +1001,6 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 	"}
 	usr << browse(dat, "window=dressup;size=550x600")
 
-/client/proc/toggle_antag_hud()
-	set category = "Admin"
-	set name = "Toggle AntagHUD"
-	set desc = "Toggles the Admin AntagHUD"
-
-	if(!check_rights(R_ADMIN))
-		return
-
-	var/adding_hud = !has_antag_hud()
-
-	for(var/datum/atom_hud/H in GLOB.huds)
-		if(istype(H, /datum/atom_hud/antag))
-			(adding_hud) ? H.add_hud_to(usr) : H.remove_hud_from(usr)
-
-	to_chat(usr, "You toggled your admin antag HUD [adding_hud ? "ON" : "OFF"].")
-	message_admins("[key_name_admin(usr)] toggled their admin antag HUD [adding_hud ? "ON" : "OFF"].")
-	log_admin("[key_name(usr)] toggled their admin antag HUD [adding_hud ? "ON" : "OFF"].")
-	SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Antag HUD", "[adding_hud ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
 /client/proc/toggle_combo_hud()
 	set category = "Admin"
 	set name = "Toggle Combo HUD"