From 7fe5bb71d7c3ee7fe513af5b4cef001515aa7ead Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Thu, 9 Apr 2020 16:07:45 +0100
Subject: [PATCH] more quality
---
code/datums/components/butchering.dm | 14 ++++++++------
.../food_and_drinks/kitchen_machinery/gibber.dm | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm
index 1477f7cbc5..5c295b28cc 100644
--- a/code/datums/components/butchering.dm
+++ b/code/datums/components/butchering.dm
@@ -75,6 +75,7 @@
var/turf/T = meat.drop_location()
var/final_effectiveness = effectiveness - meat.butcher_difficulty
var/bonus_chance = max(0, (final_effectiveness - 100) + bonus_modifier) //so 125 total effectiveness = 25% extra chance
+ var/list/butchered_items = list()
for(var/V in meat.butcher_results)
var/obj/bones = V
var/amount = meat.butcher_results[bones]
@@ -86,20 +87,21 @@
if(butcher)
to_chat(butcher, "You harvest some extra [initial(bones.name)] from [meat]!")
for(var/i in 1 to 2)
- var/butcher_item = new bones (T)
- if(istype(butcher_item, /obj/item/reagent_containers/food))
- var/obj/item/reagent_containers/food/butcher_food = butcher_item
- butcher_food.adjust_food_quality(meat_quality)
+ butchered_items += new bones (T)
else
- new bones (T)
+ butchered_items += new bones (T)
meat.butcher_results.Remove(bones) //in case you want to, say, have it drop its results on gib
for(var/V in meat.guaranteed_butcher_results)
var/obj/sinew = V
var/amount = meat.guaranteed_butcher_results[sinew]
for(var/i in 1 to amount)
- new sinew (T)
+ butchered_items += new sinew (T)
meat.guaranteed_butcher_results.Remove(sinew)
+ for(var/butchered_item in butchered_items)
+ if(istype(butchered_item, /obj/item/reagent_containers/food))
+ var/obj/item/reagent_containers/food/butchered_meat = butchered_item
+ butchered_meat.food_quality = meat_quality
if(butcher)
meat.visible_message("[butcher] butchers [meat].")
ButcherEffects(meat)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 4b5c7d34ad..f6cd44ace1 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -185,7 +185,6 @@
for (var/i=1 to meat_produced)
var/obj/item/reagent_containers/food/snacks/meat/slab/newmeat = new typeofmeat
newmeat.name = "[sourcename] [newmeat.name]"
- newmeat.food_quality = meat_quality
if(istype(newmeat))
newmeat.subjectname = sourcename
newmeat.reagents.add_reagent (/datum/reagent/consumable/nutriment, sourcenutriment / meat_produced) // Thehehe. Fat guys go first
@@ -211,6 +210,7 @@
skin.forceMove(loc)
skin.throw_at(pick(nearby_turfs),meat_produced,3)
for (var/i=1 to meat_produced)
+ allmeat[i].adjust_food_quality(meat_quality)
var/obj/item/meatslab = allmeat[i]
meatslab.forceMove(loc)
meatslab.throw_at(pick(nearby_turfs),i,3)