Merge pull request #4953 from Schnayy/trinketbox

Trinket box

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,

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."
@@ -725,4 +724,3 @@
 	if(open && contents.len)
 		var/display_item = contents[1]
 		to_chat(user, "<span class='notice'>\The [src] contains \the [display_item]!</span>")
-		*/