Merge branch 'master' of https://github.com/tgstation/-tg-station into no_bones_about_it

This commit is contained in:
Incoming
2016-06-12 17:55:22 -04:00
312 changed files with 456013 additions and 8329 deletions
+4 -1
View File
@@ -200,7 +200,10 @@
should_draw_gender = S.sexes
if(MUTCOLORS in S.specflags)
species_color = H.dna.features["mcolor"]
if(S.fixed_mut_color)
species_color = S.fixed_mut_color
else
species_color = H.dna.features["mcolor"]
should_draw_greyscale = TRUE
else
species_color = ""