Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit

code/modules/asset_cache/asset_list.dm

@@ -486,6 +486,24 @@ GLOBAL_LIST_EMPTY(asset_datums)
 #undef SPRSZ_ICON
 #undef SPRSZ_STRIPPED
 
+/datum/asset/changelog_item
+	_abstract = /datum/asset/changelog_item
+	var/item_filename
+
+/datum/asset/changelog_item/New(date)
+	item_filename = SANITIZE_FILENAME("[date].yml")
+	SSassets.transport.register_asset(item_filename, file("html/changelogs/archive/" + item_filename))
+
+/datum/asset/changelog_item/send(client)
+	if (!item_filename)
+		return
+	. = SSassets.transport.send_assets(client, item_filename)
+
+/datum/asset/changelog_item/get_url_mappings()
+	if (!item_filename)
+		return
+	. = list("[item_filename]" = SSassets.transport.get_asset_url(item_filename))
+
 /datum/asset/changelog_item
 	_abstract = /datum/asset/changelog_item
 	var/item_filename

code/modules/asset_cache/assets/paper.dm

@@ -1,6 +1,7 @@
 /datum/asset/spritesheet/simple/paper
 	name = "paper"
 	assets = list(
+<<<<<<< HEAD
 
 		// SKYRAT EDIT ADDITION: START - Donator stamp icons
 		"stamp-cat_blue" = 'modular_skyrat/master_files/icons/stamp_icons/cat_blue.png',
@@ -15,6 +16,8 @@
 		"stamp-nri" = 'modular_skyrat/master_files/icons/stamp_icons/large_stamp-nri.png',
 		"stamp-solfed" = 'modular_skyrat/master_files/icons/stamp_icons/large_stamp-solfed.png',
 		// SKYRAT EDIT ADDITION: END
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 		"stamp-clown" = 'icons/stamp_icons/large_stamp-clown.png',
 		"stamp-deny" = 'icons/stamp_icons/large_stamp-deny.png',
 		"stamp-ok" = 'icons/stamp_icons/large_stamp-ok.png',