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/power/cable.dm b/code/modules/power/cable.dm index 853705abed..dd0d31540b 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -496,13 +496,13 @@ obj/structure/cable/proc/cableColor(var/colorC) uses_charge = 1 charge_costs = list(1) -/obj/item/stack/cable_coil/suicide_act(mob/user) - var/datum/gender/TU = gender_datums[user.get_visible_gender()] - if(locate(/obj/item/weapon/stool) in user.loc) - user.visible_message("[user] is making a noose with the [src.name]! It looks like [TU.he] [TU.is] trying to commit suicide.") - else - user.visible_message("[user] is strangling [TU.himself] with the [src.name]! It looks like [TU.he] [TU.is] trying to commit suicide.") - return(OXYLOSS) +// /obj/item/stack/cable_coil/suicide_act(mob/user) +// var/datum/gender/TU = gender_datums[user.get_visible_gender()] +// if(locate(/obj/item/weapon/stool) in user.loc) +// user.visible_message("[user] is making a noose with the [src.name]! It looks like [TU.he] [TU.is] trying to commit suicide.") +// else +// user.visible_message("[user] is strangling [TU.himself] with the [src.name]! It looks like [TU.he] [TU.is] trying to commit suicide.") +// return(OXYLOSS) /obj/item/stack/cable_coil/New(loc, length = MAXCOIL, var/param_color = null) ..() @@ -938,4 +938,4 @@ obj/structure/cable/proc/cableColor(var/colorC) if(get_dist(src, user) <= 1) msg += " It doesn't seem to have a beginning, or an end." - to_chat(user, msg) \ No newline at end of file + to_chat(user, msg) diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm index 140c5d9baa..5a0c27fe38 100644 --- a/code/modules/vore/appearance/sprite_accessories_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_vr.dm @@ -962,16 +962,17 @@ icon_state = "chimptail_s" /datum/sprite_accessory/tail/special/seromitail - name = "seromi tail" + name = "teshari tail" desc = "" icon_state = "seromitail_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/special/seromitailfeathered - name = "seromi tail w/ feathers" + name = "teshari tail w/ feathers" desc = "" - icon_state = "seromitail_feathers_s" + icon_state = "seromitail_s" + extra_overlay = "seromitail_feathers_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY 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, "You can taste the flavor of garbage and leftovers. Delicious?") else to_chat(src, "You can taste the flavor of gluttonous waste of food.") + else if(istype(I,/obj/item/weapon/storage/glass_ornament)) + to_chat(src, "You can taste the flavor of smooth glass.") else to_chat(src, "You can taste the flavor of garbage. Delicious.") return diff --git a/vorestation.dme b/vorestation.dme index 54fc1e279a..acc1694950 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"