Change sprites of photo, flashlight and megaphone (#563)

* Change sprites foto+flashlight+megaphone * Update photography.dm Signed-off-by: Kirill <[email protected]> --------- Signed-off-by: Kirill <[email protected]>
PMC-Unga-Marines · Oct 18, 2024 · 8de41be · 8de41be
1 parent 0dbfe99
commit 8de41be
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 2 deletions.
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/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/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/lighting.dmi b/icons/obj/lighting.dmi