Standardised Contained Sprites : Now Atomic (#15142)

2026-08-26 14:31:59 +01:00 · 2022-12-17 12:28:27 +01:00
parent 25e5f08bbd
commit e7aabb7e14
248 changed files with 341 additions and 324 deletions
@@ -61,7 +61,7 @@
 /obj/structure/spaceship
 	name = "Abandoned Shuttle"
 	desc = "An ancient and inoperable shuttle-craft"
-	icon = 'icons/obj/machines/spaceship.dmi'
+	icon = 'icons/obj/machinery/spaceship.dmi'
 	anchored = 1
 	density = 1

@@ -309,7 +309,7 @@
 /obj/item/cane/telecane
 	name = "telescopic cane"
 	desc = "A compact cane which can be collapsed for storage."
-	icon = 'icons/obj/contained_items/weapons/telecane.dmi'
+	icon = 'icons/obj/item/telecane.dmi'
 	icon_state = "telecane"
 	contained_sprite = TRUE
 	w_class = ITEMSIZE_SMALL
@@ -11,7 +11,7 @@
 /obj/machinery/computer/slot_machine
 	name = "slot machine"
 	desc = "Gambling for the antisocial."
-	icon = 'icons/obj/machines/slotmachine.dmi'
+	icon = 'icons/obj/machinery/slotmachine.dmi'
 	icon_state = "slots"
 	density = TRUE
 	clicksound = null
@@ -4,7 +4,7 @@
 /obj/machinery/crusher_base
 	name = "trash compactor"
 	desc = "A colossal piston used for crushing garbage."
-	icon = 'icons/obj/machines/crusherbase.dmi'
+	icon = 'icons/obj/machinery/crusherbase.dmi'
 	icon_state = "standalone"
 	anchored = 1
 	density = 1
@@ -364,7 +364,7 @@
 /obj/machinery/crusher_piston
 	name = "trash compactor piston"
 	desc = "A colossal piston used for crushing garbage."
-	icon = 'icons/obj/machines/crusherpiston.dmi' //Placeholder TODO: Get a proper icon
+	icon = 'icons/obj/machinery/crusherpiston.dmi' //Placeholder TODO: Get a proper icon
 	icon_state = "piston_0"
 	density = 0
 	anchored = 1
@@ -2,7 +2,7 @@
 /obj/machinery/floodlight
 	name = "industrial floodlight"
 	desc = "A series of large LEDs housed in a reflective frame, this is a cheap and easy way of lighting large areas during construction."
-	icon = 'icons/obj/machines/floodlight.dmi'
+	icon = 'icons/obj/machinery/floodlight.dmi'
 	icon_state = "flood00"
 	density = TRUE
 	obj_flags = OBJ_FLAG_ROTATABLE
@@ -2,7 +2,7 @@ var/list/floor_light_cache = list()

 /obj/machinery/floor_light
 	name = "floor light"
-	icon = 'icons/obj/machines/floor_light.dmi'
+	icon = 'icons/obj/machinery/floor_light.dmi'
 	icon_state = "base"
 	desc = "A backlit floor panel."
 	layer = TURF_LAYER+0.001
@@ -1,6 +1,6 @@
 /obj/machinery/stargazer
 	name = "stargazer system"
-	icon = 'icons/obj/machines/stargazer.dmi'
+	icon = 'icons/obj/machinery/stargazer.dmi'
 	icon_state = "stargazer_off"
 	anchored = TRUE
 	density = TRUE
@@ -1,7 +1,7 @@
 /obj/machinery/station_map
 	name = "holomap"
 	desc = "A virtual map of the surrounding area."
-	icon = 'icons/obj/machines/stationmap.dmi'
+	icon = 'icons/obj/machinery/stationmap.dmi'
 	icon_state = "station_map"
 	anchored = 1
 	density = 0
@@ -61,7 +61,7 @@
 	small_station_map.filters = filter(type = "drop_shadow", color = light_color + "F0", size = 1, offset = 1, x = 0, y = 0)

 /obj/machinery/station_map/proc/add_floor_decal()
-	floor_markings = image('icons/obj/machines/stationmap.dmi', "decal_station_map")
+	floor_markings = image('icons/obj/machinery/stationmap.dmi', "decal_station_map")
 	floor_markings.dir = src.dir
 	floor_markings.layer = ON_TURF_LAYER
 	update_icon()
@@ -69,7 +69,7 @@
 //This goes on the station map so away ships can maintain radio contact.
 /obj/machinery/telecomms/allinone/ship/station_relay
 	name = "external signal receiver"
-	icon = 'icons/obj/machines/telecomms.dmi'
+	icon = 'icons/obj/machinery/telecomms.dmi'
 	icon_state = "ntnet"
 	desc = "This device allows nearby third-party ships to maintain radio contact with their crew that are aboard the %STATIONNAME."
 	desc_info = "This device does not need to be linked to other telecommunications equipment; it will receive and broadcast on its own. It only needs to be powered."
@@ -65,7 +65,7 @@
 				priority = "Undetermined"

 /obj/machinery/telecomms/message_server
-	icon = 'icons/obj/machines/research.dmi'
+	icon = 'icons/obj/machinery/research.dmi'
 	icon_state = "server"
 	name = "messaging server"
 	desc = "A machine that processes and routes request console messages."
@@ -18,7 +18,7 @@
 */

 /obj/machinery/telecomms
-	icon = 'icons/obj/machines/telecomms.dmi'
+	icon = 'icons/obj/machinery/telecomms.dmi'
 	density = TRUE
 	anchored = TRUE
 	idle_power_usage = 600 // WATTS
@@ -10,7 +10,7 @@
 /obj/machinery/turretid
 	name = "turret control panel"
 	desc = "Used to control a room's automated defenses."
-	icon = 'icons/obj/machines/turret_control.dmi'
+	icon = 'icons/obj/machinery/turret_control.dmi'
 	icon_state = "control_standby"
 	anchored = 1
 	density = 0
@@ -1,7 +1,7 @@
 /obj/machinery/washing_machine
 	name = "washing machine"
 	desc = "A washing machine with special decontamination procedures. It can fit everything from clothes to even rifles."
-	icon = 'icons/obj/machines/washing_machine.dmi'
+	icon = 'icons/obj/machinery/washing_machine.dmi'
 	icon_state = "wm_10"
 	density = 1
 	anchored = 1.0
@@ -99,7 +99,7 @@
 				state = 3
 		else
 			return ..()
-	else 
+	else
 		if(contents.len < 5)
 			if (state in list(1, 3))
 				user.drop_from_inventory(W,src)
@@ -1,7 +1,7 @@
 /obj/machinery/wish_granter
 	name = "Wish Granter"
 	desc = "You are not so sure about this anymore..."
-	icon = 'icons/obj/machines/wishgranter.dmi' //thanks cakeisossim for the sprites
+	icon = 'icons/obj/machinery/wishgranter.dmi' //thanks cakeisossim for the sprites
 	icon_state = "wishgranter"

 	light_color = "#458F94"
@@ -2,7 +2,7 @@
 	name = "paint gun"
 	desc = "A Hephaestus-made paint gun that uses microbes to replenish its paint storage. Very high-tech and fancy too!"
 	desc_info = "Use control-click on a coloured decal on a turf to copy its colour. You can also use shift-click on a turf with the paint gun in hand to clear all decals on it."
-	icon = 'icons/obj/contained_items/tools/floor_painter.dmi'
+	icon = 'icons/obj/item/tools/floor_painter.dmi'
 	icon_state = "floor_painter"
 	item_state = "floor_painter"
 	contained_sprite = TRUE
@@ -282,4 +282,4 @@
 	var/new_dir = input("Select a direction.") as null|anything in paint_dirs
 	if(new_dir && !isnull(paint_dirs[new_dir]))
 		paint_dir = new_dir
-		to_chat(usr, "<span class='notice'>You set \the [src] direction to '[paint_dir]'.</span>")
+		to_chat(usr, "<span class='notice'>You set \the [src] direction to '[paint_dir]'.</span>")
@@ -3,7 +3,7 @@
 	desc = "Pretend to be a director for a brief moment before someone tackles you to make you shut up."
 	desc_extended = "Annoy your colleagues! Scare interns! Impress no one!"
 	desc_info = "A device used to project your voice. Loudly."
-	icon = 'icons/obj/contained_items/tools/megaphone.dmi'
+	icon = 'icons/obj/item/tools/megaphone.dmi'
 	icon_state = "megaphone"
 	item_state = "megaphone"
 	contained_sprite = TRUE
@@ -7,7 +7,7 @@
 	name = "multitool"
 	desc = "This small, handheld device is made of durable, insulated plastic. It has a electrode jack, perfect for interfacing with numerous machines, as well as an in-built NT-SmartTrack! system."
 	desc_info = "You can use this on airlocks or APCs to try to hack them without cutting wires. You can also use it to wire circuits, and track APCs by using it in-hand."
-	icon = 'icons/obj/contained_items/tools/multitool.dmi'
+	icon = 'icons/obj/item/tools/multitool.dmi'
 	icon_state = "multitool"
 	item_state = "multitool"
 	item_icons = null
@@ -212,4 +212,4 @@
 		to_chat(user, "<span class='notice'>You clip the data connection between the [io1.holder.displayed_name]'s \
 		'[io1.name]' pin and the [io2.holder.displayed_name]'s '[io2.name]' pin.</span>")
 		io1.holder.interact(user) // This is to update the UI.
-		update_icon()
+		update_icon()
@@ -1,6 +1,6 @@
 /obj/item/device/pipe_painter
 	name = "pipe painter"
-	icon = 'icons/obj/contained_items/tools/pipe_painter.dmi'
+	icon = 'icons/obj/item/tools/pipe_painter.dmi'
 	icon_state = "pipe_painter"
 	item_state = "pipe_painter"
 	contained_sprite = TRUE
@@ -361,7 +361,7 @@ BREATH ANALYZER
 /obj/item/device/analyzer
 	name = "analyzer"
 	desc = "A hand-held environmental scanner which reports current gas levels."
-	icon = 'icons/obj/contained_items/tools/air_analyzer.dmi'
+	icon = 'icons/obj/item/tools/air_analyzer.dmi'
 	icon_state = "analyzer"
 	item_state = "analyzer"
 	contained_sprite = TRUE
@@ -2,7 +2,7 @@
 	name = "portable suit cooling unit"
 	desc = "A portable heat sink and liquid cooled radiator that can be hooked up to a space suit's existing temperature controls to provide industrial levels of cooling."
 	w_class = ITEMSIZE_LARGE
-	icon = 'icons/obj/contained_items/tools/suitcooler.dmi'
+	icon = 'icons/obj/item/tools/suitcooler.dmi'
 	icon_state = "suitcooler0"
 	item_state = "coolingpack"
 	action_button_name = "Toggle Cooling Unit"
@@ -3,7 +3,7 @@
 /obj/item/device/t_scanner
 	name = "\improper T-ray scanner"
 	desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
-	icon = 'icons/obj/contained_items/tools/t_scanner.dmi'
+	icon = 'icons/obj/item/tools/t_scanner.dmi'
 	icon_state = "t-ray0"
 	item_state = "t-ray"
 	contained_sprite = TRUE
@@ -152,4 +152,4 @@
 	set_user_client(null)
 	..()

-#undef OVERLAY_CACHE_LEN
+#undef OVERLAY_CACHE_LEN
@@ -1,14 +1,14 @@
 /obj/item/knittingneedles
 	name = "knitting needles"
 	desc = "Silver knitting needles used for stitching yarn."
-	icon = 'icons/obj/contained_items/tools/knitting.dmi'
+	icon = 'icons/obj/item/tools/knitting.dmi'
 	icon_state = "knittingneedles"
 	item_state = "knittingneedles"
 	w_class = ITEMSIZE_SMALL
 	contained_sprite = TRUE
 	var/working = FALSE
 	var/obj/item/yarn/ball
-	var/static/list/knitables = list(/obj/item/clothing/accessory/sweater, /obj/item/clothing/suit/storage/toggle/cardigan, /obj/item/clothing/suit/storage/toggle/cardigan/sweater, /obj/item/clothing/suit/storage/toggle/cardigan/argyle, /obj/item/clothing/accessory/sweater_vest, /obj/item/clothing/accessory/sweater/turtleneck, /obj/item/clothing/gloves/fingerless/colour/knitted, /obj/item/clothing/gloves/knitted, /obj/item/clothing/accessory/bandanna/colorable/knitted, /obj/item/clothing/accessory/scarf)
+	var/static/list/knitables = list(/obj/item/clothing/accessory/sweater, /obj/item/clothing/suit/storage/toggle/cardigan, /obj/item/clothing/suit/storage/toggle/cardigan/sweater, /obj/item/clothing/suit/storage/toggle/cardigan/argyle, /obj/item/clothing/accessory/sweater/vest, /obj/item/clothing/accessory/sweater/turtleneck, /obj/item/clothing/gloves/fingerless/colour/knitted, /obj/item/clothing/gloves/knitted, /obj/item/clothing/accessory/bandanna/colorable/knitted, /obj/item/clothing/accessory/scarf)
 	var/static/list/name2knit

 /obj/item/knittingneedles/verb/remove_yarn()
@@ -118,7 +118,7 @@
 /obj/item/yarn
 	name = "ball of yarn"
 	desc = "A ball of yarn, this one is white."
-	icon = 'icons/obj/contained_items/tools/knitting.dmi'
+	icon = 'icons/obj/item/tools/knitting.dmi'
 	icon_state = "white_ball"
 	w_class = ITEMSIZE_TINY

@@ -1,7 +1,7 @@
 /obj/item/stellascope
 	name = "stellascope"
 	desc = "An antique and delicate looking instrument used to study the stars."
-	icon = 'icons/obj/contained_items/skrell/stellascope.dmi'
+	icon = 'icons/obj/item/skrell/stellascope.dmi'
 	icon_state = "starscope"
 	w_class = ITEMSIZE_TINY
 	matter = list(MATERIAL_GLASS = 200)
@@ -46,7 +46,7 @@
 /obj/effect/temp_visual/constellation
 	name = "starry projection"
 	desc = "A holographic projection of star system."
-	icon = 'icons/obj/contained_items/skrell/stellascope.dmi'
+	icon = 'icons/obj/item/skrell/stellascope.dmi'
 	icon_state = "starprojection"
 	mouse_opacity = TRUE
 	duration = 30 SECONDS
@@ -76,7 +76,7 @@
 /obj/item/skrell_projector
 	name = "nralakk projector"
 	desc = "A projector using technology that originated in Nralakk, meant to help Skrell feel like they're carrying home with them wherever they go. It looks very complex."
-	icon = 'icons/obj/contained_items/skrell/nralakk_projector.dmi'
+	icon = 'icons/obj/item/skrell/nralakk_projector.dmi'
 	icon_state = "projector"
 	light_color = LIGHT_COLOR_HALOGEN
 	w_class = ITEMSIZE_TINY
@@ -225,7 +225,7 @@
 	desc = "An ear-tag that shows the wearer is loyal to the Nralakk Federation. A small cable travels into the ear canal..."
 	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_EARS
-	icon = 'icons/obj/contained_items/skrell/jargtag.dmi'
+	icon = 'icons/obj/item/skrell/jargtag.dmi'
 	icon_state = "jargtag"
 	item_state = "jargtag"
 	contained_sprite = TRUE
@@ -1210,7 +1210,7 @@
 /obj/item/chess_piece
 	name = "white pawn"
 	desc = "A %NAME% chess piece, this one is worth %POINT% points."
-	icon = 'icons/obj/contained_items/misc/chess.dmi'
+	icon = 'icons/obj/item/chess.dmi'
 	icon_state = "white_pawn"
 	w_class = ITEMSIZE_HUGE // hugh mungus
 	var/piece_worth = 1
@@ -1,7 +1,7 @@
 /obj/item/vitals_monitor
 	name = "vitals monitor"
 	desc = "A vitals monitor, used to track a patient's vitality. It needs to be attached to a rollerbed to function."
-	icon = 'icons/obj/contained_items/tools/vitals_monitor.dmi'
+	icon = 'icons/obj/item/tools/vitals_monitor.dmi'
 	icon_state = "vitals_monitor"
 	item_state = "vitals_monitor"
 	contained_sprite = TRUE
@@ -122,4 +122,4 @@
 		VUEUI_SET_CHECK(data["blood_pressure"], H.get_blood_pressure(), ., data)
 		VUEUI_SET_CHECK(data["blood_pressure_level"], H.get_blood_pressure_alert(), ., data)
 		VUEUI_SET_CHECK(data["blood_volume"], H.get_blood_volume(), ., data)
-		VUEUI_SET_CHECK(data["blood_o2"], blood_oxygenation, ., data)
+		VUEUI_SET_CHECK(data["blood_o2"], blood_oxygenation, ., data)
@@ -1,8 +1,7 @@
 /obj/item/flamethrower
 	name = "flamethrower"
 	desc = "A flamethrower created by modifying a welding tool to fit an external gas tank."
-
-	icon = 'icons/obj/contained_items/weapons/flamethrower.dmi'
+	icon = 'icons/obj/item/flamethrower.dmi'
 	icon_state = "flamethrower1"
 	item_state = "flamethrower_0"
 	contained_sprite = TRUE
@@ -2,7 +2,7 @@
 	name = "bluespace neutralizer"
 	desc = "A strange device, supposedly capable of pre-emptively shutting down bluespace portals."
 	desc_info = "Click on it, or use it in-hand to activate it. Click on any portal-like structure to instantly close it. Stand near a bluespace rift while it's active to start the closing process."
-	icon = 'icons/obj/contained_items/tools/neutralizer.dmi'
+	icon = 'icons/obj/item/tools/neutralizer.dmi'
 	icon_state = "neutralizer"
 	contained_sprite = TRUE

@@ -52,4 +52,4 @@
 /obj/item/bluespace_neutralizer/Destroy()
 	if(active)
 		STOP_PROCESSING(SSprocessing, src)
-	return ..()
+	return ..()
@@ -2,11 +2,11 @@
 	name = "research slip"
 	desc = "A small slip of plastic with an embedded chip. It is commonly used to store small amounts of research data."
 	desc_info = "This item is to be used in the destructive analyzer to gain research points."
-	icon = 'icons/obj/contained_items/tools/research_slip.dmi'
+	icon = 'icons/obj/item/tools/research_slip.dmi'
 	icon_state = "slip"
 	contained_sprite = TRUE

 /obj/item/research_slip/Initialize(mapload, var/list/research_levels)
 	. = ..()
 	if(length(research_levels))
-		origin_tech = research_levels
+		origin_tech = research_levels
@@ -36,7 +36,7 @@
 /obj/item/melee/telebaton
 	name = "telescopic baton"
 	desc = "A compact yet rebalanced personal defense weapon. Can be concealed when folded."
-	icon = 'icons/obj/contained_items/weapons/telebaton.dmi'
+	icon = 'icons/obj/item/melee/telebaton.dmi'
 	icon_state = "telebaton_0"
 	item_state = "telebaton_0"
 	var/state_extended = "telebaton_1"
@@ -109,12 +109,10 @@

 /obj/item/melee/telebaton/nlom
 	name = "nlomkala baton"
-	icon = 'icons/obj/contained_items/skrell/skrell_weaponry.dmi'
 	icon_state = "nlom_telebaton_0"
 	item_state = "nlom_telebaton_0"
 	state_extended = "nlom_telebaton_1"
 	force = 5
-	contained_sprite = TRUE

 /obj/item/melee/telebaton/nlom/do_special_effects(var/mob/living/carbon/human/H)
-	spark(H, 5)
+	spark(H, 5)
@@ -210,7 +210,7 @@
 /obj/item/weldingtool
 	name = "welding tool"
 	desc = "A welding tool with a built-in fuel tank, designed for welding and cutting metal."
-	icon = 'icons/obj/contained_items/tools/welding_tools.dmi'
+	icon = 'icons/obj/item/tools/welding_tools.dmi'
 	icon_state = "welder"
 	item_state = "welder"
 	var/welding_state = "welding_sparks"
@@ -694,7 +694,7 @@
 	name = "experimental eyeshield"
 	desc = "An advanced eyeshield capable of dampening the welding glare produced when working on modern super-materials, removing the need for user-worn welding gear."
 	desc_info = "This can be attached to an experimental welder to give it welding protection, removing the need for welding goggles or masks."
-	icon = 'icons/obj/contained_items/tools/welding_tools.dmi'
+	icon = 'icons/obj/item/tools/welding_tools.dmi'
 	icon_state = "eyeshield"
 	item_state = "eyeshield"
 	contained_sprite = TRUE
@@ -703,7 +703,7 @@
 	name = "experimental overcapacitor"
 	desc = "An advanced capacitor that injects a current into the welding stream, doubling the speed of welding tasks without sacrificing quality. Excess current burns up welding fuel, reducing fuel efficiency, however."
 	desc_info = "This can be attached to an experimental welder to double the speed it works at, at the cost of tripling the fuel cost of using it."
-	icon = 'icons/obj/contained_items/tools/welding_tools.dmi'
+	icon = 'icons/obj/item/tools/welding_tools.dmi'
 	icon_state = "overcap"
 	item_state = "overcap"
 	contained_sprite = TRUE
@@ -865,7 +865,7 @@
 /obj/item/powerdrill
 	name = "impact wrench"
 	desc = "The screwdriver's big brother."
-	icon = 'icons/obj/contained_items/tools/impact_wrench.dmi'
+	icon = 'icons/obj/item/tools/impact_wrench.dmi'
 	icon_state = "impact_wrench-screw"
 	item_state = "impact_wrench"
 	contained_sprite = TRUE
@@ -4,7 +4,7 @@
 	throw_speed = 2
 	throw_range = 1
 	gender = PLURAL
-	icon = 'icons/obj/contained_items/weapons/traps.dmi'
+	icon = 'icons/obj/item/traps.dmi'
 	var/icon_base = "beartrap"
 	icon_state = "beartrap0"
 	randpixel = 0
@@ -613,7 +613,7 @@
 /obj/item/large_trap_foundation
 	name = "large trap foundation"
 	desc = "A metal foundation for large trap, it is missing metals rods to hold the prey."
-	icon = 'icons/obj/contained_items/weapons/traps.dmi'
+	icon = 'icons/obj/item/traps.dmi'
 	icon_state = "large_foundation"
 	throwforce = 4
 	force = 5
@@ -5,7 +5,7 @@
 	name = "inflatable"
 	desc_info = "Inflate by using it in your hand. The inflatable barrier will inflate on the turf you are standing on. To deflate it, use the 'deflate' verb."
 	w_class = ITEMSIZE_SMALL
-	icon = 'icons/contained_items/items/inflatables.dmi'
+	icon = 'icons/obj/item/inflatables.dmi'
 	var/deploy_path = null

 /obj/item/inflatable/attack_self(mob/user)
@@ -34,7 +34,7 @@
 	name = "inflatable"
 	desc = "An inflated membrane. Do not puncture."
 	desc_info = "To remove these safely, use the 'deflate' verb.  Hitting these with any objects will probably puncture and break it forever."
-	icon = 'icons/contained_objects/objects/inflatables.dmi'
+	icon = 'icons/obj/item/inflatables.dmi'
 	icon_state = "wall"

 	density = TRUE
@@ -282,7 +282,7 @@
 /obj/item/storage/bag/inflatable
 	name = "inflatable barrier box"
 	desc = "Contains inflatable walls and doors."
-	icon = 'icons/contained_items/items/inflatables_box.dmi'
+	icon = 'icons/obj/item/inflatables.dmi'
 	icon_state = "inf_box"
 	item_state = "inf_box"
 	contained_sprite = TRUE
@@ -3,7 +3,7 @@
 	var/reload = 180
 	name = "bluespace artillery control"
 	icon_state = "control_boxp1"
-	icon = 'icons/obj/machines/particle_accelerator2.dmi'
+	icon = 'icons/obj/machinery/particle_accelerator2.dmi'
 	density = 1
 	anchored = 1

@@ -55,7 +55,7 @@

 /obj/structure/artilleryplaceholder
 	name = "artillery"
-	icon = 'icons/obj/machines/artillery.dmi'
+	icon = 'icons/obj/machinery/artillery.dmi'
 	anchored = 1
 	density = 1

@@ -1,7 +1,7 @@
 /obj/machinery/gateway
 	name = "gateway"
 	desc = "A mysterious gateway built by unknown hands, it allows for faster than light travel to far-flung locations."
-	icon = 'icons/obj/machines/gateway.dmi'
+	icon = 'icons/obj/machinery/gateway.dmi'
 	icon_state = "off"
 	density = 1
 	anchored = 1
@@ -204,15 +204,15 @@
 	sweater["deep v-neck sweater"] = /obj/item/clothing/accessory/sweater/v_neck/deep

 	// Argyle Sweaters
-	sweater["argyle sweater"] = /obj/item/clothing/accessory/argyle_sweater
-	sweater["argyle tubeneck sweater"] = /obj/item/clothing/accessory/argyle_sweater/tubeneck
-	sweater["argyle turtleneck sweater"] = /obj/item/clothing/accessory/argyle_sweater/turtleneck
-	sweater["argyle crewneck sweater"] = /obj/item/clothing/accessory/argyle_sweater/crewneck
-	sweater["argyle v-neck sweater"] = /obj/item/clothing/accessory/argyle_sweater/v_neck
+	sweater["argyle sweater"] = /obj/item/clothing/accessory/sweater/argyle
+	sweater["argyle tubeneck sweater"] = /obj/item/clothing/accessory/sweater/argyle/tubeneck
+	sweater["argyle turtleneck sweater"] = /obj/item/clothing/accessory/sweater/argyle/turtleneck
+	sweater["argyle crewneck sweater"] = /obj/item/clothing/accessory/sweater/argyle/crewneck
+	sweater["argyle v-neck sweater"] = /obj/item/clothing/accessory/sweater/argyle/v_neck

 	// Sweater Vests
-	sweater["sweater vest"] = /obj/item/clothing/accessory/sweater_vest
-	sweater["argyle sweater vest"] = /obj/item/clothing/accessory/argyle_sweater_vest
+	sweater["sweater vest"] = /obj/item/clothing/accessory/sweater/vest
+	sweater["argyle sweater vest"] = /obj/item/clothing/accessory/sweater/argyle/vest

 	gear_tweaks += new /datum/gear_tweak/path(sweater)

@@ -1,7 +1,7 @@
 /obj/item/clothing/ears/skrell
 	name = "skrell tentacle wear"
 	desc = "Some stuff worn by skrell to adorn their head tentacles."
-	icon = 'icons/obj/contained_items/skrell/chains.dmi'
+	icon = 'icons/obj/item/clothing/ears/skrell/chains.dmi'
 	contained_sprite = TRUE
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_HEAD | SLOT_EARS
@@ -16,7 +16,7 @@
 /obj/item/clothing/ears/skrell/chain
 	name = "gold headtail chains"
 	desc = "A delicate golden chain worn by skrell to decorate their head tails."
-	icon = 'icons/obj/contained_items/skrell/chains.dmi'
+	icon = 'icons/obj/item/clothing/ears/skrell/chains.dmi'
 	icon_state = "skrell_chain"
 	item_state = "skrell_chain"
 	drop_sound = 'sound/items/drop/accessory.ogg'
@@ -119,7 +119,7 @@
 /obj/item/clothing/ears/skrell/band
 	name = "gold headtail bands"
 	desc = "Golden metallic bands worn by skrell to adorn their head tails."
-	icon = 'icons/obj/contained_items/skrell/bands.dmi'
+	icon = 'icons/obj/item/clothing/ears/skrell/bands.dmi'
 	icon_state = "skrell_band"
 	item_state = "skrell_band"
 	drop_sound = 'sound/items/drop/accessory.ogg'
@@ -152,7 +152,7 @@
 /obj/item/clothing/ears/skrell/cloth
 	name = "headtail cloth"
 	desc = "A cloth shawl worn by skrell draped around their head tails."
-	icon = 'icons/obj/contained_items/skrell/headtail_cloth.dmi'
+	icon = 'icons/obj/item/clothing/ears/skrell/headtail_cloth.dmi'
 	icon_state = "skrell_cloth"
 	item_state = "skrell_cloth"

@@ -163,7 +163,7 @@
 /obj/item/clothing/ears/skrell/goop
 	name = "glowing algae"
 	desc = "A mixture of glowing algae applied by skrell on their head tails."
-	icon = 'icons/obj/contained_items/skrell/algae.dmi'
+	icon = 'icons/obj/item/clothing/ears/skrell/algae.dmi'
 	icon_state = "skrell_dots"
 	item_state = "skrell_dots"

@@ -195,7 +195,7 @@
 /obj/item/clothing/ears/skrell/scrunchy
 	name = "skrell tentacle tie"
 	desc = "A self-powered hard-light 'scrunchy' used to comfortably tie back the tentacles."
-	icon = 'icons/obj/contained_items/skrell/scrunchies.dmi'
+	icon = 'icons/obj/item/clothing/ears/skrell/scrunchies.dmi'
 	icon_state = "skrellhairtie"
 	item_state = "scrunchy_seaweed"

@@ -211,7 +211,7 @@
 /obj/item/clothing/ears/skrell/workcap
 	name = "Worker's Cap"
 	desc = "A simple clothing item used by Skrell to cover their headtails. It comes with a main sleeve for the middle headtail, with smaller sleeves for the outer headtails to help keep it in place."
-	icon = 'icons/obj/contained_items/skrell/nralakk_caps.dmi'
+	icon = 'icons/obj/item/clothing/ears/skrell/nralakk_caps.dmi'
 	item_state = "skrell_cap"
 	icon_state = "skrell_cap_item"

@@ -223,7 +223,7 @@
 /obj/item/clothing/ears/skrell/tailband
 	name = "ox tailband"
 	desc = "A band meant to be worn on a Skrell's main headtail. This one has the ox symbol on it."
-	icon = 'icons/obj/contained_items/skrell/tailband.dmi'
+	icon = 'icons/obj/item/clothing/ears/skrell/tailband.dmi'
 	item_state = "ox"
 	icon_state = "tailband"

@@ -243,4 +243,4 @@
 	name = "iqi tailband"
 	desc = "A band meant to be worn on a Skrell's main headtail. This one has the iqi symbol on it."
 	item_state = "iqi"
-	icon_state = "tailband"
+	icon_state = "tailband"
@@ -1,7 +1,7 @@
 /obj/item/clothing/under/rank/scc2
 	name = "\improper SCC uniform"
 	desc = "A standardized uniform used by SCC personnel."
-	icon = 'icons/obj/contained_items/scc.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/scc.dmi'
 	icon_state = "scc_liaison"
 	item_state = "scc_liaison"
 	contained_sprite = TRUE
@@ -9,7 +9,7 @@
 /obj/item/clothing/suit/storage/toggle/armor/vest/scc
 	name = "\improper SCC vest"
 	desc = "A stylish vest worn by SCC personnel."
-	icon = 'icons/obj/contained_items/scc.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/scc.dmi'
 	icon_state = "scc_liaison_vest"
 	item_state = "scc_liaison_vest"
 	contained_sprite = TRUE
@@ -38,7 +38,7 @@
 /obj/item/clothing/accessory/tie/corporate/scc
 	name = "\improper SCC tie"
 	desc = "A sleek corporate tie, worn by SCC employees."
-	icon = 'icons/obj/contained_items/scc.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/scc.dmi'
 	icon_state = "scc_tie"
 	item_state = "scc_tie"
 	contained_sprite = TRUE
@@ -47,7 +47,7 @@
 	name = "\improper SCC beret"
 	desc = "A corporate beret in the colours of the Stellar Corporate Conglomerate."
 	desc_extended = "The Stellar Corporate Conglomerate, also known as the Chainlink, is a joint alliance between the NanoTrasen, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals, and Zavodskoi Interstellar corporations to exercise an undisputed economic dominance over the Orion Spur."
-	icon = 'icons/obj/contained_items/scc.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/scc.dmi'
 	icon_state = "scc_beret"
 	item_state = "scc_beret"
-	contained_sprite = TRUE
+	contained_sprite = TRUE
@@ -66,13 +66,13 @@
 	item_state = "bandana_hydro"

 /obj/item/clothing/head/bandana/hydro/nt
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	contained_sprite = TRUE
 	icon_state = "nt_gardener_headband"
 	item_state = "nt_gardener_headband"

 /obj/item/clothing/head/bandana/hydro/idris
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	contained_sprite = TRUE
 	icon_state = "idris_gardener_headband"
 	item_state = "idris_gardener_headband"
@@ -6,7 +6,7 @@
 /obj/item/clothing/head/hazmat
 	name = "hazmat hood"
 	desc = "A hood that protects against biological hazards."
-	icon = 'icons/contained_items/clothing/headwear/hazmat.dmi'
+	icon = 'icons/obj/item/clothing/head/hazmat.dmi'
 	icon_state = "hazmat"
 	item_state = "hazmat"
 	contained_sprite = TRUE
@@ -38,4 +38,4 @@
 // Custodial
 /obj/item/clothing/head/hazmat/custodial
 	icon_state = "hazmat_custodial"
-	item_state = "hazmat_custodial"
+	item_state = "hazmat_custodial"
@@ -6,13 +6,13 @@
 	item_state = "chefhat"

 /obj/item/clothing/head/chefhat/nt
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	contained_sprite = TRUE
 	icon_state = "nt_chef_hat"
 	item_state = "nt_chef_hat"

 /obj/item/clothing/head/chefhat/idris
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	contained_sprite = TRUE
 	icon_state = "idris_chef_hat"
 	item_state = "idris_chef_hat"
@@ -41,7 +41,7 @@
 /obj/item/clothing/head/caphat/xo
 	name = "executive officer cap"
 	desc = "A stylish cap issued to SCC executive officers."
-	icon = 'icons/obj/contained_items/department_uniforms/command.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
 	contained_sprite = TRUE
 	icon_state = "executive_officer_cap"
 	item_state = "executive_officer_cap"
@@ -49,7 +49,7 @@
 /obj/item/clothing/head/caphat/bridge_crew
 	name = "bridge crew cap"
 	desc = "A stylish cap issued to the bridge crew of SCC vessels."
-	icon = 'icons/obj/contained_items/department_uniforms/command.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
 	contained_sprite = TRUE
 	icon_state = "bridge_crew_cap"
 	item_state = "bridge_crew_cap"
@@ -58,8 +58,6 @@
 	name = "bridge crew cap"
 	desc = "A more formal hat in a Colettish style, authorized for the bridge crew of SCC vessels."
 	desc_extended = "Designed to allow the wearer to wear both a peaked cap and a radio headset, Colettish 'crusher' caps are prized throughout the Alliance and Republic for their comfort."
-	icon = 'icons/contained_items/clothing/hats/bridge_crew_cap_alt.dmi'
-	contained_sprite = TRUE
 	icon_state = "bridge_crew_cap_alt"
 	item_state = "bridge_crew_cap_alt"

@@ -83,7 +81,7 @@
 	name = "otolaryngologist's mirror"
 	desc = "Turn your head and cough."
 	desc_extended = "That's an Ear, Nose and/or Throat surgeon to you, mister."
-	icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/medical.dmi'
 	contained_sprite = TRUE
 	icon_state = "headmirror"
 	item_state = "headmirror"
@@ -91,7 +89,7 @@
 /obj/item/clothing/head/surgery
 	name = "surgical cap"
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs."
-	icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/medical.dmi'
 	icon_state = "surgcap_nt"
 	item_state = "surgcap_nt"
 	contained_sprite = TRUE
@@ -144,7 +142,7 @@
 /obj/item/clothing/head/warden
 	name = "warden hat"
 	desc = "A warden hat. For showing who is in charge of the brig."
-	icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/security.dmi'
 	icon_state = "nt_warden_hat"
 	item_state = "nt_warden_hat"
 	flags_inv = HIDEEARS
@@ -169,7 +167,7 @@
 /obj/item/clothing/head/hos
 	name = "head of security hat"
 	desc = "The navy blue parade hat of the Head of Security. For showing the officers who's in charge."
-	icon = 'icons/obj/contained_items/department_uniforms/command.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
 	icon_state = "hos_hat"
 	item_state = "hos_hat"
 	flags_inv = HIDEEARS
@@ -184,7 +182,7 @@
 	Worker's rights tentatively grace your grey matter before you return to your job. \
 	Hey, at least it isn't as physically demanding. \
 	You should probably stop singing sixteen-tons when wearing this hat, though."
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	contained_sprite = TRUE
 	icon_state = "nt_bartender_flatcap"
 	item_state = "nt_bartender_flatcap"
@@ -82,7 +82,7 @@
 /obj/item/clothing/head/pin/ribbon
 	name = "hair ribbon parent item"
 	desc = DESC_PARENT
-	icon = 'icons/contained_items/clothing/accessories/hair_ribbons.dmi'
+	icon = 'icons/obj/item/clothing/accessory/hair_ribbons.dmi'
 	contained_sprite = TRUE

 /obj/item/clothing/head/pin/ribbon/head
@@ -182,7 +182,7 @@
 /obj/item/clothing/head/flatcap
 	name = "flat cap"
 	desc = "A working man's hat."
-	icon = 'icons/contained_items/clothing/headwear/flat_cap.dmi'
+	icon = 'icons/obj/item/clothing/head/flat_cap.dmi'
 	icon_state = "flat_cap"
 	item_state = "flat_cap"
 	contained_sprite = TRUE
@@ -226,7 +226,7 @@

 /obj/item/clothing/head/feathertrilby
 	name = "feather trilby"
-	icon = 'icons/contained_items/clothing/headwear/feather_trilby.dmi'
+	icon = 'icons/obj/item/clothing/head/feather_trilby.dmi'
 	icon_state = "feather_trilby"
 	item_state = "feather_trilby"
 	contained_sprite = TRUE
@@ -1,9 +1,9 @@
 /obj/item/clothing/head/skrell
 	name = "skrell mantle"
 	desc = "A mantle used to cover the headtails of a Skrell."
-	icon = 'icons/obj/contained_items/skrell/dreamer_mantle.dmi'
+	icon = 'icons/obj/item/clothing/head/skrell/dreamer_mantle.dmi'
 	item_state = "dreamer_mantle"
 	icon_state = "dreamer_mantle"
 	contained_sprite = TRUE
 	species_restricted = list(BODYTYPE_SKRELL)
-	flags_inv = BLOCKHAIR
+	flags_inv = BLOCKHAIR
@@ -35,7 +35,7 @@
 /obj/item/clothing/mask/breath/skrell
 	name = "skrellian gill cover"
 	desc = "A comfy technological piece used typically by those suffering from gill-related disorders. It goes around the neck and shoulders with a small water tank on the back, featuring a hookup for oxytanks to keep the water oxygenated."
-	icon = 'icons/obj/contained_items/skrell/gillcover.dmi'
+	icon = 'icons/obj/item/clothing/mask/breath/skrell/gillcover.dmi'
 	icon_state = "gillcover"
 	item_state = "gillcover"
 	contained_sprite = TRUE
@@ -1,7 +1,7 @@
 /obj/item/clothing/mask/skrell
 	name = "pinhole mask"
 	desc = "Masks used within the Srom to hide the face, whether for cultural or personal reasons."
-	icon = 'icons/obj/contained_items/skrell/srom_masks.dmi'
+	icon = 'icons/obj/item/clothing/mask/skrell/srom_masks.dmi'
 	icon_state = "pinhole"
 	item_state = "pinhole"
 	w_class = ITEMSIZE_SMALL
@@ -39,4 +39,4 @@
 /obj/item/clothing/mask/skrell/horned
 	name = "horned mask"
 	icon_state = "horned"
-	item_state = "horned"
+	item_state = "horned"
@@ -9,7 +9,7 @@
 		)

 /obj/item/clothing/head/caphat/scc
-	icon = 'icons/obj/contained_items/department_uniforms/command.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
 	icon_state = "caphat"
 	item_state = "caphat"
 	contained_sprite = TRUE
@@ -225,8 +225,8 @@
 /obj/item/clothing/under/scc_captain
 	name = "captain's jumpsuit"
 	desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
-	icon = 'icons/obj/contained_items/department_uniforms/command.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
 	icon_state = "captain"
 	item_state = "captain"
 	contained_sprite = TRUE
-	contained_sprite = TRUE
+	contained_sprite = TRUE
@@ -5,7 +5,7 @@
 /obj/item/clothing/head/helmet/space
 	name = "softsuit helmet"
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment."
-	icon = 'icons/obj/contained_items/softsuits/softsuit.dmi'
+	icon = 'icons/obj/item/clothing/softsuits/softsuit.dmi'
 	icon_state = "softsuit_helmet"
 	item_state = "softsuit_helmet"
 	contained_sprite = TRUE
@@ -35,7 +35,7 @@
 /obj/item/clothing/suit/space
 	name = "softsuit"
 	desc = "A suit that protects against low pressure environments."
-	icon = 'icons/obj/contained_items/softsuits/softsuit.dmi'
+	icon = 'icons/obj/item/clothing/softsuits/softsuit.dmi'
 	icon_state = "softsuit"
 	item_state = "softsuit"
 	contained_sprite = TRUE
@@ -90,7 +90,7 @@
 /obj/item/clothing/head/helmet/space/emergency
 	name = "emergency softsuit helmet"
 	desc = "A simple helmet with a built in light. Smells like mothballs."
-	icon = 'icons/obj/contained_items/softsuits/softsuit_emergency.dmi'
+	icon = 'icons/obj/item/clothing/softsuits/softsuit_emergency.dmi'
 	icon_state = "softsuit_emergency_helmet"
 	item_state = "softsuit_emergency_helmet"
 	contained_sprite = TRUE
@@ -104,7 +104,7 @@
 /obj/item/clothing/suit/space/emergency
 	name = "emergency softsuit"
 	desc = "A thin, ungainly softsuit colored in blaze orange for rescuers to easily locate. It looks pretty fragile."
-	icon = 'icons/obj/contained_items/softsuits/softsuit_emergency.dmi'
+	icon = 'icons/obj/item/clothing/softsuits/softsuit_emergency.dmi'
 	icon_state = "softsuit_emergency"
 	item_state = "softsuit_emergency"
 	contained_sprite = TRUE
@@ -112,4 +112,4 @@

 /obj/item/clothing/suit/space/emergency/marooning_equipment
 	name = "marooning softsuit"
-	desc = "A thin, ungainly softsuit colored in blaze orange for rescuers to easily locate. Designed for issuing to marooned personnel and it looks pretty fragile."
+	desc = "A thin, ungainly softsuit colored in blaze orange for rescuers to easily locate. Designed for issuing to marooned personnel and it looks pretty fragile."
@@ -706,7 +706,7 @@
 	desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\
 	is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors. It quickly found purchase among \
 	Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
-	icon = 'icons/obj/contained_items/voidsuits/himeotaj.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/himeotaj.dmi'
 	icon_state = "rig0-himeotaj"
 	item_state = "rig0-himeotaj"
 	item_state_slots = list(
@@ -723,7 +723,7 @@
 	Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet \
 	enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster. They quickly found purchase among Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. \
 	Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
-	icon = 'icons/obj/contained_items/voidsuits/himeotaj.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/himeotaj.dmi'
 	item_state = "rig-himeotaj"
 	icon_state = "rig-himeotaj"
 	item_state_slots = list(
@@ -739,7 +739,7 @@
 	desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life \
 	is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors. It quickly found purchase among \
 	Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
-	icon = 'icons/obj/contained_items/voidsuits/himeotaj.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/himeotaj.dmi'
 	icon_state = "rig0-himeotaj-engineering"
 	item_state = "rig0-himeotaj-engineering"
 	item_state_slots = list(
@@ -757,7 +757,7 @@
 	Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet \
 	enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster. They quickly found purchase among Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. \
 	Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
-	icon = 'icons/obj/contained_items/voidsuits/himeotaj.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/himeotaj.dmi'
 	item_state = "rig-himeotaj-engineering"
 	icon_state = "rig-himeotaj-engineering"
 	item_state_slots = list(
@@ -773,7 +773,7 @@
 	desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life \
 	is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors. It quickly found purchase among \
 	Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
-	icon = 'icons/obj/contained_items/voidsuits/himeotaj.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/himeotaj.dmi'
 	icon_state = "rig0-himeotaj-engineering"
 	item_state = "rig0-himeotaj-engineering"
 	item_state_slots = list(
@@ -791,7 +791,7 @@
 	Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet \
 	enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster. They quickly found purchase among Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. \
 	Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
-	icon = 'icons/obj/contained_items/voidsuits/himeotaj.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/himeotaj.dmi'
 	item_state = "rig-himeotaj-engineering"
 	icon_state = "rig-himeotaj-engineering"
 	item_state_slots = list(
@@ -804,7 +804,7 @@
 /obj/item/clothing/head/helmet/space/void/sol/srf
 	name = "solarian restoration front voidsuit helmet"
 	desc = "An uparmored variant of the gargoyle voidsuit helmet, with a solid visor and redundant comms antenna. Intended for urban combat operations."
-	icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "srf_helmet"
 	item_state = "srf_helmet"
 	contained_sprite = TRUE
@@ -813,7 +813,7 @@
 	name = "solarian restoration front voidsuit"
 	desc = "A variant of the Solarian Armed Forces Type-4 \"Gargoyle\" voidsuit, the Type-5 \"Cyclops\" is the urban combat version of the Gargoyle. While practical testing showed it was a marginal improvement over the Type-4 at best, the SRF have taken to using this modification \
 	both on account of its intimidating design and in an effort to distinguish its forces from others using the Type-4, warlord or not. This one has the SRF's flag on the breastplate."
-	icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "srf_suit"
 	item_state = "srf_suit"
 	contained_sprite = TRUE
@@ -821,7 +821,7 @@
 /obj/item/clothing/head/helmet/space/void/sol/league
 	name = "anti-corporate league voidsuit helmet"
 	desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the League of Independent Corporate-Free Systems to match the colors of the Xanusian \"Vulture\" voidsuit, and also features a modified comms antenna."
-	icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "league_helmet"
 	item_state = "league_helmet"
 	contained_sprite = TRUE
@@ -830,7 +830,7 @@
 	name = "anti-corporate league voidsuit"
 	desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been modified by the forces of the League of Independent Corporate-Free Systems to match the colors of the Xanusian \
 	\"Vulture\" voidsuit, to make it more easily identified by friendly Coalition forces."
-	icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "league_suit"
 	item_state = "league_suit"
 	contained_sprite = TRUE
@@ -838,7 +838,7 @@
 /obj/item/clothing/head/helmet/space/void/sol/fsf
 	name = "free solarian fleets voidsuit helmet"
 	desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Free Solarian Fleets to make it more easily identifiable from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "fsf_helmet"
 	item_state = "fsf_helmet"
 	contained_sprite = TRUE
@@ -847,7 +847,7 @@
 	name = "free solarian fleets voidsuit"
 	desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the forces of the Free Solarian Fleets to make it more easily identifiable \
 	from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "fsf_suit"
 	item_state = "fsf_suit"
 	contained_sprite = TRUE
@@ -855,7 +855,7 @@
 /obj/item/clothing/head/helmet/space/void/sol/ssmd
 	name = "military district voidsuit helmet"
 	desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Southern Solarian Military District to make it more easily identifiable from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "ssmd_helmet"
 	item_state = "ssmd_helmet"
 	contained_sprite = TRUE
@@ -864,7 +864,7 @@
 	name = "military district voidsuit"
 	desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the forces of the Southern Solarian Military District to make it more easily identifiable \
 	from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "ssmd_suit"
 	item_state = "ssmd_suit"
 	contained_sprite = TRUE
@@ -872,7 +872,7 @@
 /obj/item/clothing/head/helmet/space/void/sol/spg
 	name = "provisional government voidsuit helmet"
 	desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Solarian Provisional Government to make it more easily identifiable from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "spg_helmet"
 	item_state = "spg_helmet"
 	contained_sprite = TRUE
@@ -881,7 +881,7 @@
 	name = "provisional government voidsuit"
 	desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the forces of the Solarian Provisional Government to make it more easily identifiable \
 	from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "spg_suit"
 	item_state = "spg_suit"
 	contained_sprite = TRUE
@@ -889,7 +889,7 @@
 /obj/item/clothing/head/helmet/space/void/sol/mrsp
 	name = "shield pact voidsuit helmet"
 	desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Middle Ring Shield Pact to make it more easily identifiable from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "mrsp_helmet"
 	item_state = "mrsp_helmet"
 	contained_sprite = TRUE
@@ -898,7 +898,7 @@
 	name = "shield pact voidsuit"
 	desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the scant forces of the Middle Ring Shield Pact to make it more easily identifiable \
 	from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "mrsp_suit"
 	item_state = "mrsp_suit"
 	contained_sprite = TRUE
@@ -906,7 +906,7 @@
 /obj/item/clothing/head/helmet/space/void/sol/sfa
 	name = "southern fleet administration voidsuit helmet"
 	desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Southern Fleet Administration to make it more easily identifiable from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "sfa_helmet"
 	item_state = "sfa_helmet"
 	contained_sprite = TRUE
@@ -915,7 +915,7 @@
 	name = "southern fleet administration voidsuit"
 	desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the scant forces of the Southern Fleet Administration to make it more easily identifiable \
 	from other forces using the Type-4, warlord or not. Due to poor maintenance, the highlights appear to have gone out."
-	icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
+	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "sfa_suit"
 	item_state = "sfa_suit"
-	contained_sprite = TRUE
+	contained_sprite = TRUE
@@ -364,7 +364,7 @@
 /obj/item/clothing/suit/storage/hazardvest/security
 	name = "cadet hazard vest"
 	desc = "A sturdy high-visibility vest intended for training security personnel."
-	icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/security.dmi'
 	icon_state = "hazard_cadet"
 	item_state = "hazard_cadet"
 	allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/device/flashlight)
@@ -6,7 +6,7 @@
 /obj/item/clothing/suit/hazmat
 	name = "hazmat suit"
 	desc = "A suit that protects against biological hazards."
-	icon = 'icons/contained_items/clothing/bottomwear/hazmat.dmi'
+	icon = 'icons/obj/item/clothing/suit/hazmat.dmi'
 	icon_state = "hazmat"
 	item_state = "hazmat"
 	contained_sprite = TRUE
@@ -39,4 +39,4 @@
 // Custodial
 /obj/item/clothing/suit/hazmat/custodial
 	icon_state = "hazmat_custodial"
-	item_state = "hazmat_custodial"
+	item_state = "hazmat_custodial"
@@ -80,13 +80,13 @@ obj/item/clothing/suit/apron/overalls/blue
 	allowed = list (/obj/item/material/knife)

 /obj/item/clothing/suit/chef/nt
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	contained_sprite = TRUE
 	icon_state = "nt_chef_jacket"
 	item_state = "nt_chef_jacket"

 /obj/item/clothing/suit/chef/idris
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	contained_sprite = TRUE
 	icon_state = "idris_chef_jacket"
 	item_state = "idris_chef_jacket"
@@ -104,7 +104,7 @@ obj/item/clothing/suit/apron/overalls/blue
 //Security
 /obj/item/clothing/suit/storage/security
 	name = "security jacket parent item"
-	icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/security.dmi'
 	contained_sprite = TRUE
 	blood_overlay_type = "coat"
 	body_parts_covered = UPPER_TORSO | LOWER_TORSO | ARMS
@@ -173,8 +173,8 @@ obj/item/clothing/suit/apron/overalls/blue
 /obj/item/clothing/suit/storage/toggle/warden
 	name = "warden coat"
 	desc = "A thick, rugged overcoat, with corporate livery emblazoned on it."
-	body_parts_covered = UPPER_TORSO | LOWER_TORSO | ARMS | LEGS
-	icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+	icon = 'icons/obj/item/clothing/department_uniforms/security.dmi'
 	icon_state = "nt_warden_coat"
 	item_state = "nt_warden_coat"
 	opened = TRUE
@@ -223,7 +223,7 @@ obj/item/clothing/suit/apron/overalls/blue
 /obj/item/clothing/suit/storage/liaison
 	name = "liaison vest"
 	desc = "A smooth suit vest. Freshly drycleaned, ready for a day of firm handshakes and dynamic synergy paradigm shifts."
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	icon_state = "nt_liaison_vest"
 	item_state = "nt_liaison_vest"
 	blood_overlay_type = "coat"
@@ -285,7 +285,7 @@ obj/item/clothing/suit/apron/overalls/blue
 /obj/item/clothing/suit/storage/toggle/fr_jacket
 	name = "first responder jacket"
 	desc = "A high-visibility jacket worn by medical first responders."
-	icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/medical.dmi'
 	contained_sprite = TRUE
 	icon_state = "nt_emt_jacket"
 	item_state = "nt_emt_jacket"
@@ -332,7 +332,7 @@ obj/item/clothing/suit/apron/overalls/blue
 /obj/item/clothing/suit/storage/bartender
 	name = "bartender jacket"
 	desc = "A fancy jacket worn by corporate bartenders."
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	icon_state = "nt_bartender_jacket"
 	item_state = "nt_bartender_jacket"
 	contained_sprite = TRUE
@@ -347,7 +347,7 @@ obj/item/clothing/suit/apron/overalls/blue
 /obj/item/clothing/suit/storage/machinist
 	name = "machinist jacket"
 	desc = "Functional, rugged durability. The perfect workwear for tinkering with muscle cars, robots and giant mechas."
-	icon = 'icons/obj/contained_items/department_uniforms/operations.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/operations.dmi'
 	icon_state = "machinist_jacket"
 	item_state = "machinist_jacket"
 	contained_sprite = TRUE
@@ -301,7 +301,7 @@
 	desc = "A more formal jacket for bridge staff. Designed in a typical Colettish style."
 	desc_extended= "While not a true Colettish uniform the aiguillette and cuff tabs of this one are obviously based on the real thing. \
 	An actual Civil Guard uniform, commonly known as a rayadillo, is generally of a darker blue and features the wearer’s ranks on the collar."
-	icon = 'icons/contained_items/clothing/topwear/bridge_crew_jacket_sancol.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/bridge_crew_jacket_sancol.dmi'
 	icon_state = "bridge_crew_jacket_sancol"
 	item_state = "bridge_crew_jacket_sancol"

@@ -202,7 +202,7 @@
 /obj/item/clothing/accessory/tie/ribbon
 	name = "neck ribbon parent item"
 	desc = DESC_PARENT
-	icon = 'icons/contained_items/clothing/accessories/neck_ribbons.dmi'
+	icon = 'icons/obj/item/clothing/accessory/neck_ribbons.dmi'
 	contained_sprite = TRUE

 /obj/item/clothing/accessory/tie/ribbon/neck
@@ -210,21 +210,18 @@
 	desc = "A ribbon for adorning the neck."
 	icon_state = "ribbon"
 	item_state = "ribbon"
-	contained_sprite = TRUE

 /obj/item/clothing/accessory/tie/ribbon/bow
 	name = "neck bow"
 	desc = "A bow for adorning the neck."
 	icon_state = "bow"
 	item_state = "bow"
-	contained_sprite = TRUE

 /obj/item/clothing/accessory/tie/ribbon/bow_tie
 	name = "bow tie"
-	desc = "A bow tie."
+	desc = "A bow tie. Snazzy!"
 	icon_state = "bow_tie"
 	item_state = "bow_tie"
-	contained_sprite = TRUE

 /obj/item/clothing/accessory/stethoscope
 	name = "stethoscope"
@@ -660,8 +657,7 @@
 	desc_extended = "A cloak given to senior level doctors and researchers for Zeng-Hu who has \
 	in the past been given the privilege of working within or in collaboration with the Nralakk Federation\
 	 as a show of goodwill between the corporation and federation."
-	icon = 'icons/obj/contained_items/accessories/ZH_cape.dmi'
-	icon_override = 'icons/obj/contained_items/accessories/ZH_cape.dmi'
+	icon = 'icons/obj/item/clothing/accessory/zh_cape.dmi'
 	icon_state = "ZH_cape"
 	item_state = "ZH_cape"
 	flippable = FALSE
@@ -897,7 +893,7 @@

 /obj/item/clothing/accessory/tie/corporate
 	name = "corporate tie"
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	icon_state = "nt_tie"
 	item_state = "nt_tie"
 	contained_sprite = TRUE
@@ -929,7 +925,7 @@
 /obj/item/clothing/accessory/pin/corporate
 	name = "corporate badge"
 	desc = "A shiny button which reads, <i>'NanoTrasen - The leader in all things Phoron!'</i>"
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	icon_state = "nt_liaison_badge"
 	item_state = "nt_liaison_badge"
 	drop_sound = 'sound/items/drop/ring.ogg'
@@ -976,4 +972,3 @@
 	contained_sprite = TRUE
 	icon_override = null
 	body_parts_covered = UPPER_TORSO
-
@@ -4,7 +4,9 @@
 /obj/item/clothing/accessory/holster
 	name = "shoulder holster"
 	desc = "A handgun holster."
+	icon = 'icons/obj/item/clothing/accessory/holster.dmi'
 	icon_state = "holster"
+	contained_sprite = TRUE
 	slot = ACCESSORY_SLOT_UTILITY
 	var/obj/item/holstered = null
 	var/sound_in = 'sound/weapons/holster/holsterin.ogg'
@@ -182,8 +184,6 @@
 /obj/item/clothing/accessory/holster/utility
 	name = "utility holster"
 	desc = "A utility holster."
-	icon = 'icons/contained_items/clothing/accessories/utility_holsters.dmi'
-	contained_sprite = TRUE

 	var/list/allowed_items = list() // A list of allowed items.

@@ -212,13 +212,13 @@
 /obj/item/clothing/accessory/holster/utility/custodial/armpit
 	name = "brown custodial armpit holster"
 	desc = "A brown utility holster which can't hold actual firearms. This particular one is designed for custodial personnel."
-	icon_state = "custodial_brown"
-	item_state = "custodial_brown"
+	icon_state = "holster_brown"
+	item_state = "holster_brown"

 // Brown Custodial Hip Holster
 /obj/item/clothing/accessory/holster/utility/custodial/hip
 	name = "brown custodial hip holster"
 	desc = "A brown utility holster which can't hold actual firearms. This particular one is designed for custodial personnel."
-	icon_state = "custodial_brown_hip"
-	item_state = "custodial_brown_hip"
-/********** Utility Holsters End **********/
+	icon_state = "holster_brown_hip"
+	item_state = "holster_brown_hip"
+/********** Utility Holsters End **********/
@@ -7,7 +7,7 @@
 	name = "sweater"
 	desc = "A warm, knit sweater."
 	desc_extended = "Commonly made out of cotton or wool, but sometimes polyester or acrylic as well."
-	icon = 'icons/contained_items/clothing/topwear/sweaters.dmi'
+	icon = 'icons/obj/item/clothing/accessory/sweaters.dmi'
 	icon_state = "sweater"
 	item_state = "sweater"
 	contained_sprite = TRUE
@@ -47,61 +47,54 @@
 	contained_sprite = TRUE

 // Argyle Sweater
-/obj/item/clothing/accessory/argyle_sweater
+/obj/item/clothing/accessory/sweater/argyle
 	name = "argyle sweater"
 	desc = "A warm, knit sweater with an argyle pattern."
-	icon = 'icons/contained_items/clothing/topwear/sweaters.dmi'
 	icon_state = "argyle_sweater"
 	item_state = "argyle_sweater"
-	contained_sprite = TRUE

 // Argyle Tubeneck Sweater
-/obj/item/clothing/accessory/argyle_sweater/tubeneck
+/obj/item/clothing/accessory/sweater/argyle/tubeneck
 	name = "argyle tubeneck sweater"
 	desc = "A warm, knit argyle tubeneck sweater."
 	icon_state = "argyle_sweater_tubeneck"
 	item_state = "argyle_sweater_tubeneck"

 // Argyle Turtleneck Sweater
-/obj/item/clothing/accessory/argyle_sweater/turtleneck
+/obj/item/clothing/accessory/sweater/argyle/turtleneck
 	name = "argyle turtleneck sweater"
 	desc = "A warm, knit argyle turtleneck sweater."
 	icon_state = "argyle_sweater_turtleneck"
 	item_state = "argyle_sweater_turtleneck"

 // Argyle Crewneck Sweater
-/obj/item/clothing/accessory/argyle_sweater/crewneck
+/obj/item/clothing/accessory/sweater/argyle/crewneck
 	name = "argyle crewneck sweater"
 	desc = "A sewn crewneck sweater featuring a collarless neckline and an argyle pattern."
 	icon_state = "argyle_sweater_crewneck"
 	item_state = "argyle_sweater_crewneck"

 // Argyle V-neck Sweater
-/obj/item/clothing/accessory/argyle_sweater/v_neck
+/obj/item/clothing/accessory/sweater/argyle/v_neck
 	name = "argyle v-neck sweater"
 	desc = "A sewn v-neck sweater featuring a collarless neckline and an argyle pattern."
 	icon_state = "argyle_sweater_v_neck"
 	item_state = "argyle_sweater_v_neck"

 // Sweater Vest
-/obj/item/clothing/accessory/sweater_vest
+/obj/item/clothing/accessory/sweater/vest
 	name = "sweater vest"
 	desc = "A warm, knit sweater vest."
 	desc_extended = "Commonly made out of cotton or wool, but sometimes polyester or acrylic as well."
-	icon = 'icons/contained_items/clothing/topwear/sweaters.dmi'
 	icon_state = "sweater_vest"
 	item_state = "sweater_vest"
-	contained_sprite = TRUE
-
 // Argyle Sweater Vest
-/obj/item/clothing/accessory/argyle_sweater_vest
+/obj/item/clothing/accessory/sweater/argyle/vest
 	name = "argyle sweater vest"
 	desc = "A warm, knit sweater vest with an argyle pattern."
 	desc_extended = "Commonly made out of cotton or wool, but sometimes polyester or acrylic as well."
-	icon = 'icons/contained_items/clothing/topwear/sweaters.dmi'
 	icon_state = "argyle_sweater_vest"
 	item_state = "argyle_sweater_vest"
-	contained_sprite = TRUE

 //
 // Shirts
@@ -272,7 +265,7 @@
 /obj/item/clothing/accessory/haltertop
 	name = "halter top"
 	desc = "A sleeveless tank with straps tied behind the neck, commonly seen worn in Biesel."
-	icon = 'icons/contained_items/clothing/topwear/halter_top.dmi'
+	icon = 'icons/obj/item/clothing/accessory/halter_top.dmi'
 	icon_state = "haltertop"
 	item_state = "haltertop"
 	contained_sprite = TRUE
@@ -354,4 +347,4 @@
 /obj/item/clothing/accessory/university/black
 	desc = "A comfy university sweatshirt. This one is black."
 	icon_state = "usweatshirt_black"
-	item_state = "usweatshirt_black"
+	item_state = "usweatshirt_black"
@@ -3,8 +3,8 @@
 	name = "Ox cloak"
 	desc = "A plain cloak that denotes the wearer as being an Ox-class worker."
 	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Nralakk Society."
-	icon = 'icons/obj/contained_items/skrell/nralakk_cloaks.dmi'
-	icon_override = 'icons/obj/contained_items/skrell/nralakk_cloaks.dmi'
+	icon = 'icons/obj/item/clothing/accessory/poncho/nralakk_cloaks.dmi'
+	icon_override = 'icons/obj/item/clothing/accessory/poncho/nralakk_cloaks.dmi'
 	item_state = "ox_cloak"
 	icon_state = "cloak_item"
 	flippable = FALSE
@@ -32,7 +32,7 @@
 /obj/item/clothing/accessory/poncho/skrell
 	name = "white skrell poncho"
 	desc = "This cover is a design of the Nralakk Federation. It is meant to keep moisture in and stop a Skrell's skin from baking in the hot sun. C'thur and Diona may also wear it as a fashion statement."
-	icon = 'icons/obj/contained_items/skrell/skrell_ponchos.dmi'
+	icon = 'icons/obj/item/clothing/accessory/poncho/skrell_ponchos.dmi'
 	icon_state = "skr_poncho"
 	item_state = "skr_poncho"
 	overlay_state = "skr_poncho"
@@ -62,8 +62,8 @@
 	name = "\improper Nralakk cape"
 	desc = "A cape that has the Nralakk flag on the back."
 	desc_extended = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Nralakk Federation - specifically, the inner systems."
-	icon = 'icons/obj/contained_items/skrell/nationcapes.dmi'
-	icon_override = 'icons/obj/contained_items/skrell/nationcapes.dmi'
+	icon = 'icons/obj/item/clothing/accessory/poncho/nationcapes.dmi'
+	icon_override = 'icons/obj/item/clothing/accessory/poncho/nationcapes.dmi'
 	item_state = "jargcape"
 	icon_state = "jargcape"
 	flippable = TRUE
@@ -3,7 +3,7 @@
 /obj/item/clothing/under/rank/bartender
 	name = "bartender's uniform"
 	desc = "It looks like it could use some more flair."
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	contained_sprite = TRUE
 	icon_state = "nt_bartender"
 	item_state = "nt_bartender"
@@ -26,13 +26,13 @@
 	worn_state = "chef"

 /obj/item/clothing/under/rank/chef/nt
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	contained_sprite = TRUE
 	icon_state = "nt_chef"
 	item_state = "nt_chef"

 /obj/item/clothing/under/rank/chef/idris
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	contained_sprite = TRUE
 	icon_state = "idris_chef"
 	item_state = "idris_chef"
@@ -40,7 +40,7 @@
 /obj/item/clothing/under/rank/hydroponics
 	desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
 	name = "botanist's jumpsuit"
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	icon_state = "nt_gardener"
 	item_state = "nt_gardener"
 	permeability_coefficient = 0.50
@@ -54,7 +54,7 @@
 /obj/item/clothing/under/rank/liaison
 	name = "corporate liaison uniform"
 	desc = "The plain, professional attire of a corporate liaison. The collar is <i>immaculately</i> starched."
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	icon_state = "nt_liaison"
 	item_state = "nt_liaison"
 	contained_sprite = TRUE
@@ -87,7 +87,7 @@
 /obj/item/clothing/under/rank/janitor
 	desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
 	name = "janitor's jumpsuit"
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	icon_state = "nt_janitor"
 	item_state = "nt_janitor"
 	contained_sprite = TRUE
@@ -130,7 +130,7 @@
 /obj/item/clothing/under/librarian
 	name = "sensible suit"
 	desc = "It's very... sensible."
-	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	contained_sprite = TRUE
 	icon_state = "nt_librarian"
 	item_state = "nt_librarian"
@@ -144,7 +144,7 @@
 /obj/item/clothing/under/rank/miner
 	desc = "It's a snappy miner's jumpsuit, complete with overalls and caked-on dirt."
 	name = "miner's jumpsuit"
-	icon = 'icons/obj/contained_items/department_uniforms/operations.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/operations.dmi'
 	contained_sprite = TRUE
 	icon_state = "nt_miner"
 	item_state = "nt_miner"
@@ -160,7 +160,7 @@
 /obj/item/clothing/under/rank/operations_manager
 	name = "operations manager's jumpsuit"
 	desc = "A uniform worn by the operations manager. It has the SCC insignia on it."
-	icon = 'icons/obj/contained_items/department_uniforms/command.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
 	icon_state = "operations_manager"
 	item_state = "operations_manager"
 	contained_sprite = TRUE
@@ -168,7 +168,7 @@
 /obj/item/clothing/under/rank/hangar_technician
 	name = "hangar technician's jumpsuit"
 	desc = "The future of hangar tech apparel: long, stuffy slacks. We never said it was a bright future."
-	icon = 'icons/obj/contained_items/department_uniforms/operations.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/operations.dmi'
 	icon_state = "nt_tech"
 	item_state = "nt_tech"
 	contained_sprite = TRUE
@@ -184,7 +184,7 @@
 /obj/item/clothing/under/rank/bridge_crew
 	name = "bridge crew's jumpsuit"
 	desc = "The uniform worn by the SCC's bridge crew."
-	icon = 'icons/obj/contained_items/department_uniforms/command.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
 	icon_state = "bridge_crew"
 	item_state = "bridge_crew"
 	contained_sprite = TRUE
@@ -192,40 +192,32 @@
 /obj/item/clothing/under/rank/bridge_crew/alt
 	name = "bridge crew's skirt"
 	desc = "The uniform worn by the SCC's bridge crew, featuring a skirt."
-	icon = 'icons/contained_items/clothing/bottomwear/bridge_crew_alt.dmi'
 	icon_state = "bridge_crew_alt"
 	item_state = "bridge_crew_alt"
-	contained_sprite = TRUE
-
 /obj/item/clothing/under/rank/bridge_crew/alt/white
 	icon_state = "bridge_crew_alt_white"
 	item_state = "bridge_crew_alt_white"
-	contained_sprite = TRUE

 /obj/item/clothing/under/rank/bridge_crew/sancolette
 	name = "bridge crew's uniform"
 	desc = "A bridge staff uniform in SCC colors but Colettish style, consisting of trousers and meant to be paired with a jacket. Fancy!"
 	desc_extended = "This uniform is based upon an officer's uniform of the Civil Guard of San Colette. The blue-and-white \
 	uniforms of the Civil Guard are one of the more striking uniforms found in the local military forces of the Alliance, and are often copied by both corporate and civil actors."
-	icon = 'icons/contained_items/clothing/bottomwear/bridge_crew_sancol.dmi'
 	icon_state = "bridge_crew_sancol"
 	item_state = "bridge_crew_sancol"
-	contained_sprite = TRUE

 /obj/item/clothing/under/rank/bridge_crew/sancolette/alt
 	name = "bridge crew's uniform"
 	desc = "A bridge staff uniform in SCC colors but Colettish style, consisting of navy trousers and meant to be paired with a jacket. Fancy!"
 	desc_extended = "This uniform is based upon an officer's uniform of the Civil Guard of San Colette. The blue-and-white \
 	uniforms of the Civil Guard are one of the more striking uniforms found in the local military forces of the Alliance, and are often copied by both corporate and civil actors."
-	icon = 'icons/contained_items/clothing/bottomwear/bridge_crew_sancol.dmi'
 	icon_state = "bridge_crew_sancol_alt"
 	item_state = "bridge_crew_sancol_alt"
-	contained_sprite = TRUE

 /obj/item/clothing/under/rank/xo
 	name = "executive officer's jumpsuit"
 	desc = "The uniform worn by the SCC's executive officers."
-	icon = 'icons/obj/contained_items/department_uniforms/command.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
 	icon_state = "executive_officer"
 	item_state = "executive_officer"
 	contained_sprite = TRUE
@@ -233,7 +225,7 @@
 /obj/item/clothing/under/rank/machinist
 	name = "machinist's jumpsuit"
 	desc = "A practical uniform designed for industrial work."
-	icon = 'icons/obj/contained_items/department_uniforms/operations.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/operations.dmi'
 	contained_sprite = TRUE
 	icon_state = "nt_machinist"
 	item_state = "nt_machinist"
@@ -2,7 +2,7 @@
 /obj/item/clothing/under/rank/chief_engineer
 	name = "chief engineer's jumpsuit"
 	desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief Engineer\". It has minor radiation shielding."
-	icon = 'icons/obj/contained_items/department_uniforms/command.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
 	icon_state = "chief_engineer"
 	item_state = "chief_engineer"
 	contained_sprite = TRUE
@@ -14,7 +14,7 @@
 /obj/item/clothing/under/rank/atmospheric_technician
 	name = "atmospheric technician's jumpsuit"
 	desc = "It's a jumpsuit worn by atmospheric technicians."
-	icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/engineering.dmi'
 	icon_state = "nt_atmos"
 	item_state = "nt_atmos"
 	contained_sprite = TRUE
@@ -31,7 +31,7 @@
 /obj/item/clothing/under/rank/engineer
 	name = "engineer's jumpsuit"
 	desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
-	icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/engineering.dmi'
 	icon_state = "nt_engineer"
 	item_state = "nt_engineer"
 	contained_sprite = TRUE
@@ -4,7 +4,7 @@
 /obj/item/clothing/under/rank/research_director
 	desc = "It's a jumpsuit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
 	name = "research director's jumpsuit"
-	icon = 'icons/obj/contained_items/department_uniforms/command.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
 	icon_state = "research_director"
 	item_state = "research_director"
 	contained_sprite = TRUE
@@ -16,7 +16,7 @@
 /obj/item/clothing/under/rank/scientist
 	name = "scientist's jumpsuit"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
-	icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/science.dmi'
 	icon_state = "nt_scientist"
 	item_state = "nt_scientist"
 	permeability_coefficient = 0.50
@@ -104,7 +104,7 @@
 /obj/item/clothing/under/rank/chief_medical_officer
 	desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
 	name = "chief medical officer's jumpsuit"
-	icon = 'icons/obj/contained_items/department_uniforms/command.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
 	icon_state = "chief_medical_officer"
 	item_state = "chief_medical_officer"
 	contained_sprite = TRUE
@@ -130,7 +130,7 @@
 /obj/item/clothing/under/rank/medical
 	name = "physician's jumpsuit"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It denotes that the wearer is a trained medical physician."
-	icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/medical.dmi'
 	icon_state = "nt_phys"
 	item_state = "nt_phys"
 	contained_sprite = TRUE
@@ -12,7 +12,7 @@
 /obj/item/clothing/under/rank/security
 	name = "security officer's uniform"
 	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
-	icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/security.dmi'
 	icon_state = "nt_officer"
 	item_state = "nt_officer"
 	armor = list(
@@ -76,7 +76,7 @@
 /obj/item/clothing/under/rank/cadet
 	name = "security cadet's uniform"
 	desc = "It's made of a slightly sturdier material, to allow for robust protection."
-	icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/security.dmi'
 	icon_state = "nt_cadet"
 	item_state = "nt_cadet"
 	armor = list(
@@ -103,7 +103,7 @@
 /obj/item/clothing/under/rank/warden
 	name = "warden's uniform"
 	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection."
-	icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/security.dmi'
 	icon_state = "nt_warden"
 	item_state = "nt_warden"
 	armor = list(
@@ -143,7 +143,7 @@
 /obj/item/clothing/under/det
 	name = "investigator's uniform"
 	desc = "Someone who wears this means business."
-	icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/security.dmi'
 	icon_state = "nt_invest"
 	item_state = "nt_invest"
 	armor = list(
@@ -189,7 +189,7 @@
 /obj/item/clothing/under/rank/head_of_security
 	desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
 	name = "head of security's uniform"
-	icon = 'icons/obj/contained_items/department_uniforms/command.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
 	icon_state = "head_of_security"
 	item_state = "head_of_security"
 	contained_sprite = TRUE
@@ -117,7 +117,7 @@
 /obj/item/clothing/under/pants
 	name = "jeans"
 	desc = "A nondescript pair of tough blue jeans."
-	icon = 'icons/obj/pants.dmi'
+	icon = 'icons/obj/item/clothing/under/pants.dmi'
 	icon_state = "jeans"
 	item_state = "jeans"
 	contained_sprite = TRUE
@@ -275,7 +275,5 @@
 /obj/item/clothing/under/pants/flared
 	name = "flared pants"
 	desc = "The peak of Biesellite fashion, these pants are flared at the ankle."
-	icon = 'icons/contained_items/clothing/bottomwear/flared_pants.dmi'
 	icon_state = "flaredpants"
 	item_state = "flaredpants"
-	contained_sprite = TRUE
@@ -1,7 +1,7 @@
 /obj/item/clothing/under/skrell
 	name = "federation uniform"
 	desc = "The uniform worn by Official Jagon Federation Representatives and Diplomats.  It looks pretty waterproof."
-	icon = 'icons/obj/contained_items/skrell/federation_uniform.dmi'
+	icon = 'icons/obj/item/clothing/under/skrell/federation_uniform.dmi'
 	icon_state = "skrell_formal"
 	item_state = "skrell_formal"
 	contained_sprite = TRUE
@@ -9,7 +9,7 @@
 /obj/item/clothing/under/skrell/qeblak
 	name = "qeblak ceremonial garment"
 	desc = "A traditional garment worn by Qeblak Star Keepers"
-	icon = 'icons/obj/contained_items/skrell/qeblak_uniform.dmi'
+	icon = 'icons/obj/item/clothing/under/skrell/qeblak_uniform.dmi'
 	icon_state = "qeblak_uniform"
 	item_state = "qeblak_uniform"
 	action_button_name = "Toggle Ceremonial Garment Lights"
@@ -46,7 +46,7 @@
 /obj/item/clothing/under/skrell/slugger
 	name = "prescient republic of the qar wetsuit"
 	desc = "A wetsuit worn by members of Prescient Republic of the Qar generational fleet."
-	icon = 'icons/obj/contained_items/skrell/slugger_wetsuit.dmi'
+	icon = 'icons/obj/item/clothing/under/skrell/slugger_wetsuit.dmi'
 	item_state = "slugger_wetsuit"
 	icon_state = "slugger_wetsuit"

@@ -55,9 +55,9 @@
 	name = "Ox research uniform"
 	desc = "A plain, utilitarian jumpsuit that signifies the wearer as a Tertiary Numerical working in a scientific field."
 	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Nralakk Society."
-	icon = 'icons/obj/contained_items/skrell/nralakk_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/under/skrell/nralakk_uniforms.dmi'
 	sprite_sheets = list(
-		BODYTYPE_VAURCA_BULWARK = 'icons/obj/contained_items/vaurca/bulwark/nralakk_uniforms.dmi'
+		BODYTYPE_VAURCA_BULWARK = 'icons/obj/item/clothing/under/vaurca/bulwark/nralakk_uniforms.dmi'
 	)
 	item_state = "ox_sci"
 	icon_state = "ox_sci"
@@ -187,7 +187,7 @@
 	name = "Ox research jacket"
 	desc = "A plain, utilitarian jacket that signifies the wearer as a Tertiary Numerical in a scientific field."
 	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Nralakk Society."
-	icon = 'icons/obj/contained_items/skrell/nralakk_jackets.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/skrell/nralakk_jackets.dmi'
 	item_state = "ox_sci_jacket"
 	icon_state = "ox_sci_jacket"
 	contained_sprite = TRUE
@@ -315,7 +315,7 @@
 /obj/item/clothing/under/skrell/wetsuit
 	name = "casual wetsuit"
 	desc = "A wetsuit intended as casualwear for Skrell. Can be worn on its own or under additional clothes."
-	icon = 'icons/obj/contained_items/skrell/wetsuit.dmi'
+	icon = 'icons/obj/item/clothing/under/skrell/wetsuit.dmi'
 	icon_state = "wetsuit"
 	item_state = "wetsuit"
 	var/additional_color = COLOR_GRAY
@@ -340,7 +340,7 @@
 	name = "star coat"
 	desc = "A very fashionable coat, that traps moisture and provides good insulation. Starry patterns have been woven into its fabric."
 	desc_extended = "The patterns typically represent the constellations visible from the home system of the wearer. Coats like this one are usually very personal and custom made."
-	icon = 'icons/obj/contained_items/skrell/nralakk_jackets.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/skrell/nralakk_jackets.dmi'
 	item_state = "starcoat"
 	icon_state = "starcoat"

@@ -22,7 +22,7 @@

 /obj/item/device/analyzer/plant_analyzer
 	name = "plant analyzer"
-	icon = 'icons/obj/contained_items/tools/plant_analyzer.dmi'
+	icon = 'icons/obj/item/tools/plant_analyzer.dmi'
 	icon_state = "hydro"
 	item_state = "hydro"
 	contained_sprite = TRUE
@@ -313,7 +313,7 @@
 /obj/machinery/mineral/processing_unit
 	name = "industrial smelter" //This isn't actually a goddamn furnace, we're in space and it's processing platinum and flammable phoron... //lol fuk u bay it is //i'm gay // based and redpilled
 	desc = "A large smelter and compression machine which heats up ore, then applies the process specified within the ore redemption console, outputting the result to the other side."
-	icon = 'icons/obj/machines/mining_machines.dmi'
+	icon = 'icons/obj/machinery/mining_machines.dmi'
 	icon_state = "furnace-off"
 	density = TRUE
 	anchored = TRUE
@@ -116,7 +116,7 @@
 /obj/machinery/mineral/stacking_machine
 	name = "stacking machine"
 	desc = "A machine which takes loose stacks of finished sheets and packs them together into one easily transportable sheet."
-	icon = 'icons/obj/machines/mining_machines.dmi'
+	icon = 'icons/obj/machinery/mining_machines.dmi'
 	icon_state = "stacker"
 	density = TRUE
 	anchored = TRUE
@@ -3,7 +3,7 @@
 /obj/machinery/mineral/unloading_machine
 	name = "unloading machine"
 	desc = "A machine capable of unloading an ore box or ore scattered on the floor within its input zone, to its output zone."
-	icon = 'icons/obj/machines/mining_machines.dmi'
+	icon = 'icons/obj/machinery/mining_machines.dmi'
 	icon_state = "unloader"
 	density = TRUE
 	anchored = TRUE
@@ -63,7 +63,7 @@ var/global/list/minevendor_list = list( //keep in order of price
 /obj/machinery/mineral/equipment_vendor
 	name = "mining equipment vendor"
 	desc = "An equipment vendor for miners, points collected at an ore redemption machine can be spent here."
-	icon = 'icons/obj/machines/mining_machines.dmi'
+	icon = 'icons/obj/machinery/mining_machines.dmi'
 	icon_state = "mining"
 	density = TRUE
 	anchored = TRUE
@@ -213,7 +213,7 @@
 /obj/item/pickaxe/drill
 	name = "mining drill" // Can dig sand as well!
 	desc = "Yours is the drill that will pierce through the rock walls."
-	icon = 'icons/obj/contained_items/tools/drills.dmi'
+	icon = 'icons/obj/item/tools/drills.dmi'
 	icon_state = "miningdrill"
 	item_state = "miningdrill"
 	contained_sprite = TRUE
@@ -244,7 +244,7 @@
 /obj/item/pickaxe/jackhammer
 	name = "sonic jackhammer"
 	desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
-	icon = 'icons/obj/contained_items/tools/drills.dmi'
+	icon = 'icons/obj/item/tools/drills.dmi'
 	icon_state = "jackhammer"
 	item_state = "jackhammer"
 	contained_sprite = TRUE
@@ -288,7 +288,7 @@

 /obj/item/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
 	name = "diamond mining drill"
-	icon = 'icons/obj/contained_items/tools/drills.dmi'
+	icon = 'icons/obj/item/tools/drills.dmi'
 	icon_state = "diamonddrill"
 	item_state = "diamonddrill"
 	contained_sprite = TRUE
@@ -310,7 +310,7 @@

 /obj/item/pickaxe/borgdrill
 	name = "cyborg mining drill"
-	icon = 'icons/obj/contained_items/tools/drills.dmi'
+	icon = 'icons/obj/item/tools/drills.dmi'
 	icon_state = "diamonddrill"
 	item_state = "jackhammer"
 	contained_sprite = TRUE
@@ -1173,7 +1173,7 @@ var/list/total_extraction_beacons = list()
 /obj/item/autochisel
 	name = "auto-chisel"
 	desc = "With an integrated AI chip and hair-trigger precision, this baby makes sculpting almost automatic!"
-	icon = 'icons/obj/contained_items/tools/drills.dmi'
+	icon = 'icons/obj/item/tools/drills.dmi'
 	icon_state = "chisel"
 	item_state = "jackhammer"
 	contained_sprite = TRUE
@@ -4,7 +4,7 @@
 /obj/item/ore_detector
 	name = "ore detector"
 	desc = "A device capable of locating and displaying ores to the average untrained hole explorer."
-	icon = 'icons/obj/contained_items/tools/ore_scanner.dmi'
+	icon = 'icons/obj/item/tools/ore_scanner.dmi'
 	icon_state = "ore_scanner"
 	item_state = "ore_scanner"
 	w_class = ITEMSIZE_SMALL
@@ -92,7 +92,7 @@
 		if(isnull(our_user)) // in the event it's dropped midsweep
 			return
 		if((length(mine_turf.finds) && (MINOR_ARTIFACTS in search_ores)) || (mine_turf.artifact_find && (MAJOR_ARTIFACTS in search_ores)) || (mine_turf.mineral && (mine_turf.mineral.display_name in search_ores)))
-			var/image/ore_ping = image(icon = 'icons/obj/contained_items/tools/ore_scanner.dmi', icon_state = "signal_overlay", loc = our_turf, layer = OBFUSCATION_LAYER + 0.1)
+			var/image/ore_ping = image(icon = 'icons/obj/item/tools/ore_scanner.dmi', icon_state = "signal_overlay", loc = our_turf, layer = OBFUSCATION_LAYER + 0.1)
 			pixel_shift_to_turf(ore_ping, our_turf, mine_turf)
 			M << ore_ping
 			QDEL_IN(ore_ping, 4 SECONDS)
@@ -124,4 +124,4 @@
 	deactivate()

 #undef MINOR_ARTIFACTS
-#undef MAJOR_ARTIFACTS
+#undef MAJOR_ARTIFACTS
@@ -51,7 +51,7 @@
 /obj/item/crowbar/robotic/jawsoflife
 	name = "jaws of life"
 	desc = "A set of specialized tools that functions as both the ordinary crowbar, but is additionally capable of brute forcing bolted doors without power."
-	icon = 'icons/obj/contained_items/weapons/jawsoflife.dmi'
+	icon = 'icons/obj/item/tools/jawsoflife.dmi'
 	icon_state = "jawspry"
 	flags = NOBLUDGEON
 	force = 0
@@ -9,7 +9,7 @@
 	name = "drone fabricator"
 	desc = "A large automated factory for producing maintenance drones."

-	icon = 'icons/obj/machines/drone_fab.dmi'
+	icon = 'icons/obj/machinery/drone_fab.dmi'
 	icon_state = "drone_fab_idle"

 	density = TRUE
@@ -3,7 +3,7 @@
 	desc = "A phoron-enhanced induction charger hooked up to its attached stationbound's internal cell."
 	desc_extended = "Harnessing the energy potential found in phoron structures, NanoTrasen engineers have created a portable device capable of highly efficient wireless charging. The expense and limit of energy output of using this method of charging prevents it from being used on a large scale, being far outclassed by Phoron-Supermatter charging systems."
 	desc_info = "Click on an adjacent object that contains or is a power cell to attempt to find and charge it. After a successful charge, the inductive charger recharge in a few minutes. The amount transfered can be adjusted by alt clicking it."
-	icon = 'icons/obj/contained_items/tools/inductive_charger.dmi'
+	icon = 'icons/obj/item/tools/inductive_charger.dmi'
 	icon_state = "inductive_charger"
 	item_state = "inductive_charger"
 	flags = HELDMAPTEXT
@@ -4,7 +4,7 @@
 /obj/item/inflatable_dispenser
 	name = "inflatables dispenser"
 	desc = "Small device which allows rapid deployment and removal of inflatables."
-	icon = 'icons/contained_items/items/inflatables_dispenser.dmi'
+	icon = 'icons/obj/item/inflatables.dmi'
 	icon_state = "inf_deployer"
 	w_class = ITEMSIZE_NORMAL
 	var/deploying = FALSE
@@ -116,4 +116,4 @@
 	max_doors = 3

 #undef MODE_WALL
-#undef MODE_DOOR
+#undef MODE_DOOR
@@ -6,7 +6,7 @@
 	active_power_usage = 20000 //20kW, appropriate for machine that keeps massive cross-Zlevel wireless network operational.
 	idle_power_usage = 100
 	icon_state = "ntnet"
-	icon = 'icons/obj/machines/telecomms.dmi'
+	icon = 'icons/obj/machinery/telecomms.dmi'
 	anchored = TRUE
 	density = TRUE
 	var/datum/ntnet/NTNet			// This is mostly for backwards reference and to allow varedit modifications from ingame.
@@ -1,7 +1,7 @@
 /obj/machinery/ammunition_loader
 	name = "ammunition loader"
 	desc = "An ammunition loader for ship weapons systems. All hands to battlestations!"
-	icon = 'icons/obj/machines/ship_guns/ship_weapon_attachments.dmi'
+	icon = 'icons/obj/machinery/ship_guns/ship_weapon_attachments.dmi'
 	icon_state = "ammo_loader"
 	density = TRUE
 	anchored = TRUE
@@ -89,7 +89,7 @@
 /obj/structure/viewport
 	name = "viewport"
 	desc = "A viewport for some sort of ship-mounted weapon. You can see your enemies blow up into many, many bits and pieces from here."
-	icon = 'icons/obj/machines/ship_guns/ship_weapon_attachments.dmi'
+	icon = 'icons/obj/machinery/ship_guns/ship_weapon_attachments.dmi'
 	icon_state = "viewport_generic"
 	density = TRUE
 	opacity = FALSE
@@ -1,7 +1,7 @@
 /obj/machinery/ship_weapon
 	name = "ship weapon"
 	desc = "You shouldn't be seeing this."
-	icon = 'icons/obj/machines/ship_guns/longbow.dmi'
+	icon = 'icons/obj/machinery/ship_guns/longbow.dmi'
 	idle_power_usage = 1500
 	active_power_usage = 50000
 	anchored = TRUE
@@ -14,7 +14,7 @@
 	var/special_firing_mechanism = FALSE //If set to TRUE, the gun won't show up on normal controls.
 	var/charging_sound //The sound played when the gun is charging up.
 	var/caliber = SHIP_CALIBER_NONE
-	var/use_ammunition = TRUE //If we use physical ammo or not. Note that the creation of ammunition in pre_fire() is still REQUIRED! 
+	var/use_ammunition = TRUE //If we use physical ammo or not. Note that the creation of ammunition in pre_fire() is still REQUIRED!
 							  //This just skips the initial check for ammunition.
 	var/list/obj/item/ship_ammunition/ammunition = list()
 	var/ammo_per_shot = 1
@@ -108,7 +108,7 @@
 	if(istype(W, /obj/item/weldingtool) && damage)
 		var/obj/item/weldingtool/WT = W
 		if(WT.get_fuel() >= 20)
-			user.visible_message(SPAN_NOTICE("[user] starts slowly welding kinks and holes in \the [src] back to working shape..."), 
+			user.visible_message(SPAN_NOTICE("[user] starts slowly welding kinks and holes in \the [src] back to working shape..."),
 								SPAN_NOTICE("You start welding kinks and holes back to working shape. This'll take a long while..."))
 			if(do_after(user, 15 SECONDS))
 				add_damage(-max_damage)
@@ -258,7 +258,7 @@
 //What kind of dinky ass gun is only 32x32?
 /obj/structure/ship_weapon_dummy
 	name = "ship weapon dummy"
-	icon = 'icons/obj/machines/ship_guns/ship_weapon_dummy.dmi'
+	icon = 'icons/obj/machinery/ship_guns/ship_weapon_dummy.dmi'
 	icon_state = "dummy"
 	mouse_opacity = 2
 	layer = OBJ_LAYER+0.1 //Higher than the gun itself.
@@ -433,7 +433,7 @@
 		return

 	playsound(src, clicksound, clickvol)
-	
+
 	if(href_list["fire"])
 		var/obj/effect/landmark/LM
 		if(!selected_entrypoint)
@@ -455,7 +455,7 @@
 			if(SHIP_GUN_FIRING_SUCCESSFUL)
 				to_chat(usr, SPAN_WARNING("The console shows a positive message: firing sequence successful!"))
 				log_and_message_admins("[usr] has fired [cannon] with target [linked.targeting] and entry point [LM]!", location = get_turf(usr))
-	
+
 	if(href_list["viewing"])
 		if(usr)
 			viewing_overmap(usr) ? unlook(usr) : look(usr)
@@ -475,4 +475,4 @@
 				names_to_entries[capitalize_first_letters(O.name)] = O
 		. = sortList(.)
 	if(!length(.))
-		. += SHIP_HAZARD_TARGET //No entrypoints == hazard
+		. += SHIP_HAZARD_TARGET //No entrypoints == hazard
@@ -1,7 +1,7 @@
 /obj/machinery/ship_weapon/bruiser
 	name = "bruiser cannon II"
 	desc = "Among the Hegemony's earliest forays into ranged weaponry for their military ships, although obsolete nowadays, the Bruiser is popular among many Unathi sailors - including pirates - for its extreme simplicity, allowing it to fire handcraft ammo with minimal modification."
-	icon = 'icons/obj/machines/ship_guns/bruiser.dmi'
+	icon = 'icons/obj/machinery/ship_guns/bruiser.dmi'
 	heavy_firing_sound = 'sound/weapons/gunshot/cannon.ogg'
 	icon_state = "weapon_base"
 	max_ammo = 1
@@ -167,4 +167,4 @@
 	if(istype(target))
 		var/throwdir = dir
 		target.throw_at(get_edge_target_turf(target, throwdir),9,8)
-		return 1
+		return 1
@@ -2,7 +2,7 @@
 	name = "type 21 nadziak solarian coilgun"
 	desc = "The venerable Nadziak-class line of coilguns was born in the fires of the Interstellar War, where its ability to shred shields and low-class hulls have ensured its immortality in the infrastructure of the Solarian Navy."
 	desc_extended = "Although originally an expensive blunder made by over-worked Kumar Arms designers, the Nadziak later preformed to an outstanding degree following numerous improvements. Its fame among post-War Admirals was such that its name and purpose has largely remained the same, with a new 'Type' iteration commissioned every decade or so. With the expulsion of Zavodskoi and its subsidiary from Solarian space, this aging giant and symbol of military might is under threat of being consumed by the resulting arms manufacturing vacuum."
-	icon = 'icons/obj/machines/ship_guns/sol_coilgun.dmi'
+	icon = 'icons/obj/machinery/ship_guns/sol_coilgun.dmi'
 	icon_state = "weapon_base"
 	projectile_type = /obj/item/projectile/ship_ammo/coilgun

@@ -40,4 +40,4 @@
 	icon_state = "ammo_loader_sol"

 /obj/structure/viewport/sol
-	icon_state = "viewport_sol"
+	icon_state = "viewport_sol"
@@ -1,7 +1,7 @@
 /obj/machinery/ship_weapon/francisca
 	name = "francisca rotary gun"
 	desc = "A Kumar Arms rotary gun developed in 2461. While its barrels may be smaller than its significantly larger kin's, the Longbow's, don't let that fool you: this gun will shred through smaller ships."
-	icon = 'icons/obj/machines/ship_guns/francisca.dmi'
+	icon = 'icons/obj/machinery/ship_guns/francisca.dmi'
 	heavy_firing_sound = 'sound/weapons/gunshot/ship_weapons/rotary_fire.ogg'
 	icon_state = "weapon_base"
 	max_ammo = 3
@@ -44,4 +44,4 @@
 	name = "40mm AP bullet"
 	damage = 30
 	armor_penetration = 100
-	penetrating = 4
+	penetrating = 4
@@ -2,7 +2,7 @@
 	name = "grauwolf flak battery"
 	desc = "A Kumar Arms flak battery developed in 2461 as part of the same <i>\"Chivalry\"</i> line of the Longbow. Its barrels may look smaller than its significantly larger kin's, \
 			but don't let that fool you: this gun will shred through smaller ships."
-	icon = 'icons/obj/machines/ship_guns/grauwolf.dmi'
+	icon = 'icons/obj/machinery/ship_guns/grauwolf.dmi'
 	heavy_firing_sound = 'sound/weapons/gunshot/ship_weapons/flak_fire.ogg'
 	icon_state = "weapon_base"
 	max_ammo = 5
@@ -48,4 +48,4 @@
 	name = "armor-piercing flak"
 	damage = 50
 	armor_penetration = 50
-	penetrating = 2
+	penetrating = 2
@@ -1,7 +1,7 @@
 /obj/machinery/ship_weapon/leviathan
 	name = "leviathan zero-point artillery"
 	desc = "A hulking structure made up of an uncalculable amount of moving parts, components and capacitors. It has no branding other than the \"ZAT\" inscription on the sides."
-	icon = 'icons/obj/machines/ship_guns/leviathan.dmi'
+	icon = 'icons/obj/machinery/ship_guns/leviathan.dmi'
 	icon_state = "weapon_off"
 	special_firing_mechanism = TRUE
 	max_damage = 10000
@@ -22,7 +22,7 @@
 /obj/machinery/ship_weapon/leviathan/Destroy()
 	smes = null
 	return ..()
-	
+
 /obj/machinery/ship_weapon/leviathan/LateInitialize()
 	. = ..()
 	couple_to_smes()
@@ -151,7 +151,7 @@
 	impact_type = /obj/effect/projectile/impact/pulse

 /obj/item/projectile/ship_ammo/leviathan/on_hit(atom/target, blocked, def_zone, is_landmark_hit)
-	if(!is_landmark_hit)	
+	if(!is_landmark_hit)
 		if(ismob(target))
 			var/mob/M = target
 			M.visible_message(SPAN_DANGER("<font size=6>[M] evaporates as they are engulfed by the beam!</font>"))
@@ -211,13 +211,13 @@
 	name = "leviathan activation key"
 	desc = "A key made of hardlight used to activate the Leviathan. It is a software-controlled morphing key that uses self-replicating encryption: \
 			it cannot be replicated at all. Most importantly, if it is stolen, it can simply be deactivated by the SCC. A marvel of modern technology!"
-	icon = 'icons/obj/machines/ship_guns/zat_confirmation_terminals.dmi'
+	icon = 'icons/obj/machinery/ship_guns/zat_confirmation_terminals.dmi'
 	icon_state = "cannon_key"

 /obj/item/leviathan_case
 	name = "leviathan key case"
 	desc = "It contains the Leviathan's activation key. The case is made out of authentic ebony wood, while the cushioning on the inside is made of silk."
-	icon = 'icons/obj/machines/ship_guns/zat_confirmation_terminals.dmi'
+	icon = 'icons/obj/machinery/ship_guns/zat_confirmation_terminals.dmi'
 	icon_state = "key_case"
 	var/open = FALSE
 	var/obj/item/leviathan_key/LK
@@ -243,7 +243,7 @@
 	else
 		user.visible_message(SPAN_NOTICE("[user] closes \the [src]."))
 		icon_state = "key_case"
-	
+
 /obj/item/leviathan_case/attack_hand(mob/user)
 	if(!open || !LK || !ishuman(loc))
 		. = ..()
@@ -267,11 +267,11 @@
 			LK = key
 			user.drop_from_inventory(key, src)
 			icon_state = "key_case-o"
-			
+
 /obj/machinery/leviathan_safeguard
 	name = "leviathan activation terminal"
 	desc = "The terminal used to confirm if you really want to wipe someone out."
-	icon = 'icons/obj/machines/ship_guns/zat_confirmation_terminals.dmi'
+	icon = 'icons/obj/machinery/ship_guns/zat_confirmation_terminals.dmi'
 	icon_state = "safeguard"
 	anchored = TRUE
 	density = TRUE
@@ -294,7 +294,7 @@
 	QDEL_NULL(key)
 	button = null
 	return ..()
-	
+
 /obj/machinery/leviathan_safeguard/LateInitialize()
 	if(current_map.use_overmap && !linked)
 		var/my_sector = map_sectors["[z]"]
@@ -340,7 +340,7 @@
 /obj/machinery/leviathan_button
 	name = "leviathan fire button"
 	desc = "The button that controls the Leviathan's firing mechanism."
-	icon = 'icons/obj/machines/ship_guns/zat_confirmation_terminals.dmi'
+	icon = 'icons/obj/machinery/ship_guns/zat_confirmation_terminals.dmi'
 	icon_state = "button_closed"
 	anchored = TRUE
 	var/open = FALSE
@@ -392,4 +392,4 @@
 				visible_message(SPAN_DANGER("[user] presses \the [src]!"))
 				for(var/obj/machinery/ship_weapon/leviathan/LT in linked.ship_weapons)
 					if(istype(LT))
-						LT.firing_command(linked.targeting, landmark)
+						LT.firing_command(linked.targeting, landmark)
@@ -77,7 +77,7 @@
 		data["status"] = "MISSING"
 		data["range"] = "N/A"
 		data["on"] = 0
-	
+
 	if(identification)
 		data["id_on"] = identification.use_power
 		if(identification.disabled)
@@ -196,7 +196,7 @@
 /obj/machinery/shipsensors
 	name = "sensors suite"
 	desc = "Long range gravity scanner with various other sensors, used to detect irregularities in surrounding space. Can only run in vacuum to protect delicate quantum BS elements."
-	icon = 'icons/obj/machines/sensors.dmi'
+	icon = 'icons/obj/machinery/sensors.dmi'
 	icon_state = "sensors"
 	anchored = 1
 	var/max_health = 200
@@ -305,7 +305,7 @@

 	if (heat > 0)
 		heat = max(0, heat - heat_reduction)
-	
+
 	update_icon()

 /obj/machinery/shipsensors/power_change()
@@ -1,7 +1,7 @@
 /obj/machinery/iff_beacon
 	name = "IFF transponder" //This object handles ship identification on sensors.
 	desc = "A complex set of various bluespace and subspace arrays that transmit a ship's identification tags."
-	icon = 'icons/obj/machines/telecomms.dmi'
+	icon = 'icons/obj/machinery/telecomms.dmi'
 	icon_state = "ntnet"
 	idle_power_usage = 500
 	var/datum/wires/iff/wires
@@ -71,4 +71,4 @@

 /obj/machinery/iff_beacon/name_change
 	can_change_name = TRUE
-	can_change_class = FALSE
+	can_change_class = FALSE
@@ -3,7 +3,7 @@
 	desc = "A journal, kind of like a folder, but bigger! And personal."
 	var/closed_desc
 	desc_info = "Alt-click this while it's on your person or next to you to open this journal.\nWhile the journal is open, use it in hand or use a pen on it to access the contents."
-	icon = 'icons/obj/contained_items/misc/journal.dmi'
+	icon = 'icons/obj/item/journal.dmi'
 	icon_state = "journal"
 	item_state = "journal"
 	contained_sprite = TRUE
@@ -100,4 +100,4 @@

 /obj/item/journal/proc/remove_index(var/obj/item/folder/embedded/E)
 	LAZYREMOVE(indices, E.name)
-	update_icon()
+	update_icon()
@@ -2,7 +2,7 @@
 	name = "antimatter containment jar"
 	desc = "Holds antimatter. Warranty void if exposed to matter."
 	desc_antag = "Antimatter is extremely volatile, and containment jars are not particularly strong. Weak explosions will reduce the container's integrity, and larger ones will cause it to explode immediately."
-	icon = 'icons/obj/machines/antimatter.dmi'
+	icon = 'icons/obj/machinery/antimatter.dmi'
 	icon_state = "jar"
 	force = 8
 	throwforce = 10
@@ -43,4 +43,4 @@
 	if(fuel < wanted)
 		wanted = fuel
 	fuel -= wanted
-	return wanted
+	return wanted
@@ -3,7 +3,7 @@
 	desc = "The control unit for an antimatter reactor. Probably safe."
 	desc_info = "Use a wrench to attach the control unit to the ground, then arrange the reactor sections nearby. Reactor sections can only be activated if they are near the control unit, but otherwise are not restricted in how they must be placed."
 	desc_antag = "The antimatter engine will quickly destabilize if the fuel injection rate is set too high, causing a large explosion."
-	icon = 'icons/obj/machines/new_ame.dmi'
+	icon = 'icons/obj/machinery/new_ame.dmi'
 	icon_state = "control"
 	var/icon_mod = "on" // on, critical, or fuck
 	anchored = FALSE
@@ -13,7 +13,7 @@ proc/cardinalrange(var/center)
 	desc = "A shielding component for an antimatter reactor. Looks delicate."
 	desc_info = "Antimatter shielding sections must be beside an anchored control unit or another shielding section. If either are destroyed, the section will disappear."
 	desc_antag = "Antimatter shielding sections are delicate. Attacking the shielding unit with a damaging object will reduce its stability, as will explosions. If the stability hits zero, the reactor may explode."
-	icon = 'icons/obj/machines/new_ame.dmi'
+	icon = 'icons/obj/machinery/new_ame.dmi'
 	icon_state = "shield"
 	anchored = TRUE
 	density = TRUE
@@ -215,7 +215,7 @@ proc/cardinalrange(var/center)
 	name = "packaged antimatter reactor section"
 	desc = "A section of antimatter reactor shielding. Do not eat."
 	desc_info = "To deploy, drop near an antimatter control unit or an existing deployed section and use your multitool on it."
-	icon = 'icons/obj/machines/antimatter.dmi'
+	icon = 'icons/obj/machinery/antimatter.dmi'
 	icon_state = "box"
 	item_state = "electronic"
 	throwforce = 5
@@ -18,7 +18,7 @@
 /obj/machinery/gravity_generator
 	name = "gravitational generator"
 	desc = "A device which produces a gravaton field when set up."
-	icon = 'icons/obj/machines/gravity_generator.dmi'
+	icon = 'icons/obj/machinery/gravity_generator.dmi'
 	anchored = 1
 	density = 1
 	use_power = POWER_USE_OFF
@@ -1,7 +1,7 @@
 /obj/machinery/power/radial_floodlight
 	name = "radial floodlight"
 	desc = "A floodlight that illuminates a wide area around it. It has to be wrenched down on top of a knot to work."
-	icon = 'icons/obj/machines/floodlight.dmi'
+	icon = 'icons/obj/machinery/floodlight.dmi'
 	icon_state = "radial_floodlight"
 	anchored = FALSE
 	density = TRUE
@@ -16,7 +16,7 @@ field_generator power level display
 /obj/machinery/field_generator
 	name = "field generator"
 	desc = "A large thermal battery that projects a high amount of energy when powered."
-	icon = 'icons/obj/machines/field_generator.dmi'
+	icon = 'icons/obj/machinery/field_generator.dmi'
 	icon_state = "Field_Gen"
 	anchored = 0
 	density = 1
@@ -3,7 +3,7 @@
 /obj/effect/accelerated_particle
 	name = "Accelerated Particles"
 	desc = "Small things moving very fast."
-	icon = 'icons/obj/machines/particle_accelerator.dmi'
+	icon = 'icons/obj/machinery/particle_accelerator.dmi'
 	icon_state = "particle"//Need a new icon for this
 	anchored = TRUE
 	density = FALSE
@@ -61,7 +61,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 /obj/structure/particle_accelerator
 	name = "Particle Accelerator"
 	desc = "Part of a Particle Accelerator."
-	icon = 'icons/obj/machines/particle_accelerator.dmi'
+	icon = 'icons/obj/machinery/particle_accelerator.dmi'
 	anchored = FALSE
 	density = TRUE
 	obj_flags = OBJ_FLAG_ROTATABLE
@@ -222,7 +222,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 /obj/machinery/particle_accelerator
 	name = "Particle Accelerator"
 	desc = "Part of a Particle Accelerator."
-	icon = 'icons/obj/machines/particle_accelerator2.dmi'
+	icon = 'icons/obj/machinery/particle_accelerator2.dmi'
 	anchored = FALSE
 	density = TRUE
 	use_power = POWER_USE_OFF
@@ -3,7 +3,7 @@
 /obj/machinery/particle_accelerator/control_box
 	name = "Particle Accelerator Control Computer"
 	desc = "This controls the density of the particles."
-	icon = 'icons/obj/machines/particle_accelerator.dmi'
+	icon = 'icons/obj/machinery/particle_accelerator.dmi'
 	icon_state = "control_box"
 	reference = "control_box"
 	anchored = FALSE
@@ -3,7 +3,7 @@
 /obj/structure/particle_accelerator/particle_emitter
 	name = "EM Containment Grid"
 	desc = "This emits alpha particles, you might not want to stand near this end."
-	icon = 'icons/obj/machines/particle_accelerator.dmi'
+	icon = 'icons/obj/machinery/particle_accelerator.dmi'
 	var/fire_delay = 50
 	var/last_shot = 0

@@ -1,13 +1,13 @@
 /obj/structure/particle_accelerator/power_box
 	name = "Particle Focusing EM Lens"
 	desc = "This uses electromagnetic waves to focus Alpha-Particles."
-	icon = 'icons/obj/machines/particle_accelerator.dmi'
+	icon = 'icons/obj/machinery/particle_accelerator.dmi'
 	icon_state = "power_box"
 	reference = "power_box"

 /obj/structure/particle_accelerator/fuel_chamber
 	name = "EM Acceleration Chamber"
 	desc = "This is where the Alpha particles are accelerated to <b><i>radical speeds</i></b>."
-	icon = 'icons/obj/machines/particle_accelerator.dmi'
+	icon = 'icons/obj/machinery/particle_accelerator.dmi'
 	icon_state = "fuel_chamber"
-	reference = "fuel_chamber"
+	reference = "fuel_chamber"
@@ -95,7 +95,7 @@
 //Projectile.
 /obj/item/projectile/energy/sonic
 	name = "distortion"
-	icon = 'icons/obj/machines/particle_accelerator2.dmi'
+	icon = 'icons/obj/machinery/particle_accelerator2.dmi'
 	icon_state = "particle"
 	damage = 60
 	damage_type = BRUTE
@@ -249,7 +249,7 @@
 	name = "tqi-qop rifle"
 	desc = "The Tqi-Qop Rifle is the main weapon of the Qukala. Its compact light frame and excellent ammo capacity make it a superb weapon for the Skrell."
 	desc_extended = ""
-	icon = 'icons/obj/contained_items/skrell/skrell_weaponry.dmi'
+	icon = 'icons/obj/item/gun/energy/gun/qukala.dmi'
 	icon_state = "qukalagun"
 	item_state = "qukalagun"
 	fire_sound = 'sound/weapons/Taser.ogg'
@@ -235,8 +235,8 @@
 	name = "geop cannon"
 	desc = "An advanced weapon of Skrell design, this Geop Cannon uses a tiny warp accelerator to super heat particles."
 	desc_extended = ""
-	icon = 'icons/obj/contained_items/skrell/skrell_weaponry.dmi'
+	icon = 'icons/obj/item/gun/energy/rifle/qukala_heavy.dmi'
 	icon_state = "qukala_heavy"
 	item_state = "qukala_heavy"
 	max_shots = 10
-	projectile_type = /obj/item/projectile/beam/midlaser/skrell/heavy
+	projectile_type = /obj/item/projectile/beam/midlaser/skrell/heavy
@@ -473,7 +473,7 @@
 	It features a light-weight polymer pistol grip, a bulky plasteel frame and an extra long barrel. \
 	It is chambered in the newly developed .599 Kumar Super rifle cartridge. Despite designed for rifle use, the newly developed propellants allows this cartridge for use in the Kumar Arms 2557, upping the stopping power significantly. \
 	Kumar Arms guarantees your enemy's armor penetrated or your money back. It features a revolving bolt system with an electromagnetic striker, allowing for hammerless actuation. It has a revolutinary blowback system to ensure accuracy at the cost of fire rate."
-	icon = 'icons/obj/contained_items/weapons/k_arms.dmi'
+	icon = 'icons/obj/item/gun/projectile/pistol/k_arms.dmi'
 	icon_state = "k2557-loaded"
 	item_state = "k2557-loaded"
 	contained_sprite = TRUE
@@ -497,7 +497,7 @@
 	accuracy = -3
 	accuracy_wielded = 1

-	
+
 /obj/item/gun/projectile/pistol/super_heavy/update_icon()
 	..()
 	if(istype(ammo_magazine))
@@ -505,7 +505,7 @@
 			icon_state = "k2557-loaded"
 		else
 			icon_state = "k2557-empty"
-	else 
+	else
 		icon_state = "k2557"

 /obj/item/gun/projectile/pistol/super_heavy/handle_post_fire(mob/user)
@@ -527,4 +527,4 @@
 				if(active_hand)
 					LH.take_damage(30)
 				else
-					RH.take_damage(30)
+					RH.take_damage(30)
@@ -2,7 +2,7 @@
 	name = "welding kit"
 	desc = "A heavy-duty, portable welding fluid carrier."
 	slot_flags = SLOT_BACK
-	icon = 'icons/obj/contained_items/tools/welderpack.dmi'
+	icon = 'icons/obj/item/tools/welderpack.dmi'
 	icon_state = "welderpack"
 	item_state = "welderpack"
 	contained_sprite = TRUE
@@ -61,4 +61,4 @@
 			to_chat(user, SPAN_NOTICE("Welder refilled!"))
 			playsound(loc, 'sound/effects/refill.ogg', 50, 1, -6)
 		return
-	return ..()
+	return ..()
@@ -4,7 +4,7 @@

 /obj/machinery/r_n_d
 	name = "R&D device"
-	icon = 'icons/obj/machines/research.dmi'
+	icon = 'icons/obj/machinery/research.dmi'
 	density = 1
 	anchored = 1
 	var/busy = 0
--- a/Show More
+++ b/Show More