shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12644 from timothyteakettle/more-blood-fixes

Browse Source 
simple mob blood is no longer white
This commit is contained in:
Ghom
2020-06-29 18:29:07 +02:00
committed by GitHub
parent 53a9dd560b 9d134f4fc9
commit 3264ece150
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/atoms.dm
+2 -2
View File
@@ -436,7 +436,7 @@
var/blood_id = get_blood_id() var/blood_id = get_blood_id()
if(!(blood_id in GLOB.blood_reagent_types)) if(!(blood_id in GLOB.blood_reagent_types))
return return
return list("ANIMAL DNA" = "Y-") return list("color" = list(BLOOD_COLOR_HUMAN), "ANIMAL DNA" = "Y-")
/mob/living/carbon/get_blood_dna_list() /mob/living/carbon/get_blood_dna_list()
var/blood_id = get_blood_id() var/blood_id = get_blood_id()
@@ -452,7 +452,7 @@
return blood_dna return blood_dna
/mob/living/carbon/alien/get_blood_dna_list() /mob/living/carbon/alien/get_blood_dna_list()
return list("UNKNOWN DNA" = "X*") return list("color" = list(BLOOD_COLOR_XENO), "UNKNOWN DNA" = "X*")
//to add a mob's dna info into an object's blood_DNA list. //to add a mob's dna info into an object's blood_DNA list.
/atom/proc/transfer_mob_blood_dna(mob/living/L) /atom/proc/transfer_mob_blood_dna(mob/living/L)