From 1639a7002a9979bb69b7e529505699876214b427 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Wed, 31 Jul 2019 21:02:12 +0200 Subject: [PATCH] Adds in a stereotypical vegetarian MRE. Tweaks the rest. --- code/game/objects/items/storage/boxes.dm | 23 +++++++++++++++++++++-- code/modules/cargo/packs.dm | 3 ++- icons/obj/storage.dmi | Bin 66090 -> 66093 bytes 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 5a4d85885b..1d8f2d1fb4 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -1131,6 +1131,7 @@ name = "Nanotrasen MRE Ration Kit Menu 0" desc = "A package containing food suspended in an outdated bluespace pocket which lasts for centuries. If you're lucky you may even be able to enjoy the meal without getting food poisoning." icon_state = "mre" + illustration = null var/can_expire = TRUE var/spawner_chance = 2 var/expiration_date @@ -1184,7 +1185,7 @@ /obj/item/storage/box/mre/menu3 name = "\improper Nanotrasen MRE Ration Kit Menu 3" - desc = "The holy grail of MREs. This item contains the fabled MRE pizza and a sample of coffee instant type 2. Any NT employee lucky enough to get their hands on one of these is truly blessed." + desc = "The holy grail of MREs. This item contains the fabled MRE pizza, spicy nachos and a sample of coffee instant type 2. Any NT employee lucky enough to get their hands on one of these is truly blessed." icon_state = "menu3" can_expire = FALSE //always fresh, never expired. spawner_chance = 1 @@ -1192,11 +1193,29 @@ /obj/item/storage/box/mre/menu3/PopulateContents() new /obj/item/reagent_containers/food/snacks/pizzaslice/pepperoni(src) new /obj/item/reagent_containers/food/snacks/breadslice/plain(src) - new /obj/item/reagent_containers/food/snacks/cheesewedge(src) + new /obj/item/reagent_containers/food/snacks/cubannachos(src) new /obj/item/reagent_containers/food/snacks/grown/chili(src) new /obj/item/reagent_containers/food/drinks/coffee/type2(src) new /obj/item/tank/internals/emergency_oxygen(src) +/obj/item/storage/box/mre/menu4 + name = "\improper Nanotrasen MRE Ration Kit Menu 4" + +/obj/item/storage/box/mre/menu4/safe + spawner_chance = 0 + desc = "A package containing food suspended in a bluespace pocket capable of lasting till the end of time." + can_expire = FALSE + +/obj/item/storage/box/mre/menu4/PopulateContents() + if(prob(66)) + new /obj/item/reagent_containers/food/snacks/salad/boiledrice(src) + else + /obj/item/reagent_containers/food/snacks/salad/ricebowl(src) + new /obj/item/reagent_containers/food/snacks/burger/tofu(src) + new /obj/item/reagent_containers/food/snacks/salad/fruit(src) + new /obj/item/reagent_containers/food/snacks/cracker(src) + new /obj/item/tank/internals/emergency_oxygen(src) + //Where do I put this? /obj/item/secbat name = "Secbat box" diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 53a8ab42c3..061813b590 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2006,7 +2006,8 @@ /obj/item/storage/box/mre/menu1/safe, /obj/item/storage/box/mre/menu2/safe, /obj/item/storage/box/mre/menu2/safe, - /obj/item/storage/box/mre/menu3) + /obj/item/storage/box/mre/menu3, + /obj/item/storage/box/mre/menu4/safe) crate_name = "MRE crate (emergency rations)" /datum/supply_pack/organic/pizza diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 2a6ec3955ac85c5e2f692d9f2faff015567c270d..066842f08922a57f17e398d373d699f3ae802a56 100644 GIT binary patch delta 4548 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 b?!j5WASYokC3Q6eL<_gI4Yf+qw$J|$6kVoK delta 4545 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 ZL9WR7T7Cu1=M1`B_cb2etA*P}{T~K!%5VSx