Standardised Contained Sprites : Now Atomic (#15142)

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

@@ -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>")

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

@@ -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

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

@@ -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()

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

@@ -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

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

@@ -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

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

@@ -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"

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

@@ -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

code/game/objects/items/knitting.dm

@@ -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
 

code/game/objects/items/skrell.dm

@@ -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

code/game/objects/items/toys.dm

@@ -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

code/game/objects/items/vitals_monitor.dm

@@ -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)

code/game/objects/items/weapons/flamethrower.dm

@@ -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

code/game/objects/items/weapons/neutralizer.dm

@@ -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 ..()

code/game/objects/items/weapons/research_slip.dm

@@ -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

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -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)

code/game/objects/items/weapons/tools.dm

@@ -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

code/game/objects/items/weapons/traps.dm

@@ -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

code/game/objects/structures/inflatable.dm

@@ -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