Merge branch 'master' into development

# Conflicts:
#	code/controllers/subsystems/initialization/misc_early.dm
#	config/example/config.txt
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-4_mainlevel.dmm

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

@@ -6,7 +6,7 @@
 	extended_desc = "Program for programming employee ID cards to access parts of the station."
 	required_access_run = access_change_ids
 	required_access_download = access_change_ids
-	usage_flags = PROGRAM_CONSOLE
+	usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP
 	requires_ntnet = 0
 	size = 8
 	color = LIGHT_COLOR_BLUE

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

@@ -13,7 +13,7 @@
 	required_access_download = access_heads
 	requires_ntnet = 1
 	size = 12
-	usage_flags = PROGRAM_CONSOLE
+	usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP
 	network_destination = "station long-range communication array"
 	var/datum/comm_message_listener/message_core = new
 	var/intercept = 0