cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-06 15:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

POLARIS: Add eye color to shapeshifters

Browse Source
This commit is contained in:
Arokha Sieyes
2018-03-16 19:53:26 -04:00
parent 9012958724
commit 6072077d10
3 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
code/modules/mob/living/carbon/human/species/species_shapeshift.dm
View File

@@ -183,6 +183,9 @@ var/list/wrapped_species_by_ref = list()
r_skin = hex2num(copytext(new_skin, 2, 4))
g_skin = hex2num(copytext(new_skin, 4, 6))
b_skin = hex2num(copytext(new_skin, 6, 8))
r_synth = r_skin
g_synth = g_skin
b_synth = b_skin
var/datum/species/shapeshifter/S = species
if(S.monochromatic)
@@ -286,4 +289,36 @@ var/list/wrapped_species_by_ref = list()
if(species && mind)
apply_traits()
return
return
/mob/living/carbon/human/proc/shapeshifter_select_eye_colour()
set name = "Select Eye Color"
set category = "Abilities"
if(stat || world.time < last_special)
return
last_special = world.time + 50
var/current_color = rgb(r_eyes,g_eyes,b_eyes)
var/new_eyes = input("Pick a new color for your eyes.","Eye Color", current_color) as null|color
if(!new_eyes)
return
shapeshifter_set_eye_color(new_eyes)
/mob/living/carbon/human/proc/shapeshifter_set_eye_color(var/new_eyes)
var/list/new_color_rgb_list = hex2rgb(new_eyes)
// First, update mob vars.
r_eyes = new_color_rgb_list[1]
g_eyes = new_color_rgb_list[2]
b_eyes = new_color_rgb_list[3]
// Now sync the organ's eye_colour list, if possible
var/obj/item/organ/internal/eyes/eyes = internal_organs_by_name[O_EYES]
if(istype(eyes))
eyes.update_colour()
update_icons_body()
update_eyes()

1
code/modules/mob/living/carbon/human/species/station/prometheans.dm
View File

@@ -83,6 +83,7 @@ var/datum/species/shapeshifter/promethean/prometheans
/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_eye_colour,
/mob/living/carbon/human/proc/shapeshifter_select_hair_colors,
/mob/living/carbon/human/proc/shapeshifter_select_gender,
/mob/living/carbon/human/proc/regenerate

2
code/modules/mob/living/carbon/human/update_icons.dm
View File

@@ -231,7 +231,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
if(eyes)
icon_key += "[rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3])]"
else
icon_key += "#000000"
icon_key += "[r_eyes], [g_eyes], [b_eyes]"
for(var/organ_tag in species.has_limbs)
var/obj/item/organ/external/part = organs_by_name[organ_tag]