Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. #4586

Merged
merged 28 commits into from
Nov 29, 2023
Merged

added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. #4586

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e3727cd
adding boxes and start refactor and
Oct 4, 2023
940e4cd
changing subtype one stock
Oct 4, 2023
d5a9c03
add fridge to dry
Oct 4, 2023
ac641d8
dme
Oct 4, 2023
84040db
update map
Oct 4, 2023
c5dd558
add a special machine that seel ingredients for 1$
Oct 6, 2023
263f732
add the primordial cheese to the vendor.
Oct 6, 2023
c427e60
adding the machine to alamyer
Oct 6, 2023
77ee0df
hacking_safety = TRUE making it unhackable
Oct 6, 2023
9395d08
make it cost more for plants to make
Oct 6, 2023
f4273ad
removed a bunch of supply crate that where double
Oct 6, 2023
0417b45
fix
Oct 6, 2023
39d0208
Merge branch 'master' into refactor_kitchen
Huffie56 Oct 8, 2023
8b0372b
change naming as requested
Oct 30, 2023
f7c525d
small change to no lie and try to fix the issue
Nov 2, 2023
126229a
updating name to Galley Auxiliary Storage Requisition System
Huffie56 Nov 3, 2023
f3738d6
revert to master almayer map
Nov 6, 2023
ad58bfe
revert another time almayer.dm
Nov 6, 2023
01ecfe0
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into r…
Nov 6, 2023
fc5e280
comit to change almayer
Nov 6, 2023
d8a2725
revert some part because i am dumb
Nov 6, 2023
fdea74e
Merge remote-tracking branch 'upstream/master' into refactor_kitchen
Nov 10, 2023
941362f
Merge remote-tracking branch 'upstream/master' into refactor_kitchen
Nov 13, 2023
6d5224f
change to var/i in 1 to 7 some bird told me
Nov 16, 2023
5eae6f0
Merge remote-tracking branch 'upstream/master' into refactor_kitchen
Nov 22, 2023
2595759
make some loop better...
Nov 29, 2023
a97c0ea
change to better loop
Nov 29, 2023
33f9614
extra space.
Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions code/datums/ASRS.dm
View file
Open in desktop
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
Open in desktop
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,3 +433,69 @@
/obj/item/device/camera = 30,
)
product_type = VENDOR_PRODUCT_TYPE_RECREATIONAL

/obj/structure/machinery/vending/ingredients
name = "\improper Ingredient Machine"
desc = "A vending machine full of ingredients."
product_slogans = "Every ingredients you need are here, and only for 1$"
product_ads = "Your out of ingredients Weyland-Yutani is there for you"
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved
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,
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved
/obj/item/storage/box/whitebeet = 2,
)
product_type = VENDOR_PRODUCT_TYPE_FOOD
Loading