diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index fe19a6d1982..8522562dcdc 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -506,6 +506,7 @@ /obj/item/storage/box/fancy/cigarettes/nka = 6, /obj/item/storage/box/fancy/cigarettes/federation = 3, /obj/item/storage/box/fancy/cigarettes/dyn = 3, + /obj/item/storage/box/fancy/cigarettes/oracle = 3, /obj/item/storage/chewables/rollable = 8, /obj/item/storage/chewables/rollable/unathi = 6, /obj/item/storage/chewables/rollable/fine = 5, @@ -552,16 +553,20 @@ /obj/item/storage/box/fancy/cigarettes/nka = 74, /obj/item/storage/box/fancy/cigarettes/federation = 93, /obj/item/storage/box/fancy/cigarettes/dyn = 84, + /obj/item/storage/box/fancy/cigarettes/oracle = 84, /obj/item/storage/chewables/rollable = 63, /obj/item/storage/chewables/rollable/unathi = 65, /obj/item/storage/chewables/rollable/fine = 69, /obj/item/storage/chewables/rollable/nico = 86, + /obj/item/storage/chewables/rollable/oracle = 66, + /obj/item/storage/chewables/rollable/vedamor = 72, /obj/item/storage/chewables/tobacco/bad = 55, /obj/item/storage/chewables/tobacco = 74, /obj/item/storage/chewables/tobacco/fine = 86, /obj/item/storage/chewables/tobacco/federation = 88, /obj/item/storage/chewables/tobacco/dyn = 85, /obj/item/storage/box/fancy/chewables/tobacco/nico = 91, + /obj/item/storage/chewables/oracle = 76, /obj/item/storage/box/fancy/matches = 12, /obj/item/flame/lighter/random = 12, /obj/item/storage/cigfilters = 28, @@ -584,6 +589,7 @@ prices = list() products = list( /obj/item/storage/box/fancy/cigarettes = 10, + /obj/item/storage/box/fancy/cigarettes/oracle = 10, /obj/item/storage/box/fancy/matches = 10, /obj/item/flame/lighter/random = 4, /obj/item/storage/box/fancy/cigarettes/cigar = 5, diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index b043ccc8443..c486049a33d 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -162,6 +162,14 @@ /obj/item/clothing/mask/chewable/oracle name = "chewing oracle" desc = "A chewy wad of oracle. Cut in long strands." + throw_speed = 0.5 + icon_state = "chew" + type_butt = /obj/item/trash/spitwad + w_class = ITEMSIZE_TINY + slot_flags = SLOT_EARS | SLOT_MASK + chem_volume = 50 + chewtime = 300 + brand = "oracle" reagents_to_add = list(/singleton/reagent/toxin/oracle = 2) /obj/item/clothing/mask/chewable/candy diff --git a/html/changelogs/GeneralCamo - Oracle Fixes.yml b/html/changelogs/GeneralCamo - Oracle Fixes.yml new file mode 100644 index 00000000000..b0d5777fb70 --- /dev/null +++ b/html/changelogs/GeneralCamo - Oracle Fixes.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: GeneralCamo + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fix missing prices for oracle products in the cigarette vendor." + - bugfix: "Fix missing icon for oracle chewables." + - bugfix: "Oracle cigarettes are now available in the cigarette vendor, as intended."