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

code/controllers/configuration/entries/general.dm

@@ -434,3 +434,5 @@
 
 /datum/config_entry/flag/picture_logging_camera
 
+/datum/config_entry/flag/minimaps_enabled
+	config_entry_value = TRUE

code/controllers/subsystem/assets.dm

@@ -6,17 +6,7 @@ SUBSYSTEM_DEF(assets)
 	var/list/preload = list()
 
 /datum/controller/subsystem/assets/Initialize(timeofday)
-
-	var/list/priority_assets = list(
-		/datum/asset/simple/oui_theme_nano,
-		/datum/asset/simple/goonchat
-		)
-
-	for(var/type in priority_assets)
-		var/datum/asset/A = new type()
-		A.register()
-	
-	for(var/type in typesof(/datum/asset) - (priority_assets | list(/datum/asset, /datum/asset/simple)))
+	for(var/type in typesof(/datum/asset))
 		var/datum/asset/A = type
 		if (type != initial(A._abstract))
 			get_asset_datum(type)

code/controllers/subsystem/minimaps.dm

@@ -0,0 +1,20 @@
+SUBSYSTEM_DEF(minimaps)
+	name = "Minimaps"
+	flags = SS_NO_FIRE
+	var/list/station_minimaps = list()
+	var/datum/minimap_group/station_minimap = null
+
+/datum/controller/subsystem/minimaps/Initialize()
+	if(!CONFIG_GET(flag/minimaps_enabled))
+		to_chat(world, "<span class='boldwarning'>Minimaps disabled! Skipping init.</span>")
+		return ..()
+	build_minimaps()
+	return ..()
+
+/datum/controller/subsystem/minimaps/proc/build_minimaps()
+	for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+		var/datum/space_level/SL = SSmapping.get_level(z)
+		var/name = (SL.name == initial(SL.name))? "[z] - Station" : "[z] - [SL.name]"
+		station_minimaps += new /datum/minimap(z, name = name)
+
+	station_minimap = new(station_minimaps, "Station")