Skip to content

Commit

Permalink
Теперь часть рецептов можно готовить на костре и не только (#13360)
Browse files Browse the repository at this point in the history
* Теперь часть рецептов можно готовить на костре или не только
<!--
Читать: https://github.com/TauCetiStation/TauCetiClassic/blob/master/.github/wiki/STYLING_OF_PR.md
-->
## Описание изменений
Добавлена новая функция с помощью которой можно жарить мясо, булки и некоторые другие рецепты за счет огня а именно: костер, какое-либо открытое пламя
## Почему и что этот ПР улучшит
Больше механик готовки еды, больше контента для игры, больший интерес к игре
## Авторство
andrgysev02, Riverz, DeFour
<!--
В случае порта с другого билда - укажите источник (репозиторий или номер PR-а).
Если это оригинальный PR - укажите первоисточник/авторство спрайтов и звуков.
Укажите лицензию для звуков.
-->

## Чеинжлог

<!--
В чеинжлог стоит писать изменения, которые будут заметны игрокам. И так, чтобы они были понятны игрокам.
Ключевые слова для чеинжлога: bugfix, rscadd, rscdel, image, sound, spellcheck, tweak, balance, map, performance, experiment

:cl:
 - bugfix: Пофикшен такой-то баг.
 - map: Перемаплен такой-то отсек.
 - image: Обновлен такой-то спрайт.
-->:cl:
 - rscadd: Теперь часть рецептов можно готовить на костре и не только

* Добавил ещё ящницу
  • Loading branch information
Riverz1 authored Aug 1, 2024
1 parent 273f073 commit 83017c4
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
28 changes: 27 additions & 1 deletion code/modules/reagents/reagent_containers/food/snacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
var/slice_path
var/slices_num
var/deepfried = 0

var/cookingProgress = 0
var/cookingThreshold = 50
var/fire_act_result = /obj/item/weapon/reagent_containers/food/snacks/badrecipe
//Placeholder for effect that trigger on eating that aren't tied to reagents.
/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(mob/M, silent = FALSE)
if(!usr) return
Expand Down Expand Up @@ -204,7 +206,16 @@
else
to_chat(N, text("<span class='notice'>You are unable to nibble away at \the [src] while being hidden.</span>"))

/obj/item/weapon/reagent_containers/food/snacks/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature >= 400)
cookingProgress++

if(cookingProgress >= cookingThreshold)
var/turf/T = get_turf(src)
var/obj/item/cooking = new fire_act_result(T)
cooking.pixel_x = pixel_x
cooking.pixel_y = pixel_y
qdel(src)

////////////////////////////////////////////////////////////////////////////////
/// FOOD END
Expand Down Expand Up @@ -405,6 +416,8 @@
icon_state = "egg"
filling_color = "#fdffd1"
list_reagents = list("nutriment" = 1, "egg" = 5)
cookingThreshold = 10
fire_act_result = /obj/item/weapon/reagent_containers/food/snacks/friedegg

/obj/item/weapon/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
if(..())
Expand Down Expand Up @@ -525,6 +538,8 @@
list_reagents = list("protein" = 3, "carpotoxin" = 3)
food_type = NATURAL_FOOD
food_moodlet = /datum/mood_event/natural_food
cookingThreshold = 10
fire_act_result = /obj/item/weapon/reagent_containers/food/snacks/salmonsteak

/obj/item/weapon/reagent_containers/food/snacks/fishfingers
name = "Fish Fingers"
Expand Down Expand Up @@ -2504,6 +2519,8 @@
list_reagents = list("nutriment" = 6)
food_type = JUNK_FOOD
food_moodlet = /datum/mood_event/junk_food
cookingThreshold = 10
fire_act_result = /obj/item/weapon/reagent_containers/food/snacks/bun

// Dough + rolling pin = flat dough
/obj/item/weapon/reagent_containers/food/snacks/dough/attackby(obj/item/I, mob/user, params)
Expand Down Expand Up @@ -2531,6 +2548,8 @@
list_reagents = list("nutriment" = 6)
food_type = JUNK_FOOD
food_moodlet = /datum/mood_event/junk_food
cookingThreshold = 10
fire_act_result = /obj/item/weapon/reagent_containers/food/snacks/flatbread

/obj/item/weapon/reagent_containers/food/snacks/doughslice
name = "dough slice"
Expand Down Expand Up @@ -2617,6 +2636,8 @@
list_reagents = list("nutriment" = 1)
food_type = JUNK_FOOD
food_moodlet = /datum/mood_event/junk_food
cookingThreshold = 10
fire_act_result = /obj/item/weapon/reagent_containers/food/snacks/cutlet

/obj/item/weapon/reagent_containers/food/snacks/cutlet
name = "cutlet"
Expand Down Expand Up @@ -2651,6 +2672,8 @@
list_reagents = list("protein" = 2)
food_type = JUNK_FOOD
food_moodlet = /datum/mood_event/junk_food
cookingThreshold = 10
fire_act_result = /obj/item/weapon/reagent_containers/food/snacks/meatball

/obj/item/weapon/reagent_containers/food/snacks/hotdog
name = "hotdog"
Expand Down Expand Up @@ -2783,6 +2806,8 @@
icon_state = "raw_bacon"
bitesize = 3
list_reagents = list("protein" = 1)
cookingThreshold = 10
fire_act_result = /obj/item/weapon/reagent_containers/food/snacks/bacon

/obj/item/weapon/reagent_containers/food/snacks/bacon
name = "bacon"
Expand Down Expand Up @@ -3549,3 +3574,4 @@
bitesize = 4
food_type = NATURAL_FOOD
list_reagents = list("protein" = 7, "plantmatter" = 3, "sodiumchloride" = 1, "blackpepper" = 1)

2 changes: 2 additions & 0 deletions code/modules/reagents/reagent_containers/food/snacks/meat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
list_reagents = list("protein" = 3)
food_type = NATURAL_FOOD
food_moodlet = /datum/mood_event/natural_food
cookingThreshold = 10
fire_act_result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak

/obj/item/weapon/reagent_containers/food/snacks/meat/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/kitchenknife))
Expand Down

0 comments on commit 83017c4

Please sign in to comment.