diff --git a/code/datums/supplypacks/hospitality_vr.dm b/code/datums/supplypacks/hospitality_vr.dm index da65a8760a..ceb35b6c5d 100644 --- a/code/datums/supplypacks/hospitality_vr.dm +++ b/code/datums/supplypacks/hospitality_vr.dm @@ -91,9 +91,32 @@ /datum/supply_pack/randomised/hospitality/jaffacake contains = list( - /obj/item/weapon/storage/box/jaffacake = 10 + /obj/item/weapon/storage/box/jaffacake, + /obj/item/weapon/storage/box/jaffacake, + /obj/item/weapon/storage/box/jaffacake, + /obj/item/weapon/storage/box/jaffacake, + /obj/item/weapon/storage/box/jaffacake, + /obj/item/weapon/storage/box/jaffacake, + /obj/item/weapon/storage/box/jaffacake, + /obj/item/weapon/storage/box/jaffacake, + /obj/item/weapon/storage/box/jaffacake, + /obj/item/weapon/storage/box/jaffacake ) name = "Desatti jaffa cake crate" cost = 25 containertype = /obj/structure/closet/crate/freezer containername = "Desatti jaffa cake crate" + +/datum/supply_pack/randomised/hospitality/sweets + num_contained = 5 + contains = list( + /obj/item/weapon/storage/box/jaffacake, + /obj/item/weapon/storage/box/winegum, + /obj/item/weapon/storage/box/saucer, + /obj/item/weapon/storage/box/shrimpsandbananas, + /obj/item/weapon/storage/box/rhubarbcustard + ) + name = "Sweets crate" + cost = 25 + containertype = /obj/structure/closet/crate/freezer + containername = "Sweets crate" diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 9b6ba7b992..ba98a00251 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -445,6 +445,10 @@ name = "scotch egg packaging" icon_state = "scotchegg" +/obj/item/trash/porkpie + name = "pork pie packaging" + icon_state = "porkpie" + //Candy Bars (1-10) /obj/item/trash/candy/cb01 name = "\improper Tau Ceti Bar wrapper" diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index b8ff810fe2..788ee12ba2 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -84,7 +84,8 @@ prob(5);/obj/machinery/vending/sovietsoda, prob(5);/obj/machinery/vending/sovietvend, prob(5);/obj/machinery/vending/radren, - prob(3);/obj/machinery/vending/altevian) //VOREStation Edit End + prob(3);/obj/machinery/vending/altevian, + prob(5);/obj/machinery/vending/desatti) //VOREStation Edit End /obj/random/vendorfood //Random food vendors for station use name = "random snack vending machine" @@ -98,7 +99,8 @@ /obj/machinery/vending/sol, /obj/machinery/vending/snix, /obj/machinery/vending/snlvend, - /obj/machinery/vending/altevian) + /obj/machinery/vending/altevian, + /obj/machinery/vending/desatti) /obj/random/vendordrink //Random drink vendors for station use name = "random drink vending machine" diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index d6e8a68a55..2f22ac47e0 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -3536,3 +3536,35 @@ /obj/item/weapon/reagent_containers/food/snacks/ratpackramen = 10, /obj/item/weapon/reagent_containers/food/snacks/ratpacktaco = 10, /obj/item/weapon/reagent_containers/food/snacks/ratpackturkey = 200) + +/obj/machinery/vending/desatti + name = "Desatti Catering" + desc = "A vending machine from Desatti Catering, stocking traditional Sol snacks. Like the good ol' days, apparently." + icon = 'icons/obj/vending_vr.dmi' + icon_state = "desatti" + product_slogans = "Keep calm and eat Desatti!;Don't be a smeg head, tuck in!;Go'an. 'Ave a cheeky nosh.;TAKE A BUTCHERS AT THIS!" + product_ads = "Jaffa cakes are legally cakes!;Real synthetic processed pork!;What flavour could the shrimps really be!?;Tea recommended with every biscuit purchase!" + products = list(/obj/item/weapon/storage/box/jaffacake = 15, + /obj/item/weapon/storage/box/winegum = 15, + /obj/item/weapon/storage/box/saucer = 15, + /obj/item/weapon/storage/box/shrimpsandbananas = 15, + /obj/item/weapon/storage/box/rhubarbcustard = 10, + /obj/item/weapon/storage/box/custardcream = 10, + /obj/item/weapon/storage/box/bourbon = 10, + /obj/item/weapon/reagent_containers/food/snacks/packaged/sausageroll= 8, + /obj/item/weapon/reagent_containers/food/snacks/packaged/pasty = 8, + /obj/item/weapon/reagent_containers/food/snacks/packaged/scotchegg = 8, + /obj/item/weapon/reagent_containers/food/snacks/packaged/porkpie = 8) + + prices = list(/obj/item/weapon/storage/box/jaffacake = 8, + /obj/item/weapon/storage/box/winegum = 8, + /obj/item/weapon/storage/box/saucer = 8, + /obj/item/weapon/storage/box/shrimpsandbananas = 8, + /obj/item/weapon/storage/box/rhubarbcustard = 8, + /obj/item/weapon/storage/box/custardcream = 8, + /obj/item/weapon/storage/box/bourbon = 8, + /obj/item/weapon/reagent_containers/food/snacks/packaged/sausageroll = 10, + /obj/item/weapon/reagent_containers/food/snacks/packaged/pasty = 10, + /obj/item/weapon/reagent_containers/food/snacks/packaged/scotchegg = 10, + /obj/item/weapon/reagent_containers/food/snacks/packaged/porkpie = 10 + ) diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index f9125284fa..a7b40b20ee 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -925,6 +925,10 @@ bitesize = 2 nutriment_desc = list("chocolate" = 2, "orange" = 4, "cake" = 3) +/obj/item/weapon/reagent_containers/food/snacks/bourbon/Initialize() + . = ..() + reagents.add_reagent("coco", 2) + /obj/item/weapon/storage/box/jaffacake //This is kinda like the donut box. name = "Desatti Jaffa Cakes" desc = "A box full of desatti brand jaffa cakes, with twelve in a pack!" @@ -998,6 +1002,10 @@ nutriment_amt = 4 nutriment_desc = list("pastry" = 5, "meat" = 5, "onion" = 2, "potato" = 3) +/obj/item/weapon/reagent_containers/food/snacks/packaged/pasty/Initialize() + . = ..() + reagents.add_reagent("protein", 2) + /obj/item/weapon/reagent_containers/food/snacks/saucer name = "Sherbert Saucer" desc = "A small saucer shaped piece of rice paper filled with sugar." @@ -1073,6 +1081,10 @@ ) foldable = null +/obj/item/weapon/reagent_containers/food/snacks/bourbon/Initialize() + . = ..() + reagents.add_reagent("coco", 2) + /obj/item/weapon/reagent_containers/food/snacks/packaged/sausageroll name = "Sausage Roll" icon_state = "sausageroll" @@ -1082,6 +1094,10 @@ nutriment_amt = 3 nutriment_desc = list("pastry" = 5, "meat" = 5) +/obj/item/weapon/reagent_containers/food/snacks/packaged/sausageroll/Initialize() + . = ..() + reagents.add_reagent("protein", 2) + /obj/item/weapon/reagent_containers/food/snacks/packaged/scotchegg name = "Scotch Egg" icon_state = "scotchegg" @@ -1091,6 +1107,10 @@ nutriment_amt = 3 nutriment_desc = list("egg" = 5, "meat" = 5, "bread" = 2) +/obj/item/weapon/reagent_containers/food/snacks/packaged/scotchegg/Initialize() + . = ..() + reagents.add_reagent("protein", 2) + /obj/item/weapon/reagent_containers/food/snacks/foam_banana name = "Foam Banana" desc = "A small vaguely banana shaped sweet with a foam-like texture." @@ -1125,3 +1145,45 @@ /obj/item/weapon/reagent_containers/food/snacks/foam_shrimp = 10 ) foldable = null + +/obj/item/weapon/reagent_containers/food/snacks/rhubarbcustard + name = "Rhubarb and Custard Sweet" + desc = "A small pink and yellow boiled sweet." + icon = 'icons/obj/food_snacks.dmi' + icon_state = "rhubarbcustard_1" + w_class = ITEMSIZE_TINY + nutriment_amt = 1 + bitesize = 2 + nutriment_desc = list("sugar" = 5, "rhubarb" = 2, "custard" = 2) + var/list/color_options = list("rhubarbcustard_1","rhubarbcustard_2") + +/obj/item/weapon/reagent_containers/food/snacks/rhubarbcustard/Initialize() + . = ..() + icon_state = pick(color_options) + +/obj/item/weapon/storage/box/rhubarbcustard //This is kinda like the donut box. + name = "Desatti Rhubarb and Custards" + desc = "A pack of rhubarb and custard boiled sweets, the taste combination might sound usual, but they insist it's actually kind of okay!" + icon = 'icons/obj/food_snacks.dmi' + icon_state = "rhubarbcustard_pack" + var/icon_base = "rhubarbcustard_pack" + var/startswith = 15 + max_storage_space = ITEMSIZE_COST_TINY * 15 + can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/rhubarbcustard) + starts_with = list( + /obj/item/weapon/reagent_containers/food/snacks/rhubarbcustard = 15, + ) + foldable = null + +/obj/item/weapon/reagent_containers/food/snacks/packaged/porkpie + name = "Pork Pie" + icon_state = "porkpie" + desc = "A pre-packaged pork pie with Desatti Catering branding. Claims to contain real meat covered in pastry!" + package_trash = /obj/item/trash/porkpie + package_open_state = "porkpie_open" + nutriment_amt = 3 + nutriment_desc = list("pastry" = 5, "meat" = 5) + +/obj/item/weapon/reagent_containers/food/snacks/packaged/porkpie/Initialize() + . = ..() + reagents.add_reagent("protein", 2) diff --git a/icons/obj/food_package.dmi b/icons/obj/food_package.dmi index cf22ac48ed..ab8e1c901f 100644 Binary files a/icons/obj/food_package.dmi and b/icons/obj/food_package.dmi differ diff --git a/icons/obj/food_snacks.dmi b/icons/obj/food_snacks.dmi index 6962741815..3761135206 100644 Binary files a/icons/obj/food_snacks.dmi and b/icons/obj/food_snacks.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index e8841c78cc..8866b481c1 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ diff --git a/icons/obj/vending_vr.dmi b/icons/obj/vending_vr.dmi index a11ef2b241..961483a8d2 100644 Binary files a/icons/obj/vending_vr.dmi and b/icons/obj/vending_vr.dmi differ