diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 8c6e6ffb8e3..ffbc64a38e6 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -273,7 +273,6 @@ /obj/item/reagent_containers/food/snacks/koisbar_clean = 4, /obj/item/reagent_containers/food/snacks/candy/koko = 5, /obj/item/reagent_containers/food/snacks/tuna = 2, - /obj/item/reagent_containers/food/snacks/diona_bites = 3, /obj/item/reagent_containers/food/snacks/ricetub = 2, /obj/item/reagent_containers/food/snacks/riceball = 4, /obj/item/reagent_containers/food/snacks/seaweed = 5 @@ -305,7 +304,6 @@ /obj/item/reagent_containers/food/snacks/koisbar_clean = 60, /obj/item/reagent_containers/food/snacks/candy/koko = 40, /obj/item/reagent_containers/food/snacks/tuna = 23, - /obj/item/reagent_containers/food/snacks/diona_bites = 40, /obj/item/reagent_containers/food/snacks/ricetub = 40, /obj/item/reagent_containers/food/snacks/riceball = 15, /obj/item/reagent_containers/food/snacks/seaweed = 20 diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 228fedda602..2b994554431 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -205,10 +205,6 @@ drop_sound = 'sound/items/drop/bottle.ogg' pickup_sound = 'sound/items/pickup/bottle.ogg' -/obj/item/trash/diona_bites - name = "dionae bites" - icon_state = "dionaebitesempty" - /obj/item/trash/ricetub name = "empty rice tub" icon_state = "ricetub" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 0d930cdbb5f..15c804a7a7e 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -5013,13 +5013,3 @@ reagent_data = list(/decl/reagent/nutriment = list("diona delicacy" = 5)) reagents_to_add = list(/decl/reagent/nutriment = 8, /decl/reagent/drink/carrotjuice = 2, /decl/reagent/drink/potatojuice = 2, /decl/reagent/radium = 2) filling_color = "#BD8939" - -/obj/item/reagent_containers/food/snacks/diona_bites - name = "dionae bites" - desc = "Freeze dried Dionae bites artfully crafted by Getmore chefs for that home cooked taste on the go!" - icon_state = "dionaebites" - reagent_data = list(/decl/reagent/nutriment = list("diona delicacy" = 5)) - reagents_to_add = list(/decl/reagent/nutriment = 6) - trash = /obj/item/trash/diona_bites - bitesize = 3 - filling_color = "#BD8939" diff --git a/html/changelogs/Yonnimer-noeattree.yml b/html/changelogs/Yonnimer-noeattree.yml new file mode 100644 index 00000000000..88994bd1ae8 --- /dev/null +++ b/html/changelogs/Yonnimer-noeattree.yml @@ -0,0 +1,41 @@ +################################ +# 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: Yonnimer + +# 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: + - rscdel: "Removes diona bites." diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 1deb809a862..c1488a218d7 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index b61c42c10e3..7419b7c891a 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ