From f2c80d5becacd0bc270702fb7af096dd9aed6f27 Mon Sep 17 00:00:00 2001 From: Mickyan <38563876+Mickyan@users.noreply.github.com> Date: Tue, 10 Sep 2019 04:13:03 +0200 Subject: [PATCH] Inhands for photo albums (#46404) * inhands, grammar fix * that's not how books work --- code/datums/traits/good.dm | 2 +- code/modules/photography/photos/album.dm | 6 +++--- icons/mob/inhands/misc/books_lefthand.dmi | Bin 2891 -> 3089 bytes icons/mob/inhands/misc/books_righthand.dmi | Bin 3201 -> 3499 bytes 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index ee67a9e89cd..33c3ef7640e 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -139,7 +139,7 @@ H.equip_in_one_of_slots(photo_album, album_slots , qdel_on_fail = TRUE) photo_album.persistence_id = "personal_[H.mind.key]" // this is a persistent album, the ID is tied to the account's key to avoid tampering photo_album.persistence_load() - photo_album.name = "\improper [H.real_name]'s photo album" + photo_album.name = "[H.real_name]'s photo album" var/obj/item/camera/camera = new(get_turf(H)) var/list/camera_slots = list ( "neck" = SLOT_NECK, diff --git a/code/modules/photography/photos/album.dm b/code/modules/photography/photos/album.dm index 173d900c4b5..8c06e698884 100644 --- a/code/modules/photography/photos/album.dm +++ b/code/modules/photography/photos/album.dm @@ -6,9 +6,9 @@ desc = "A big book used to store photos and mementos." icon = 'icons/obj/items_and_weapons.dmi' icon_state = "album" - item_state = "briefcase" - lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi' + item_state = "album" + lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi' resistance_flags = FLAMMABLE w_class = WEIGHT_CLASS_SMALL var/persistence_id diff --git a/icons/mob/inhands/misc/books_lefthand.dmi b/icons/mob/inhands/misc/books_lefthand.dmi index 71d06d345a863c3130efc1d7f7cf699cdff57c68..64a97a8b5c2861521a683e74855fa5b20e8e4ab6 100644 GIT binary patch literal 3089 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 diff --git a/icons/mob/inhands/misc/books_righthand.dmi b/icons/mob/inhands/misc/books_righthand.dmi index 906f47bfe9166f62d658a5d2b5db72fcc1b999ab..da45f97e9155cc178efb25fbe6a957317b8c93fa 100644 GIT binary patch literal 3499 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 x4