Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling

This commit is contained in:
DZD
2015-04-22 11:51:18 -04:00
6 changed files with 11 additions and 5 deletions
+2 -2
View File
@@ -996,7 +996,7 @@ datum/preferences
if(species == "Human")
s_tone = random_skin_tone()
if("s_color")
if(species == "Unathi" || species == "Tajaran" || species == "Skrell")
if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Slime People")
r_skin = rand(0,255)
g_skin = rand(0,255)
b_skin = rand(0,255)
@@ -1202,7 +1202,7 @@ datum/preferences
s_tone = 35 - max(min( round(new_s_tone), 220),1)
if("skin")
if(species == "Unathi" || species == "Tajaran" || species == "Skrell")
if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Slime People")
var/new_skin = input(user, "Choose your character's skin colour: ", "Character Preference") as color|null
if(new_skin)
r_skin = hex2num(copytext(new_skin, 2, 4))