From 222d37751e19795ac3dcf42b807b9de7d1582158 Mon Sep 17 00:00:00 2001 From: Archie Date: Sun, 3 Jan 2021 01:58:45 -0300 Subject: [PATCH] Fixes blood and properly adds the char reagent to grilled items as well (you can overdose on it) --- code/game/atoms.dm | 4 ++-- code/modules/food_and_drinks/kitchen_machinery/grill.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 9be3c1f4..6dbf96e3 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -378,13 +378,13 @@ //returns the mob's dna info as a list, to be inserted in an object's blood_DNA list /mob/living/proc/get_blood_dna_list() var/blood_id = get_blood_id() - if(!(blood_id =="blood" || blood_id == "jellyblood")) + if(!(blood_id in GLOB.blood_reagent_types)) return return list("ANIMAL DNA" = "Y-") /mob/living/carbon/get_blood_dna_list() var/blood_id = get_blood_id() - if(!(blood_id =="blood" || blood_id == "jellyblood")) + if(!(blood_id in GLOB.blood_reagent_types)) return var/list/blood_dna = list() if(dna) diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index c52389cd..9693d5ba 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -73,7 +73,7 @@ smoke.start() if(grilled_item) grill_time += 1 - grilled_item.reagents.add_reagent("char", 1) + grilled_item.reagents.add_reagent(/datum/reagent/consumable/char, 1) grill_fuel -= 10 grilled_item.AddComponent(/datum/component/sizzle)