cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12104 from timothyteakettle/food-quality-2

Browse Source 
sliced foods have the same quality as the item that was cut
This commit is contained in:
Lin
2020-05-05 00:46:44 +00:00
committed by GitHub
parent e36bd50ad9 5f14ae28a1
commit c3dfcf1cfe
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/food_and_drinks/food/snacks.dm
View File

@@ -260,6 +260,7 @@ All foods are distributed among various categories. Use common sense.
slice.desc = "[desc]" slice.desc = "[desc]"
if(foodtype != initial(foodtype)) if(foodtype != initial(foodtype))
slice.foodtype = foodtype //if something happens that overrode our food type, make sure the slice carries that over slice.foodtype = foodtype //if something happens that overrode our food type, make sure the slice carries that over
slice.adjust_food_quality(food_quality)
/obj/item/reagent_containers/food/snacks/proc/generate_trash(atom/location) /obj/item/reagent_containers/food/snacks/proc/generate_trash(atom/location)
if(trash) if(trash)

1
code/modules/food_and_drinks/food/snacks/meat.dm
View File

@@ -47,6 +47,7 @@
slice.name = "raw [subjectname] cutlet" slice.name = "raw [subjectname] cutlet"
else if(subjectjob) else if(subjectjob)
slice.name = "raw [subjectjob] cutlet" slice.name = "raw [subjectjob] cutlet"
slice.adjust_food_quality(food_quality)
/obj/item/reagent_containers/food/snacks/meat/slab/human/initialize_cooked_food(obj/item/reagent_containers/food/snacks/meat/S, cooking_efficiency) /obj/item/reagent_containers/food/snacks/meat/slab/human/initialize_cooked_food(obj/item/reagent_containers/food/snacks/meat/S, cooking_efficiency)
..() ..()