Merge branch 'master' into development

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/customitems/item_defines.dm

code/controllers/subsystems/garbage.dm

@@ -3,7 +3,7 @@ var/datum/controller/subsystem/garbage_collector/SSgarbage
 /datum/controller/subsystem/garbage_collector
 	name = "Garbage"
 	priority = SS_PRIORITY_GARBAGE
-	wait = 5
+	wait = 2 SECONDS
 	flags = SS_FIRE_IN_LOBBY|SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
 
 	var/collection_timeout = 3000// deciseconds to wait to let running procs finish before we just say fuck it and force del() the object

code/controllers/subsystems/icon_cache.dm

@@ -58,6 +58,9 @@
 	var/list/collar_states
 	var/list/uniform_states
 
+	// This is for the kitty ears item.
+	var/list/kitty_ear_cache = list()
+
 /datum/controller/subsystem/icon_cache/New()
 	NEW_SS_GLOBAL(SSicon_cache)
 

code/controllers/subsystems/plants.dm

@@ -1,6 +1,6 @@
-/var/datum/controller/subsystem/processing/plants/SSplants
+/var/datum/controller/subsystem/plants/SSplants
 
-/datum/controller/subsystem/processing/plants
+/datum/controller/subsystem/plants
 	name = "Seeds & Plants"
 	flags = 0	// Override parent's flags.
 	wait = 75
@@ -14,10 +14,15 @@
 	var/list/plant_sprites = list()         // List of all harvested product sprites.
 	var/list/plant_product_sprites = list() // List of all growth sprites plus number of growth stages.
 
-/datum/controller/subsystem/processing/plants/New()
+	var/list/processing = list()
+
+/datum/controller/subsystem/plants/New()
 	NEW_SS_GLOBAL(SSplants)
 
-/datum/controller/subsystem/processing/plants/Initialize(timeofday)
+/datum/controller/subsystem/plants/stat_entry()
+	..("P:[processing.len]")
+
+/datum/controller/subsystem/plants/Initialize(timeofday)
 	// Build the icon lists.
 	for(var/icostate in icon_states('icons/obj/hydroponics_growing.dmi'))
 		var/split = findtext(icostate,"-")
@@ -63,7 +68,7 @@
 	
 	..()
 
-/datum/controller/subsystem/processing/plants/Recover()
+/datum/controller/subsystem/plants/Recover()
 	if (istype(SSplants))
 		src.product_descs = SSplants.product_descs
 		src.seeds = SSplants.seeds
@@ -72,8 +77,26 @@
 		src.plant_sprites = SSplants.plant_sprites
 		src.plant_product_sprites = SSplants.plant_product_sprites
 
+/datum/controller/subsystem/plants/fire(resumed = 0)
+	var/list/queue = processing
+	while (queue.len)
+		var/obj/effect/plant/P = queue[queue.len]
+		queue.len--
+
+		if (!QDELETED(P))
+			P.process()
+
+		if (MC_TICK_CHECK)
+			return
+
+/datum/controller/subsystem/plants/proc/add_plant(obj/effect/plant/plant)
+	processing[plant] = TRUE
+
+/datum/controller/subsystem/plants/proc/remove_plant(obj/effect/plant/plant)
+	processing -= plant
+
 // Proc for creating a random seed type.
-/datum/controller/subsystem/processing/plants/proc/create_random_seed(var/survive_on_station)
+/datum/controller/subsystem/plants/proc/create_random_seed(var/survive_on_station)
 	var/datum/seed/seed = new()
 	seed.randomize()
 	seed.uid = seeds.len + 1

code/controllers/subsystems/statistics.dm

@@ -125,8 +125,9 @@
 	feedback_add_details("radio_usage","PDA-[pda_msg_amt]")
 	feedback_add_details("radio_usage","RC-[rc_msg_amt]")
 
-	for (var/datum/statistic/S in simple_statistics)
-		if (S.write_to_database && S.key)
+	for (var/key in simple_statistics)
+		var/datum/statistic/S = simple_statistics[key]
+		if (S.write_to_db && S.key)
 			S.write_to_database()
 
 	feedback_set_details("round_end","[time2text(world.realtime)]") //This one MUST be the last one that gets set.