Puts the trinket box back in after I had to comment it out in the gift vendor pr from conflict.

https://user-images.githubusercontent.com/26665154/36401962-a75e2e54-15a0-11e8-8be3-b8271d2c6ee7.png

Also fixes a minor bug of the heartbox held sprites being in the wrong location and thus having no held sprites.
This commit is contained in:
Schnayy
2018-02-25 01:57:03 -06:00
parent 8315c0b92f
commit 460202cb6e
7 changed files with 3 additions and 5 deletions
@@ -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, "<span class='notice'>\The [src] contains \the [display_item]!</span>")
*/
to_chat(user, "<span class='notice'>\The [src] contains \the [display_item]!</span>")