Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Auto Delete Foodless MREs #5761

Merged
merged 6 commits into from
Apr 7, 2024
Merged

Auto Delete Foodless MREs #5761

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
68e1c85
MRECommit
Feb 20, 2024
ff63797
Update boxes.dm
Steelpoint Apr 6, 2024
c593f4f
Update squad_prep.dm
Steelpoint Apr 6, 2024
ed43c76
Update boxes.dm
Steelpoint Apr 6, 2024
9759140
Update misc_boxes.dm
Steelpoint Apr 6, 2024
1fc8846
Update code/game/objects/items/storage/boxes.dm
Steelpoint Apr 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
View file
Open in desktop
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),
Steelpoint marked this conversation as resolved.
Show resolved Hide resolved

list("TOOLS", -1, null, null),
Expand Down
17 changes: 17 additions & 0 deletions code/game/objects/items/storage/boxes.dm
View file
Open in desktop
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
View file
Open in desktop
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
Loading