From fdc8261f0aaffad133b2e7662430bc5199180d6c Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 31 Dec 2014 19:31:34 +1030 Subject: [PATCH] Causes spawned alien species to use their default base colour. Adds base colour for Skrell. --- code/modules/mob/living/carbon/human/human.dm | 8 ++++---- .../mob/living/carbon/human/species/station/station.dm | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index c61d33cd57..a64385efb4 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -16,7 +16,7 @@ if(!species) if(new_species) - set_species(new_species) + set_species(new_species,1) else set_species() @@ -1014,9 +1014,9 @@ if (!..()) return 0 //if this blood isn't already in the list, add it - if(blood_DNA[M.dna.unique_enzymes]) - return 0 //already bloodied with this blood. Cannot add more. - blood_DNA[M.dna.unique_enzymes] = M.dna.b_type + if(istype(M)) + if(!blood_DNA[M.dna.unique_enzymes]) + blood_DNA[M.dna.unique_enzymes] = M.dna.b_type hand_blood_color = blood_color src.update_inv_gloves() //handles bloody hands overlays and updating verbs += /mob/living/carbon/human/proc/bloody_doodle diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 91852a83d7..b7b66d2fd4 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -94,6 +94,7 @@ flesh_color = "#8CD7A3" blood_color = "#1D2CBF" + base_color = "#006666" reagent_tag = IS_SKRELL