cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes skin preset not changing in antag selector (#7386)

Browse Source
This commit is contained in:
Matt Atlas
2019-11-10 12:50:42 +01:00
committed by Erki
parent 9f5e7304f1
commit 622e355698
3 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,7 @@
return 1
/mob/living/carbon/human/proc/change_skin_color(var/red, var/green, var/blue)
if((red == r_skin && green == g_skin && blue == b_skin) || !((species.appearance_flags & HAS_SKIN_COLOR) && (species.appearance_flags & HAS_SKIN_PRESET)))
if((red == r_skin && green == g_skin && blue == b_skin) || (!(species.appearance_flags & HAS_SKIN_COLOR) && !(species.appearance_flags & HAS_SKIN_PRESET)))
return
r_skin = red

1
code/modules/nano/modules/human_appearance.dm
View File

@@ -52,6 +52,7 @@
if(can_change_skin_preset())
var/new_preset = input(usr, "Choose your character's body color preset:", "Character Preference", rgb(owner.r_skin, owner.g_skin, owner.b_skin)) as null|anything in owner.species.character_color_presets
if(new_preset && can_still_topic(state))
new_preset = owner.species.character_color_presets[new_preset]
var/r_skin = GetRedPart(new_preset)
var/g_skin = GetGreenPart(new_preset)
var/b_skin = GetBluePart(new_preset)