diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 73787eb88ed..1d9bd75ecb6 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -132,8 +132,7 @@ P.b_eyes = O.b_eyes P << "You feel lightheaded and drowsy..." owner << "You feel warm as you make subtle changes to your captive's body." - P.update_body() - P.updateicon() + P.update_eyes() if(TFmodify == 2 && P.r_hair != O.r_hair || P.g_hair != O.g_hair || P.b_hair != O.b_hair || P.r_skin != O.r_skin || P.g_skin != O.g_skin || P.b_skin != O.b_skin || P.r_facial != O.r_facial || P.g_facial != O.g_facial || P.b_facial != O.b_facial) P.r_hair = O.r_hair @@ -183,8 +182,7 @@ P.b_eyes = O.b_eyes P << "You feel lightheaded and drowsy..." owner << "You feel warm as your make subtle changes to your captive's body." - P.update_body() - P.updateicon() + P.update_eyes() if(TFmodify == 2 && P.r_hair != O.r_hair || P.g_hair != O.g_hair || P.b_hair != O.b_hair || P.r_skin != O.r_skin || P.g_skin != O.g_skin || P.b_skin != O.b_skin) P.r_hair = O.r_hair @@ -232,8 +230,7 @@ P.b_eyes = O.b_eyes P << "You feel lightheaded and drowsy..." owner << "You feel warm as you make subtle changes to your captive's body." - P.update_body() - P.updateicon() + P.update_eyes() if(TFmodify == 2 && P.r_hair != O.r_hair || P.g_hair != O.g_hair || P.b_hair != O.b_hair || P.r_skin != O.r_skin || P.g_skin != O.g_skin || P.b_skin != O.b_skin || P.r_facial != O.r_facial || P.g_facial != O.g_facial || P.b_facial != O.b_facial) P.r_hair = O.r_hair @@ -275,8 +272,7 @@ P.b_eyes = O.b_eyes P << "You feel lightheaded and drowsy..." owner << "You feel warm as you make subtle changes to your captive's body." - P.update_body() - P.updateicon() + P.update_eyes() if(TFmodify == 2 && P.r_hair != O.r_hair || P.g_hair != O.g_hair || P.b_hair != O.b_hair || P.r_skin != O.r_skin || P.g_skin != O.g_skin || P.b_skin != O.b_skin || P.r_facial != O.r_facial || P.g_facial != O.g_facial || P.b_facial != O.b_facial) P.r_hair = O.r_hair @@ -314,8 +310,11 @@ P.custom_species = O.custom_species for(var/obj/item/organ/I in P.internal_organs) //This prevents organ rejection I.species = O.species - for(var/obj/item/organ/external/Z in P.organs) //This makes their limb sprites look correct. - Z.species = O.species + for(var/obj/item/organ/external/chest/A in O.organs) + for(var/obj/item/organ/external/Z in P.organs) //This makes their limb sprites look correct. + Z.species = O.species + Z.h_col = A.h_col + Z.s_col = A.s_col P << "You lose sensation of your body, feeling only the warmth of everything around you... " owner << "Your body shifts as you make dramatic changes to your captive's body." P.fixblood() @@ -358,16 +357,24 @@ P.h_style = O.h_style //Since some things are required, like the cobra hood. P.species = O.species P.custom_species = O.custom_species + P.r_eyes = O.r_eyes + P.g_eyes = O.g_eyes + P.b_eyes = O.b_eyes for(var/obj/item/organ/I in P.internal_organs) //This prevents organ rejection I.species = O.species - for(var/obj/item/organ/external/Z in P.organs) //This makes their limb sprites look correct. - Z.species = O.species + //Z.h_col = //This is required to get their color the same as the preds. + for(var/obj/item/organ/external/chest/A in O.organs) + for(var/obj/item/organ/external/Z in P.organs) //This makes their limb sprites look correct. + Z.species = O.species + Z.h_col = A.h_col + Z.s_col = A.s_col P << "You lose sensation of your body, feeling only the warmth around you as you're encased in an egg. " owner << "You shift as you make dramatic changes to your captive's body as you encase them in an egg." P.fixblood() P.update_hair() P.update_body() P.update_tail_showing() + P.update_eyes() P.updateicon() switch(O.egg_type) if("Unathi") @@ -455,16 +462,23 @@ P.h_style = O.h_style P.species = O.species P.custom_species = O.custom_species + P.r_eyes = O.r_eyes + P.g_eyes = O.g_eyes + P.b_eyes = O.b_eyes for(var/obj/item/organ/I in P.internal_organs) //This prevents organ rejection I.species = O.species - for(var/obj/item/organ/external/Z in P.organs) //This makes their limb sprites look correct. - Z.species = O.species - P << "You lose sensation of your body, feeling only the warmth are you as you're encased in an egg. " + for(var/obj/item/organ/external/chest/A in O.organs) + for(var/obj/item/organ/external/Z in P.organs) //This makes their limb sprites look correct. + Z.species = O.species + Z.h_col = A.h_col + Z.s_col = A.s_col + P << "You lose sensation of your body, feeling only the warmth around you as are you as you're encased in an egg. " owner << "You shift as you make dramatic changes to your captive's body as you encase them in an egg." P.fixblood() P.update_hair() P.update_body() P.update_tail_showing() + P.update_eyes() P.updateicon() switch(O.egg_type) if("Unathi") @@ -549,6 +563,7 @@ owner << "You tingle as you make noticeable changes to your captive's body." P.update_hair() P.update_body() + P.update_eyes() P.updateicon() switch(O.egg_type) if("Unathi") @@ -636,6 +651,7 @@ owner << "You tingle as you make noticeable changes to your captive's body." P.update_hair() P.update_body() + P.update_eyes() P.updateicon() switch(O.egg_type) if("Unathi") @@ -716,6 +732,9 @@ P.b_skin = O.b_skin P.h_style = O.h_style P.gender = MALE + P.r_eyes = O.r_eyes + P.g_eyes = O.g_eyes + P.b_eyes = O.b_eyes P << "Your body feels very strange..." owner << "Your body feels strange as you alter your captive's gender." P.update_hair() @@ -800,6 +819,9 @@ P.b_skin = O.b_skin P.h_style = O.h_style P.gender = MALE + P.r_eyes = O.r_eyes + P.g_eyes = O.g_eyes + P.b_eyes = O.b_eyes P << "Your body feels very strange..." owner << "You feel strange as you alter your captive's gender." P.update_hair() @@ -885,6 +907,9 @@ P.b_skin = O.b_skin P.h_style = O.h_style P.gender = FEMALE + P.r_eyes = O.r_eyes + P.g_eyes = O.g_eyes + P.b_eyes = O.b_eyes P << "Your body feels very strange..." owner << "You feels strange as you alter your captive's gender." P.update_hair() @@ -969,6 +994,9 @@ P.b_skin = O.b_skin P.h_style = O.h_style P.gender = FEMALE + P.r_eyes = O.r_eyes + P.g_eyes = O.g_eyes + P.b_eyes = O.b_eyes owner << "You feel strange as you alter your captive's gender." P << "Your body feels very strange..." P.update_hair()