From 1f58e4c36302d4f564a4e18e83914774fdb7f182 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 14 Oct 2020 12:51:19 +0200 Subject: [PATCH] [MIRROR] The trashbag of holding now has its own inhand sprite. (#1300) * Merge pull request #54347 from uomo91/trashbagsprite The trashbag of holding now has its own inhand sprite. * The trashbag of holding now has its own inhand sprite. Co-authored-by: ShizCalev --- code/game/objects/items/storage/bags.dm | 1 + .../inhands/equipment/custodial_lefthand.dmi | Bin 2264 -> 2511 bytes .../inhands/equipment/custodial_righthand.dmi | Bin 2255 -> 2528 bytes 3 files changed, 1 insertion(+) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 1366c95938b..e34c93340ed 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -90,6 +90,7 @@ name = "trash bag of holding" desc = "The latest and greatest in custodial convenience, a trashbag that is capable of holding vast quantities of garbage." icon_state = "bluetrashbag" + inhand_icon_state = "bluetrashbag" item_flags = NO_MAT_REDEMPTION /obj/item/storage/bag/trash/bluespace/ComponentInitialize() diff --git a/icons/mob/inhands/equipment/custodial_lefthand.dmi b/icons/mob/inhands/equipment/custodial_lefthand.dmi index 2c9f34af2e1d11c44cff5d714e76c6a8b49ecee2..43eb0665cd71b7aaed5ae2952f0c0ac37e1e8205 100644 GIT binary patch delta 2454 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 bGq^5lya)v;GZHeme=UGDGBYgIzY_6ZEv^8b