From 2fd9200036dd18a56e6887f8090d5dc0477fc6f3 Mon Sep 17 00:00:00 2001 From: Bm0n <92271472+Bm0n@users.noreply.github.com> Date: Mon, 6 Jan 2025 15:09:21 -0500 Subject: [PATCH] adds new camera inhands (#27841) Co-authored-by: Bmon --- code/game/objects/items/devices/flash.dm | 2 +- code/modules/paperwork/photography.dm | 2 +- icons/mob/inhands/items_lefthand.dmi | Bin 103428 -> 103821 bytes icons/mob/inhands/items_righthand.dmi | Bin 102331 -> 102271 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 047c61dcb9a65..64c2e9284f3d6 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -226,7 +226,7 @@ icon = 'icons/obj/items.dmi' desc = "A polaroid camera. 10 photos left." icon_state = "camera" - item_state = "electropack" //spelling, a coders worst enemy. This part gave me trouble for a while. + item_state = "camera" w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_BELT can_overcharge = FALSE diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index b1997c6be8bd4..683d93a34d189 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -171,7 +171,7 @@ icon = 'icons/obj/items.dmi' desc = "A polaroid camera." icon_state = "camera" - item_state = "electropack" + item_state = "camera" w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_NECK var/list/matter = list("metal" = 2000) diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 81322117b123e16b8e061902769f057dead66cc9..f03540a971bc3c14e1565e6a3d580aa066b13f48 100644 GIT binary patch delta 3051 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