From 68e1c85288bf0f369875993122db29813755ac89 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Tue, 20 Feb 2024 16:55:50 +0800 Subject: [PATCH] MRECommit --- .../vendor_types/squad_prep/squad_prep.dm | 2 +- code/game/objects/items/storage/boxes.dm | 17 +++++++++++++++++ .../projectiles/ammo_boxes/misc_boxes.dm | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 2736de3a981d..cf57d9d7cfaa 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -305,7 +305,7 @@ /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad/populate_product_list(scale) listed_products = list( list("FOOD", -1, null, null), - list("MRE", round(scale * 5), /obj/item/storage/box/MRE, VENDOR_ITEM_REGULAR), + list("MRE", round(scale * 5), /obj/item/storage/box/MRE/nofluff, VENDOR_ITEM_REGULAR), list("MRE Box", round(scale * 1), /obj/item/ammo_box/magazine/misc/mre, VENDOR_ITEM_REGULAR), list("TOOLS", -1, null, null), diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 8e4ffb90d2bd..b96d58f251a5 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -762,6 +762,23 @@ isopened = 1 icon_state = "mealpackopened" +/obj/item/storage/box/MRE/nofluff + +/obj/item/storage/box/MRE/nofluff/fill_preset_inventory() + pickfluffflavor() + +/obj/item/storage/box/MRE/nofluff/proc/pickfluffflavor() + var/main = pick("boneless pork ribs", "grilled chicken", "pizza square", "spaghetti chunks", "chicken tender") + var/second = pick("cracker", "cheese spread", "rice onigiri", "mashed potatoes", "risotto") + var/side = pick("biscuit", "meatballs", "pretzels", "peanuts", "sushi") + var/desert = pick("spiced apples", "chocolate brownie", "sugar cookie", "coco bar", "flan", "honey flan") + name = "[initial(name)] ([main])" + //1 in 3 chance of getting a fortune cookie + new /obj/item/reagent_container/food/snacks/packaged_meal(src, main) + new /obj/item/reagent_container/food/snacks/packaged_meal(src, second) + new /obj/item/reagent_container/food/snacks/packaged_meal(src, side) + new /obj/item/reagent_container/food/snacks/packaged_meal(src, desert) + //food boxes for storage in bulk //meat diff --git a/code/modules/projectiles/ammo_boxes/misc_boxes.dm b/code/modules/projectiles/ammo_boxes/misc_boxes.dm index 7b19555f4de5..9706fd5eec68 100644 --- a/code/modules/projectiles/ammo_boxes/misc_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/misc_boxes.dm @@ -58,7 +58,7 @@ /obj/item/ammo_box/magazine/misc/mre name = "\improper box of MREs" desc = "A box of MREs. Nutritious, but not delicious." - magazine_type = /obj/item/storage/box/MRE + magazine_type = /obj/item/storage/box/MRE/nofluff num_of_magazines = 12 overlay_content = "_mre"