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.

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

feat: FoodPorn #188

Merged
merged 15 commits into from
Sep 18, 2023
1 change: 1 addition & 0 deletions code/modules/crafting/craft.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
CAT_NONE, //Misc subcategories
CAT_NONE, //Tribal subcategories
list( //Food subcategories
CAT_MISCFOOD, // SS220 ADDITION
CAT_CAKE,
CAT_SUSHI,
CAT_SANDWICH),
Expand Down
Binary file added modular_ss220/emotes/audio/fart.ogg
Binary file not shown.
9 changes: 9 additions & 0 deletions modular_ss220/emotes/code/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,15 @@
'modular_ss220/emotes/audio/kidan/wiggles_kidan_2.ogg',
'modular_ss220/emotes/audio/kidan/wiggles_kidan_3.ogg')

/datum/emote/living/carbon/human/fart
message = "пердит."
message_param = "пердит в направлении %t."
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
vary = TRUE
muzzle_ignore = TRUE
only_forced_audio = TRUE
bypass_unintentional_cooldown = TRUE
sound = 'modular_ss220/emotes/audio/fart.ogg'

////////////////////
/// Keybindings ///
Expand Down
4 changes: 0 additions & 4 deletions modular_ss220/emotes/code/emote_translations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,6 @@
message_param = "щелкает пальцами на %t."
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE

/datum/emote/living/carbon/human/fart
message = "пердит."
message_param = "пердит в направлении %t."

/datum/emote/living/carbon/sign/signal
message_param = "показывает %t пальцев."
param_desc = "число(0-10)"
Expand Down
1 change: 1 addition & 0 deletions modular_ss220/food/_food.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

#include "code/drinks.dm"
#include "code/food.dm"
#include "code/ingredients.dm"
984 changes: 974 additions & 10 deletions modular_ss220/food/code/food.dm

Large diffs are not rendered by default.

186 changes: 186 additions & 0 deletions modular_ss220/food/code/ingredients.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
// Reagents
/datum/reagent/consumable/buckwheat
name = "Гречка"
id = "buckwheat"
description = "Ходят слухи, что советские люди жрут только водку и... это?"
reagent_state = SOLID
nutriment_factor = 3 * REAGENTS_METABOLISM
color = "#8E633C"
taste_description = "сухая гречка"

/datum/reagent/consumable/tomato_sauce
name = "томатный соус"
id = "tomato_sauce"
description = "Отец всех соусов. Помидоры, немного специй и ничего лишнего."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#ee1000"
taste_description = "томатный соус"

/datum/reagent/consumable/cheesesauce
name = "сырный соус"
id = "cheese_sauce"
description = "Сыр, сливки и молоко... максимальная концентрация белка!"
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#e6d600"
taste_description = "сырный соус"

/datum/reagent/consumable/mushroomsauce
name = "грибной соус"
id = "mushroom_sauce"
description = "Сливочный соус с грибами, имеет довольно резкий запах."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#beb58a"
taste_description = "грибной соус"

/datum/reagent/consumable/garlicsauce
name = "чесночный соус"
id = "garlic_sauce"
description = "Сильный соус с чесноком, его запах бьет в нос. Некоторые члены экипажа, вероятно, будут шипеть на вас и уходить."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#fffee1"
taste_description = "чесночный соус"

/datum/reagent/consumable/diablosauce
name = "соус 'Диабло'"
id = "diablo_sauce"
description = "Старинный жгучий соус, рецепт которого практически не изменился с момента его создания."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#440804"
taste_description = "острый кетчуп"

/datum/reagent/consumable/custard
name = "заварной крем"
id = "custard"
description = "Мягкий и сладкий крем, используемый в кондитерском производстве."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#fffed1"
taste_description = "сладкий нежный крем"

/datum/reagent/consumable/herbs
name = "приправа"
id = "herbsmix"
description = "Смесь различных трав."
reagent_state = SOLID
color = "#2c5c04"
taste_description = "сухая приправа"

// Slices
/obj/item/reagent_containers/food/snacks/cucumberslice
name = "ломтик огурца"
desc = "Нарезанный огурец, неожиданно, правда?"
icon = 'modular_ss220/food/icons/food.dmi'
icon_state = "cucumberslice"
filling_color = "#00DB00"
bitesize = 6
list_reagents = list("kelotane" = 1)
tastes = list("cucumber" = 1)

// Tomato Sauce
/obj/item/reagent_containers/food/condiment/tomato_sauce
name = "томатный соус"
desc = "Отец всех соусов. Помидоры, немного специй и ничего лишнего."
icon = 'modular_ss220/food/icons/containers.dmi'
icon_state = "tomato_sauce"
list_reagents = list("tomato_sauce" = 50)
possible_states = list()

/datum/recipe/microwave/tomato_sauce
reagents = list("water" = 15, "sodiumchloride" = 1, "blackpepper" = 1, "herbsmix" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/grown/garlic,
/obj/item/reagent_containers/food/snacks/grown/tomato)
result = /obj/item/reagent_containers/food/condiment/tomato_sauce

// Diablo Sauce
/obj/item/reagent_containers/food/condiment/diablo_sauce
name = "соус 'Диабло'"
desc = "Старинный жгучий соус, рецепт которого практически не изменился с момента его создания."
icon = 'modular_ss220/food/icons/containers.dmi'
icon_state = "diablo_sauce"
list_reagents = list("diablo_sauce" = 30, "capsaicin" = 20)
possible_states = list()

/datum/recipe/microwave/diablo_sauce
reagents = list("water" = 15, "sodiumchloride" = 1, "blackpepper" = 2, "herbsmix" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/grown/tomato,
/obj/item/reagent_containers/food/snacks/grown/chili)
result = /obj/item/reagent_containers/food/condiment/diablo_sauce

// Cheese Sauce
/obj/item/reagent_containers/food/condiment/cheese_sauce
name = "сырный соус"
desc = "Сыр, сливки и молоко... максимальная концентрация белка!"
icon = 'modular_ss220/food/icons/containers.dmi'
icon_state = "cheese_sauce"
list_reagents = list("cheese_sauce" = 50)
possible_states = list()

/datum/recipe/microwave/cheese_sauce
reagents = list("milk" = 15, "cream" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/cheesewedge)
result = /obj/item/reagent_containers/food/condiment/cheese_sauce

// Mushroom Sauce
/obj/item/reagent_containers/food/condiment/mushroom_sauce
name = "грибной соус"
desc = "Сливочный соус с грибами, имеет довольно резкий запах."
icon = 'modular_ss220/food/icons/containers.dmi'
icon_state = "mushroom_sauce"
list_reagents = list("mushroom_sauce" = 50)
possible_states = list()

/datum/recipe/microwave/mushroom_sauce
reagents = list("milk" = 15, "cream" = 5, "sodiumchloride" = 1,)
items = list(
/obj/item/reagent_containers/food/snacks/grown/onion,
/obj/item/reagent_containers/food/snacks/grown/mushroom)
result = /obj/item/reagent_containers/food/condiment/mushroom_sauce

// Garlic Sauce
/obj/item/reagent_containers/food/condiment/garlic_sauce
name = "чесночный соус"
desc = "Сильный соус с чесноком, его запах бьет в нос. Некоторые члены экипажа, вероятно, будут шипеть на вас и уходить."
icon = 'modular_ss220/food/icons/containers.dmi'
icon_state = "garlic_sauce"
list_reagents = list("garlic_sauce" = 50)
possible_states = list()

/datum/recipe/microwave/garlic_sauce
reagents = list("water" = 15, "sodiumchloride" = 1, "herbsmix" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/grown/garlic,
/obj/item/reagent_containers/food/snacks/grown/cucumber)
result = /obj/item/reagent_containers/food/condiment/garlic_sauce

// Custard
/obj/item/reagent_containers/food/condiment/custard
name = "заварной крем"
desc = "Мягкий и сладкий крем, используемый в кондитерском производстве."
icon = 'modular_ss220/food/icons/containers.dmi'
icon_state = "custard"
list_reagents = list("custard" = 50)
possible_states = list()

/datum/recipe/microwave/custard
reagents = list("sugar" = 10, "milk" = 10, "cream" = 5, "vanilla" = 5)
items = list(/obj/item/reagent_containers/food/snacks/egg)
result = /obj/item/reagent_containers/food/condiment/custard

// Herbs
/obj/item/reagent_containers/food/condiment/herbs
name = "приправа"
desc = "Смесь различных трав. Идеально подходит для пиццы!"
icon = 'modular_ss220/food/icons/containers.dmi'
icon = 'modular_ss220/food/icons/containers.dmi'
icon_state = "herbs"
list_reagents = list("herbsmix" = 50)
possible_states = list()
Binary file added modular_ss220/food/icons/containers.dmi
Binary file not shown.
Binary file modified modular_ss220/food/icons/food.dmi
Binary file not shown.
95 changes: 93 additions & 2 deletions modular_ss220/hydroponics/code/plants.dm
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
// HydroSeed
/obj/machinery/economy/vending/hydroseeds/Initialize(mapload)
products += list(
/obj/item/seeds/cucumber = 3,
/obj/item/seeds/soya/olive = 3,)
. = ..()

// Buckwheat
/obj/item/seeds/wheat/oat
mutatelist = list(/obj/item/seeds/wheat/buckwheat)

/obj/item/seeds/wheat/buckwheat
name = "пачка семян гречки"
name = "семена гречки"
desc = "Из этого может получиться гречка, а может и нет."
icon = 'modular_ss220/hydroponics/icons/seeds.dmi'
icon_state = "seed-buckwheat"
growing_icon = 'modular_ss220/hydroponics/icons/growing.dmi'
species = "buckwheat"
icon_dead = "buckwheat-dead"
plantname = "Стебли Гречки"
plantname = "Cтебли Гречки"
product = /obj/item/reagent_containers/food/snacks/grown/buckwheat
mutatelist = list()

Expand All @@ -25,3 +32,87 @@
bitesize_mod = 2
tastes = list("гречка" = 1)
can_distill = FALSE

// Cucumber
/obj/item/seeds/cucumber
name = "семена огурцов"
desc = "Из этих семян вырастут огурцы."
icon = 'modular_ss220/hydroponics/icons/seeds.dmi'
icon_state = "seed-cucumber"
species = "cucumber"
plantname = "Огуречный Куст"
product = /obj/item/reagent_containers/food/snacks/grown/cucumber
lifespan = 40
endurance = 70
potency = 30
yield = 5
maturation = 8
weed_rate = 4
growthstages = 2
growing_icon = 'modular_ss220/hydroponics/icons/growing.dmi'
icon_grow = "cucumber-grow"
icon_dead = "cucumber-dead"
genes = list(/datum/plant_gene/trait/squash, /datum/plant_gene/trait/repeated_harvest)
reagents_add = list("water" = 0.15, "kelotane" = 0.04, "plantmatter" = 0.05)

/obj/item/reagent_containers/food/snacks/grown/cucumber
seed = /obj/item/seeds/cucumber
name = "огурец"
desc = "Сила земли!"
icon = 'modular_ss220/hydroponics/icons/plants.dmi'
icon_state = "cucumber"
splat_type = /obj/effect/decal/cleanable/plant_smudge
slice_path = /obj/item/reagent_containers/food/snacks/cucumberslice
slices_num = 5
filling_color = "#47FF91"
tastes = list("огурец" = 1)
bitesize_mod = 2
distill_reagent = "enzyme"

// Olives
/obj/item/seeds/soya/olive
name = "семена оливок"
desc = "Из этих семян вырастут оливки."
icon = 'modular_ss220/hydroponics/icons/seeds.dmi'
icon_state = "seed-olives"
species = "olives"
plantname = "Оливковое Деревце"
product = /obj/item/reagent_containers/food/snacks/grown/olive
growing_icon = 'modular_ss220/hydroponics/icons/growing.dmi'
icon_grow = "olives-grow"
icon_dead = "olives-dead"
icon_harvest = "olives-harvest"
mutatelist = list(/obj/item/seeds/soya/olive/charcoal)

/obj/item/reagent_containers/food/snacks/grown/olive
seed = /obj/item/seeds/soya/olive
name = "оливки"
desc = "Любишь их или ненавидишь..."
icon = 'modular_ss220/hydroponics/icons/plants.dmi'
icon_state = "olives"
filling_color = "#161220"
tastes = list("оливок" = 1)

// Olives Charcoal
/obj/item/seeds/soya/olive/charcoal
name = "семена угливок"
desc = "Из этих семян вырастут угливки."
icon = 'modular_ss220/hydroponics/icons/seeds.dmi'
icon_state = "seed-charcolives"
species = "charcolives"
plantname = "Угливковое Деревце"
product = /obj/item/reagent_containers/food/snacks/grown/olive/charcoal
growing_icon = 'modular_ss220/hydroponics/icons/growing.dmi'
icon_grow = "charcolives-grow"
icon_dead = "charcolives-dead"
icon_harvest = "charcolives-harvest"
reagents_add = list("charcoal" = 0.4, "plantmatter" = 0.05)

/obj/item/reagent_containers/food/snacks/grown/olive/charcoal
seed = /obj/item/seeds/soya/olive/charcoal
name = "угливки"
desc = "Это... маслины?"
icon = 'modular_ss220/hydroponics/icons/plants.dmi'
icon_state = "charcolives"
filling_color = "#000000"
tastes = list("уголя" = 1)
Binary file modified modular_ss220/hydroponics/icons/growing.dmi
Binary file not shown.
Binary file modified modular_ss220/hydroponics/icons/plants.dmi
Binary file not shown.
Binary file modified modular_ss220/hydroponics/icons/seeds.dmi
Binary file not shown.