Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

baystation12.dme

@@ -1208,7 +1208,6 @@
 #include "code\WorkInProgress\virus2\monkeydispensor.dm"
 #include "code\WorkInProgress\virus2\Prob.dm"
 #include "code\WorkInProgress\Wrongnumber\weldbackpack.dm"
-#include "code\ZAS\Airflow.dm"
 #include "code\ZAS\Connection.dm"
 #include "code\ZAS\Creation.dm"
 #include "code\ZAS\Definition.dm"

code/ZAS/Processing.dm

@@ -51,8 +51,8 @@ zone
 		//Add checks to ensure that we're not sucking air out of an empty room.
 		if(total_space && air.total_moles > 0.1 && air.temperature > TCMB+0.5)
 			//If there is space, air should flow out of the zone.
-			if(abs(air.pressure) > vsc.airflow_lightest_pressure)
-				AirflowSpace(src)
+			//if(abs(air.pressure) > vsc.airflow_lightest_pressure)
+			//	AirflowSpace(src)
 			ShareSpace(air,total_space*(zone_share_percent/100))
 
 		//React the air here.
@@ -109,8 +109,8 @@ zone
 			for(var/zone/Z in connected_zones)
 				//Ensure we're not doing pointless calculations on equilibrium zones.
 				if(abs(air.total_moles - Z.air.total_moles) > 0.1 || abs(air.temperature - Z.air.temperature) > 0.1)
-					if(abs(Z.air.pressure - air.pressure) > vsc.airflow_lightest_pressure)
-						Airflow(src,Z)
+					//if(abs(Z.air.pressure - air.pressure) > vsc.airflow_lightest_pressure)
+					//	Airflow(src,Z)
 					ShareRatio(air,Z.air,connected_zones[Z]*(zone_share_percent/100))
 
 proc/ShareRatio(datum/gas_mixture/A, datum/gas_mixture/B, ratio)

code/modules/DetectiveWork/detective_work.dm

@@ -134,10 +134,8 @@ obj/machinery/computer/forensic_scanning
 					authenticated = 1
 					updateDialog()
 					return
-				var/obj/item/weapon/card/id/I = M.equipped()
-				if (I && istype(I))
-					if(src.check_access(I))
-						authenticated = 1
+				if (allowed(M))
+					authenticated = 1
 						//usr << "\green Access Granted"
 				//if(!authenticated)
 					//usr << "\red Access Denied"

code/modules/mob/living/carbon/human/hud_overlays.dm

@@ -4,4 +4,16 @@ mob/living/carbon/human
 	var/image/sec_img
 	var/image/sec2_img
 	var/image/imp_img
-	var/image/health_img
+	var/image/health_img
+
+mob/New()
+	. = ..()
+	antag_img = image('icons/mob/hud.dmi',src)
+
+mob/living/carbon/human/New()
+	. = ..()
+	med_img = image('icons/mob/hud.dmi',src)
+	sec_img = image('icons/mob/hud.dmi',src)
+	sec2_img = image('icons/mob/hud.dmi',src)
+	imp_img = image('icons/mob/hud.dmi',src)
+	health_img = image('icons/mob/hud.dmi',src)