diff --git a/.gitignore b/.gitignore
index 4d2b7e810de8..785d756d7e5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ sound/music/walkman/*/*.ogg
 sound/music/walkman/*.txt
 icons/custom/*
 maps/**/backup
+maps/templates.dm
 *.before
 __pycache__
 test_environment.txt
diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm
index 7f1201bd12e0..0623c79947d3 100644
--- a/code/__HELPERS/icons.dm
+++ b/code/__HELPERS/icons.dm
@@ -581,7 +581,7 @@ world
 		A.overlays.Remove(src)
 
 /mob/proc/flick_heal_overlay(time, color = "#00FF00") //used for warden and queen healing
-	var/image/I = image('icons/mob/mob.dmi', src, "heal_overlay")
+	var/image/I = image('icons/mob/do_afters.dmi', src, "heal_overlay")
 	switch(icon_size)
 		if(48)
 			I.pixel_x = 8
diff --git a/code/game/objects/items/devices/portable_vendor.dm b/code/game/objects/items/devices/portable_vendor.dm
index 53f83b110908..cb0e49e2fa98 100644
--- a/code/game/objects/items/devices/portable_vendor.dm
+++ b/code/game/objects/items/devices/portable_vendor.dm
@@ -6,6 +6,10 @@
 	name = "\improper Automated Storage Briefcase"
 	desc = "A suitcase-sized automated storage and retrieval system. Designed to efficiently store and selectively dispense small items."
 	icon = 'icons/obj/items/storage/briefcases.dmi'
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi'
+	)
 	icon_state = "secure"
 	flags_atom = FPRINT|CONDUCT
 	force = 8
diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm
index 5648eec4ceab..2e952e4d4911 100644
--- a/code/game/objects/items/misc.dm
+++ b/code/game/objects/items/misc.dm
@@ -36,8 +36,8 @@
 	icon_state = "wooden_pole"
 	item_state = "wooden_pole"
 	item_icons = list(
-		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/energy_lefthand.dmi',
-		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/energy_righthand.dmi'
+		WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/holster.dmi',
+		WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/scabbards.dmi',
 	)
 	force = 20
 	attack_speed = 1.5 SECONDS
@@ -144,14 +144,6 @@
 /obj/item/weapon/pole/fancy_cane/this_is_a_knife/katana
 	stored_item = new /obj/item/weapon/sword/katana
 
-// IN SHOTGUNS.DM!!
-
-/*obj/item/weapon/pole/fancy_cane/gun
-	name = "fancy cane"
-	desc = "An ebony cane with a fancy, seemingly-golden tip. Feels hollow to the touch."
-	force = 15 // hollow
-*/
-
 /obj/item/research//Makes testing much less of a pain -Sieve
 	name = "research"
 	icon = 'icons/obj/items/stock_parts.dmi'
@@ -166,10 +158,6 @@
 	throwforce = 2
 	w_class = SIZE_LARGE
 
-
-
-
-
 /obj/item/evidencebag
 	name = "evidence bag"
 	desc = "An empty evidence bag."
diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm
index aec498b5847a..4b11fd69e6f9 100644
--- a/code/game/objects/items/props/helmetgarb.dm
+++ b/code/game/objects/items/props/helmetgarb.dm
@@ -662,6 +662,7 @@
 	name = "compass"
 	desc = "It always faces north. Are you sure it is not broken?"
 	icon = 'icons/obj/items/tools.dmi'
+	icon_state = "compass"
 	item_icons = list(
 		WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/misc.dmi',
 	)
diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm
index 29a388e77d7f..4ab0c1d1e8b5 100644
--- a/code/game/objects/items/reagent_containers/food/snacks.dm
+++ b/code/game/objects/items/reagent_containers/food/snacks.dm
@@ -3276,6 +3276,7 @@
 		playsound(src.loc,'sound/effects/pageturn2.ogg', 15, 1)
 		to_chat(user, SPAN_NOTICE("You pull off the wrapping from the squishy burrito!"))
 		package = 0
+		new /obj/item/trash/buritto (user.loc)
 		icon_state = "open-burrito"
 
 /obj/item/reagent_container/food/snacks/packaged_burger
@@ -3300,6 +3301,7 @@
 		playsound(src.loc,'sound/effects/pageturn2.ogg', 15, 1)
 		to_chat(user, SPAN_NOTICE("You pull off the wrapping from the squishy hamburger!"))
 		package = 0
+		new /obj/item/trash/burger (user.loc)
 		icon_state = "hburger"
 		item_state = "burger"
 
@@ -3324,6 +3326,7 @@
 		playsound(src.loc,'sound/effects/pageturn2.ogg', 15, 1)
 		to_chat(user, SPAN_NOTICE("You pull off the wrapping from the squishy hotdog!"))
 		package = 0
+		new /obj/item/trash/hotdog (user.loc)
 		icon_state = "open-hotdog"
 
 /obj/item/reagent_container/food/snacks/upp
diff --git a/code/game/objects/items/stacks/cable_coil.dm b/code/game/objects/items/stacks/cable_coil.dm
index ae44632fc515..ec05b26824e9 100644
--- a/code/game/objects/items/stacks/cable_coil.dm
+++ b/code/game/objects/items/stacks/cable_coil.dm
@@ -6,8 +6,8 @@
 	name = "cable coil"
 	icon = 'icons/obj/structures/machinery/power.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'
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/tools_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/tools_righthand.dmi',
 	)
 	icon_state = "coil"
 	amount = MAXCOIL
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 4f7ec74633b9..0d6d1d8568a7 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -102,7 +102,7 @@ GLOBAL_LIST_INIT(iron_recipes, list ( \
 	icon_state = "sheet-sandstone"
 	throw_speed = SPEED_VERY_FAST
 	throw_range = 5
-
+	amount_sprites = TRUE
 	sheettype = "sandstone"
 	stack_id = "sandstone"
 
@@ -118,6 +118,7 @@ GLOBAL_LIST_INIT(iron_recipes, list ( \
 	desc = "Sandstone is sand cemented into stone. A common building material for primitive civilizations, but it can still make a good enough wall. This one has strange runes embued into the brick."
 	singular_name = "runed sandstone brick"
 	icon_state = "sheet-runedsandstone"
+	amount_sprites = FALSE
 	black_market_value = 15
 
 /obj/item/stack/sheet/mineral/sandstone/runed/large_stack
@@ -190,7 +191,7 @@ GLOBAL_LIST_INIT(iron_recipes, list ( \
 	singular_name = "plastic sheet"
 	icon_state = "sheet-plastic"
 	matter = list("plastic" = 2000)
-
+	amount_sprites = TRUE
 	perunit = 2000
 	stack_id = "plastic"
 	black_market_value = 0
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index f4210d3801ae..0769d78eb8d8 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -953,6 +953,7 @@
 	w_class = SIZE_LARGE
 	storage_slots = 12
 	storage_flags = STORAGE_FLAGS_DEFAULT|STORAGE_USING_DRAWING_METHOD|STORAGE_ALLOW_QUICKDRAW
+	flags_atom = FPRINT // has gamemode skin
 	max_w_class = SIZE_SMALL
 	max_storage_space = 48
 	can_hold = list(
@@ -1143,12 +1144,7 @@
 		/obj/item/ammo_magazine/pistol,
 	)
 	cant_hold = list(
-		/obj/item/weapon/gun/revolver/m44/custom/pkd_special, // HONKed currently
-		/obj/item/weapon/gun/revolver/m44/custom/pkd_special/k2049, // HONKed currently
-		/obj/item/weapon/gun/revolver/m44/custom/pkd_special/l_series, // HONKed currently
 		/obj/item/weapon/gun/pistol/kt42, // HONKed currently
-		/obj/item/weapon/gun/pistol/holdout, // HONKed currently
-		/obj/item/weapon/gun/pistol/holdout/flashlight, // HONKed currently
 		/obj/item/weapon/gun/pistol/auto9, // HONKed currently
 		/obj/item/weapon/gun/pistol/chimp, // HONKed currently
 		/obj/item/weapon/gun/pistol/skorpion, // HONKed currently
@@ -1239,7 +1235,7 @@
 		*/
 		playsound(src, drawSound, 7, TRUE)
 		var/image/gun_underlay = image('icons/obj/items/clothing/belts/holstered_guns.dmi', current_gun.base_gun_icon)
-		if(gun_has_gamemode_skin & current_gun.map_specific_decoration)
+		if(gun_has_gamemode_skin && current_gun.map_specific_decoration)
 			switch(SSmapping.configs[GROUND_MAP].camouflage_type)
 				if("snow")
 					gun_underlay = image('icons/obj/items/clothing/belts/holstered_guns.dmi', "s_" + current_gun.base_gun_icon)
@@ -1360,13 +1356,7 @@
 	cant_hold = list(
 		/obj/item/weapon/gun/pistol/smart,
 		/obj/item/ammo_magazine/pistol/smart,
-		/obj/item/weapon/gun/revolver/m44/custom/pkd_special, // HONKed currently
-		/obj/item/weapon/gun/revolver/m44/custom/pkd_special/k2049, // HONKed currently
-		/obj/item/weapon/gun/revolver/m44/custom/pkd_special/l_series, // HONKed currently
 		/obj/item/weapon/gun/pistol/kt42, // HONKed currently
-		/obj/item/weapon/gun/pistol/holdout, // HONKed currently
-		/obj/item/weapon/gun/pistol/holdout/flashlight, // HONKed currently
-		/obj/item/weapon/gun/pistol/es4, // HONKed currently
 		/obj/item/weapon/gun/pistol/auto9, // HONKed currently
 		/obj/item/weapon/gun/pistol/chimp, // HONKed currently
 		/obj/item/weapon/gun/pistol/skorpion, // HONKed currently
@@ -1525,9 +1515,6 @@
 		/obj/item/weapon/gun/smg/m39,
 		/obj/item/ammo_magazine/smg,
 	)
-	cant_hold = list (
-		/obj/item/weapon/gun/smg/m39/elite, // HONKed currently
-	)
 	holster_slots = list(
 		"1" = list(
 			"icon_x" = -11,
@@ -1960,13 +1947,7 @@
 	var/list/bad_guns = list(
 		/obj/item/weapon/gun/pistol/m4a3/training,
 		/obj/item/weapon/gun/pistol/mod88/training,
-		/obj/item/weapon/gun/revolver/m44/custom/pkd_special, // HONKed currently
-		/obj/item/weapon/gun/revolver/m44/custom/pkd_special/k2049, // HONKed currently
-		/obj/item/weapon/gun/revolver/m44/custom/pkd_special/l_series, // HONKed currently
 		/obj/item/weapon/gun/pistol/kt42, // HONKed currently
-		/obj/item/weapon/gun/pistol/holdout, // HONKed currently
-		/obj/item/weapon/gun/pistol/holdout/flashlight, // HONKed currently
-		/obj/item/weapon/gun/pistol/es4, // HONKed currently
 		/obj/item/weapon/gun/pistol/auto9, // HONKed currently
 		/obj/item/weapon/gun/pistol/chimp, // HONKed currently
 		/obj/item/weapon/gun/pistol/skorpion, // HONKed currently
diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm
index fab4fbd8bc76..3043412170a0 100644
--- a/code/game/objects/items/storage/briefcase.dm
+++ b/code/game/objects/items/storage/briefcase.dm
@@ -2,6 +2,10 @@
 	name = "briefcase"
 	desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
 	icon = 'icons/obj/items/storage/briefcases.dmi'
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi'
+	)
 	icon_state = "briefcase"
 	item_state = "briefcase"
 	flags_atom = FPRINT|CONDUCT|NO_GAMEMODE_SKIN
diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm
index b8b8a313b650..4e7ef49bf43f 100644
--- a/code/game/objects/items/storage/large_holster.dm
+++ b/code/game/objects/items/storage/large_holster.dm
@@ -153,6 +153,10 @@
 	name = "\improper katana scabbard"
 	desc = "A large, vibrantly colored katana scabbard used to carry a Japanese sword. It can be strapped to the back or worn at the belt. Because of the sturdy wood casing of the scabbard, it makes an okay defensive weapon in a pinch."
 	icon_state = "katana_holster"
+	item_icons = list(
+		WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/holster.dmi',
+		WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/scabbards.dmi',
+	)
 	force = 12
 	attack_verb = list("bludgeoned", "struck", "cracked")
 	flags_equip_slot = SLOT_WAIST|SLOT_BACK
@@ -164,7 +168,10 @@
 /obj/item/storage/large_holster/ceremonial_sword
 	name = "ceremonial sword scabbard"
 	desc = "A large, vibrantly colored scabbard used to carry a ceremonial sword."
-	icon_state = "ceremonial_sword_holster"//object icon is duplicate of katana holster, needs new icon at some point.
+	icon_state = "ceremonial_sword_holster"
+	item_icons = list(
+		WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/scabbards.dmi',
+	)
 	force = 12
 	flags_equip_slot = SLOT_WAIST
 	can_hold = list(/obj/item/weapon/sword/ceremonial)
diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm
index 1aad5f1f71f0..9b1b0e251fb6 100644
--- a/code/game/objects/items/storage/secure.dm
+++ b/code/game/objects/items/storage/secure.dm
@@ -124,6 +124,10 @@
 /obj/item/storage/secure/briefcase
 	name = "secure briefcase"
 	icon = 'icons/obj/items/storage/briefcases.dmi'
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi'
+	)
 	icon_state = "secure"
 	item_state = "sec-case"
 	desc = "A large briefcase with a digital locking system."
diff --git a/code/game/objects/items/storage/smartpack.dm b/code/game/objects/items/storage/smartpack.dm
index 997a1e51a830..56f5715e964e 100644
--- a/code/game/objects/items/storage/smartpack.dm
+++ b/code/game/objects/items/storage/smartpack.dm
@@ -16,7 +16,7 @@
 	icon_state = "smartpack"
 	icon = 'icons/obj/items/clothing/backpack/smartpack.dmi'
 	item_icons = list(
-		WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UA.dmi'
+		WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/smartpack.dmi'
 	)
 	flags_atom = FPRINT|NO_GAMEMODE_SKIN // same sprite for all gamemodes
 	max_storage_space = 14
diff --git a/code/game/objects/items/storage/toolkit.dm b/code/game/objects/items/storage/toolkit.dm
index 615b95520048..3ce7a7d47fa9 100644
--- a/code/game/objects/items/storage/toolkit.dm
+++ b/code/game/objects/items/storage/toolkit.dm
@@ -2,6 +2,10 @@
 	name = "engineer kit"
 	desc = "An combat engineering toolkit intended to carry electrical and mechanical supplies into combat. With engineering training you can fit this in a backpack."
 	icon = 'icons/obj/items/storage/kits.dmi'
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/tools_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/tools_righthand.dmi',
+	)
 	icon_state = "toolkit"
 	item_state = "fulton"
 	throw_speed = SPEED_FAST
diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm
index 2726459e5a61..d817e6bd01e6 100644
--- a/code/game/objects/items/tools/maintenance_tools.dm
+++ b/code/game/objects/items/tools/maintenance_tools.dm
@@ -47,6 +47,11 @@
 	name = "screwdriver"
 	desc = "You can be totally screwy with this."
 	icon = 'icons/obj/items/tools.dmi'
+	item_icons = list(
+		WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/objects.dmi',
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/tools_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/tools_righthand.dmi',
+	)
 	icon_state = "screwdriver"
 	pickup_sound = 'sound/handling/multitool_pickup.ogg'
 	drop_sound = 'sound/handling/screwdriver_drop.ogg'
@@ -510,6 +515,7 @@
 	icon_state = "maintenance_jack"
 	item_state = "maintenance_jack"
 	item_icons = list(
+		WEAR_J_STORE = 'icons/mob/humans/onmob/clothing/suit_storage/tools.dmi',
 		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/tools_lefthand.dmi',
 		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/tools_righthand.dmi',
 	)
diff --git a/code/game/objects/items/weapons/blades.dm b/code/game/objects/items/weapons/blades.dm
index 253e3cd64f11..48b6e4f1b2e8 100644
--- a/code/game/objects/items/weapons/blades.dm
+++ b/code/game/objects/items/weapons/blades.dm
@@ -118,6 +118,7 @@
 	name ="\improper M11 throwing knife"
 	icon = 'icons/obj/items/weapons/melee/knives.dmi'
 	item_icons = list(
+		WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/objects.dmi',
 		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/knives_lefthand.dmi',
 		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/knives_righthand.dmi'
 	)
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index f2ae9860cbb6..eabbd919c534 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -44,6 +44,10 @@
 	name = "telescopic baton"
 	desc = "A compact yet rebalanced personal defense weapon. Can be concealed when folded. It will knock down humans when not on harm intent."
 	icon = 'icons/obj/items/weapons/melee/non_lethal.dmi'
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/non_lethal_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/non_lethal_righthand.dmi'
+	)
 	icon_state = "telebaton_0"
 	item_state = "telebaton_0"
 	flags_equip_slot = SLOT_WAIST
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index c49c505b322a..5f0a252acc9b 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -230,6 +230,7 @@
 	name = "Optical Material Scanners"
 	desc = "With these you can see objects... just like you can with your un-aided eyes. Say why were these ever made again?"
 	icon = 'icons/obj/items/clothing/glasses/goggles.dmi'
+	icon_state = "material"
 	item_icons = list(
 		WEAR_EYES = 'icons/mob/humans/onmob/clothing/glasses/goggles.dmi',
 	)
diff --git a/code/modules/clothing/glasses/thermal.dm b/code/modules/clothing/glasses/thermal.dm
index c1f444e4347d..d63b8f9e8afd 100644
--- a/code/modules/clothing/glasses/thermal.dm
+++ b/code/modules/clothing/glasses/thermal.dm
@@ -58,6 +58,14 @@
 	deactive_state = "rwelding-gup"
 	gender = PLURAL
 
+/obj/item/clothing/glasses/thermal/syndi/kutjevo
+	icon = 'icons/obj/items/clothing/glasses/goggles.dmi'
+	icon_state = "kutjevo_goggles"
+	deactive_state = "kutjevo_goggles"
+	item_icons = list(
+		WEAR_EYES = 'icons/mob/humans/onmob/clothing/glasses/goggles.dmi',
+	)
+
 /obj/item/clothing/glasses/thermal/monocle
 	name = "Thermoncle"
 	desc = "A monocle thermal."
diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm
index 0b07bd80f5ac..7da7354b1f04 100644
--- a/code/modules/clothing/head/head.dm
+++ b/code/modules/clothing/head/head.dm
@@ -44,7 +44,7 @@
 	icon_state = "band2"
 	icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
 	item_icons = list(
-		WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
 	)
 	flags_atom = null
 
@@ -123,7 +123,7 @@
 	icon_state = "berettan"
 	icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
 	item_icons = list(
-		WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
 	)
 
 /obj/item/clothing/head/beret/cm/tan/Initialize(mapload, ...)
@@ -152,6 +152,7 @@
 /obj/item/clothing/head/beret/cm/squadberet
 	name = "USCM Squad Beret"
 	desc = "For those who want to show pride and have nothing to lose (in their head, at least)."
+	flags_atom = NO_GAMEMODE_SKIN
 
 /obj/item/clothing/head/beret/cm/white/civilian
 	name = "White Beret"
@@ -209,10 +210,10 @@
 	icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
 	flags_obj = OBJ_NO_HELMET_BAND|OBJ_IS_HELMET_GARB
 	item_icons = list(
-		WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi',
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi',
 		WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi',
 	)
-	item_state_slots = list(WEAR_AS_GARB = "headbandgreen")
+	item_state_slots = list(WEAR_AS_GARB = "headband")
 
 /obj/item/clothing/head/headband/Initialize(mapload, ...)
 	. = ..()
@@ -225,15 +226,19 @@
 		if("jungle")
 			icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
 			item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
+			item_icons[WEAR_AS_GARB] = 'icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/jungle.dmi'
 		if("classic")
 			icon = 'icons/obj/items/clothing/hats/hats_by_map/classic.dmi'
 			item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi'
+			item_icons[WEAR_AS_GARB] = 'icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/classic.dmi'
 		if("desert")
 			icon = 'icons/obj/items/clothing/hats/hats_by_map/desert.dmi'
 			item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi'
+			item_icons[WEAR_AS_GARB] = 'icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/desert.dmi'
 		if("snow")
 			icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi'
 			item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi'
+			item_icons[WEAR_AS_GARB] = 'icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/snow.dmi'
 
 /obj/item/clothing/head/headband/red
 	icon_state = "headbandred"
@@ -247,11 +252,10 @@
 	icon_state = "headbandbrown"
 	icon = 'icons/obj/items/clothing/hats/headbands.dmi'
 	item_icons = list(
-		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi',
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/headbands.dmi',
 		WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi',
 	)
 	item_state_slots = list(
-		WEAR_HEAD = "headbandtan",
 		WEAR_AS_GARB = "headbandbrown", // will be prefixed with either hat_ or helmet_
 	)
 	flags_atom = NO_GAMEMODE_SKIN
@@ -260,11 +264,10 @@
 	icon_state = "headbandgray"
 	icon = 'icons/obj/items/clothing/hats/headbands.dmi'
 	item_icons = list(
-		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi',
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/headbands.dmi',
 		WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi',
 	)
 	item_state_slots = list(
-		WEAR_HEAD = "headband",
 		WEAR_AS_GARB = "headbandgray", // will be prefixed with either hat_ or helmet_
 	)
 	flags_atom = NO_GAMEMODE_SKIN
@@ -284,7 +287,7 @@
 	icon = 'icons/obj/items/clothing/hats/headbands.dmi'
 	icon_state = null
 	item_icons = list(
-		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi',
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/headbands.dmi',
 		WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi',
 	)
 	item_state_slots = null
@@ -393,7 +396,7 @@ GLOBAL_LIST_INIT(allowed_hat_items, list(
 	icon_state = "cap"
 	icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
 	item_icons = list(
-		WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi',
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.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'
 	)
@@ -664,7 +667,7 @@ GLOBAL_LIST_INIT(allowed_hat_items, list(
 	icon_state = "coberet"
 	icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
 	item_icons = list(
-		WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
 	)
 	black_market_value = 30
 
@@ -975,7 +978,7 @@ GLOBAL_LIST_INIT(allowed_hat_items, list(
 	icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
 	flags_inv_hide = HIDETOPHAIR
 	item_icons = list(
-		WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi',
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.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'
 	)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 015b85ec0f08..9c6f73816795 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -986,8 +986,12 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 /obj/item/clothing/head/helmet/marine/MP/SO
 	name = "\improper M10 pattern Officer Helmet"
 	desc = "A special variant of the M10 Pattern Helmet worn by Officers of the USCM, attracting the attention of the grunts and sniper fire alike."
-	icon_state = "helmet"
-	item_state = "helmet"
+	icon_state = "officer"
+	item_state = "officer"
+	item_state_slots = list(
+		WEAR_L_HAND = "helmet",
+		WEAR_R_HAND = "helmet"
+	)
 	specialty = "M10 pattern officer"
 	built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced)
 
@@ -1379,9 +1383,9 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 			item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi'
 
 
-/obj/item/clothing/head/helmet/specrag/New()
+/obj/item/clothing/head/helmet/specrag/Initialize(mapload, ...)
+	. = ..()
 	select_gamemode_skin(type)
-	..()
 
 /obj/item/clothing/head/helmet/skullcap
 	name = "skullcap"
@@ -1403,11 +1407,11 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
 	)
 
-/obj/item/clothing/head/helmet/skullcap/New()
+/obj/item/clothing/head/helmet/skullcap/Initialize(mapload, ...)
+	. = ..()
 	select_gamemode_skin(type)
-	..()
 
-/obj/item/clothing/head/helmet/specrag/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+/obj/item/clothing/head/helmet/skullcap/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
 	. = ..()
 	switch(SSmapping.configs[GROUND_MAP].camouflage_type)
 		if("jungle")
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 099304307c56..e7f78ecbf0dc 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -101,7 +101,7 @@
 	. = ..()
 	select_gamemode_skin(/obj/item/clothing/suit/armor/vest/pilot)
 
-/obj/item/clothing/suit/armor/vest/pilot/marine/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+/obj/item/clothing/suit/armor/vest/pilot/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
 	. = ..()
 	switch(SSmapping.configs[GROUND_MAP].camouflage_type)
 		if("jungle")
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index e46a896fb54b..d50f42c90639 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -151,6 +151,11 @@
 	name = "snow suit"
 	desc = "A standard snow suit. It can protect the wearer from extreme cold."
 	icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
+	item_icons = list(
+		WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/suits_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/suits_righthand.dmi',
+	)
 	icon_state = "snowsuit"
 	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
 	flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS
@@ -299,7 +304,7 @@
 		/obj/item/device/walkman,
 	)
 	item_icons = list(
-		WEAR_BODY = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UPP.dmi'
+		WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UPP.dmi'
 	)
 
 
@@ -309,7 +314,7 @@
 	icon_state = "snowsuit_liaison"
 	icon = 'icons/obj/items/clothing/suits/suits_by_faction/WY.dmi'
 	item_icons = list(
-		WEAR_BODY = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi'
+		WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi'
 	)
 
 /obj/item/clothing/suit/storage/snow_suit/liaison/modified
diff --git a/code/modules/clothing/suits/marine_armor/ert.dm b/code/modules/clothing/suits/marine_armor/ert.dm
index cf037dc936f9..2e87f4e259b2 100644
--- a/code/modules/clothing/suits/marine_armor/ert.dm
+++ b/code/modules/clothing/suits/marine_armor/ert.dm
@@ -89,11 +89,13 @@
 	flags_armor_protection = BODY_FLAG_CHEST
 	flags_cold_protection = BODY_FLAG_CHEST
 	flags_heat_protection = BODY_FLAG_CHEST
+	item_state_slots = list(WEAR_JACKET = "armor")
 
 /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead
 	desc = "A basic vest with a Weyland-Yutani badge on the right breast. This variant is worn by low-level guards that have elevated in rank due to 'good conduct in the field', also known as corporate bootlicking."
 	icon_state = "lead_armor"
 	item_state = "lead_armor"
+	item_state_slots = list(WEAR_JACKET = "lead_armor")
 
 /obj/item/clothing/suit/storage/marine/veteran/pmc/leader
 	name = "\improper M4 pattern PMC leader armor"
diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm
index ebb7f1924bb9..16e013a69550 100644
--- a/code/modules/clothing/under/marine_uniform.dm
+++ b/code/modules/clothing/under/marine_uniform.dm
@@ -21,6 +21,7 @@
 	siemens_coefficient = 0.9
 	///Makes it so that we can see the right name in the vendor.
 	var/specialty = "USCM"
+	var/snow_name = " snow uniform"
 	layer = UPPER_ITEM_LAYER
 	item_icons = list(
 		WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/jungle.dmi',
@@ -34,7 +35,7 @@
 	if(!(flags_atom & NO_NAME_OVERRIDE))
 		name = "[specialty]"
 		if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
-			name += " snow uniform"
+			name += snow_name
 		else
 			name += " uniform"
 	if(!(flags_atom & NO_GAMEMODE_SKIN))
@@ -190,7 +191,10 @@
 	worn_state = "pilot_flightsuit"
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
 	flags_cold_protection = ICE_PLANET_MIN_COLD_PROT
+	specialty = "pilot officer"
+	snow_name = " snow bodysuit"
 	suit_restricted = list(/obj/item/clothing/suit/armor/vest/pilot, /obj/item/clothing/suit/storage/marine/light/vest/dcc, /obj/item/clothing/suit/storage/jacket/marine/pilot, /obj/item/clothing/suit/storage/marine/light/vest)
+	flags_atom = FPRINT
 
 /obj/item/clothing/under/marine/officer/pilot/flight
 	name = "tactical pilot officer flightsuit"
@@ -275,6 +279,8 @@
 	icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/engineering.dmi'
 	item_icons = list(
 		WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/engineering.dmi',
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/uniforms_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/uniforms_righthand.dmi',
 	)
 	flags_atom = NO_NAME_OVERRIDE|NO_GAMEMODE_SKIN
 	item_state_slots = list(WEAR_BODY = "EC_jumpsuit")
diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
index d1deec0b1513..437060b05af7 100644
--- a/code/modules/clothing/under/shorts.dm
+++ b/code/modules/clothing/under/shorts.dm
@@ -2,7 +2,9 @@
 	name = "athletic shorts"
 	desc = "95% Polyester, 5% Spandex!"
 	icon = 'icons/obj/items/clothing/uniforms/underwear_uniforms.dmi'
-	icon_override = 'icons/mob/humans/onmob/clothing/uniforms/underwear_uniforms.dmi'
+	item_icons = list(
+		WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/underwear_uniforms.dmi',
+	)
 	gender = PLURAL
 	flags_armor_protection = BODY_FLAG_GROIN
 
diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm
index c54bfe1a98b7..76e667a0e286 100644
--- a/code/modules/clothing/under/ties.dm
+++ b/code/modules/clothing/under/ties.dm
@@ -993,6 +993,11 @@
 /obj/item/clothing/accessory/holobadge/cord
 	icon_state = "holobadge-cord"
 	flags_equip_slot = SLOT_FACE
+	accessory_icons = list(
+		WEAR_FACE = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi',
+		WEAR_BODY = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi',
+		WEAR_JACKET = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi'
+	)
 
 /obj/item/clothing/accessory/holobadge/attack_self(mob/user)
 	..()
diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm
index b8897217c337..138e0a32cf53 100644
--- a/code/modules/cm_aliens/XenoStructures.dm
+++ b/code/modules/cm_aliens/XenoStructures.dm
@@ -15,7 +15,7 @@
 /obj/effect/alien/resin
 	name = "resin"
 	desc = "Looks like some kind of slimy growth."
-	icon_state = "Resin1"
+	icon_state = "weeds"
 	anchored = TRUE
 	health = 200
 	unacidable = TRUE
diff --git a/code/modules/cm_marines/Donator_Items.dm b/code/modules/cm_marines/Donator_Items.dm
index 6702d30fccb6..e9236e600620 100644
--- a/code/modules/cm_marines/Donator_Items.dm
+++ b/code/modules/cm_marines/Donator_Items.dm
@@ -12,6 +12,9 @@
 	item_state = null
 	//DON'T GRAB STUFF BETWEEN THIS LINE
 	icon = 'icons/obj/items/clothing/hats/donator.dmi'
+	item_icons = list(
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/donator.dmi'
+	)
 	flags_inventory = BLOCKSHARPOBJ
 	flags_inv_hide = HIDEEARS
 	flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE|NO_GAMEMODE_SKIN
@@ -319,7 +322,7 @@
 		WEAR_R_HAND = "marine_armor"
 	)
 
-/obj/item/clothing/head/helmet/marine/fluff/sas_legion/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+/obj/item/clothing/suit/storage/marine/light/fluff/sas_legion/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
 	. = ..()
 	switch(SSmapping.configs[GROUND_MAP].camouflage_type)
 		if("jungle")
diff --git a/code/modules/cm_marines/m2c.dm b/code/modules/cm_marines/m2c.dm
index b7fdc22599e9..9458f233a299 100644
--- a/code/modules/cm_marines/m2c.dm
+++ b/code/modules/cm_marines/m2c.dm
@@ -58,6 +58,11 @@
 	w_class = SIZE_HUGE
 	flags_equip_slot = SLOT_BACK
 	icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/machineguns.dmi'
+	item_icons = list(
+		WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/guns_by_type/machineguns.dmi',
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/machineguns_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/machineguns_righthand.dmi'
+	)
 	icon_state = "M2C_gun_mount"
 	item_state = "M2C_gun_mount"
 	var/rounds = 0
diff --git a/code/modules/cm_marines/smartgun_mount.dm b/code/modules/cm_marines/smartgun_mount.dm
index 691913f5eac5..78758a0bd12c 100644
--- a/code/modules/cm_marines/smartgun_mount.dm
+++ b/code/modules/cm_marines/smartgun_mount.dm
@@ -42,6 +42,11 @@
 	w_class = SIZE_HUGE
 	flags_equip_slot = SLOT_BACK
 	icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/machineguns.dmi'
+	item_icons = list(
+		WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/guns_by_type/machineguns.dmi',
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/machineguns_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/machineguns_righthand.dmi'
+	)
 	icon_state = "M56D_gun_e"
 	///How many rounds are in the weapon. This is useful if we break down our guns.
 	var/rounds = 0
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index cfef0d5aa9dc..ad62dc6cb6e0 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -4,6 +4,7 @@
 	desc = "You shouldn't ever see this."
 	icon = 'icons/obj/objects.dmi'
 	item_icons = list(
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/critters.dmi',
 		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items/critters_lefthand.dmi',
 		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items/critters_righthand.dmi'
 	)
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 4b7e873435c3..be3c7af4ce2f 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -12,10 +12,12 @@
 	icon_state = "paper"
 	item_state = "paper"
 	item_icons = list(
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats.dmi',
 		WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/misc.dmi',
 		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/paperwork_lefthand.dmi',
 		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/paperwork_righthand.dmi'
 	)
+	item_state_slots = list(WEAR_HEAD = "paper")
 	pickup_sound = 'sound/handling/paper_pickup.ogg'
 	drop_sound = 'sound/handling/paper_drop.ogg'
 	throwforce = 0
diff --git a/code/modules/projectiles/ammo_boxes/ammo_boxes.dm b/code/modules/projectiles/ammo_boxes/ammo_boxes.dm
index 4b0cbb835871..4b02478454ef 100644
--- a/code/modules/projectiles/ammo_boxes/ammo_boxes.dm
+++ b/code/modules/projectiles/ammo_boxes/ammo_boxes.dm
@@ -3,6 +3,9 @@
 /obj/item/ammo_box
 	name = "\improper generic ammo box"
 	icon = 'icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi'
+	item_icons = list(
+		WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/ammo_boxes.dmi'
+	)
 	icon_state = "base"
 	w_class = SIZE_HUGE
 	var/empty = FALSE
@@ -87,9 +90,6 @@
 	limit_per_tile = 2
 	ground_offset_x = 5
 	ground_offset_y = 5
-	item_icons = list(
-		WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/ammo_boxes.dmi'
-	)
 
 /obj/item/ammo_box/magazine/empty
 	empty = TRUE
diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm
index 101a8e89dfda..0769592460c7 100644
--- a/code/modules/projectiles/gun_attachables.dm
+++ b/code/modules/projectiles/gun_attachables.dm
@@ -282,6 +282,7 @@ Defined in conflicts.dm of the #defines folder.
 	icon_state = "bayonet"
 	item_state = "combat_knife"
 	item_icons = list(
+		WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/objects.dmi',
 		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/knives_lefthand.dmi',
 		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/knives_righthand.dmi'
 	)
diff --git a/icons/mob/humans/onmob/clothing/back/guns_by_type/machineguns.dmi b/icons/mob/humans/onmob/clothing/back/guns_by_type/machineguns.dmi
index cfbc524e621e..a02099b9fbfe 100644
Binary files a/icons/mob/humans/onmob/clothing/back/guns_by_type/machineguns.dmi and b/icons/mob/humans/onmob/clothing/back/guns_by_type/machineguns.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi
index e9fd39b38c82..ffe332f384bb 100644
Binary files a/icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi and b/icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi
index 3e4ba9042bbc..6d5a003b80a5 100644
Binary files a/icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi and b/icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi
index fa29f4239a02..7cc2851935fb 100644
Binary files a/icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi and b/icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi
index 4db090884ac8..0e9cc5ba3788 100644
Binary files a/icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi and b/icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi
index 57ae9f135bc3..2f3322e0d2cd 100644
Binary files a/icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi and b/icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/classic.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/classic.dmi
new file mode 100644
index 000000000000..aa6031c4edf6
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/classic.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/desert.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/desert.dmi
new file mode 100644
index 000000000000..8bdc3ff8d1be
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/desert.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/jungle.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/jungle.dmi
new file mode 100644
index 000000000000..a65cb52c5a3f
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/jungle.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/snow.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/snow.dmi
new file mode 100644
index 000000000000..9a070f15b35c
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/helmet_garb_by_map/snow.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/masks/objects.dmi b/icons/mob/humans/onmob/clothing/masks/objects.dmi
index 6e85a4d52d32..a9910d35ab44 100644
Binary files a/icons/mob/humans/onmob/clothing/masks/objects.dmi and b/icons/mob/humans/onmob/clothing/masks/objects.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi
index e6f511c03610..8dd37eabe25a 100644
Binary files a/icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi and b/icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi
index 95a2586a382b..c72bb48a2ff5 100644
Binary files a/icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi and b/icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/shields_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/shields_righthand.dmi
index e76c76f09943..1ef55f52ff05 100644
Binary files a/icons/mob/humans/onmob/inhands/weapons/melee/shields_righthand.dmi and b/icons/mob/humans/onmob/inhands/weapons/melee/shields_righthand.dmi differ
diff --git a/icons/mob/xenonids/Effects.dmi b/icons/mob/xenonids/Effects.dmi
index ad7c8d247450..1fa461e18abb 100644
Binary files a/icons/mob/xenonids/Effects.dmi and b/icons/mob/xenonids/Effects.dmi differ
diff --git a/icons/mob/xenos/effects.dmi b/icons/mob/xenos/effects.dmi
index dfdcbf95d54b..b36ed404db4f 100644
Binary files a/icons/mob/xenos/effects.dmi and b/icons/mob/xenos/effects.dmi differ
diff --git a/icons/obj/items/clothing/belts/holstered_guns.dmi b/icons/obj/items/clothing/belts/holstered_guns.dmi
index 46134e43aae4..c77b10b6d54f 100644
Binary files a/icons/obj/items/clothing/belts/holstered_guns.dmi and b/icons/obj/items/clothing/belts/holstered_guns.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_map/classic.dmi b/icons/obj/items/clothing/hats/hats_by_map/classic.dmi
index f69d3afc0c7b..26cdcfe82903 100644
Binary files a/icons/obj/items/clothing/hats/hats_by_map/classic.dmi and b/icons/obj/items/clothing/hats/hats_by_map/classic.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_map/desert.dmi b/icons/obj/items/clothing/hats/hats_by_map/desert.dmi
index 0391e163e36f..6a832dbdae90 100644
Binary files a/icons/obj/items/clothing/hats/hats_by_map/desert.dmi and b/icons/obj/items/clothing/hats/hats_by_map/desert.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_map/jungle.dmi b/icons/obj/items/clothing/hats/hats_by_map/jungle.dmi
index 992ef4fae0cc..92a6beb0710a 100644
Binary files a/icons/obj/items/clothing/hats/hats_by_map/jungle.dmi and b/icons/obj/items/clothing/hats/hats_by_map/jungle.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_map/snow.dmi b/icons/obj/items/clothing/hats/hats_by_map/snow.dmi
index c7a1d89b1aee..17a8ad5d8765 100644
Binary files a/icons/obj/items/clothing/hats/hats_by_map/snow.dmi and b/icons/obj/items/clothing/hats/hats_by_map/snow.dmi differ
diff --git a/icons/obj/items/weapons/grenade.dmi b/icons/obj/items/weapons/grenade.dmi
index 4bd61436d8ee..1f712342470e 100644
Binary files a/icons/obj/items/weapons/grenade.dmi and b/icons/obj/items/weapons/grenade.dmi differ
diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm
index 59061d40dae3..d16251e4f3f7 100644
--- a/maps/map_files/Kutjevo/Kutjevo.dmm
+++ b/maps/map_files/Kutjevo/Kutjevo.dmm
@@ -4793,9 +4793,7 @@
 /obj/structure/machinery/bioprinter{
 	stored_metal = 1000
 	},
-/obj/item/clothing/glasses/thermal/syndi{
-	icon_state = "kutjevo_goggles"
-	},
+/obj/item/clothing/glasses/thermal/syndi/kutjevo,
 /turf/open/floor/kutjevo/colors/cyan,
 /area/kutjevo/interior/complex/med/operating)
 "hnZ" = (
@@ -11530,8 +11528,7 @@
 "rRC" = (
 /obj/structure/surface/table/reinforced/prison,
 /obj/item/clipboard,
-/obj/item/clothing/glasses/thermal/syndi{
-	icon_state = "kutjevo_goggles";
+/obj/item/clothing/glasses/thermal/syndi/kutjevo{
 	pixel_y = -2
 	},
 /turf/open/floor/kutjevo/multi_tiles/east,
diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
index a7258d69b201..a31a6b6358e9 100644
--- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
+++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
@@ -3099,11 +3099,7 @@
 /turf/open/floor/plating,
 /area/lv522/indoors/c_block/cargo)
 "bJp" = (
-/obj/item/storage/backpack/marine/satchel{
-	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
-	icon = 'icons/obj/janitor.dmi';
-	icon_state = "trashbag3";
-	name = "trash bag";
+/obj/item/storage/bag/trash{
 	pixel_x = -4;
 	pixel_y = 6
 	},
@@ -5141,7 +5137,7 @@
 /area/lv522/atmos/command_centre)
 "cQm" = (
 /obj/structure/surface/table/reinforced/prison,
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -8005,19 +8001,11 @@
 /turf/open/floor/corsat/squares,
 /area/lv522/atmos/cargo_intake)
 "eju" = (
-/obj/item/storage/backpack/marine/satchel{
-	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
-	icon = 'icons/obj/janitor.dmi';
-	icon_state = "trashbag3";
-	name = "trash bag";
+/obj/item/storage/bag/trash{
 	pixel_x = -4;
 	pixel_y = 6
 	},
-/obj/item/storage/backpack/marine/satchel{
-	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
-	icon = 'icons/obj/janitor.dmi';
-	icon_state = "trashbag3";
-	name = "trash bag";
+/obj/item/storage/bag/trash{
 	pixel_x = 3;
 	pixel_y = -2
 	},
@@ -13160,7 +13148,7 @@
 /area/lv522/landing_zone_1/tunnel)
 "hgM" = (
 /obj/structure/closet/crate/trashcart,
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -13568,7 +13556,7 @@
 /turf/open/floor/plating/plating_catwalk/prison,
 /area/lv522/indoors/c_block/mining)
 "hvE" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -13626,7 +13614,7 @@
 /turf/open/auto_turf/shale/layer1,
 /area/lv522/outdoors/colony_streets/north_street)
 "hxY" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -16278,7 +16266,7 @@
 /turf/open/floor/prison/blue_plate/north,
 /area/lv522/indoors/a_block/hallway)
 "iVm" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -17710,7 +17698,7 @@
 /turf/open/floor/corsat/plate,
 /area/lv522/atmos/east_reactor/south)
 "jGa" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -18002,7 +17990,7 @@
 /turf/open/floor/prison/darkpurplefull2,
 /area/lv522/indoors/a_block/dorms)
 "jOw" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -18010,7 +17998,7 @@
 	pixel_x = -4;
 	pixel_y = 6
 	},
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -21642,12 +21630,12 @@
 /turf/open/floor/prison,
 /area/lv522/outdoors/colony_streets/containers)
 "lFO" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
-	layer = 3.1;
 	name = "trash bag";
+	layer = 3.1;
 	pixel_x = -4;
 	pixel_y = 2
 	},
@@ -23700,12 +23688,12 @@
 /turf/open/floor/prison/darkbrownfull2,
 /area/lv522/indoors/c_block/mining)
 "mJQ" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
-	layer = 3.1;
 	name = "trash bag";
+	layer = 3.1;
 	pixel_x = 2;
 	pixel_y = 20
 	},
@@ -26004,7 +25992,7 @@
 /turf/open/asphalt/cement/cement4,
 /area/lv522/outdoors/colony_streets/north_west_street)
 "nQQ" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -26246,7 +26234,7 @@
 /turf/open/floor/prison/darkyellowfull2/east,
 /area/lv522/indoors/lone_buildings/outdoor_bot)
 "nWq" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -26407,11 +26395,7 @@
 /turf/open/floor/corsat/plate,
 /area/lv522/atmos/east_reactor/south)
 "oaq" = (
-/obj/item/storage/backpack/marine/satchel{
-	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
-	icon = 'icons/obj/janitor.dmi';
-	icon_state = "trashbag3";
-	name = "trash bag";
+/obj/item/storage/bag/trash{
 	pixel_x = -4;
 	pixel_y = 6
 	},
@@ -26980,7 +26964,7 @@
 /turf/open/floor/plating/plating_catwalk/prison,
 /area/lv522/indoors/a_block/bridges/corpo)
 "opt" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -26988,7 +26972,7 @@
 	pixel_x = -4;
 	pixel_y = 6
 	},
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -29521,12 +29505,12 @@
 /turf/open/floor/plating/plating_catwalk/prison,
 /area/lv522/indoors/a_block/dorms)
 "pOm" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
-	layer = 3.1;
 	name = "trash bag";
+	layer = 3.1;
 	pixel_x = 4;
 	pixel_y = 21
 	},
@@ -31493,7 +31477,7 @@
 /turf/open/auto_turf/shale/layer1,
 /area/lv522/outdoors/colony_streets/north_west_street)
 "qKr" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -31545,7 +31529,7 @@
 /turf/open/floor/strata/white_cyan1,
 /area/lv522/indoors/lone_buildings/chunk)
 "qLQ" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -33886,7 +33870,7 @@
 /turf/open/floor/shiva/radiator_tile2,
 /area/lv522/indoors/a_block/hallway)
 "rMz" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -36141,7 +36125,7 @@
 /turf/open/gm/river,
 /area/lv522/oob)
 "sRY" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -40752,7 +40736,7 @@
 /turf/open/floor/corsat/marked,
 /area/lv522/indoors/c_block/mining)
 "vfC" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -40760,7 +40744,7 @@
 	pixel_x = -4;
 	pixel_y = 6
 	},
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -43681,7 +43665,7 @@
 	},
 /area/lv522/landing_zone_forecon/UD6_Tornado)
 "wzt" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index 3677b190aefd..655c0a86bc68 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -35618,7 +35618,7 @@
 /turf/open/floor/almayer/dark_sterile,
 /area/almayer/command/corporateliaison)
 "kOJ" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -52578,7 +52578,7 @@
 /turf/open/floor/almayer/test_floor4,
 /area/almayer/maint/hull/lower/l_a_p)
 "rJh" = (
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -52586,7 +52586,7 @@
 	pixel_x = -4;
 	pixel_y = 6
 	},
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -54258,7 +54258,7 @@
 /area/almayer/shipboard/brig/evidence_storage)
 "ssk" = (
 /obj/structure/surface/rack,
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -54266,7 +54266,7 @@
 	pixel_x = -4;
 	pixel_y = 6
 	},
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
diff --git a/maps/templates.dm b/maps/templates.dm
deleted file mode 100644
index 0798649b0ae4..000000000000
--- a/maps/templates.dm
+++ /dev/null
@@ -1,181 +0,0 @@
-#include "interiors/apc_command.dmm"
-#include "interiors/apc_med.dmm"
-#include "interiors/apc_no_fpw.dmm"
-#include "interiors/apc.dmm"
-#include "interiors/arc.dmm"
-#include "interiors/tank.dmm"
-#include "interiors/van.dmm"
-#include "map_files/BigRed/BigRed.dmm"
-#include "map_files/BigRed/sprinkles/10.prison_breakout.dmm"
-#include "map_files/BigRed/sprinkles/10.tcomms_open.dmm"
-#include "map_files/BigRed/sprinkles/15.reactor_meltdown.dmm"
-#include "map_files/BigRed/sprinkles/20.etatunnel_open.dmm"
-#include "map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm"
-#include "map_files/BigRed/sprinkles/20.lz1north_mining.dmm"
-#include "map_files/BigRed/sprinkles/25.chapel_cult.dmm"
-#include "map_files/BigRed/sprinkles/25.containerroom_xenos.dmm"
-#include "map_files/BigRed/sprinkles/25.lz1cave_flank.dmm"
-#include "map_files/BigRed/sprinkles/25.lz1containers_scramble.dmm"
-#include "map_files/BigRed/sprinkles/25.vault_v2.dmm"
-#include "map_files/BigRed/sprinkles/30.cargo_containers.dmm"
-#include "map_files/BigRed/sprinkles/30.viro-rock_open.dmm"
-#include "map_files/BigRed/sprinkles/35.filtration_restored.dmm"
-#include "map_files/BigRed/sprinkles/40.admin_pmc.dmm"
-#include "map_files/BigRed/sprinkles/40.dorms_party.dmm"
-#include "map_files/BigRed/sprinkles/40.viro_open.dmm"
-#include "map_files/BigRed/sprinkles/5.eta_carp.dmm"
-#include "map_files/BigRed/sprinkles/70.se-checkpoint.dmm"
-#include "map_files/BigRed/standalone/crashlanding-eva.dmm"
-#include "map_files/BigRed/standalone/crashlanding-offices.dmm"
-#include "map_files/BigRed/standalone/lambda-cave_extratunnel.dmm"
-#include "map_files/BigRed/standalone/lambda-cave_mushroom.dmm"
-#include "map_files/BigRed/standalone/lambda-graveyard.dmm"
-#include "map_files/BigRed/standalone/medbay-passage.dmm"
-#include "map_files/BigRed/standalone/medbay-v3.dmm"
-#include "map_files/CORSAT/Corsat.dmm"
-#include "map_files/CORSAT/standalone/lockdown_gammacontrol.dmm"
-#include "map_files/CORSAT/standalone/lockdown_gammanorth.dmm"
-#include "map_files/CORSAT/standalone/lockdown_highsec.dmm"
-#include "map_files/CORSAT/standalone/lockdown_thetacontrol.dmm"
-#include "map_files/CORSAT/standalone/lockdown_thetaeast.dmm"
-#include "map_files/CORSAT/standalone/sigma_ice.dmm"
-#include "map_files/DesertDam/Desert_Dam.dmm"
-#include "map_files/DesertDam/greenriver/newbridge.dmm"
-#include "map_files/DesertDam/purpleriver/newbridge.dmm"
-#include "map_files/DesertDam/sprinkles/10.cavein_engineering.dmm"
-#include "map_files/DesertDam/sprinkles/10.damtemple_intact.dmm"
-#include "map_files/DesertDam/sprinkles/15.shipgone_northlz.dmm"
-#include "map_files/DesertDam/sprinkles/20+minievac_westresearch.dmm"
-#include "map_files/DesertDam/standalone/crashlanding-upp-alt1.dmm"
-#include "map_files/DesertDam/standalone/crashlanding-upp-bar.dmm"
-#include "map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm"
-#include "map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm"
-#include "map_files/FOP_v3_Sciannex/sprinkles/10.podholder.dmm"
-#include "map_files/FOP_v3_Sciannex/sprinkles/10.scavshipholder.dmm"
-#include "map_files/FOP_v3_Sciannex/sprinkles/15.birthdayparty.dmm"
-#include "map_files/FOP_v3_Sciannex/sprinkles/15.nogear.dmm"
-#include "map_files/FOP_v3_Sciannex/sprinkles/15.wardenofficedecorated.dmm"
-#include "map_files/FOP_v3_Sciannex/sprinkles/20.gamertime.dmm"
-#include "map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm"
-#include "map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm"
-#include "map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm"
-#include "map_files/FOP_v3_Sciannex/sprinkles/30.engineeroffice.dmm"
-#include "map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm"
-#include "map_files/FOP_v3_Sciannex/sprinkles/30.repairpanelslz.dmm"
-#include "map_files/FOP_v3_Sciannex/sprinkles/unused/20.medicalhold.dmm"
-#include "map_files/FOP_v3_Sciannex/standalone/riot_in_progress.dmm"
-#include "map_files/generic/Admin_level.dmm"
-#include "map_files/Ice_Colony_v2/Ice_Colony_v2.dmm"
-#include "map_files/Ice_Colony_v3/lz2-south-caves/20.destroyed_lz2-south-caves.dmm"
-#include "map_files/Ice_Colony_v3/lz2-south-caves/30.builtup_lz2-south-caves.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/east-gate/blocked.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/east-gate/closed.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/east/full-closed.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/east/half-closed.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/eastsouth/full-closed.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/eastsouth/half-open.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/north/full-closed.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/north/full-open.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/south-gate/blocked.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/south-gate/closed.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/southeast-gate/cleared.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/southeast-gate/closed.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/southeast/full-closed.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/southeast/half-open.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/southwest/full-open.dmm"
-#include "map_files/Ice_Colony_v3/lz2-variations/southwest/half-open.dmm"
-#include "map_files/Ice_Colony_v3/Shivas_Snowball.dmm"
-#include "map_files/Ice_Colony_v3/sprinkles/unused/20.labs-larder.dmm"
-#include "map_files/Ice_Colony_v3/sprinkles/unused/30.labs-elevator_alternate.dmm"
-#include "map_files/Ice_Colony_v3/sprinkles/unused/33.labs-entrance.dmm"
-#include "map_files/Ice_Colony_v3/sprinkles/unused/35.south-spidercave_cleared.dmm"
-#include "map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm"
-#include "map_files/Kutjevo/Kutjevo.dmm"
-#include "map_files/Kutjevo/sprinkles/25.cleaningprog_botany.dmm"
-#include "map_files/Kutjevo/sprinkles/25.plinkingspot_northlz.dmm"
-#include "map_files/Kutjevo/sprinkles/35.communications.dmm"
-#include "map_files/Kutjevo/sprinkles/5+trappedmonke_andclown.dmm"
-#include "map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm"
-#include "map_files/LV624/armory/10.cheese.dmm"
-#include "map_files/LV624/armory/10.extra.dmm"
-#include "map_files/LV624/armory/10.looted.dmm"
-#include "map_files/LV624/cargospecial/cargospecial1_mines.dmm"
-#include "map_files/LV624/cargospecial/cargospecial2_weapons.dmm"
-#include "map_files/LV624/cargospecial/cargospecial3_gear.dmm"
-#include "map_files/LV624/centralcaves/10.qc.dmm"
-#include "map_files/LV624/centralcaves/10.T.dmm"
-#include "map_files/LV624/crashedship/10.digsite.dmm"
-#include "map_files/LV624/crashedship/10.swapped.dmm"
-#include "map_files/LV624/gym/20.pool.dmm"
-#include "map_files/LV624/gym/30.alternate.dmm"
-#include "map_files/LV624/hydro/30.destroyed.dmm"
-#include "map_files/LV624/LV624.dmm"
-#include "map_files/LV624/maintemple/1.intact.dmm"
-#include "map_files/LV624/maintemple/2.flooded.dmm"
-#include "map_files/LV624/medbay/10.destroyed.dmm"
-#include "map_files/LV624/medbay/30.larvasurgery.dmm"
-#include "map_files/LV624/science/10.yautja.dmm"
-#include "map_files/LV624/science/40.fullylocked.dmm"
-#include "map_files/LV624/sprinkles/20.lz-containers_swapped.dmm"
-#include "map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm"
-#include "map_files/LV624/standalone/clfship.dmm"
-#include "map_files/LV624/standalone/corporatedome.dmm"
-#include "map_files/LV624/standalone/laststand.dmm"
-#include "map_files/LV624/standalone/leftsidepass.dmm"
-#include "map_files/LV624/standalone/lv-bridge-east.dmm"
-#include "map_files/LV624/standalone/lv-bridge-nofog.dmm"
-#include "map_files/LV624/standalone/rightsidepass.dmm"
-#include "map_files/LV624/standalone/sandtemple-jungle.dmm"
-#include "map_files/LV624/standalone/sandtemple-se.dmm"
-#include "map_files/LV624/storage-crashed-ship/10.armorystorage.dmm"
-#include "map_files/LV624/storage-crashed-ship/10.valuables.dmm"
-#include "map_files/New_Varadero/New_Varadero.dmm"
-#include "map_files/Sorokyne_Strata/Sorokyne_Strata.dmm"
-#include "map_files/USS_Almayer/USS_Almayer.dmm"
-#include "map_files/USS_Runtime/USS_Runtime.dmm"
-#include "map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm"
-#include "predship/huntership.dmm"
-#include "predship/regular.dmm"
-#include "shuttles/dropship_alamo.dmm"
-#include "shuttles/dropship_devana.dmm"
-#include "shuttles/dropship_morana.dmm"
-#include "shuttles/dropship_normandy.dmm"
-#include "shuttles/dropship_saipan.dmm"
-#include "shuttles/ert_pmc_shuttle.dmm"
-#include "shuttles/ert_response_shuttle.dmm"
-#include "shuttles/ert_shuttle_big.dmm"
-#include "shuttles/ert_small_shuttle_north.dmm"
-#include "shuttles/ert_twe_shuttle.dmm"
-#include "shuttles/ert_upp_shuttle.dmm"
-#include "shuttles/escape_shuttle_e_cl.dmm"
-#include "shuttles/escape_shuttle_e.dmm"
-#include "shuttles/escape_shuttle_n.dmm"
-#include "shuttles/escape_shuttle_s.dmm"
-#include "shuttles/escape_shuttle_w.dmm"
-#include "shuttles/lifeboat-port-archive.dmm"
-#include "shuttles/lifeboat-port.dmm"
-#include "shuttles/lifeboat-starboard-archive.dmm"
-#include "shuttles/lifeboat-starboard.dmm"
-#include "shuttles/trijentshuttle2.dmm"
-#include "shuttles/vehicle_elevator.dmm"
-#include "templates/baseone.dmm"
-#include "templates/basetwo.dmm"
-#include "templates/Chinook.dmm"
-#include "templates/lazy_templates/clf_ert_station.dmm"
-#include "templates/lazy_templates/freelancer_ert_station.dmm"
-#include "templates/lazy_templates/pizza_ert_station.dmm"
-#include "templates/lazy_templates/twe_ert_station.dmm"
-#include "templates/lazy_templates/upp_ert_station.dmm"
-#include "templates/lazy_templates/uscm_ert_station.dmm"
-#include "templates/lazy_templates/weyland_ert_station.dmm"
-#include "templates/space.dmm"
-#include "templates/unit_tests.dmm"
-#include "tents/tent_big.dmm"
-#include "tents/tent_cmd.dmm"
-#include "tents/tent_med.dmm"
-#include "tents/tent_reqs.dmm"
-#include "tutorial/tutorial_12x12.dmm"
-#include "tutorial/tutorial_7x7.dmm"
-#include "tutorial/tutorial_8x9_nb.dmm"
-#include "tutorial/tutorial_8x9.dmm"
-#include "tutorial/tutorial_reqs_line.dmm"
diff --git a/maps/templates/lazy_templates/pizza_ert_station.dmm b/maps/templates/lazy_templates/pizza_ert_station.dmm
index 98e5dec44fec..dc9cd06a1ac2 100644
--- a/maps/templates/lazy_templates/pizza_ert_station.dmm
+++ b/maps/templates/lazy_templates/pizza_ert_station.dmm
@@ -1642,7 +1642,7 @@
 /area/adminlevel/ert_station/pizza_station)
 "vI" = (
 /obj/structure/disposalpipe/segment,
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";
@@ -1650,7 +1650,7 @@
 	pixel_x = -1;
 	pixel_y = 6
 	},
-/obj/item/storage/backpack/marine/satchel{
+/obj/item/prop{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
 	icon = 'icons/obj/janitor.dmi';
 	icon_state = "trashbag3";