re-adds the light green vox skin tone, added azure and emerald ones (#12565)

This commit is contained in:
uraniummeltdown
2016-12-10 00:16:54 +04:00
committed by Intigracy
parent 8400b196b5
commit 7ab75f024e
10 changed files with 30 additions and 3 deletions

View File

@@ -84,7 +84,7 @@ proc/random_skin_tone(species = "Human")
. = rand(-185,34)
return min(max( .+rand(-25, 25), -185),34)
else if(species == "Vox")
. = rand(1,3)
. = rand(1,6)
return .
else
return 0
@@ -112,6 +112,12 @@ proc/skintone2racedescription(tone, species = "Human")
return "unknown"
else if(species == "Vox")
switch(tone)
if(6)
return "emerald"
if(5)
return "azure"
if(4)
return "light green"
if(2)
return "brown"
if(3)

View File

@@ -1263,10 +1263,16 @@ NOTE: The change will take effect AFTER any current recruiting periods."}
if(new_s_tone)
s_tone = 35 - max(min(round(new_s_tone),220),1)
else if(species == "Vox")//Can't reference species flags here, sorry.
var/skin_c = input(user, "Choose your Vox's skin color:\n(1 = Green, 2 = Brown, 3 = Gray)", "Character Preference") as num|null
var/skin_c = input(user, "Choose your Vox's skin color:\n(1 = Green, 2 = Brown, 3 = Gray, 4 = Light Green, 5 = Azure, 6 = Emerald)", "Character Preference") as num|null
if(skin_c)
s_tone = max(min(round(skin_c),3),1)
s_tone = max(min(round(skin_c),6),1)
switch(s_tone)
if(6)
to_chat(user,"Your vox will now be emerald.")
if(5)
to_chat(user,"Your vox will now be azure.")
if(4)
to_chat(user,"Your vox will now be light green.")
if(3)
to_chat(user,"Your vox will now be gray.")
if(2)

View File

@@ -728,6 +728,15 @@ var/global/list/whitelisted_species = list("Human")
/datum/species/vox/updatespeciescolor(var/mob/living/carbon/human/H)
switch(H.s_tone)
if(6)
icobase = 'icons/mob/human_races/vox/r_voxemrl.dmi'
deform = 'icons/mob/human_races/vox/r_def_voxemrl.dmi'
if(5)
icobase = 'icons/mob/human_races/vox/r_voxazu.dmi'
deform = 'icons/mob/human_races/vox/r_def_voxazu.dmi'
if(4)
icobase = 'icons/mob/human_races/vox/r_voxlgrn.dmi'
deform = 'icons/mob/human_races/vox/r_def_voxlgrn.dmi'
if(3)
icobase = 'icons/mob/human_races/vox/r_voxgry.dmi'
deform = 'icons/mob/human_races/vox/r_def_voxgry.dmi'

View File

@@ -155,6 +155,12 @@
if(current_species)
if(current_species.name == "Vox")
switch(s_tone)
if(6)
icobase = 'icons/mob/human_races/vox/r_voxemrl.dmi'
if(5)
icobase = 'icons/mob/human_races/vox/r_voxazu.dmi'
if(4)
icobase = 'icons/mob/human_races/vox/r_voxlgrn.dmi'
if(3)
icobase = 'icons/mob/human_races/vox/r_voxgry.dmi'
if(2)

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB