diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 7aca17a8e6c..470df5f1dbb 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -167,7 +167,17 @@ /obj/item/weapon/reagent_containers/food/snacks/meatsnack = 2, /obj/item/weapon/reagent_containers/food/snacks/maps = 2, /obj/item/weapon/reagent_containers/food/snacks/nathisnack = 2, - /obj/item/weapon/reagent_containers/food/snacks/koisbar_clean = 4 + /obj/item/weapon/reagent_containers/food/snacks/koisbar_clean = 4, + /obj/item/weapon/reagent_containers/food/snacks/cb01 = 4, + /obj/item/weapon/reagent_containers/food/snacks/cb02 = 4, + /obj/item/weapon/reagent_containers/food/snacks/cb03 = 4, + /obj/item/weapon/reagent_containers/food/snacks/cb04 = 4, + /obj/item/weapon/reagent_containers/food/snacks/cb05 = 4, + /obj/item/weapon/reagent_containers/food/snacks/cb06 = 4, + /obj/item/weapon/reagent_containers/food/snacks/cb07 = 4, + /obj/item/weapon/reagent_containers/food/snacks/cb08 = 4, + /obj/item/weapon/reagent_containers/food/snacks/cb09 = 4, + /obj/item/weapon/reagent_containers/food/snacks/cb10 = 4 ) contraband = list( /obj/item/weapon/reagent_containers/food/snacks/syndicake = 6, @@ -186,7 +196,17 @@ /obj/item/weapon/reagent_containers/food/snacks/meatsnack = 22, /obj/item/weapon/reagent_containers/food/snacks/maps = 23, /obj/item/weapon/reagent_containers/food/snacks/nathisnack = 24, - /obj/item/weapon/reagent_containers/food/snacks/koisbar_clean = 60 + /obj/item/weapon/reagent_containers/food/snacks/koisbar_clean = 60, + /obj/item/weapon/reagent_containers/food/snacks/cb01 = 10, + /obj/item/weapon/reagent_containers/food/snacks/cb02 = 12, + /obj/item/weapon/reagent_containers/food/snacks/cb03 = 14, + /obj/item/weapon/reagent_containers/food/snacks/cb04 = 12, + /obj/item/weapon/reagent_containers/food/snacks/cb05 = 13, + /obj/item/weapon/reagent_containers/food/snacks/cb06 = 14, + /obj/item/weapon/reagent_containers/food/snacks/cb07 = 12, + /obj/item/weapon/reagent_containers/food/snacks/cb08 = 14, + /obj/item/weapon/reagent_containers/food/snacks/cb09 = 12, + /obj/item/weapon/reagent_containers/food/snacks/cb10 = 11 ) /obj/machinery/vending/cola diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 4a6d55ade92..6378a5d63f0 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1044,3 +1044,29 @@ for(var/i in 1 to 12) new /obj/random_produce(src) make_exact_fit() + + +/obj/item/weapon/storage/box/candy + name = "candy box" + desc = "A large box of assorted small candy." + icon_state = "largebox" + +/obj/item/weapon/storage/box/candy/fill() + var/list/assorted_list = list( + /obj/item/weapon/reagent_containers/food/snacks/cb01 = 1, + /obj/item/weapon/reagent_containers/food/snacks/cb02 = 1, + /obj/item/weapon/reagent_containers/food/snacks/cb03 = 1, + /obj/item/weapon/reagent_containers/food/snacks/cb04 = 1, + /obj/item/weapon/reagent_containers/food/snacks/cb05 = 1, + /obj/item/weapon/reagent_containers/food/snacks/cb06 = 1, + /obj/item/weapon/reagent_containers/food/snacks/cb07 = 1, + /obj/item/weapon/reagent_containers/food/snacks/cb08 = 1, + /obj/item/weapon/reagent_containers/food/snacks/cb09 = 1, + /obj/item/weapon/reagent_containers/food/snacks/cb10 = 1 + ) + + for(var/i in 1 to 24) + var/chosen_candy = pickweight(assorted_list) + new chosen_candy(src) + + make_exact_fit() diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 6fedd181988..44939e3696f 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -5242,5 +5242,156 @@ nutriment_desc = list("french bread" = 4) bitesize = 2 +//Snacks +/obj/item/weapon/reagent_containers/food/snacks/cb01 + name = "tau ceti bar" + desc = "A dark chocolate caramel and nougat bar made famous in biesel." + filling_color = "#552200" + icon_state = "cb01" + nutriment_amt = 4 + nutriment_desc = list("chocolate" = 2, "nougat" = 1, "caramel" = 1) + bitesize = 2 + nutriment_type = NUTRIMENT_BAD + w_class = 1 + +/obj/item/weapon/reagent_containers/food/snacks/cb01/Initialize() + . = ..() + reagents.add_reagent("sugar", 1) + +/obj/item/weapon/reagent_containers/food/snacks/cb02 + name = "hundred thousand credit bar" + desc = "An ironically cheap puffed rice caramel milk chocolate bar." + filling_color = "#552200" + icon_state = "cb02" + nutriment_amt = 4 + nutriment_desc = list("chocolate" = 2, "caramel" = 1, "puffed rice" = 1) + bitesize = 2 + nutriment_type = NUTRIMENT_BAD + w_class = 1 + +/obj/item/weapon/reagent_containers/food/snacks/cb02/Initialize() + . = ..() + reagents.add_reagent("sugar", 1) + +/obj/item/weapon/reagent_containers/food/snacks/cb03 + name = "spacewind bar" + desc = "Bubbly milk chocolate." + filling_color = "#552200" + icon_state = "cb03" + nutriment_amt = 4 + nutriment_desc = list("chocolate" = 4) + bitesize = 2 + nutriment_type = NUTRIMENT_BAD + w_class = 1 + +/obj/item/weapon/reagent_containers/food/snacks/cb03/Initialize() + . = ..() + reagents.add_reagent("sugar", 1) + +/obj/item/weapon/reagent_containers/food/snacks/cb04 + name = "crunchy crisp" + desc = "An almond flake bar covered in milk chocolate." + filling_color = "#552200" + icon_state = "cb04" + nutriment_amt = 4 + nutriment_desc = list("chocolate" = 3, "almonds" = 1) + bitesize = 2 + nutriment_type = NUTRIMENT_BAD + w_class = 1 + +/obj/item/weapon/reagent_containers/food/snacks/cb04/Initialize() + . = ..() + reagents.add_reagent("sugar", 1) + +/obj/item/weapon/reagent_containers/food/snacks/cb05 + name = "hearsay bar" + desc = "A cheap milk chocolate bar loaded with sugar." + filling_color = "#552200" + icon_state = "cb05" + nutriment_amt = 3 + nutriment_desc = list("chocolate" = 2, "vomit" = 1) + bitesize = 3 + nutriment_type = NUTRIMENT_BAD + w_class = 1 + +/obj/item/weapon/reagent_containers/food/snacks/cb05/Initialize() + . = ..() + reagents.add_reagent("sugar", 3) + +/obj/item/weapon/reagent_containers/food/snacks/cb06 + name = "latte crunch" + desc = "A large latte flavored wafer chocolate bar." + filling_color = "#552200" + icon_state = "cb06" + nutriment_amt = 4 + nutriment_desc = list("chocolate" = 2, "coffee" = 1, "vanilla wafer" = 1) + bitesize = 3 + nutriment_type = NUTRIMENT_BAD + w_class = 1 + +/obj/item/weapon/reagent_containers/food/snacks/cb06/Initialize() + . = ..() + reagents.add_reagent("sugar", 1) + +/obj/item/weapon/reagent_containers/food/snacks/cb07 + name = "martain bar" + desc = "Dark chocolate with a nougat and caramel center. Known as the first chocolate bar grown and produced on Mars." + filling_color = "#552200" + icon_state = "cb07" + nutriment_amt = 4 + nutriment_desc = list("chocolate" = 2, "caramel" = 1, "nougat" = 1) + bitesize = 3 + nutriment_type = NUTRIMENT_BAD + w_class = 1 + +/obj/item/weapon/reagent_containers/food/snacks/cb07/Initialize() + . = ..() + reagents.add_reagent("sugar", 1) + +/obj/item/weapon/reagent_containers/food/snacks/cb08 + name = "crisp bar" + desc = "A large puffed rice milk chocolate bar." + filling_color = "#552200" + icon_state = "cb08" + nutriment_amt = 3 + nutriment_desc = list("chocolate" = 2, "puffed rice" = 1) + bitesize = 3 + nutriment_type = NUTRIMENT_BAD + w_class = 1 + +/obj/item/weapon/reagent_containers/food/snacks/cb08/Initialize() + . = ..() + reagents.add_reagent("sugar", 2) + +/obj/item/weapon/reagent_containers/food/snacks/cb09 + name = "owo daddy bar" + desc = "A massive cluster of peanuts covered in caramel and chocolate." + filling_color = "#552200" + icon_state = "cb09" + nutriment_amt = 6 + nutriment_desc = list("chocolate" = 3, "caramel" = 1, "peanuts" = 2) + bitesize = 3 + nutriment_type = NUTRIMENT_BAD + w_class = 1 + +/obj/item/weapon/reagent_containers/food/snacks/cb09/Initialize() + . = ..() + reagents.add_reagent("sugar", 1) + +/obj/item/weapon/reagent_containers/food/snacks/cb10 + name = "laughter bar" + desc = "Nuts, nougat, peanuts, and caramel covered in chocolate." + filling_color = "#552200" + icon_state = "cb10" + nutriment_amt = 5 + nutriment_desc = list("chocolate" = 2, "caramel" = 1, "peanuts" = 1, "nougat" = 1) + bitesize = 3 + nutriment_type = NUTRIMENT_BAD + w_class = 1 + +/obj/item/weapon/reagent_containers/food/snacks/cb10/Initialize() + . = ..() + reagents.add_reagent("sugar", 1) + #undef NUTRIMENT_GOOD #undef NUTRIMENT_BAD diff --git a/html/changelogs/burgerbb-chocolate.yml b/html/changelogs/burgerbb-chocolate.yml new file mode 100644 index 00000000000..dc1b046cfd1 --- /dev/null +++ b/html/changelogs/burgerbb-chocolate.yml @@ -0,0 +1,37 @@ +################################ +# 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 +################################# + +# Your name. +author: BurgerBB + +# 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: + - rscadd: "Adds several new chocolate bars to the getmore chocolate vendor." diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index e061cecf010..ce8523beb92 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ