diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 1522d8970b8..0c9ffc58391 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -200,6 +200,8 @@ hi icon = 'custom_items.dmi' desc = "A modified detective's camera, painted in bright orange. On the back you see \"Have fun\" written in small accurate letters with something black." icon_state = "orangecamera" + icon_on = "orangecamera" + icon_off = "camera_off" pictures_left = 30 /obj/item/device/camera/fluff/oldcamera //magmaram: Maria Crash @@ -207,6 +209,8 @@ hi icon = 'custom_items.dmi' desc = "An old, slightly beat-up digital camera, with a cheap photo printer taped on. It's a nice shade of blue." icon_state = "oldcamera" + icon_on = "oldcamera" + icon_off = "oldcamera_off" pictures_left = 30 /obj/item/weapon/card/id/fluff/lifetime //fastler: Fastler Greay; it seemed like something multiple people would have diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index d6daad60922..dae7ac1384b 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -122,6 +122,8 @@ var/pictures_max = 10 var/pictures_left = 10 var/on = 1 + var/icon_on = "camera" + var/icon_off = "camera_off" /obj/item/device/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob) @@ -130,9 +132,9 @@ /obj/item/device/camera/attack_self(mob/user as mob) on = !on if(on) - src.icon_state = "camera" + src.icon_state = icon_on else - src.icon_state = "camera_off" + src.icon_state = icon_off user << "You switch the camera [on ? "on" : "off"]." return @@ -253,8 +255,8 @@ pictures_left-- desc = "A polaroid camera. It has [pictures_left] photos left." user << "[pictures_left] photos left." - icon_state = "camera_off" + icon_state = icon_off on = 0 spawn(64) - icon_state = "camera" + icon_state = icon_on on = 1 \ No newline at end of file diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index f0a310d2e86..54dfe170747 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ