diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 116c17562d..7d9f80756c 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1113,8 +1113,8 @@ /obj/item/toy/plushie/kitten = 2, /obj/item/toy/plushie/lizard = 2, /obj/item/toy/plushie/spider = 2, - /obj/item/toy/plushie/farwa = 2) - // /obj/item/weapon/storage/trinketbox = 2 (readding later due to conflict) + /obj/item/toy/plushie/farwa = 2, + /obj/item/weapon/storage/trinketbox = 2) prices = list(/obj/item/weapon/storage/fancy/heartbox = 15, /obj/item/toy/bouquet = 10, /obj/item/toy/bouquet/fake = 3, diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 6bddb28769..799169bad5 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -674,7 +674,6 @@ /* * Trinket Box - READDING SOON */ -/* /obj/item/weapon/storage/trinketbox name = "trinket box" desc = "A box that can hold small trinkets, such as a ring." @@ -724,5 +723,4 @@ ..() if(open && contents.len) var/display_item = contents[1] - to_chat(user, "\The [src] contains \the [display_item]!") - */ \ No newline at end of file + to_chat(user, "\The [src] contains \the [display_item]!") \ No newline at end of file diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index a42fe56547..a06310415f 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/lefthand_storage.dmi b/icons/mob/items/lefthand_storage.dmi index 530823eb77..d7e1c4ec10 100644 Binary files a/icons/mob/items/lefthand_storage.dmi and b/icons/mob/items/lefthand_storage.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index 54720b1f6d..ac1ea14c40 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/mob/items/righthand_storage.dmi b/icons/mob/items/righthand_storage.dmi index 2d6ff6d601..66646547c5 100644 Binary files a/icons/mob/items/righthand_storage.dmi and b/icons/mob/items/righthand_storage.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index add3c315a6..a8e41841c3 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ