Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Chickens now drop Chicken Meat instead of untyped Meat #15571

Merged
JamieD1 merged 1 commit into from
Sep 4, 2022
Merged

Chickens now drop Chicken Meat instead of untyped Meat #15571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 34 additions & 4 deletions code/modules/food_and_drinks/food/snacks/meat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,11 +323,24 @@
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/penguin
slice_path = /obj/item/reagent_containers/food/snacks/meat/raw_cutlet/penguin
filling_color = "#B22222"
tastes = list("beef" = 1, "cod fish" = 1)
tastes = list("chicken" = 1, "cod fish" = 1)

/obj/item/reagent_containers/food/snacks/meat/slab/penguin/MakeGrillable()
AddComponent(/datum/component/grillable, /obj/item/reagent_containers/food/snacks/meat/steak/penguin, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) //Add medium rare later maybe?

/obj/item/reagent_containers/food/snacks/meat/slab/chicken
name = "chicken meat"
icon_state = "birdmeat"
desc = "A slab of chicken meat. Tastes like ch....wait..."
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/cooking_oil = 2) //low fat high nutrition
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/chicken
slice_path = /obj/item/reagent_containers/food/snacks/meat/raw_cutlet/chicken
filling_color = "#B22222"
tastes = list("chicken" = 1, "antibiotics" = 1)

/obj/item/reagent_containers/food/snacks/meat/slab/penguin/MakeGrillable()
AddComponent(/datum/component/grillable, /obj/item/reagent_containers/food/snacks/meat/steak/chicken, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) //Add medium rare later maybe?

/obj/item/reagent_containers/food/snacks/meat/slab/blessed
name = "blessed meat"
icon_state = "shadowmeat"
Expand Down Expand Up @@ -423,7 +436,13 @@
slice_path = /obj/item/reagent_containers/food/snacks/meat/cutlet/penguin
name = "penguin steak"
icon_state = "birdsteak"
tastes = list("beef" = 1, "cod fish" = 1)
tastes = list("chicken" = 1, "cod fish" = 1)

/obj/item/reagent_containers/food/snacks/meat/steak/chicken
slice_path = /obj/item/reagent_containers/food/snacks/meat/cutlet/chicken
name = "chicken steak"
icon_state = "birdsteak"
tastes = list("chicken" = 1, "antibiotics" = 1)

/obj/item/reagent_containers/food/snacks/meat/steak/plain/human/lizard
slice_path = /obj/item/reagent_containers/food/snacks/meat/cutlet
Expand Down Expand Up @@ -523,11 +542,18 @@

/obj/item/reagent_containers/food/snacks/meat/raw_cutlet/penguin
name = "raw penguin cutlet"
tastes = list("beef" = 1, "cod fish" = 1)
tastes = list("chicken" = 1, "cod fish" = 1)

/obj/item/reagent_containers/food/snacks/meat/raw_cutlet/penguin/MakeGrillable()
AddComponent(/datum/component/grillable, /obj/item/reagent_containers/food/snacks/meat/cutlet/penguin, rand(35 SECONDS, 50 SECONDS), TRUE, TRUE)

/obj/item/reagent_containers/food/snacks/meat/raw_cutlet/chicken
name = "raw chicken cutlet"
tastes = list("chicken" = 1, "antibiotics" = 1)

/obj/item/reagent_containers/food/snacks/meat/raw_cutlet/penguin/MakeGrillable()
AddComponent(/datum/component/grillable, /obj/item/reagent_containers/food/snacks/meat/cutlet/chicken, rand(35 SECONDS, 50 SECONDS), TRUE, TRUE)

//Cooked cutlets

/obj/item/reagent_containers/food/snacks/meat/cutlet
Expand Down Expand Up @@ -572,4 +598,8 @@

/obj/item/reagent_containers/food/snacks/meat/cutlet/penguin
name = "penguin cutlet"
tastes = list("beef" = 1, "cod fish" = 1)
tastes = list("chicken" = 1, "cod fish" = 1)

/obj/item/reagent_containers/food/snacks/meat/cutlet/chicken
name = "chicken cutlet"
tastes = list("chicken" = 1, "antibiotics" = 1)
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/friendly/farm_animals.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
density = FALSE
speak_chance = 2
turns_per_move = 3
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2)
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/chicken = 2)
var/egg_type = /obj/item/reagent_containers/food/snacks/egg
var/food_type = /obj/item/reagent_containers/food/snacks/grown/wheat
response_help = "pets"
Expand Down