cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-07 07:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ports MREs from Baystation (#6424)

Browse Source 
* Ports MREs from Baystation

- Ports MREs from Baystation
- Adds an 'Emergency ration' that contains liquidfood rations
- Two new ration packs that have the new rations.

* Placates travis

* Lynxlog

* Adds liquidprotein rations

* Sacrifice for travis

* Changes desc

* Fixing missing filling in crayon paste

* Fixes missing side for random rations

* Renames Paste Supplypack

* aaaaa minor error

* Slight organization

* Fixes some errors

* Why am I like this
This commit is contained in:
Novacat
2019-08-31 18:00:14 -04:00
committed by Atermonera
parent 9b5573eee6
commit 7f49c680e5
14 changed files with 827 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/trash.dm
View File

@@ -76,6 +76,10 @@
name = "\improper \"LiquidFood\" ration"
icon_state = "liquidfood"
/obj/item/trash/liquidprotein
name = "\improper \"LiquidProtein\" ration"
icon_state = "liquidprotein"
/obj/item/trash/tastybread
name = "bread tube"
icon_state = "tastybread"

18
code/game/objects/items/weapons/storage/fancy.dm
View File

@@ -67,6 +67,7 @@
item_state = "candlebox5"
throwforce = 2
slot_flags = SLOT_BELT
max_storage_space = ITEMSIZE_COST_SMALL * 5
starts_with = list(/obj/item/weapon/flame/candle = 5)
/obj/item/weapon/storage/fancy/whitecandle_box
@@ -78,6 +79,7 @@
item_state = "whitecandlebox5"
throwforce = 2
slot_flags = SLOT_BELT
max_storage_space = ITEMSIZE_COST_SMALL * 5
starts_with = list(/obj/item/weapon/flame/candle/white = 5)
/obj/item/weapon/storage/fancy/blackcandle_box
@@ -89,6 +91,7 @@
item_state = "blackcandlebox5"
throwforce = 2
slot_flags = SLOT_BELT
max_storage_space = ITEMSIZE_COST_SMALL * 5
starts_with = list(/obj/item/weapon/flame/candle/black = 5)
@@ -179,6 +182,21 @@
return
..()
/*
* Cracker Packet
*/
/obj/item/weapon/storage/fancy/crackers
name = "\improper Getmore Crackers"
icon = 'icons/obj/food.dmi'
icon_state = "crackerbox"
icon_type = "cracker"
max_storage_space = ITEMSIZE_COST_TINY * 6
max_w_class = ITEMSIZE_TINY
w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/cracker)
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/cracker = 6)
////////////
//CIG PACK//
////////////

276
code/game/objects/items/weapons/storage/mre.dm Normal file
View File

@@ -0,0 +1,276 @@
/*
MRE Stuff
*/
/obj/item/weapon/storage/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."
icon = 'icons/obj/food.dmi'
icon_state = "mre"
max_storage_space = ITEMSIZE_COST_SMALL * 6
max_w_class = ITEMSIZE_SMALL
var/opened = FALSE
var/meal_desc = "This one is menu 1, meat pizza."
starts_with = list(
/obj/item/weapon/storage/mrebag,
/obj/item/weapon/storage/mrebag/side,
/obj/item/weapon/storage/mrebag/dessert,
/obj/item/weapon/storage/fancy/crackers,
/obj/random/mre/spread,
/obj/random/mre/drink,
/obj/random/mre/sauce,
/obj/item/weapon/material/kitchen/utensil/spoon/plastic
)
/obj/item/weapon/storage/mre/examine(mob/user)
. = ..()
to_chat(user, meal_desc)
/obj/item/weapon/storage/mre/update_icon()
if(opened)
icon_state = "[initial(icon_state)][opened]"
. = ..()
/obj/item/weapon/storage/mre/attack_self(mob/user)
open(user)
/obj/item/weapon/storage/mre/open(mob/user)
if(!opened)
to_chat(usr, "<span class='notice'>You tear open the bag, breaking the vacuum seal.</span>")
opened = 1
update_icon()
. = ..()
/obj/item/weapon/storage/mre/menu2
meal_desc = "This one is menu 2, margherita."
starts_with = list(
/obj/item/weapon/storage/mrebag/menu2,
/obj/item/weapon/storage/mrebag/side,
/obj/item/weapon/storage/mrebag/dessert,
/obj/item/weapon/storage/fancy/crackers,
/obj/random/mre/spread,
/obj/random/mre/drink,
/obj/random/mre/sauce,
/obj/item/weapon/material/kitchen/utensil/spoon/plastic
)
/obj/item/weapon/storage/mre/menu3
meal_desc = "This one is menu 3, vegetable pizza."
starts_with = list(
/obj/item/weapon/storage/mrebag/menu3,
/obj/item/weapon/storage/mrebag/side,
/obj/item/weapon/storage/mrebag/dessert,
/obj/item/weapon/storage/fancy/crackers,
/obj/random/mre/spread,
/obj/random/mre/drink,
/obj/random/mre/sauce,
/obj/item/weapon/material/kitchen/utensil/spoon/plastic
)
/obj/item/weapon/storage/mre/menu4
meal_desc = "This one is menu 4, hamburger."
starts_with = list(
/obj/item/weapon/storage/mrebag/menu4,
/obj/item/weapon/storage/mrebag/side,
/obj/item/weapon/storage/mrebag/dessert,
/obj/item/weapon/storage/fancy/crackers,
/obj/random/mre/spread,
/obj/random/mre/drink,
/obj/random/mre/sauce,
/obj/item/weapon/material/kitchen/utensil/spoon/plastic
)
/obj/item/weapon/storage/mre/menu5
meal_desc = "This one is menu 5, taco."
starts_with = list(
/obj/item/weapon/storage/mrebag/menu5,
/obj/item/weapon/storage/mrebag/side,
/obj/item/weapon/storage/mrebag/dessert,
/obj/item/weapon/storage/fancy/crackers,
/obj/random/mre/spread,
/obj/random/mre/drink,
/obj/random/mre/sauce,
/obj/item/weapon/material/kitchen/utensil/spoon/plastic
)
/obj/item/weapon/storage/mre/menu6
meal_desc = "This one is menu 6, meatbread."
starts_with = list(
/obj/item/weapon/storage/mrebag/menu6,
/obj/item/weapon/storage/mrebag/side,
/obj/item/weapon/storage/mrebag/dessert,
/obj/item/weapon/storage/fancy/crackers,
/obj/random/mre/spread,
/obj/random/mre/drink,
/obj/random/mre/sauce,
/obj/item/weapon/material/kitchen/utensil/spoon/plastic
)
/obj/item/weapon/storage/mre/menu7
meal_desc = "This one is menu 7, salad."
starts_with = list(
/obj/item/weapon/storage/mrebag/menu7,
/obj/item/weapon/storage/mrebag/side,
/obj/item/weapon/storage/mrebag/dessert,
/obj/item/weapon/storage/fancy/crackers,
/obj/random/mre/spread,
/obj/random/mre/drink,
/obj/random/mre/sauce,
/obj/item/weapon/material/kitchen/utensil/spoon/plastic
)
/obj/item/weapon/storage/mre/menu8
meal_desc = " This one is menu 8, hot chili."
starts_with = list(
/obj/item/weapon/storage/mrebag/menu8,
/obj/item/weapon/storage/mrebag/side,
/obj/item/weapon/storage/mrebag/dessert,
/obj/item/weapon/storage/fancy/crackers,
/obj/random/mre/spread,
/obj/random/mre/drink,
/obj/random/mre/sauce,
/obj/item/weapon/material/kitchen/utensil/spoon/plastic
)
/obj/item/weapon/storage/mre/menu9
name = "vegan MRE"
meal_desc = "This one is menu 9, boiled rice (skrell-safe)."
icon_state = "vegmre"
starts_with = list(
/obj/item/weapon/storage/mrebag/menu9,
/obj/item/weapon/storage/mrebag/side,
/obj/item/weapon/storage/mrebag/dessert/menu9,
/obj/item/weapon/storage/fancy/crackers,
/obj/random/mre/spread/vegan,
/obj/random/mre/drink,
/obj/random/mre/sauce/vegan,
/obj/item/weapon/material/kitchen/utensil/spoon/plastic
)
/obj/item/weapon/storage/mre/menu10
name = "protein MRE"
meal_desc = "This one is menu 10, protein."
icon_state = "meatmre"
starts_with = list(
/obj/item/weapon/storage/mrebag/menu10,
/obj/item/weapon/storage/mrebag/menu10,
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/protein,
/obj/random/mre/sauce/sugarfree,
/obj/item/weapon/material/kitchen/utensil/spoon/plastic
)
/obj/item/weapon/storage/mre/menu11
name = "emergency MRE"
meal_desc = "This one is menu 11, nutriment paste. Only for emergencies."
icon_state = "crayonmre"
starts_with = list(
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
)
/obj/item/weapon/storage/mre/menu12
name = "crayon MRE"
meal_desc = "This one doesn't have a menu listing. How very odd."
icon_state = "crayonmre"
starts_with = list(
/obj/item/weapon/storage/fancy/crayons,
/obj/item/weapon/storage/mrebag/dessert/menu11,
/obj/random/mre/sauce/crayon,
/obj/random/mre/sauce/crayon,
/obj/random/mre/sauce/crayon
)
/obj/item/weapon/storage/mre/random
meal_desc = "The menu label is faded out."
starts_with = list(
/obj/random/mre/main,
/obj/item/weapon/storage/mrebag/side,
/obj/item/weapon/storage/mrebag/dessert,
/obj/item/weapon/storage/fancy/crackers,
/obj/random/mre/spread,
/obj/random/mre/drink,
/obj/random/mre/sauce,
/obj/item/weapon/material/kitchen/utensil/spoon/plastic
)
/obj/item/weapon/storage/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"
storage_slots = 1
w_class = ITEMSIZE_SMALL
max_w_class = ITEMSIZE_SMALL
var/opened = FALSE
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza/filled)
/obj/item/weapon/storage/mrebag/Initialize()
. = ..()
/obj/item/weapon/storage/mrebag/update_icon()
if(opened)
icon_state = "[initial(icon_state)][opened]"
. = ..()
/obj/item/weapon/storage/mrebag/attack_self(mob/user)
open(user)
/obj/item/weapon/storage/mrebag/open(mob/user)
if(!opened)
to_chat(usr, "<span class='notice'>The pouch heats up as you break the vaccum seal.</span>")
opened = 1
update_icon()
. = ..()
/obj/item/weapon/storage/mrebag/menu2
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/slice/margherita/filled)
/obj/item/weapon/storage/mrebag/menu3
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza/filled)
/obj/item/weapon/storage/mrebag/menu4
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeyburger)
/obj/item/weapon/storage/mrebag/menu5
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/taco)
/obj/item/weapon/storage/mrebag/menu6
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/slice/meatbread/filled)
/obj/item/weapon/storage/mrebag/menu7
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/tossedsalad)
/obj/item/weapon/storage/mrebag/menu8
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/hotchili)
/obj/item/weapon/storage/mrebag/menu9
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/boiledrice)
/obj/item/weapon/storage/mrebag/menu10
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/meatcube)
/obj/item/weapon/storage/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/weapon/storage/mrebag/side/menu10
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/meatcube)
/obj/item/weapon/storage/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/weapon/storage/mrebag/dessert/menu9
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit)
/obj/item/weapon/storage/mrebag/dessert/menu11
starts_with = list(/obj/item/weapon/pen/crayon/rainbow)

147
code/game/objects/random/misc.dm
View File

@@ -540,3 +540,150 @@
var/possible_object_paths = list(/obj/item/weapon/paper/carbon/cursedform)
possible_object_paths |= subtypesof(/obj/item/clothing/head/psy_crown)
return pick(possible_object_paths)
//Random MRE stuff
/obj/random/mre
name = "random MRE"
desc = "This is a random single MRE."
icon = 'icons/obj/food.dmi'
icon_state = "mre"
drop_get_turf = FALSE
/obj/random/mre/item_to_spawn()
return pick(/obj/item/weapon/storage/mre,
/obj/item/weapon/storage/mre/menu2,
/obj/item/weapon/storage/mre/menu3,
/obj/item/weapon/storage/mre/menu4,
/obj/item/weapon/storage/mre/menu5,
/obj/item/weapon/storage/mre/menu6,
/obj/item/weapon/storage/mre/menu7,
/obj/item/weapon/storage/mre/menu8,
/obj/item/weapon/storage/mre/menu9,
/obj/item/weapon/storage/mre/menu10)
/obj/random/mre/main
name = "random MRE main course"
desc = "This is a random main course for MREs."
icon_state = "pouch"
drop_get_turf = FALSE
/obj/random/mre/main/item_to_spawn()
return pick(/obj/item/weapon/storage/mrebag,
/obj/item/weapon/storage/mrebag/menu2,
/obj/item/weapon/storage/mrebag/menu3,
/obj/item/weapon/storage/mrebag/menu4,
/obj/item/weapon/storage/mrebag/menu5,
/obj/item/weapon/storage/mrebag/menu6,
/obj/item/weapon/storage/mrebag/menu7,
/obj/item/weapon/storage/mrebag/menu8)
/obj/random/mre/side
name = "random MRE side dish"
desc = "This is a random side dish for MREs."
icon_state = "pouch"
drop_get_turf = FALSE
/obj/random/mre/side/item_to_spawn()
return pick(/obj/item/weapon/reagent_containers/food/snacks/tossedsalad,
/obj/item/weapon/reagent_containers/food/snacks/boiledrice,
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel,
/obj/item/weapon/reagent_containers/food/snacks/twobread,
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast)
/obj/random/mre/dessert
name = "random MRE dessert"
desc = "This is a random dessert for MREs."
icon_state = "pouch"
drop_get_turf = FALSE
/obj/random/mre/dessert/item_to_spawn()
return pick(/obj/item/weapon/reagent_containers/food/snacks/candy,
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,
/obj/item/weapon/reagent_containers/food/snacks/donut/normal,
/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
/obj/item/weapon/reagent_containers/food/snacks/cookie)
/obj/random/mre/dessert/vegan
name = "random vegan MRE dessert"
desc = "This is a random vegan dessert for MREs."
/obj/random/mre/dessert/vegan/item_to_spawn()
return pick(/obj/item/weapon/reagent_containers/food/snacks/candy,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly,
/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit)
/obj/random/mre/drink
name = "random MRE drink"
desc = "This is a random drink for MREs."
icon_state = "packet"
drop_get_turf = FALSE
/obj/random/mre/drink/item_to_spawn()
return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/coffee,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/tea,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/cocoa,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/grape,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/orange,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/watermelon,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/apple)
/obj/random/mre/spread
name = "random MRE spread"
desc = "This is a random spread packet for MREs."
icon_state = "packet"
drop_get_turf = FALSE
/obj/random/mre/spread/item_to_spawn()
return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/jelly,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/honey)
/obj/random/mre/spread/vegan
name = "random vegan MRE spread"
desc = "This is a random vegan spread packet for MREs"
/obj/random/mre/spread/vegan/item_to_spawn()
return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/jelly)
/obj/random/mre/sauce
name = "random MRE sauce"
desc = "This is a random sauce packet for MREs."
icon_state = "packet"
drop_get_turf = FALSE
/obj/random/mre/sauce/item_to_spawn()
return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/salt,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/pepper,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/sugar,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/capsaicin,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/ketchup,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/mayo,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/soy)
/obj/random/mre/sauce/vegan/item_to_spawn()
return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/salt,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/pepper,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/sugar,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/soy)
/obj/random/mre/sauce/sugarfree/item_to_spawn()
return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/salt,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/pepper,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/capsaicin,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/ketchup,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/mayo,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/soy)
/obj/random/mre/sauce/crayon/item_to_spawn()
return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/generic,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/red,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/orange,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/yellow,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/green,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/blue,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/purple,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/grey,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/brown)

2
code/game/objects/structures/crates_lockers/crates.dm
View File

@@ -343,7 +343,7 @@
desc = "A crate of emergency rations."
starts_with = list(
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 4)
/obj/random/mre = 6)
/obj/structure/closet/crate/bin