From 4909f3f22b297a0618f14ff3c82e7698349f358c Mon Sep 17 00:00:00 2001
From: ReddeyfishVor <36580397+ReddeyfishVor@users.noreply.github.com>
Date: Sat, 31 Mar 2018 11:11:09 -0700
Subject: [PATCH] Add trash-edible glass container (#83)

* Add trash-edible glass container

* Refactor to clearer item path, add flavortext

* Add autolathe cost
---
 code/_helpers/global_lists_vr.dm                    |  1 +
 code/datums/autolathe/general.dm                    |  4 ++++
 code/game/objects/items/weapons/storage/glass_vr.dm | 10 ++++++++++
 code/modules/vore/eating/living_vr.dm               |  2 ++
 vorestation.dme                                     |  1 +
 5 files changed, 18 insertions(+)
 create mode 100644 code/game/objects/items/weapons/storage/glass_vr.dm

diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm
index f54d8d6b18..e69d047133 100644
--- a/code/_helpers/global_lists_vr.dm
+++ b/code/_helpers/global_lists_vr.dm
@@ -143,6 +143,7 @@ var/global/list/edible_trash = list(/obj/item/trash,
 				/obj/item/weapon/paperplane,
 				/obj/item/weapon/pen,
 				/obj/item/weapon/photo,
+				/obj/item/weapon/storage/glass_ornament,
 				/obj/item/weapon/storage/box/wings,
 				/obj/item/weapon/storage/box/matches,
 				/obj/item/weapon/storage/fancy/cigarettes,
diff --git a/code/datums/autolathe/general.dm b/code/datums/autolathe/general.dm
index f354583318..be80f4b9db 100644
--- a/code/datums/autolathe/general.dm
+++ b/code/datums/autolathe/general.dm
@@ -54,6 +54,10 @@
 	name = "jar"
 	path =/obj/item/glass_jar
 
+/datum/category_item/autolathe/general/glass_ornament
+	name = "glass ornament"
+	path =/obj/item/weapon/storage/glass_ornament
+
 /datum/category_item/autolathe/general/radio_headset
 	name = "radio headset"
 	path =/obj/item/device/radio/headset
diff --git a/code/game/objects/items/weapons/storage/glass_vr.dm b/code/game/objects/items/weapons/storage/glass_vr.dm
new file mode 100644
index 0000000000..1de6e9d4f8
--- /dev/null
+++ b/code/game/objects/items/weapons/storage/glass_vr.dm
@@ -0,0 +1,10 @@
+/obj/item/weapon/storage/glass_ornament
+	name = "Hollow Glass Ornament"
+	desc = "An ornate, bulbous glass ornament, clear and transparent. A hinge on the bottom allows things to be dropped inside."
+	icon = 'icons/obj/lighting.dmi'
+	icon_state = "glowstick_yellow"
+	item_state = "glowstick_yellow"
+	max_w_class = ITEMSIZE_SMALL
+	matter = list("glass" = 100)
+	max_storage_space = 1 * ITEMSIZE_COST_SMALL
+	can_hold = list(/obj/item/weapon/holder/micro)
\ No newline at end of file
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index 19cd71f3c3..f8cac9a50f 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -593,6 +593,8 @@
 				to_chat(src, "<span class='notice'>You can taste the flavor of garbage and leftovers. Delicious?</span>")
 			else
 				to_chat(src, "<span class='notice'>You can taste the flavor of gluttonous waste of food.</span>")
+		else if(istype(I,/obj/item/weapon/storage/glass_ornament))
+			to_chat(src, "<span class='notice'>You can taste the flavor of smooth glass.</span>")
 		else
 			to_chat(src, "<span class='notice'>You can taste the flavor of garbage. Delicious.</span>")
 		return
diff --git a/vorestation.dme b/vorestation.dme
index fcd0d569e7..be116963bf 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1113,6 +1113,7 @@
 #include "code\game\objects\items\weapons\storage\briefcase.dm"
 #include "code\game\objects\items\weapons\storage\fancy.dm"
 #include "code\game\objects\items\weapons\storage\firstaid.dm"
+#include "code\game\objects\items\weapons\storage\glass_vr.dm"
 #include "code\game\objects\items\weapons\storage\internal.dm"
 #include "code\game\objects\items\weapons\storage\laundry_basket.dm"
 #include "code\game\objects\items\weapons\storage\lockbox.dm"