cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 17:42:26 +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

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)