Merge pull request #8823 from Incoming5643/shit_lets_be_barney

Removes the mutant_colors config option
This commit is contained in:
Cheridan
2015-04-10 14:13:24 -05:00
4 changed files with 3 additions and 24 deletions
+1 -4
View File
@@ -722,13 +722,10 @@ datum/preferences
if(result)
var/newtype = roundstart_species[result]
pref_species = new newtype()
if(!config.mutant_colors || mutant_color == "#000")
if(mutant_color == "#000")
mutant_color = pref_species.default_color
if("mutant_color")
if(!config.mutant_colors)
user << "<span class='danger'>Alien colors are disabled.</span>"
return
var/new_mutantcolor = input(user, "Choose your character's alien skin color:", "Character Preference") as color|null
if(new_mutantcolor)
var/temp_hsv = RGBtoHSV(new_mutantcolor)
@@ -92,9 +92,6 @@
var/g = (H.gender == FEMALE) ? "f" : "m"
if(!config.mutant_colors)
H.dna.mutant_color = default_color
if(MUTCOLORS in specflags)
var/image/spec_base
var/icon_state_string = "[id]_"
@@ -128,10 +125,7 @@
if(hair_color)
if(hair_color == "mutcolor")
if(!config.mutant_colors)
img_facial_s.color = "#" + default_color
else
img_facial_s.color = "#" + H.dna.mutant_color
img_facial_s.color = "#" + H.dna.mutant_color
else
img_facial_s.color = "#" + hair_color
else
@@ -159,10 +153,7 @@
if(hair_color)
if(hair_color == "mutcolor")
if(!config.mutant_colors)
img_hair_s.color = "#" + default_color
else
img_hair_s.color = "#" + H.dna.mutant_color
img_hair_s.color = "#" + H.dna.mutant_color
else
img_hair_s.color = "#" + hair_color
else
@@ -254,9 +245,6 @@
else
icon_state_string += "_s"
if(!config.mutant_colors)
H.dna.mutant_color = default_color
for(var/layer in relevent_layers)
for(var/bodypart in bodyparts_to_add)
I = image("icon" = 'icons/mob/mutant_bodyparts.dmi', "icon_state" = "[icon_state_string]_[bodypart]_[layer]", "layer" =- layer)