diff --git a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm index 11a50c1316..f1f36322a2 100644 --- a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm +++ b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm @@ -197,3 +197,30 @@ var/list/wrapped_species_by_ref = list() E.sync_colour_to_human(src) regenerate_icons() + +/mob/living/carbon/human/proc/shapeshifter_select_hair_colors() + + set name = "Select Hair Colors" + set category = "Abilities" + + if(stat || world.time < last_special) + return + + last_special = world.time + 50 + + var/new_hair = input("Please select a new hair color.", "Hair Colour") as color + if(!new_hair) + return + shapeshifter_set_hair_color(new_hair) + var/new_fhair = input("Please select a new facial hair color.", "Facial Hair Color") as color + if(!new_fhair) + return + shapeshifter_set_facial_color(new_fhair) + +/mob/living/carbon/human/proc/shapeshifter_set_hair_color(var/new_hair) + + change_hair_color(hex2num(copytext(new_hair, 2, 4)), hex2num(copytext(new_hair, 4, 6)), hex2num(copytext(new_hair, 6, 8))) + +/mob/living/carbon/human/proc/shapeshifter_set_facial_color(var/new_fhair) + + change_facial_hair_color(hex2num(copytext(new_fhair, 2, 4)), hex2num(copytext(new_fhair, 4, 6)), hex2num(copytext(new_fhair, 6, 8))) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index db50586504..1f3b4ecfc8 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -108,6 +108,7 @@ var/datum/species/shapeshifter/promethean/prometheans /datum/species/shapeshifter/promethean/hug(var/mob/living/carbon/human/H, var/mob/living/target) + if(H.zone_sel.selecting == "head" || H.zone_sel.selecting == "r_hand" || H.zone_sel.selecting == "l_hand") return ..() //VOREStation Edit var/t_him = "them" if(ishuman(target)) var/mob/living/carbon/human/T = target diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm b/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm index b02cd21695..3816a1721e 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm @@ -13,6 +13,7 @@ /mob/living/carbon/human/proc/shapeshifter_select_shape, /mob/living/carbon/human/proc/shapeshifter_select_colour, /mob/living/carbon/human/proc/shapeshifter_select_hair, + /mob/living/carbon/human/proc/shapeshifter_select_hair_colors, /mob/living/carbon/human/proc/shapeshifter_select_gender, /mob/living/carbon/human/proc/regenerate, /mob/living/proc/set_size,