upd

code/game/machinery/buttons.dm

@@ -26,7 +26,7 @@
 	desc = "Burn baby burn!"
 	name = "crematorium igniter"
 	icon = 'icons/obj/structures/machinery/power.dmi'
-	icon_state = "crema_switch"
+	icon_state = "light0"
 	anchored = TRUE
 	req_access = list(ACCESS_MARINE_MEDBAY)
 	var/on = 0

code/game/machinery/computer/HolodeckControl.dm

@@ -91,15 +91,6 @@
 	icon_state = "woodtable"
 	table_prefix = "wood"
 
-/obj/structure/holostool
-	name = "stool"
-	desc = "Apply butt."
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "stool"
-	anchored = TRUE
-	flags_atom = FPRINT
-
-
 /obj/item/clothing/gloves/boxing/hologlove
 	name = "boxing gloves"
 	desc = "Because you really needed another excuse to punch your crewmates."

code/game/machinery/mining.dm

@@ -1,6 +1,6 @@
 /obj/structure/machinery/mineral/processing_unit
 	name = "material processor" //This isn't actually a goddamn furnace, we're in space and it's processing platinum and flammable phoron...
-	icon = 'icons/obj/structures/machinery/mining_machines.dmi'
+	icon = 'icons/obj/structures/props/stationobjs.dmi'
 	icon_state = "furnace"
 	density = TRUE
 	anchored = TRUE

code/game/objects/items/devices/flash.dm

@@ -160,21 +160,3 @@
 					M.apply_effect(10, WEAKEN)
 					M.visible_message(SPAN_DISARM("[M] is blinded by \the [src]!"))
 
-/obj/item/device/flash/synthetic
-	name = "synthetic flash"
-	desc = "When a problem arises, SCIENCE is the solution. Only good for one use."
-	icon_state = "sflash"
-
-/obj/item/device/flash/synthetic/attack(mob/living/M as mob, mob/user as mob)
-	..()
-	if(!broken)
-		broken = TRUE
-		to_chat(user, SPAN_DANGER("The bulb has burnt out!"))
-		update_icon()
-
-/obj/item/device/flash/synthetic/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0)
-	..()
-	if(!broken)
-		broken = TRUE
-		to_chat(user, SPAN_DANGER("The bulb has burnt out!"))
-		update_icon()

code/game/objects/items/frames/frame.dm

@@ -9,7 +9,7 @@
 /obj/item/frame/apc
 	name = "\improper APC frame"
 	desc = "Used for repairing or building APCs"
-	icon = 'icons/obj/structures/machinery/apc_repair.dmi'
+	icon = 'icons/obj/structures/machinery/apc.dmi'
 	icon_state = "apc_frame"
 	flags_atom = FPRINT|CONDUCT
 

code/game/objects/items/reagent_containers/food/snacks.dm

@@ -2200,7 +2200,7 @@
 	name = "golden apple streusel tart"
 	desc = "A tasty dessert that won't make it through a metal detector."
 	icon_state = "gappletart"
-	icon = 'icons/obj/items/food/dishes.dmi'
+	icon = 'icons/obj/items/food/bakery.dmi'
 	trash = /obj/item/trash/plate
 	filling_color = COLOR_YELLOW
 

code/game/objects/items/storage/backpack.dm

@@ -425,6 +425,8 @@
 
 /obj/item/storage/backpack/marine/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
 	. = ..()
+	if(flags_atom & MAP_COLOR_INDEX)
+		return
 	switch(SSmapping.configs[GROUND_MAP].camouflage_type)
 		if("jungle")
 			icon = 'icons/obj/items/clothing/backpack/backpacks_by_map/jungle.dmi'

code/game/objects/items/storage/belt.dm

@@ -445,9 +445,13 @@
 	desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This configuration is commonly seen among USCM Military Police and peacekeepers, though it can hold some light munitions."
 	icon_state = "securitybelt"
 	item_state = "security"//Could likely use a better one.
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+	)
 	item_state_slots = list(
-		WEAR_L_HAND = "s_marinebelt",
-		WEAR_R_HAND = "s_marinebelt"
+		WEAR_L_HAND = "marinebelt",
+		WEAR_R_HAND = "marinebelt"
 	)
 	storage_slots = 7
 	max_w_class = SIZE_MEDIUM
@@ -1390,6 +1394,7 @@
 	name = "customized nailgun holster"
 	desc = "Combination of a M276 pistol holster and engineering toolbelt that have been cannibalized into a unique belt that can holster a compact nailgun and two spare nailgun magazines."
 	icon_state = "nailgun_holster"
+	icon = 'icons/obj/items/clothing/belts/belts.dmi'
 	item_icons = list(
 		WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts.dmi',
 		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_lefthand.dmi',
@@ -1532,6 +1537,12 @@
 	name = "custom-tooled gunslinger's belt"
 	desc = "It's always high noon <i>somewhere</i>."
 	icon_state = "gunslinger_holster"
+	icon = 'icons/obj/items/clothing/belts/belts.dmi'
+	item_icons = list(
+		WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts.dmi',
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
+	)
 	flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
 	storage_slots = 6
 	can_hold = list(
@@ -1874,6 +1885,7 @@
 	max_storage_space = 20
 	icon_state = "m82f_holster"
 	item_state = "marinebelt"
+	icon = 'icons/obj/items/clothing/belts/belts.dmi'
 	item_icons = list(
 		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
 		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'

code/game/objects/items/toys/toys.dm

@@ -659,6 +659,3 @@
 		icon_state = "runner_beret"
 		return
 	icon_state = "runner"
-
-/obj/item/toy/plush/shark/alt
-	icon_state = "shark_alt"

code/game/objects/structures/reagent_dispensers.dm

@@ -159,42 +159,36 @@
 /obj/structure/reagent_dispensers/watertank
 	name = "watertank"
 	desc = "A water tank"
-	icon = 'icons/obj/objects.dmi'
 	icon_state = "watertank"
 	chemical = "water"
 
 /obj/structure/reagent_dispensers/ammoniatank
 	name = "ammoniatank"
 	desc = "An ammonia tank"
-	icon = 'icons/obj/objects.dmi'
 	icon_state = "ammoniatank"
 	chemical = "ammonia"
 
 /obj/structure/reagent_dispensers/acidtank
 	name = "sulfuric acid tank"
 	desc = "A sulfuric acid tank"
-	icon = 'icons/obj/objects.dmi'
 	icon_state = "sacidtank"
 	chemical = "sulphuric acid"
 
 /obj/structure/reagent_dispensers/pacidtank
 	name = "polytrinic acid tank"
 	desc = "A polytrinic acid tank"
-	icon = 'icons/obj/objects.dmi'
 	icon_state = "pacidtank"
 	chemical = "pacid"
 
 /obj/structure/reagent_dispensers/ethanoltank
 	name = "ethanol tank"
 	desc = "An ethanol tank."
-	icon = 'icons/obj/objects.dmi'
 	icon_state = "ethanoltank"
 	chemical = "ethanol"
 
 /obj/structure/reagent_dispensers/fueltank
 	name = "fueltank"
 	desc = "A fuel tank"
-	icon = 'icons/obj/objects.dmi'
 	icon_state = "weldtank"
 	amount_per_transfer_from_this = 10
 	chemical = "fuel"
@@ -234,14 +228,6 @@
 		to_chat(user, SPAN_WARNING("You're already peforming an action!"))
 		return
 
-	/*if (HAS_TRAIT(W, TRAIT_TOOL_WRENCH))
-		user.visible_message("[user] wrenches [src]'s faucet [modded ? "closed" : "open"].", \
-			"You wrench [src]'s faucet [modded ? "closed" : "open"]")
-		modded = modded ? 0 : 1
-		if (modded)
-			message_admins("[key_name_admin(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel. [ADMIN_JMP(loc)]")
-			log_game("[key_name(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel.")
-			leak_fuel(amount_per_transfer_from_this)*/
 	if(istype(W,/obj/item/device/assembly_holder))
 
 		if(rig)

code/modules/clothing/head/helmet.dm

@@ -65,6 +65,10 @@
 /obj/item/clothing/head/helmet/riot/vintage_riot
 	desc = "A scarred riot helmet covered in cobwebs. It still protects your ears."
 	icon_state = "old_riot"
+	icon = 'icons/obj/items/clothing/hats/hats.dmi'
+	item_icons = list(
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats.dmi',
+	)
 
 /obj/item/clothing/head/helmet/augment
 	name = "augment array"