diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index a67656dd03..fd5afe34ea 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -33,13 +33,13 @@ #define DNA_UI_GENDER 14 #define DNA_UI_BEARD_STYLE 15 #define DNA_UI_HAIR_STYLE 16 -#define DNA_UI_EAR_STYLE 17 +#define DNA_UI_EAR_STYLE 17 // VOREStation snippet. #define DNA_UI_TAIL_STYLE 18 #define DNA_UI_PLAYERSCALE 19 #define DNA_UI_TAIL_R 20 #define DNA_UI_TAIL_G 21 #define DNA_UI_TAIL_B 22 -#define DNA_UI_TAIL2_R 23 // VOREStation snippet. +#define DNA_UI_TAIL2_R 23 #define DNA_UI_TAIL2_G 24 #define DNA_UI_TAIL2_B 25 #define DNA_UI_EARS_R 26 @@ -54,7 +54,7 @@ #define DNA_UI_WING_B 35 // VOREStation snippet end. #define DNA_UI_LENGTH 35 // VOREStation Edit to 35 -#define DNA_SE_LENGTH 27 +#define DNA_SE_LENGTH 46 // VOREStation Edit (original was UI+11) // For later: //#define DNA_SE_LENGTH 50 // Was STRUCDNASIZE, size 27. 15 new blocks added = 42, plus room to grow. diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm index 2ee34f650e..35b6028c48 100644 --- a/code/game/dna/dna2_helpers.dm +++ b/code/game/dna/dna2_helpers.dm @@ -175,18 +175,20 @@ // VORE StationEdit Start - //Ears + // Ears var/ears = dna.GetUIValueRange(DNA_UI_EAR_STYLE, ear_styles_list.len + 1) - 1 + if(ears <= 1) + H.ear_style = null + else if((0 < ears) && (ears <= ear_styles_list.len)) + H.ear_style = ear_styles_list[ear_styles_list[ears]] + + // Ear Color H.r_ears = dna.GetUIValueRange(DNA_UI_EARS_R, 255) H.g_ears = dna.GetUIValueRange(DNA_UI_EARS_G, 255) H.b_ears = dna.GetUIValueRange(DNA_UI_EARS_B, 255) H.r_ears2 = dna.GetUIValueRange(DNA_UI_EARS2_R, 255) H.g_ears2 = dna.GetUIValueRange(DNA_UI_EARS2_G, 255) H.b_ears2 = dna.GetUIValueRange(DNA_UI_EARS2_B, 255) - if(ears <= 1) - H.ear_style = null - else if((0 < ears) && (ears <= ear_styles_list.len)) - H.ear_style = ear_styles_list[ear_styles_list[ears]] //Tail var/tail = dna.GetUIValueRange(DNA_UI_TAIL_STYLE, tail_styles_list.len + 1) - 1 @@ -202,6 +204,11 @@ else if((0 < wing) && (wing <= wing_styles_list.len)) H.wing_style = wing_styles_list[wing_styles_list[wing]] + //Wing Color + H.r_wing = dna.GetUIValueRange(DNA_UI_WING_R, 255) + H.g_wing = dna.GetUIValueRange(DNA_UI_WING_G, 255) + H.b_wing = dna.GetUIValueRange(DNA_UI_WING_B, 255) + // Playerscale var/size = dna.GetUIValueRange(DNA_UI_PLAYERSCALE, player_sizes_list.len) if((0 < size) && (size <= player_sizes_list.len))