Merge pull request #4484 from Baystation12/dev-freeze

[Standby] Dev freeze 0.1.9 staging

baystation12.dme

@@ -372,11 +372,9 @@
 #include "code\game\machinery\doors\shutters.dm"
 #include "code\game\machinery\doors\unpowered.dm"
 #include "code\game\machinery\doors\windowdoor.dm"
-#include "code\game\machinery\embedded_controller\access_controller.dm"
-#include "code\game\machinery\embedded_controller\airlock_controller.dm"
+#include "code\game\machinery\embedded_controller\airlock_controllers.dm"
+#include "code\game\machinery\embedded_controller\airlock_program.dm"
 #include "code\game\machinery\embedded_controller\embedded_controller_base.dm"
-#include "code\game\machinery\embedded_controller\simple_vent_controller.dm"
-#include "code\game\machinery\embedded_controller\smart_airlock_controller.dm"
 #include "code\game\machinery\kitchen\gibber.dm"
 #include "code\game\machinery\kitchen\juicer.dm"
 #include "code\game\machinery\kitchen\microwave.dm"
@@ -446,6 +444,7 @@
 #include "code\game\objects\effects\decals\Cleanable\misc.dm"
 #include "code\game\objects\effects\decals\Cleanable\robots.dm"
 #include "code\game\objects\effects\decals\Cleanable\tracks.dm"
+#include "code\game\objects\effects\decals\posters\bs12.dm"
 #include "code\game\objects\effects\spawners\bombspawner.dm"
 #include "code\game\objects\effects\spawners\gibspawner.dm"
 #include "code\game\objects\effects\spawners\vaultspawner.dm"
@@ -1247,6 +1246,7 @@
 #include "code\modules\scripting\Scanner\Tokens.dm"
 #include "code\modules\security levels\keycard authentication.dm"
 #include "code\modules\security levels\security levels.dm"
+#include "code\modules\supermatter\supermatter.dm"
 #include "code\modules\surgery\appendix.dm"
 #include "code\modules\surgery\bones.dm"
 #include "code\modules\surgery\braincore.dm"
@@ -1274,6 +1274,11 @@
 #include "code\modules\virus2\helpers.dm"
 #include "code\modules\virus2\isolator.dm"
 #include "code\modules\virus2\items_devices.dm"
+#include "code\TriDimension\controller.dm"
+#include "code\TriDimension\Movement.dm"
+#include "code\TriDimension\Pipes.dm"
+#include "code\TriDimension\Structures.dm"
+#include "code\TriDimension\Turfs.dm"
 #include "code\WorkInProgress\autopsy.dm"
 #include "code\WorkInProgress\buildmode.dm"
 #include "code\WorkInProgress\explosion_particles.dm"
@@ -1320,7 +1325,6 @@
 #include "code\WorkInProgress\Ported\policetape.dm"
 #include "code\WorkInProgress\SkyMarshal\officer_stuff.dm"
 #include "code\WorkInProgress\SkyMarshal\Ultralight_procs.dm"
-#include "code\WorkInProgress\Yinadele\Supermatter.dm"
 #include "code\ZAS\Airflow.dm"
 #include "code\ZAS\Connection.dm"
 #include "code\ZAS\Debug.dm"

code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm

@@ -154,8 +154,8 @@
 		if("power_toggle" in signal.data)
 			on = !on
 
-		if("set_direction" in signal.data)
-			pump_direction = text2num(signal.data["set_direction"])
+		if("direction" in signal.data)
+			pump_direction = text2num(signal.data["direction"])
 
 		if("checks" in signal.data)
 			pressure_checks = text2num(signal.data["checks"])

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -5,8 +5,6 @@ obj/machinery/atmospherics/trinary/filter
 
 	name = "Gas filter"
 
-	req_access = list(access_atmospherics)
-
 	var/on = 0
 	var/temp = null // -- TLE
 

code/ATMOSPHERICS/components/trinary_devices/mixer.dm

@@ -5,8 +5,6 @@ obj/machinery/atmospherics/trinary/mixer
 
 	name = "Gas mixer"
 
-	req_access = list(access_atmospherics)
-
 	var/on = 0
 
 	var/target_pressure = ONE_ATMOSPHERE

code/ATMOSPHERICS/components/unary/heat_source.dm

@@ -26,7 +26,7 @@
 
 	process()
 		..()
-		if(!on)
+		if(!on || !network)
 			return 0
 		var/air_heat_capacity = air_contents.heat_capacity()
 		var/combined_heat_capacity = current_heat_capacity + air_heat_capacity