Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements

2019-09-13 12:59:15 -05:00
parent f2b343518b b2cde8e121
commit f0afc9c490
73 changed files with 4309 additions and 125 deletions
@@ -6,7 +6,17 @@ SUBSYSTEM_DEF(assets)
 	var/list/preload = list()

 /datum/controller/subsystem/assets/Initialize(timeofday)
-	for(var/type in typesof(/datum/asset))
+
+	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)))
 		var/datum/asset/A = type
 		if (type != initial(A._abstract))
 			get_asset_datum(type)