Skip to content

Commit

Permalink
removed a bunch of supply crate that where double
Browse files Browse the repository at this point in the history 
and added a surplus ingredient crate in ASRS
  • Loading branch information
Julien committed Oct 6, 2023
1 parent 9395d08 commit f4273ad
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 172 deletions.
5 changes: 5 additions & 0 deletions code/datums/ASRS.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,8 @@
buyable = 0
group = "ASRS"
cost = ASRS_VERY_LOW_WEIGHT

/datum/supply_packs/ingredient/asrs
buyable = 0
group = "ASRS"
cost = ASRS_LOW_WEIGHT
204 changes: 33 additions & 171 deletions code/datums/supply_packs/food.dm
View file
Original file line number Diff line number Diff line change
@@ -1,144 +1,47 @@
//Food.Regrouping all the ASRS crate related to food here.

//All the ingredients that you can grown.

/datum/supply_packs/potato
name = "Potatoes(x20)"
contains = list(
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
)
cost = 10
containertype = /obj/structure/closet/crate/freezer
containername = "\improper Potato crate"
group = "Food"

/datum/supply_packs/tomato
name = "tomato (x20)"
contains = list(
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
)
cost = 10
containertype = /obj/structure/closet/crate/freezer
containername = "\improper Tomato crate"
group = "Food"

/datum/supply_packs/wheat
name = "wheat (x20)"
contains = list(
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
/obj/item/reagent_container/food/snacks/grown/wheat,
)
cost = 10
containertype = /obj/structure/closet/crate/freezer
containername = "\improper Wheat crate"
group = "Food"

//All the meats

/datum/supply_packs/meat
name = "meat(x5)"
contains = list(
/obj/item/reagent_container/food/snacks/meat,
/obj/item/reagent_container/food/snacks/meat,
/obj/item/reagent_container/food/snacks/meat,
/obj/item/reagent_container/food/snacks/meat,
/obj/item/reagent_container/food/snacks/meat,
)
cost = 10
containertype = /obj/structure/closet/crate/freezer
containername = "\improper meat crate"
group = "Food"

/datum/supply_packs/carp_fillet
name = "carp fillet (x5)"
contains = list(
/obj/item/reagent_container/food/snacks/carpmeat,
/obj/item/reagent_container/food/snacks/carpmeat,
/obj/item/reagent_container/food/snacks/carpmeat,
/obj/item/reagent_container/food/snacks/carpmeat,
/obj/item/reagent_container/food/snacks/carpmeat,
)
cost = 10
containertype = /obj/structure/closet/crate/freezer
containername = "\improper carp filet crate"
group = "Food"

//all the condiment type items

/datum/supply_packs/condiment
name = "crate of condiments"
// crate of random ingredient that you can buy in vendor in kitchen
/datum/supply_packs/ingredient
name = "surplus boxes of ingredients(x6 boxes)"
randomised_num_contained = 6
contains = list(
/obj/item/reagent_container/food/condiment/enzyme,
/obj/item/reagent_container/food/condiment/sugar,
/obj/item/reagent_container/food/condiment/saltshaker,
/obj/item/reagent_container/food/condiment/peppermill,
/obj/item/storage/fancy/egg_box,
/obj/item/storage/box/fish,
/obj/item/storage/box/meat,
/obj/item/storage/box/milk,
/obj/item/storage/box/soymilk,
/obj/item/storage/box/enzyme,
/obj/item/storage/box/flour,
/obj/item/storage/box/sugar,
/obj/item/storage/box/apple,
/obj/item/storage/box/banana,
/obj/item/storage/box/chanterelle,
/obj/item/storage/box/cherries,
/obj/item/storage/box/chili,
/obj/item/storage/box/cabbage,
/obj/item/storage/box/carrot,
/obj/item/storage/box/corn,
/obj/item/storage/box/eggplant,
/obj/item/storage/box/lemon,
/obj/item/storage/box/lime,
/obj/item/storage/box/orange,
/obj/item/storage/box/potato,
/obj/item/storage/box/tomato,
/obj/item/storage/box/whitebeet,
/obj/item/reagent_container/food/condiment/hotsauce/cholula,
/obj/item/reagent_container/food/condiment/hotsauce/franks,
/obj/item/reagent_container/food/condiment/hotsauce/sriracha,
/obj/item/reagent_container/food/condiment/hotsauce/tabasco,
/obj/item/reagent_container/food/drinks/bottle/whiskey,
/obj/item/reagent_container/food/drinks/bottle/tequila,
/obj/item/reagent_container/food/drinks/bottle/rum,
/obj/item/reagent_container/food/drinks/bottle/wine,
)
cost = 10
containertype = /obj/structure/closet/crate/freezer
containername = "\improper crate of condiment"
containername = "\improper surplus of ingredients crate"
group = "Food"

//all the finish snacks.
//all the finish snacks.

/datum/supply_packs/donuts
name = "box of donuts (x5)"
Expand All @@ -165,47 +68,6 @@
containername = "\improper USCM MRE crate(x2)"
group = "Food"

/datum/supply_packs/funfood
name = "special ingredients crate (x6)"
randomised_num_contained = 6
contains = list(
/obj/item/reagent_container/food/condiment/enzyme,
/obj/item/reagent_container/food/condiment/saltshaker,
/obj/item/reagent_container/food/condiment/saltshaker,
/obj/item/reagent_container/food/condiment/saltshaker,
/obj/item/reagent_container/food/condiment/peppermill,
/obj/item/reagent_container/food/condiment/peppermill,
/obj/item/reagent_container/food/condiment/peppermill,
/obj/item/reagent_container/food/condiment/sugar,
/obj/item/reagent_container/food/condiment/sugar,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/grown/potato,
/obj/item/reagent_container/food/snacks/mint,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/tomato,
/obj/item/reagent_container/food/snacks/grown/carrot,
/obj/item/reagent_container/food/snacks/grown/carrot,
/obj/item/reagent_container/food/snacks/grown/lemon,
/obj/item/reagent_container/food/snacks/grown/lemon,
/obj/item/reagent_container/food/snacks/grown/orange,
/obj/item/reagent_container/food/snacks/grown/orange,
/obj/item/reagent_container/food/snacks/grown/lime,
/obj/item/reagent_container/food/snacks/grown/lime,
/obj/item/reagent_container/food/drinks/bottle/whiskey,
/obj/item/reagent_container/food/drinks/bottle/tequila,
/obj/item/reagent_container/food/drinks/bottle/rum,
/obj/item/reagent_container/food/drinks/bottle/wine,
/obj/item/reagent_container/food/drinks/bottle/wine,
/obj/item/reagent_container/food/drinks/bottle/wine,
)
cost = 10
containertype = /obj/structure/closet/crate/freezer
containername = "\improper Special ingredients crate"
group = "Food"

/datum/supply_packs/pizzas
name = "pizza ready-to-eat (x3)"
contains = list(
Expand Down
8 changes: 7 additions & 1 deletion code/game/machinery/vending/vending_types.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,11 +445,14 @@
/obj/item/storage/fancy/egg_box = 12,
/obj/item/storage/box/fish = 12,
/obj/item/storage/box/meat = 12,
/obj/item/storage/box/milk =12,
/obj/item/storage/box/milk = 12,
/obj/item/storage/box/soymilk = 12,
/obj/item/storage/box/enzyme = 12,
/obj/item/storage/box/flour = 12,
/obj/item/storage/box/sugar = 12,
/obj/item/storage/box/saltshaker = 12,
/obj/item/storage/box/peppermill = 12,
/obj/item/storage/box/mint = 12,
/obj/item/storage/box/apple = 12,
/obj/item/storage/box/banana = 12,
/obj/item/storage/box/chanterelle = 12,
Expand All @@ -476,6 +479,9 @@
/obj/item/storage/box/enzyme = 1,
/obj/item/storage/box/flour = 1,
/obj/item/storage/box/sugar = 1,
/obj/item/storage/box/saltshaker = 1,
/obj/item/storage/box/peppermill = 1,
/obj/item/storage/box/mint = 1,
/obj/item/storage/box/apple = 1,
/obj/item/storage/box/banana = 2,
/obj/item/storage/box/chanterelle = 2,
Expand Down
24 changes: 24 additions & 0 deletions code/game/objects/items/storage/boxes.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,30 @@
for(var/i = 0, i < 7, i++)
new /obj/item/reagent_container/food/condiment/sugar(src)

//saltshaker
/obj/item/storage/box/saltshaker
name = "\improper Saltshaker Box"

/obj/item/storage/box/saltshaker/fill_preset_inventory()
for(var/i = 0, i < 7, i++)
new /obj/item/reagent_container/food/condiment/saltshaker(src)

//peppermill
/obj/item/storage/box/peppermill
name = "\improper Peppermill Box"

/obj/item/storage/box/peppermill/fill_preset_inventory()
for(var/i = 0, i < 7, i++)
/obj/item/reagent_container/food/condiment/peppermill(src)

Check failure on line 840 in code/game/objects/items/storage/boxes.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

got '(', expected one of: path separator, '{', operator, field access, ';'

//mint
/obj/item/storage/box/mint
name = "\improper Mint Box"

/obj/item/storage/box/mint/fill_preset_inventory()
for(var/i = 0, i < 7, i++)
/obj/item/reagent_container/food/snacks/mint(src)

Check failure on line 848 in code/game/objects/items/storage/boxes.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

got '(', expected one of: path separator, '{', operator, field access, ';'

// ORGANICS

//apple
Expand Down

0 comments on commit f4273ad

Please sign in to comment.