Update preferences.dm

This commit is contained in:
Novacat
2020-09-05 12:16:09 -04:00
committed by GitHub
parent 2b600cbe85
commit 549d875f53
+1 -8
View File
@@ -50,17 +50,10 @@ datum/preferences
var/r_facial = 0 //Face hair color
var/g_facial = 0 //Face hair color
var/b_facial = 0 //Face hair color
<<<<<<< HEAD
var/s_tone = 0 //Skin tone
var/s_tone = -75 //Skin tone
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/s_tone = -75 //Skin tone
var/r_skin = 0 //Skin color
var/g_skin = 0 //Skin color
var/b_skin = 0 //Skin color
>>>>>>> 90cfd5b... Changes default skin tone from 35 to 110 (#7622)
var/r_eyes = 0 //Eye color
var/g_eyes = 0 //Eye color
var/b_eyes = 0 //Eye color