cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-17 10:58:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #811 from ArchieBeepBoop/smallfix

Browse Source 
Fixes blood overlay and properly adds the char reagent to grilled items as well.
This commit is contained in:
QuoteFox
2021-01-03 05:01:03 +00:00
committed by GitHub
parent 49f39f27db 222d37751e
commit 8e84815f4b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/atoms.dm
+2 -2
View File
@@ -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)
code/modules/food_and_drinks/kitchen_machinery/grill.dm
+1 -1
View File
@@ -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)