Merge remote-tracking branch 'upstream/master' into nanites

code/controllers/subsystem/lighting.dm

@@ -6,7 +6,6 @@ SUBSYSTEM_DEF(lighting)
 	name = "Lighting"
 	wait = 2
 	init_order = INIT_ORDER_LIGHTING
-	flags = SS_TICKER
 	var/static/list/sources_queue = list() // List of lighting sources queued for update.
 	var/static/list/corners_queue = list() // List of lighting corners queued for update.
 	var/static/list/objects_queue = list() // List of lighting objects queued for update.
@@ -88,4 +87,4 @@ SUBSYSTEM_DEF(lighting)
 
 /datum/controller/subsystem/lighting/Recover()
 	initialized = SSlighting.initialized
-	..()
+	..()

code/controllers/subsystem/processing/flightpacks.dm

@@ -1,25 +1 @@
-PROCESSING_SUBSYSTEM_DEF(flightpacks)
-	name = "Flightpack Movement"
-	priority = FIRE_PRIORITY_FLIGHTPACKS
-	wait = 2
-	stat_tag = "FM"
-	flags = SS_NO_INIT|SS_TICKER|SS_KEEP_TIMING
-
-	var/flightsuit_processing = FLIGHTSUIT_PROCESSING_FULL
-
-/datum/controller/subsystem/processing/flightpacks/Initialize()
-	sync_flightsuit_processing()
-
-/datum/controller/subsystem/processing/flightpacks/vv_edit_var(var_name, var_value)
-	..()
-	switch(var_name)
-		if("flightsuit_processing")
-			sync_flightsuit_processing()
-
-/datum/controller/subsystem/processing/flightpacks/proc/sync_flightsuit_processing()
-	for(var/obj/item/flightpack/FP in processing)
-		FP.sync_processing(src)
-	if(flightsuit_processing == FLIGHTSUIT_PROCESSING_NONE)	//Don't even bother firing.
-		can_fire = FALSE
-	else
-		can_fire = TRUE
+//Dead subsystem is dead