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

martian hotfix #77562

Merged
merged 6 commits into from
Aug 13, 2023
Merged

martian hotfix #77562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80a9bb0
martian hotfix
EOBGames Aug 12, 2023
d5ffa57
chap
EOBGames Aug 12, 2023
93d00da
commit issue
EOBGames Aug 12, 2023
803c6a8
tsukune fix
EOBGames Aug 12, 2023
a2aded5
noodles, ethereal fixes
EOBGames Aug 13, 2023
0accf2f
butter, prospect sunrise
EOBGames Aug 13, 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
4 changes: 4 additions & 0 deletions code/game/objects/items/food/martian.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
food_reagents = list(
/datum/reagent/consumable/nutriment = 15
)
burns_in_oven = TRUE
tastes = list("bread" = 10)
foodtypes = GRAIN | VEGETABLES
venue_value = FOOD_PRICE_TRASH
Expand Down Expand Up @@ -1176,6 +1177,8 @@
/datum/reagent/consumable/nutriment = 6,
/datum/reagent/consumable/salt = 1,
)
burns_on_grill = TRUE
burns_in_oven = TRUE
tastes = list("bread" = 1, "salt" = 1)
foodtypes = GRAIN
w_class = WEIGHT_CLASS_SMALL
Expand Down Expand Up @@ -1205,6 +1208,7 @@
/datum/reagent/consumable/nutriment/protein = 6,
/datum/reagent/consumable/nutriment = 4,
)
burns_on_grill = TRUE
tastes = list("chicken" = 1, "umami sauce" = 1)
foodtypes = MEAT
w_class = WEIGHT_CLASS_SMALL
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/food/packaged.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@
food_reagents = list(
/datum/reagent/consumable/nutriment/vitamin = 3
)
burns_on_grill = TRUE
tastes = list("meat" = 1)
foodtypes = MEAT
w_class = WEIGHT_CLASS_SMALL
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/food/snacks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ GLOBAL_LIST_INIT(safe_peanut_types, populate_safe_peanut_types())
desc = "You've heard of Snap-Roks, now get ready for Shok-Roks: the popping candy for Ethereals! Available in 5 exciting flavours, any of which could be in this bag!"

/obj/item/food/shok_roks/random/Initialize(mapload)
var/random_flavour = pick(subtypesof(/obj/item/food/sticko) - /obj/item/food/sticko/random)
var/random_flavour = pick(subtypesof(/obj/item/food/shok_roks) - /obj/item/food/shok_roks/random)
var/obj/item/food/sample = new random_flavour(loc)
name = sample.name
desc = sample.desc
Expand Down
2 changes: 1 addition & 1 deletion code/modules/food_and_drinks/recipes/soup_mixtures.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2192,7 +2192,7 @@
/datum/reagent/consumable/volt_energy = 15,
)
required_ingredients = list(
/obj/item/food/fishmeat/carp = 1
/obj/item/food/fishmeat = 1
)
resulting_food_path = /obj/item/food/volt_fish
ingredient_reagent_multiplier = 0
Expand Down
54 changes: 53 additions & 1 deletion code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,13 @@
/datum/crafting_recipe/food/reaction/moonshine
reaction = /datum/chemical_reaction/drink/moonshine

/datum/crafting_recipe/food/reaction/martian_batter
reaction = /datum/chemical_reaction/food/martian_batter
category = CAT_MARTIAN

/datum/crafting_recipe/food/reaction/grounding_neutralise
reaction = /datum/chemical_reaction/food/grounding_neutralise

// Tools: Rolling pin

/datum/crafting_recipe/food/rollingpin
Expand Down Expand Up @@ -357,6 +364,21 @@
result = /obj/item/food/watermelonslice
category = CAT_SALAD

/datum/crafting_recipe/food/knife/kamaboko_slice
reqs = list(/obj/item/food/kamaboko = 1)
result = /obj/item/food/kamaboko_slice
category = CAT_MARTIAN

/datum/crafting_recipe/food/knife/raw_noodles
reqs = list(/obj/item/food/rice_dough = 1)
result = /obj/item/food/spaghetti/rawnoodles
category = CAT_MARTIAN

/datum/crafting_recipe/food/knife/chapslice
reqs = list(/obj/item/food/canned/chap = 1)
result = /obj/item/food/chapslice
category = CAT_MEAT

// Machinery: Grill

/datum/crafting_recipe/food/grill
Expand Down Expand Up @@ -427,11 +449,26 @@
result = /obj/item/food/sandwich/cheese/grilled
category = CAT_BREAD

/datum/crafting_recipe/food/grill/moonfish
/datum/crafting_recipe/food/grill/grilled_cheese
reqs = list(/obj/item/food/cheese/firm_cheese_slice = 1)
result = /obj/item/food/grilled_cheese
category = CAT_MISCFOOD

/datum/crafting_recipe/food/grill/ballpark_pretzel
reqs = list(/obj/item/food/raw_ballpark_pretzel = 1)
result = /obj/item/food/ballpark_pretzel
category = CAT_MARTIAN

/datum/crafting_recipe/food/grill/ballpark_tsukune
reqs = list(/obj/item/food/kebab/raw_ballpark_tsukune = 1)
result = /obj/item/food/kebab/ballpark_tsukune
category = CAT_MARTIAN

/datum/crafting_recipe/food/grill/chapslice
reqs = list(/obj/item/food/chapslice = 1)
result = /obj/item/food/grilled_chapslice
category = CAT_MEAT

/datum/crafting_recipe/food/grill/friedegg
reqs = list(/obj/item/food/egg = 1)
result = /obj/item/food/friedegg
Expand Down Expand Up @@ -767,6 +804,16 @@
result = /obj/item/food/yakiimo
category = CAT_MISCFOOD

/datum/crafting_recipe/food/oven/reispan
reqs = list(/obj/item/food/rice_dough = 1)
result = /obj/item/food/bread/reispan
category = CAT_MARTIAN

/datum/crafting_recipe/food/oven/ballpark_pretzel
reqs = list(/obj/item/food/raw_ballpark_pretzel = 1)
result = /obj/item/food/ballpark_pretzel
category = CAT_MARTIAN

// Machinery: Drying rack
/datum/crafting_recipe/food/drying
machinery = list(/obj/machinery/smartfridge/drying_rack)
Expand Down Expand Up @@ -800,3 +847,8 @@
/datum/crafting_recipe/food/drying/semki
reqs = list(/obj/item/food/grown/sunflower = 1)
result = /obj/item/food/semki/healthy

/datum/crafting_recipe/food/drying/kamaboko
reqs = list(/obj/item/food/surimi = 1)
result = /obj/item/food/kamaboko
category = CAT_MARTIAN
8 changes: 4 additions & 4 deletions code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
/obj/item/food/spaghetti/boilednoodles = 1,
/datum/reagent/consumable/soysauce = 3,
)
result = /obj/item/food/salad/martian_fried_noodles
result = /obj/item/food/salad/simple_fried_noodles
category = CAT_MARTIAN

/datum/crafting_recipe/food/setagaya_curry
Expand Down Expand Up @@ -310,7 +310,7 @@
/obj/item/food/omelette = 1,
/obj/item/food/pickle = 1,
)
result = /obj/item/food/croque_martienne
result = /obj/item/food/prospect_sunrise
category = CAT_MARTIAN

/datum/crafting_recipe/food/takoyaki
Expand Down Expand Up @@ -669,7 +669,7 @@
reqs = list(
/obj/item/food/cake/plain = 1,
/obj/item/food/grown/ambrosia/vulgaris = 1,
/obj/item/food/butter = 1,
/obj/item/food/butterslice = 2,
)
result = /obj/item/food/cake/spekkoek
category = CAT_MARTIAN
Expand Down Expand Up @@ -700,7 +700,7 @@
name = "Boh loh yah"
reqs = list(
/obj/item/food/doughslice = 1,
/obj/item/food/butter = 1,
/obj/item/food/butterslice = 1,
/datum/reagent/consumable/sugar = 5,
)
result = /obj/item/food/boh_loh_yah
Expand Down
Loading