Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13-RP into tgui4examinetake2

code/modules/modular_computers/NTNet/NTNet_relay.dm

@@ -35,7 +35,7 @@
 	else
 		icon_state = "bus_off"
 
-/obj/machinery/ntnet_relay/process()
+/obj/machinery/ntnet_relay/process(delta_time)
 	if(operable())
 		update_use_power(USE_POWER_ACTIVE)
 	else

code/modules/modular_computers/computers/modular_computer/core.dm

@@ -1,4 +1,4 @@
-/obj/item/modular_computer/process()
+/obj/item/modular_computer/process(delta_time)
 	if(!enabled) // The computer is turned off
 		last_power_usage = 0
 		return 0

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

@@ -27,7 +27,7 @@
 
 	if(monitored_alarm_ids)
 		for(var/obj/machinery/alarm/alarm in machines)
-			if(alarm.alarm_id && alarm.alarm_id in monitored_alarm_ids)
+			if(alarm.alarm_id && (alarm.alarm_id in monitored_alarm_ids))
 				monitored_alarms += alarm
 		// machines may not yet be ordered at this point
 		monitored_alarms = dd_sortedObjectList(monitored_alarms)

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

@@ -123,8 +123,8 @@
 		if(!computer || !computer.hard_drive || !computer.hard_drive.store_file(logfile))
 			if(!computer)
 				// This program shouldn't even be runnable without computer.
+				. = TRUE
 				CRASH("Var computer is null!")
-				return 1
 			if(!computer.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