From cf505f900a9244183cfb4fc9d1eb731c8bdf6840 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sat, 18 Apr 2020 03:29:45 +0200 Subject: [PATCH 1/2] Update atoms.dm --- code/game/atoms.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 44a891e24a..d66ddf59de 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -397,13 +397,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 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 blood_reagent_types)) return var/list/blood_dna = list() if(dna) From 3188ef3475e677abac8bbc159c7fea9d1b406e75 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sat, 18 Apr 2020 03:32:54 +0200 Subject: [PATCH 2/2] Whops --- code/game/atoms.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index d66ddf59de..40090c35c5 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -397,13 +397,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 in blood_reagent_types)) + 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 in blood_reagent_types)) + if(!(blood_id in GLOB.blood_reagent_types)) return var/list/blood_dna = list() if(dna)