mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2026-08-23 07:06:33 +01:00
LordMEandGitHub
30d91ed702
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request adds an MRE vendor adds sprites for the food vendors adds MRE vendor to all three station maps, always near the kitchen adds Food vendor to gaia. reorganizes vending machine defines into their own seperate files <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game The reorganizing helps break down the moloch file that was the vending file before. The food vendor was using the boozeomat sprites which made it hard to recognize. the MRE vendor offers the crew an means to get a full meal when there is no kitchen staff. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> 🆑 add: adds an MRE vendor add: adds sprites for the food vendors add: adds MRE vendor to all three station maps, always near the kitchen add: adds Food vendor to gaia. refactor: reorganizes vending machine defines into their own seperate files /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
272 lines
11 KiB
Plaintext
272 lines
11 KiB
Plaintext
/*
|
|
MRE Stuff
|
|
*/
|
|
|
|
/obj/item/storage/single_use/mre
|
|
name = "standard MRE"
|
|
desc = "A vacuum-sealed bag containing a day's worth of nutrients for an adult in strenuous situations. There is no visible expiration date on the package. This one is menu 1, meat pizza."
|
|
icon = 'icons/obj/food.dmi'
|
|
icon_state = "mre"
|
|
max_combined_volume = WEIGHT_VOLUME_SMALL * 7
|
|
max_single_weight_class = WEIGHT_CLASS_SMALL
|
|
starts_with = list(
|
|
/obj/item/storage/single_use/mrebag,
|
|
/obj/item/storage/single_use/mrebag/side,
|
|
/obj/item/storage/single_use/mrebag/dessert,
|
|
/obj/item/storage/fancy/crackers,
|
|
/obj/random/mre/spread,
|
|
/obj/random/mre/drink,
|
|
/obj/random/mre/sauce,
|
|
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
|
|
/obj/item/material/kitchen/utensil/spoon/plastic
|
|
)
|
|
|
|
/obj/item/storage/single_use/mre/menu2
|
|
name = "MRE - Menu 2"
|
|
desc = "A vacuum-sealed bag containing a day's worth of nutrients for an adult in strenuous situations. There is no visible expiration date on the package. This one is menu 2, margherita."
|
|
starts_with = list(
|
|
/obj/item/storage/single_use/mrebag/menu2,
|
|
/obj/item/storage/single_use/mrebag/side,
|
|
/obj/item/storage/single_use/mrebag/dessert,
|
|
/obj/item/storage/fancy/crackers,
|
|
/obj/random/mre/spread,
|
|
/obj/random/mre/drink,
|
|
/obj/random/mre/sauce,
|
|
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
|
|
/obj/item/material/kitchen/utensil/spoon/plastic
|
|
)
|
|
|
|
/obj/item/storage/single_use/mre/menu3
|
|
name = "MRE - Menu 3"
|
|
desc = "A vacuum-sealed bag containing a day's worth of nutrients for an adult in strenuous situations. There is no visible expiration date on the package. This one is menu 3, vegetable pizza."
|
|
starts_with = list(
|
|
/obj/item/storage/single_use/mrebag/menu3,
|
|
/obj/item/storage/single_use/mrebag/side,
|
|
/obj/item/storage/single_use/mrebag/dessert,
|
|
/obj/item/storage/fancy/crackers,
|
|
/obj/random/mre/spread,
|
|
/obj/random/mre/drink,
|
|
/obj/random/mre/sauce,
|
|
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
|
|
/obj/item/material/kitchen/utensil/spoon/plastic
|
|
)
|
|
|
|
/obj/item/storage/single_use/mre/menu4
|
|
name = "MRE - Menu 4"
|
|
desc = "A vacuum-sealed bag containing a day's worth of nutrients for an adult in strenuous situations. There is no visible expiration date on the package. This one is menu 4, hamburger."
|
|
starts_with = list(
|
|
/obj/item/storage/single_use/mrebag/menu4,
|
|
/obj/item/storage/single_use/mrebag/side,
|
|
/obj/item/storage/single_use/mrebag/dessert,
|
|
/obj/item/storage/fancy/crackers,
|
|
/obj/random/mre/spread,
|
|
/obj/random/mre/drink,
|
|
/obj/random/mre/sauce,
|
|
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
|
|
/obj/item/material/kitchen/utensil/spoon/plastic
|
|
)
|
|
|
|
/obj/item/storage/single_use/mre/menu5
|
|
name = "MRE - Menu 5"
|
|
desc = "A vacuum-sealed bag containing a day's worth of nutrients for an adult in strenuous situations. There is no visible expiration date on the package. This one is menu 5, taco."
|
|
starts_with = list(
|
|
/obj/item/storage/single_use/mrebag/menu5,
|
|
/obj/item/storage/single_use/mrebag/side,
|
|
/obj/item/storage/single_use/mrebag/dessert,
|
|
/obj/item/storage/fancy/crackers,
|
|
/obj/random/mre/spread,
|
|
/obj/random/mre/drink,
|
|
/obj/random/mre/sauce,
|
|
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
|
|
/obj/item/material/kitchen/utensil/spoon/plastic
|
|
)
|
|
|
|
/obj/item/storage/single_use/mre/menu6
|
|
name = "MRE - Menu 6"
|
|
desc = "A vacuum-sealed bag containing a day's worth of nutrients for an adult in strenuous situations. There is no visible expiration date on the package. This one is menu 6, meatbread."
|
|
starts_with = list(
|
|
/obj/item/storage/single_use/mrebag/menu6,
|
|
/obj/item/storage/single_use/mrebag/side,
|
|
/obj/item/storage/single_use/mrebag/dessert,
|
|
/obj/item/storage/fancy/crackers,
|
|
/obj/random/mre/spread,
|
|
/obj/random/mre/drink,
|
|
/obj/random/mre/sauce,
|
|
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
|
|
/obj/item/material/kitchen/utensil/spoon/plastic
|
|
)
|
|
|
|
/obj/item/storage/single_use/mre/menu7
|
|
name = "MRE - Menu 7"
|
|
desc = "A vacuum-sealed bag containing a day's worth of nutrients for an adult in strenuous situations. There is no visible expiration date on the package. This one is menu 7, salad."
|
|
starts_with = list(
|
|
/obj/item/storage/single_use/mrebag/menu7,
|
|
/obj/item/storage/single_use/mrebag/side,
|
|
/obj/item/storage/single_use/mrebag/dessert,
|
|
/obj/item/storage/fancy/crackers,
|
|
/obj/random/mre/spread,
|
|
/obj/random/mre/drink,
|
|
/obj/random/mre/sauce,
|
|
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
|
|
/obj/item/material/kitchen/utensil/spoon/plastic
|
|
)
|
|
|
|
/obj/item/storage/single_use/mre/menu8
|
|
name = "MRE - Menu 8"
|
|
desc = "A vacuum-sealed bag containing a day's worth of nutrients for an adult in strenuous situations. There is no visible expiration date on the package. This one is menu 8, hot chili."
|
|
starts_with = list(
|
|
/obj/item/storage/single_use/mrebag/menu8,
|
|
/obj/item/storage/single_use/mrebag/side,
|
|
/obj/item/storage/single_use/mrebag/dessert,
|
|
/obj/item/storage/fancy/crackers,
|
|
/obj/random/mre/spread,
|
|
/obj/random/mre/drink,
|
|
/obj/random/mre/sauce,
|
|
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
|
|
/obj/item/material/kitchen/utensil/spoon/plastic
|
|
)
|
|
|
|
/obj/item/storage/single_use/mre/menu9
|
|
name = "vegan MRE"
|
|
desc = "A vacuum-sealed bag containing a day's worth of nutrients for an adult in strenuous situations. There is no visible expiration date on the package. This one is menu 9, boiled rice (skrell-safe)."
|
|
icon_state = "vegmre"
|
|
starts_with = list(
|
|
/obj/item/storage/single_use/mrebag/menu9,
|
|
/obj/item/storage/single_use/mrebag/side,
|
|
/obj/item/storage/single_use/mrebag/dessert/menu9,
|
|
/obj/item/storage/fancy/crackers,
|
|
/obj/random/mre/spread/vegan,
|
|
/obj/random/mre/drink,
|
|
/obj/random/mre/sauce/vegan,
|
|
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
|
|
/obj/item/material/kitchen/utensil/spoon/plastic
|
|
)
|
|
|
|
/obj/item/storage/single_use/mre/menu10
|
|
name = "protein MRE"
|
|
desc = "A vacuum-sealed bag containing a day's worth of nutrients for an adult in strenuous situations. There is no visible expiration date on the package. This one is menu 10, protein."
|
|
icon_state = "meatmre"
|
|
starts_with = list(
|
|
/obj/item/storage/single_use/mrebag/menu10,
|
|
/obj/item/storage/single_use/mrebag/menu10,
|
|
/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/protein,
|
|
/obj/random/mre/sauce/sugarfree,
|
|
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
|
|
/obj/item/material/kitchen/utensil/spoon/plastic
|
|
)
|
|
|
|
/obj/item/storage/single_use/mre/menu11
|
|
name = "emergency MRE"
|
|
desc = "A vacuum-sealed bag containing a day's worth of nutrients for an adult in strenuous situations. There is no visible expiration date on the package. This one is menu 11, nutriment paste. Only for emergencies."
|
|
icon_state = "crayonmre"
|
|
starts_with = list(
|
|
/obj/item/reagent_containers/food/snacks/liquid,
|
|
/obj/item/reagent_containers/food/snacks/liquid,
|
|
/obj/item/reagent_containers/food/snacks/liquid,
|
|
/obj/item/reagent_containers/food/snacks/liquid,
|
|
/obj/item/reagent_containers/food/snacks/liquid/protein,
|
|
/obj/item/reagent_containers/food/snacks/liquid/protein,
|
|
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
|
|
)
|
|
|
|
/obj/item/storage/single_use/mre/menu12
|
|
name = "crayon MRE"
|
|
desc = "This one doesn't have a menu listing. How very odd."
|
|
icon_state = "crayonmre"
|
|
starts_with = list(
|
|
/obj/item/storage/fancy/crayons,
|
|
/obj/item/storage/single_use/mrebag/dessert/menu11,
|
|
/obj/random/mre/sauce/crayon,
|
|
/obj/random/mre/sauce/crayon,
|
|
/obj/random/mre/sauce/crayon
|
|
)
|
|
|
|
/obj/item/storage/single_use/mre/menu13
|
|
name = "medical MRE"
|
|
desc = "This one is menu 13, vitamin paste & dessert. Only for emergencies."
|
|
icon_state = "crayonmre"
|
|
starts_with = list(
|
|
/obj/item/reagent_containers/food/snacks/liquid/vitamin,
|
|
/obj/item/reagent_containers/food/snacks/liquid/vitamin,
|
|
/obj/item/reagent_containers/food/snacks/liquid/vitamin,
|
|
/obj/item/reagent_containers/food/snacks/liquid/protein,
|
|
/obj/random/mre/drink,
|
|
/obj/item/storage/single_use/mrebag/dessert,
|
|
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
|
|
/obj/item/material/kitchen/utensil/spoon/plastic
|
|
)
|
|
|
|
/obj/item/storage/single_use/mre/random
|
|
desc = "The menu label is faded out."
|
|
starts_with = list(
|
|
/obj/random/mre/main,
|
|
/obj/item/storage/single_use/mrebag/side,
|
|
/obj/item/storage/single_use/mrebag/dessert,
|
|
/obj/item/storage/fancy/crackers,
|
|
/obj/random/mre/spread,
|
|
/obj/random/mre/drink,
|
|
/obj/random/mre/sauce,
|
|
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
|
|
/obj/item/material/kitchen/utensil/spoon/plastic
|
|
)
|
|
|
|
//Subtypes
|
|
/obj/item/storage/single_use/mrebag
|
|
name = "main course"
|
|
desc = "A vacuum-sealed bag containing the MRE's main course. Self-heats when opened."
|
|
icon = 'icons/obj/food.dmi'
|
|
icon_state = "pouch_medium"
|
|
max_items = 1
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
max_single_weight_class = WEIGHT_CLASS_SMALL
|
|
starts_with = list(/obj/item/reagent_containers/food/snacks/slice/meatpizza/filled)
|
|
|
|
|
|
/obj/item/storage/single_use/mrebag/menu2
|
|
starts_with = list(/obj/item/reagent_containers/food/snacks/slice/margherita/filled)
|
|
|
|
/obj/item/storage/single_use/mrebag/menu3
|
|
starts_with = list(/obj/item/reagent_containers/food/snacks/slice/vegetablepizza/filled)
|
|
|
|
/obj/item/storage/single_use/mrebag/menu4
|
|
starts_with = list(/obj/item/reagent_containers/food/snacks/monkeyburger)
|
|
|
|
/obj/item/storage/single_use/mrebag/menu5
|
|
starts_with = list(/obj/item/reagent_containers/food/snacks/taco)
|
|
|
|
/obj/item/storage/single_use/mrebag/menu6
|
|
starts_with = list(/obj/item/reagent_containers/food/snacks/slice/meatbread/filled)
|
|
|
|
/obj/item/storage/single_use/mrebag/menu7
|
|
starts_with = list(/obj/item/reagent_containers/food/snacks/tossedsalad)
|
|
|
|
/obj/item/storage/single_use/mrebag/menu8
|
|
starts_with = list(/obj/item/reagent_containers/food/snacks/hotchili)
|
|
|
|
/obj/item/storage/single_use/mrebag/menu9
|
|
starts_with = list(/obj/item/reagent_containers/food/snacks/boiledrice)
|
|
|
|
/obj/item/storage/single_use/mrebag/menu10
|
|
starts_with = list(/obj/item/reagent_containers/food/snacks/meatcube)
|
|
|
|
/obj/item/storage/single_use/mrebag/side
|
|
name = "side dish"
|
|
desc = "A vacuum-sealed bag containing the MRE's side dish. Self-heats when opened."
|
|
icon_state = "pouch_small"
|
|
starts_with = list(/obj/random/mre/side)
|
|
|
|
/obj/item/storage/single_use/mrebag/side/menu10
|
|
starts_with = list(/obj/item/reagent_containers/food/snacks/meatcube)
|
|
|
|
/obj/item/storage/single_use/mrebag/dessert
|
|
name = "dessert"
|
|
desc = "A vacuum-sealed bag containing the MRE's dessert."
|
|
icon_state = "pouch_small"
|
|
starts_with = list(/obj/random/mre/dessert)
|
|
|
|
/obj/item/storage/single_use/mrebag/dessert/menu9
|
|
starts_with = list(/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit)
|
|
/obj/item/storage/single_use/mrebag/dessert/menu11
|
|
starts_with = list(/obj/item/pen/crayon/rainbow)
|