Skip to content

Commit

Permalink
MRECommit
Browse files Browse the repository at this point in the history
  • Loading branch information
Steelpoint committed Feb 20, 2024
1 parent 2b9e7ac commit 68e1c85
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
17 changes: 17 additions & 0 deletions code/game/objects/items/storage/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/ammo_boxes/misc_boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 68e1c85

Please sign in to comment.