Merge remote-tracking branch 'refs/remotes/VOREStation/master'

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
This commit is contained in:
killer653
2016-07-03 19:04:53 -04:00
10 changed files with 51 additions and 9 deletions
+3 -3
View File
@@ -39,9 +39,9 @@ datum/preferences
var/g_facial = 0 //Face hair color
var/b_facial = 0 //Face hair color
var/s_tone = 0 //Skin tone
var/r_skin = 0 //Skin color
var/g_skin = 0 //Skin color
var/b_skin = 0 //Skin color
var/r_skin = 238 //Skin color // Vorestation edit, so color multi sprites can aren't BLACK AS THE VOID by default.
var/g_skin = 206 //Skin color // Vorestation edit, so color multi sprites can aren't BLACK AS THE VOID by default.
var/b_skin = 179 //Skin color // Vorestation edit, so color multi sprites can aren't BLACK AS THE VOID by default.
var/r_eyes = 0 //Eye color
var/g_eyes = 0 //Eye color
var/b_eyes = 0 //Eye color