Skip to content

Commit

Permalink
added a file to handle the fridges in kitchen on almayer and added a …
Browse files Browse the repository at this point in the history 
…bunch of food boxes. (#4586)

# About the pull request
i wanted to make it more clear code wise and separating the fridge used
on colony and other places from main kitchen.
the food boxes are there to help make stock version having less item
into them and make it cleaner.
made two version of each fridge on that hold less for the front kitchen
and one for the stock in the back room that hold way more.
remove a bunch of food crate that are duplicate with the vendor.
add a vendor that sell boxes of ingredients.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
better organization for kitchen and separation from other fridge allow
to not add item on top of fridge if you want to give him more...
cook will now be able to buy directly will hydroponic will stay viable
and they are still able to order or receive supply from req..

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: Added a lot's of food boxes for that hold the basic ingredients for
cooking.
add: Added a file to handle the fridges in almayer kitchen.
add: Added a vendor in the kitchen that sell boxes of ingredients.
add: Added a a food crate called surplus boxes ingredient containing
random boxes of ingredients.
add: Added a version of this crate that will be freely given via the ASR
system.
/:cl:

---------

Co-authored-by: Julien <[email protected]>
  • Loading branch information
@Huffie56
Huffie56 and Julien authored Nov 29, 2023
1 parent 2f48db4 commit 3f79ad3
Show file tree
Hide file tree
Showing 7 changed files with 3,602 additions and 3,302 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
66 changes: 66 additions & 0 deletions code/game/machinery/vending/vending_types.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,3 +447,69 @@
/obj/item/tool/pen/fountain = 30,
)
product_type = VENDOR_PRODUCT_TYPE_RECREATIONAL

//vendor of ingredients for kitchen
/obj/structure/machinery/vending/ingredients
name = "\improper Galley Auxiliary Storage Requisition System"
desc = "A vending machine meant to be use for cooks."
product_ads = "If your out of ingredients i am here for you;all my organic produce are fresh;don't let my potatoes go stale time for you to cook some fries"
icon_state = "snack"
hacking_safety = TRUE
products = list(
/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/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,
/obj/item/storage/box/cherries = 12,
/obj/item/storage/box/chili = 12,
/obj/item/storage/box/cabbage = 12,
/obj/item/storage/box/carrot = 12,
/obj/item/storage/box/corn = 12,
/obj/item/storage/box/eggplant = 12,
/obj/item/storage/box/lemon = 12,
/obj/item/storage/box/lime = 12,
/obj/item/storage/box/orange = 12,
/obj/item/storage/box/potato = 12,
/obj/item/storage/box/tomato = 12,
/obj/item/storage/box/whitebeet = 12,
)

prices = list(
/obj/item/storage/fancy/egg_box = 1,
/obj/item/storage/box/fish = 1,
/obj/item/storage/box/meat = 1,
/obj/item/storage/box/milk =1,
/obj/item/storage/box/soymilk = 1,
/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,
/obj/item/storage/box/cherries = 2,
/obj/item/storage/box/chili = 2,
/obj/item/storage/box/cabbage = 2,
/obj/item/storage/box/carrot = 2,
/obj/item/storage/box/corn = 2,
/obj/item/storage/box/eggplant = 2,
/obj/item/storage/box/lemon = 2,
/obj/item/storage/box/lime = 2,
/obj/item/storage/box/orange = 2,
/obj/item/storage/box/potato = 2,
/obj/item/storage/box/tomato = 2,
/obj/item/storage/box/whitebeet = 2,
)
product_type = VENDOR_PRODUCT_TYPE_FOOD
Loading

0 comments on commit 3f79ad3

Please sign in to comment.