Merge remote-tracking branch 'origin/master' into TGUI_Updoot

2020-09-21 00:16:12 +03:00
parent 74533d3f9d 16430dab4c
commit 435565f1d8
223 changed files with 7046 additions and 3941 deletions
@@ -24,12 +24,10 @@
 /datum/asset_cache_item/New(name, file)
 	if (!isfile(file))
 		file = fcopy_rsc(file)
-	hash = md5(file)
+
+	hash = md5asfile(file) //icons sent to the rsc sometimes md5 incorrectly
 	if (!hash)
-		hash = md5(fcopy_rsc(file))
-		if (!hash)
-			CRASH("invalid asset sent to asset cache")
-		debug_world_log("asset cache unexpected success of second fcopy_rsc")
+		CRASH("invalid asset sent to asset cache")
 	src.name = name
 	var/extstart = findlasttext(name, ".")
 	if (extstart)