Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

code/modules/admin/admin_verbs.dm

@@ -153,7 +153,7 @@ var/list/admin_verbs_debug = list(
 	/client/proc/callproc,
 	/client/proc/toggledebuglogs,
 	/client/proc/SDQL_query,
-	/client/proc/SDQL2_query
+	/client/proc/SDQL2_query,
 	)
 var/list/admin_verbs_possess = list(
 	/proc/possess,
@@ -305,7 +305,6 @@ var/list/admin_verbs_mentor = list(
 		/client/proc/camera_view,
 		/client/proc/sec_camera_report,
 		/client/proc/intercom_view,
-		/client/proc/air_status,
 		/client/proc/atmosscan,
 		/client/proc/powerdebug,
 		/client/proc/count_objects_on_z_level,

code/modules/admin/verbs/debug.dm

@@ -131,7 +131,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 /client/proc/Cell()
 	set category = "Debug"
-	set name = "Air Status in Location"
+	set name = "Cell"
 	if(!mob)
 		return
 	var/turf/T = mob.loc
@@ -141,11 +141,11 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 	var/datum/gas_mixture/env = T.return_air()
 
-	var/t = ""
-	t+= "Nitrogen : [env.nitrogen]\n"
-	t+= "Oxygen : [env.oxygen]\n"
-	t+= "Phoron : [env.phoron]\n"
-	t+= "CO2: [env.carbon_dioxide]\n"
+	var/t = "\blue Coordinates: [T.x],[T.y],[T.z]\n"
+	t += "\red Temperature: [env.temperature]\n"
+	t += "\red Pressure: [env.return_pressure()]kPa\n"
+	for(var/g in env.gas)
+		t += "\blue [g]: [env.gas[g]] / [env.gas[g] * R_IDEAL_GAS_EQUATION * env.temperature / env.volume]kPa\n"
 
 	usr.show_message(t, 1)
 	feedback_add_details("admin_verb","ASL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -956,7 +956,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		if(Rad.anchored)
 			if(!Rad.P)
 				var/obj/item/weapon/tank/phoron/Phoron = new/obj/item/weapon/tank/phoron(Rad)
-				Phoron.air_contents.phoron = 70
+				Phoron.air_contents.gas["phoron"] = 70
 				Rad.drainratio = 0
 				Rad.P = Phoron
 				Phoron.loc = Rad
@@ -999,7 +999,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 				var/obj/item/weapon/tank/phoron/Phoron = new/obj/item/weapon/tank/phoron(Rad)
 
-				Phoron.air_contents.phoron = 29.1154	//This is a full tank if you filled it from a canister
+				Phoron.air_contents.gas["phoron"] = 29.1154	//This is a full tank if you filled it from a canister
 				Rad.P = Phoron
 
 				Phoron.loc = Rad
@@ -1012,7 +1012,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 				var/obj/machinery/atmospherics/binary/pump/Pump = M
 				if(Pump.name == "Engine Feed" && response == "Setup Completely")
 					found_the_pump = 1
-					Pump.air2.nitrogen = 3750	//The contents of 2 canisters.
+					Pump.air2.gas["nitrogen"] = 3750	//The contents of 2 canisters.
 					Pump.air2.temperature = 50
 					Pump.air2.update_values()
 				Pump.on=1
@@ -1040,7 +1040,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	if(!found_the_pump && response == "Setup Completely")
 		src << "\red Unable to locate air supply to fill up with coolant, adding some coolant around the supermatter"
 		var/turf/simulated/T = SM.loc
-		T.zone.air.nitrogen += 450
+		T.zone.air.gas["nitrogen"] += 450
 		T.zone.air.temperature = 50
 		T.zone.air.update_values()
 

code/modules/admin/verbs/diagnostics.dm

@@ -41,27 +41,6 @@
 
 	usr << browse(output,"window=airreport")
 
-
-/client/proc/air_status(turf/target as turf)
-	set category = "Debug"
-	set name = "Display Air Status"
-
-	/*(!isturf(target))
-		return
-
-	var/datum/gas_mixture/GM = target.return_air()
-	var/burning = 0
-	if(istype(target, /turf/simulated))
-		var/turf/simulated/T = target
-		if(T.active_hotspot)
-			burning = 1
-
-	usr << "\blue @[target.x],[target.y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.phoron] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]"
-	for(var/datum/gas/trace_gas in GM.trace_gases)
-		usr << "[trace_gas.type]: [trace_gas.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()
 	set category = "Debug"
 	set name = "Unfreeze Everyone"
@@ -145,7 +124,7 @@
 	set category = "Debug"
 
 	if(!check_rights(R_SERVER)) return
-	
+
 	message_admins("[usr] manually reloaded Mentors")
 	world.load_mods()
 

code/modules/admin/verbs/mapping.dm

@@ -129,7 +129,6 @@ var/list/debug_verbs = list (
         ,/client/proc/camera_view
         ,/client/proc/sec_camera_report
         ,/client/proc/intercom_view
-        ,/client/proc/air_status
         ,/client/proc/Cell
         ,/client/proc/atmosscan
         ,/client/proc/powerdebug

code/modules/admin/verbs/modifyvariables.dm

@@ -212,12 +212,14 @@ var/list/forbidden_varedit_object_types = list(
 			usr << "If a direction, direction is: [dir]"
 
 	var/class = "text"
+	var/list/choices = list("text","num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default")
 	if(src.holder && src.holder.marked_datum)
-		class = input("What kind of variable?","Variable Type",default) as null|anything in list("text",
-			"num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default","marked datum ([holder.marked_datum.type])", "DELETE FROM LIST")
-	else
-		class = input("What kind of variable?","Variable Type",default) as null|anything in list("text",
-			"num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default", "DELETE FROM LIST")
+		choices += "marked datum ([holder.marked_datum.type])"
+	if(!isnull(default) && default != "num" && !isnull(L[variable]))
+		choices += "edit associated variable"
+	choices += "DELETE FROM LIST"
+
+	class = input("What kind of variable?","Variable Type",default) as null|anything in choices
 
 	if(!class)
 		return
@@ -264,6 +266,11 @@ var/list/forbidden_varedit_object_types = list(
 		if("marked datum")
 			L[L.Find(variable)] = holder.marked_datum
 
+		if("edit associated variable")
+			var/temp_var = mod_list_add_ass()
+			if(temp_var)
+				L[variable] = temp_var
+
 
 /client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0)
 	if(!check_rights(R_VAREDIT))	return