PMC-Unga-Marines · Tatarla · Sep 5, 2024 · Sep 6, 2024 · Sep 6, 2024 · Sep 6, 2024
diff --git a/code/game/objects/items/flashlight.dm b/code/game/objects/items/flashlight.dm
@@ -51,8 +51,11 @@
 	. = ..()
 	if(light_on)
 		icon_state = "[initial(icon_state)]-on"
+		item_state = "[initial(item_state)]_on"
+
 	else
 		icon_state = initial(icon_state)
+		item_state = initial(item_state)
 
 
 /obj/item/flashlight/attack_self(mob/user)
@@ -200,10 +203,10 @@
 /obj/item/flashlight/lantern
 	name = "lantern"
 	icon_state = "lantern"
+	item_state = "lantern"
 	desc = "A mining lantern."
 	light_range = 6			// luminosity when on
 	raillight_compatible = FALSE
 
 /obj/item/flashlight/lantern/turned_on
-	icon_state = "lantern-on"
 	light_on = TRUE
diff --git a/code/game/objects/items/megaphone.dm b/code/game/objects/items/megaphone.dm
@@ -7,7 +7,7 @@
 		slot_l_hand_str = 'icons/mob/inhands/equipment/tools_left.dmi',
 		slot_r_hand_str = 'icons/mob/inhands/equipment/tools_right.dmi',
 	)
-	item_state = "radio"
+	item_state = "megaphone"
 	w_class = WEIGHT_CLASS_SMALL
 	flags_atom = CONDUCT
 	var/spamcheck = 0

diff --git a/code/game/objects/items/tools/flame_tools.dm b/code/game/objects/items/tools/flame_tools.dm
@@ -156,6 +156,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/clothing/mask/cigarette
 	name = "cigarette"
 	desc = "A roll of tobacco and nicotine."
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/inhands/clothing/lefthand_cigs.dmi',
+		slot_r_hand_str = 'icons/mob/inhands/clothing/righthand_cigs.dmi',
+	)
 	icon_state = "cigoff"
 	throw_speed = 0.5
 	item_state = "cigoff"

diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm
@@ -91,11 +91,13 @@
 /obj/item/tool/pen/blue
 	desc = "It's a normal blue ink pen."
 	icon_state = "pen_blue"
+	item_state = "pen_blue"
 	colour = "blue"
 
 /obj/item/tool/pen/red
 	desc = "It's a normal red ink pen."
 	icon_state = "pen_red"
+	item_state = "pen_red"
 	colour = "red"
 
 /obj/item/tool/pen/invisible
@@ -177,43 +179,55 @@
 
 /obj/item/tool/stamp/qm
 	name = "Quartermaster's Stamp"
+	icon_state = "stamp-cap"
+	item_state = "stamp-qm"
 
 /obj/item/tool/stamp/captain
 	name = "captain's rubber stamp"
 	icon_state = "stamp-cap"
+	item_state = "stamp-cap"
 
 /obj/item/tool/stamp/hop
 	name = "head of personnel's rubber stamp"
 	icon_state = "stamp-hop"
+	item_state = "stamp-hop"
 
 /obj/item/tool/stamp/hos
 	name = "head of security's rubber stamp"
 	icon_state = "stamp-hos"
+	item_state = "stamp-hos"
 
 /obj/item/tool/stamp/ce
 	name = "chief ship engineer's rubber stamp"
 	icon_state = "stamp-ce"
+	item_state = "stamp-ce"
 
 /obj/item/tool/stamp/rd
 	name = "research director's rubber stamp"
 	icon_state = "stamp-rd"
+	item_state = "stamp-rd"
 
 /obj/item/tool/stamp/cmo
 	name = "chief medical officer's rubber stamp"
 	icon_state = "stamp-cmo"
+	item_state = "stamp-cmo"
 
 /obj/item/tool/stamp/denied
 	name = "\improper DENIED rubber stamp"
 	icon_state = "stamp-deny"
+	item_state = "stamp-deny"
 
 /obj/item/tool/stamp/clown
 	name = "clown's rubber stamp"
 	icon_state = "stamp-clown"
+	item_state = "stamp-clown"
 
 /obj/item/tool/stamp/internalaffairs
 	name = "internal affairs rubber stamp"
 	icon_state = "stamp-intaff"
+	item_state = "stamp-intaff"
 
 /obj/item/tool/stamp/centcom
 	name = "centcom rubber stamp"
 	icon_state = "stamp-cent"
+	item_state = "stamp-cent"
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
@@ -1,30 +1,40 @@
 /obj/item/folder
 	name = "folder"
 	desc = "A folder."
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/inhands/items/civilian_left.dmi',
+		slot_r_hand_str = 'icons/mob/inhands/items/civilian_right.dmi',
+	)
 	icon = 'icons/obj/items/paper.dmi'
 	icon_state = "folder"
+	item_state = "folder"
 	w_class = WEIGHT_CLASS_SMALL
 	var/updateicon = 0//If they spawn with premade papers, update icon
 
 /obj/item/folder/blue
 	desc = "A blue folder."
 	icon_state = "folder_blue"
+	item_state = "folder_blue"
 
 /obj/item/folder/grape
 	desc = "A violet folder."
 	icon_state = "folder_grape"
+	item_state = "folder_grape"
 
 /obj/item/folder/red
 	desc = "A red folder."
 	icon_state = "folder_red"
+	item_state = "folder_red"
 
 /obj/item/folder/yellow
 	desc = "A yellow folder."
 	icon_state = "folder_yellow"
+	item_state = "folder_yellow"
 
 /obj/item/folder/white
 	desc = "A white folder."
 	icon_state = "folder_white"
+	item_state = "folder_white"
 
 /obj/item/folder/black
 	desc = "A black folder."

diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
@@ -165,8 +165,12 @@
 
 /obj/item/camera
 	name = "camera"
-	icon = 'icons/obj/device.dmi'
 	desc = "A polaroid camera."
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/inhands/items/civilian_left.dmi',
+		slot_r_hand_str = 'icons/mob/inhands/items/civilian_right.dmi',
+	)
+	icon = 'icons/obj/device.dmi'
 	icon_state = "camera"
 	item_state = "camera"
 	light_color = COLOR_WHITE

diff --git a/icons/mob/inhands/clothing/lefthand_cigs.dmi b/icons/mob/inhands/clothing/lefthand_cigs.dmi
diff --git a/icons/mob/inhands/clothing/lefthand_cigs_lighters.dmi b/icons/mob/inhands/clothing/lefthand_cigs_lighters.dmi
diff --git a/icons/mob/inhands/clothing/righthand_cigs.dmi b/icons/mob/inhands/clothing/righthand_cigs.dmi
diff --git a/icons/mob/inhands/clothing/righthand_cigs_lighters.dmi b/icons/mob/inhands/clothing/righthand_cigs_lighters.dmi
diff --git a/icons/mob/inhands/equipment/kitchen_left.dmi b/icons/mob/inhands/equipment/kitchen_left.dmi
diff --git a/icons/mob/inhands/equipment/kitchen_right.dmi b/icons/mob/inhands/equipment/kitchen_right.dmi
diff --git a/icons/mob/inhands/equipment/lights_left.dmi b/icons/mob/inhands/equipment/lights_left.dmi
diff --git a/icons/mob/inhands/equipment/lights_right.dmi b/icons/mob/inhands/equipment/lights_right.dmi
diff --git a/icons/mob/inhands/equipment/smoking_left.dmi b/icons/mob/inhands/equipment/smoking_left.dmi
diff --git a/icons/mob/inhands/equipment/smoking_right.dmi b/icons/mob/inhands/equipment/smoking_right.dmi
diff --git a/icons/mob/inhands/equipment/tools_left.dmi b/icons/mob/inhands/equipment/tools_left.dmi
diff --git a/icons/mob/inhands/equipment/tools_right.dmi b/icons/mob/inhands/equipment/tools_right.dmi
diff --git a/icons/mob/inhands/items/civilian_left.dmi b/icons/mob/inhands/items/civilian_left.dmi
diff --git a/icons/mob/inhands/items/civilian_right.dmi b/icons/mob/inhands/items/civilian_right.dmi
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
diff --git a/icons/obj/items/cigarettes.dmi b/icons/obj/items/cigarettes.dmi
diff --git a/icons/obj/items/drinks.dmi b/icons/obj/items/drinks.dmi
diff --git a/icons/obj/items/food/bread.dmi b/icons/obj/items/food/bread.dmi
diff --git a/icons/obj/items/food/condiment.dmi b/icons/obj/items/food/condiment.dmi
diff --git a/icons/obj/items/food/food.dmi b/icons/obj/items/food/food.dmi
diff --git a/icons/obj/items/food/meat.dmi b/icons/obj/items/food/meat.dmi
diff --git a/icons/obj/items/food/mexican.dmi b/icons/obj/items/food/mexican.dmi
diff --git a/icons/obj/items/food/packaged.dmi b/icons/obj/items/food/packaged.dmi
diff --git a/icons/obj/items/food/piecake.dmi b/icons/obj/items/food/piecake.dmi
diff --git a/icons/obj/items/food/pizzaspaghetti.dmi b/icons/obj/items/food/pizzaspaghetti.dmi
diff --git a/icons/obj/items/food/soupsalad.dmi b/icons/obj/items/food/soupsalad.dmi
diff --git a/icons/obj/items/items.dmi b/icons/obj/items/items.dmi
diff --git a/icons/obj/items/paper.dmi b/icons/obj/items/paper.dmi
diff --git a/icons/obj/items/storage/storage.dmi b/icons/obj/items/storage/storage.dmi
diff --git a/icons/obj/items/syringe.dmi b/icons/obj/items/syringe.dmi
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
diff --git a/icons/obj/machines/air_alarm.dmi b/icons/obj/machines/air_alarm.dmi
diff --git a/icons/obj/machines/airlock_machines.dmi b/icons/obj/machines/airlock_machines.dmi
diff --git a/icons/obj/machines/buttons.dmi b/icons/obj/machines/buttons.dmi
diff --git a/icons/obj/machines/chemical_machines.dmi b/icons/obj/machines/chemical_machines.dmi
diff --git a/icons/obj/machines/fire_alarm.dmi b/icons/obj/machines/fire_alarm.dmi
diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
diff --git a/icons/obj/status_display.dmi b/icons/obj/status_display.dmi
diff --git a/icons/obj/structures/closet.dmi b/icons/obj/structures/closet.dmi
diff --git a/icons/obj/wallframes.dmi b/icons/obj/wallframes.dmi
diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi