Various Fixes

code/modules/admin/admin_verbs.dm

@@ -35,11 +35,24 @@
 	set category = "Admin"
 	set name = "Aghost"
 	if(!holder)	return
+
+	var/build_mode
+	if(src.buildmode)
+		build_mode = tgui_alert(src, "You appear to be currently in buildmode. Do you want to re-enter buildmode after aghosting?", "Buildmode", list("Yes", "No"))
+		if(build_mode != "Yes")
+			to_chat(src, "Will not re-enter buildmode after switch.")
+
 	if(istype(mob,/mob/observer/dead))
 		//re-enter
 		var/mob/observer/dead/ghost = mob
 		if(ghost.can_reenter_corpse)
-			ghost.reenter_corpse()
+			if(build_mode)
+				togglebuildmode(mob)
+				ghost.reenter_corpse()
+				if(build_mode == "Yes")
+					togglebuildmode(mob)
+			else
+				ghost.reenter_corpse()
 		else
 			to_chat(ghost, "<span class='filter_system warning'>Error:  Aghost:  Can't reenter corpse.</span>")
 			return
@@ -51,9 +64,22 @@
 	else
 		//ghostize
 		var/mob/body = mob
+<<<<<<< HEAD
 		var/mob/observer/dead/ghost = body.ghostize(1)
 		ghost.admin_ghosted = 1
 		log_and_message_admins("[key_name(src)] admin-ghosted.") // CHOMPEdit - Add logging.
+=======
+		var/mob/observer/dead/ghost
+		if(build_mode)
+			togglebuildmode(body)
+			ghost = body.ghostize(1)
+			ghost.admin_ghosted = 1
+			if(build_mode == "Yes")
+				togglebuildmode(ghost)
+		else
+			ghost = body.ghostize(1)
+			ghost.admin_ghosted = 1
+>>>>>>> 2c7c9c3fec... Merge pull request #13094 from ItsSelis/rcon-fix
 		if(body)
 			body.teleop = ghost
 			if(!body.key)

code/modules/admin/topic.dm

@@ -151,7 +151,7 @@
 			switch(new_rank)
 				if(null,"") return
 				if("*New Rank*")
-					new_rank = input(usr, "Please input a new rank", "New custom rank", null, null) as null|text
+					new_rank = input(usr, "Please input a new rank", "New custom rank") as null|text
 					if(config.admin_legacy_system)
 						new_rank = ckeyEx(new_rank)
 					if(!new_rank)