Merge remote-tracking branch 'ParadiseSS13/master' into id_computer_demote_terminate_freejob

code/modules/modular_computers/file_system/programs/command/card.dm

@@ -35,7 +35,8 @@
 		/datum/job/ntnavyofficer,
 		/datum/job/ntspecops,
 		/datum/job/civilian,
-		/datum/job/syndicateofficer
+		/datum/job/syndicateofficer,
+		/datum/job/explorer // blacklisted so that HOPs don't try prioritizing it, then wonder why that doesn't work
 	)
 
 	//The scaling factor of max total positions in relation to the total amount of people on board the station in %

code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm

@@ -84,9 +84,7 @@
 		data["SM_ambienttemp"] = air.temperature
 		data["SM_ambientpressure"] = air.return_pressure()
 		//data["SM_EPR"] = round((air.total_moles / air.group_multiplier) / 23.1, 0.01)
-		var/other_moles = 0.0
-		for(var/datum/gas/G in air.trace_gases)
-			other_moles+=G.moles
+		var/other_moles = air.total_trace_moles()
 		var/TM = air.total_moles()
 		if(TM)
 			data["SM_gas_O2"] = round(100*air.oxygen/TM,0.01)
@@ -94,7 +92,7 @@
 			data["SM_gas_N2"] = round(100*air.nitrogen/TM,0.01)
 			data["SM_gas_PL"] = round(100*air.toxins/TM,0.01)
 			if(other_moles)
-				data["SM_gas_OTHER"] = round(100*other_moles/TM,0.01)
+				data["SM_gas_OTHER"] = round(100 * other_moles / TM, 0.01)
 			else
 				data["SM_gas_OTHER"] = 0
 		else

code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm

@@ -195,7 +195,6 @@
 				if(!computer)
 					// This program shouldn't even be runnable without computer.
 					CRASH("Var computer is null!")
-					return 1
 				if(!hard_drive)
 					computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive connection error\" warning.")
 				else	// In 99.9% cases this will mean our HDD is full

code/modules/modular_computers/file_system/programs/research/airestorer.dm

@@ -78,7 +78,7 @@
 		A.stat = CONSCIOUS
 		A.lying = 0
 		GLOB.dead_mob_list -= A
-		GLOB.living_mob_list += A
+		GLOB.alive_mob_list += A
 	// Finished restoring
 	if(A.health >= 100)
 		ai_slot.locked = FALSE