Merge conflict fix

code/modules/admin/admin_verbs.dm

@@ -335,10 +335,12 @@ var/list/admin_verbs_hideable = list(
 	if(istype(mob,/mob/dead/observer))
 		//re-enter
 		var/mob/dead/observer/ghost = mob
-		if (!ghost.can_reenter_corpse)
+		if(!ghost.mind || !ghost.mind.current) //won't do anything if there is no body
+			return
+		if(!ghost.can_reenter_corpse)
 			log_admin("[key_name(usr)] re-entered corpse")
 			message_admins("[key_name_admin(usr)] re-entered corpse")
-		ghost.can_reenter_corpse = 1			//just in-case.
+		ghost.can_reenter_corpse = 1 //force re-entering even when otherwise not possible
 		ghost.reenter_corpse()
 		feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	else if(istype(mob,/mob/new_player))

code/modules/admin/topic.dm

@@ -2174,7 +2174,7 @@
 	else if(href_list["check_antagonist"])
 		if(!check_rights(R_ADMIN))
 			return
-		check_antagonists()
+		usr.client.check_antagonists()
 
 	else if(href_list["kick_all_from_lobby"])
 		if(!check_rights(R_ADMIN))

code/modules/admin/verbs/debug.dm

@@ -197,14 +197,14 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		return
 
 	var/datum/gas_mixture/env = T.return_air()
+	var/list/env_gases = env.gases
 
 	var/t = ""
-	t+= "Nitrogen : [env.nitrogen]\n"
-	t+= "Oxygen : [env.oxygen]\n"
-	t+= "Plasma : [env.toxins]\n"
-	t+= "CO2: [env.carbon_dioxide]\n"
+	for(var/id in env_gases)
+		if(id in hardcoded_gases || env_gases[id][MOLES])
+			t+= "[env_gases[id][GAS_NAME]] : [env_gases[id][MOLES]]\n"
 
-	usr.show_message(t, 1)
+	usr << t
 	feedback_add_details("admin_verb","ASL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_robotize(mob/M in mob_list)
@@ -641,7 +641,8 @@ var/global/list/g_fancy_list_of_types = null
 		if(Rad.anchored)
 			if(!Rad.P)
 				var/obj/item/weapon/tank/internals/plasma/Plasma = new/obj/item/weapon/tank/internals/plasma(Rad)
-				Plasma.air_contents.toxins = 70
+				Plasma.air_contents.assert_gas("plasma")
+				Plasma.air_contents.gases["plasma"][MOLES] = 70
 				Rad.drainratio = 0
 				Rad.P = Plasma
 				Plasma.loc = Rad

code/modules/admin/verbs/diagnostics.dm

@@ -6,15 +6,17 @@
 		return
 
 	var/datum/gas_mixture/GM = target.return_air()
+	var/list/GM_gases
 	var/burning = 0
 	if(istype(target, /turf/simulated))
 		var/turf/simulated/T = target
 		if(T.active_hotspot)
 			burning = 1
 
-	usr << "<span class='adminnotice'>@[target.x],[target.y]: 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)]</span>"
-	for(var/datum/gas/trace_gas in GM.trace_gases)
-		usr << "[trace_gas.type]: [trace_gas.moles]"
+	usr << "<span class='adminnotice'>@[target.x],[target.y]: [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]</span>"
+	for(var/id in GM_gases)
+		if(id in hardcoded_gases || GM_gases[id][MOLES])
+			usr << "[GM_gases[id][GAS_NAME]]: [GM_gases[id][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()

code/modules/admin/verbs/onlyone.dm

@@ -10,8 +10,20 @@
 		ticker.mode.traitors += H.mind
 		H.mind.special_role = "traitor"
 
-		add_objective(H.mind, /datum/objective/default/steal)
-		add_objective(H.mind, /datum/objective/escape_obj/hijack, 1)
+		var/datum/objective/steal/steal_objective = new
+		steal_objective.owner = H.mind
+		steal_objective.set_target(new /datum/objective_item/steal/nukedisc)
+		H.mind.objectives += steal_objective
+
+		var/datum/objective/hijack/hijack_objective = new
+		hijack_objective.owner = H.mind
+		H.mind.objectives += hijack_objective
+
+		H << "<B>You are the traitor.</B>"
+		var/obj_count = 1
+		for(var/datum/objective/OBJ in H.mind.objectives)
+			H << "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]"
+			obj_count++
 
 		for (var/obj/item/I in H)
 			if (istype(I, /obj/item/weapon/implant))