fixups

code/modules/asset_cache/assets/arcade.dm

@@ -1,5 +1,7 @@
 /datum/asset/simple/arcade
 	assets = list(
+		"shopkeeper.png" = 'icons/ui_icons/arcade/shopkeeper.png',
+		"fireplace.png" = 'icons/ui_icons/arcade/fireplace.png',
 		"boss1.gif" = 'icons/ui_icons/arcade/boss1.gif',
 		"boss2.gif" = 'icons/ui_icons/arcade/boss2.gif',
 		"boss3.gif" = 'icons/ui_icons/arcade/boss3.gif',

code/modules/asset_cache/assets/icon_ref_map.dm

@@ -0,0 +1,28 @@
+/// Maps icon names to ref values
+/datum/asset/json/icon_ref_map
+	name = "icon_ref_map"
+	early = TRUE
+
+/datum/asset/json/icon_ref_map/generate()
+	var/list/data = list() //"icons/obj/drinks.dmi" => "[0xc000020]"
+
+	//var/start = "0xc000000"
+	var/value = 0
+
+	while(TRUE)
+		value += 1
+		var/ref = "\[0xc[num2text(value,6,16)]\]"
+		var/mystery_meat = locate(ref)
+
+		if(isicon(mystery_meat))
+			if(!isfile(mystery_meat)) // Ignore the runtime icons for now
+				continue
+			var/path = get_icon_dmi_path(mystery_meat) //Try to get the icon path
+			if(path)
+				data[path] = ref
+		else if(mystery_meat)
+			continue; //Some other non-icon resource, ogg/json/whatever
+		else //Out of resources end this, could also try to end this earlier as soon as runtime generated icons appear but eh
+			break;
+
+	return data

code/modules/asset_cache/transports/asset_transport.dm

@@ -82,11 +82,15 @@
 /// asset_list - A list of asset filenames to be sent to the client. Can optionally be assoicated with the asset's asset_cache_item datum.
 /// Returns TRUE if any assets were sent.
 /datum/asset_transport/proc/send_assets(client/client, list/asset_list)
+#if defined(UNIT_TESTS)
+	return
+#endif
+
 	if (!istype(client))
 		if (ismob(client))
-			var/mob/M = client
-			if (M.client)
-				client = M.client
+			var/mob/our_mob = client
+			if (our_mob.client)
+				client = our_mob.client
 			else //no stacktrace because this will mainly happen because the client went away
 				return
 		else