shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10866 from ancientpower/skintone-match-fix

Browse Source 
Fixes genital skintone mismatching
This commit is contained in:
Ghom
2020-02-03 08:57:39 +01:00
committed by GitHub
parent 2393dc26eb b55b375d17
commit f8a2116d7d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/arousal/genitals.dm
+2 -1
View File
@@ -350,7 +350,6 @@
if(use_skintones && H.dna.features["genitals_use_skintone"]) if(use_skintones && H.dna.features["genitals_use_skintone"])
genital_overlay.color = "#[skintone2hex(H.skin_tone)]" genital_overlay.color = "#[skintone2hex(H.skin_tone)]"
genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size]-s_[aroused_state]_[layertext]"
else else
switch(S.color_src) switch(S.color_src)
if("cock_color") if("cock_color")
@@ -361,6 +360,8 @@
genital_overlay.color = "#[H.dna.features["breasts_color"]]" genital_overlay.color = "#[H.dna.features["breasts_color"]]"
if("vag_color") if("vag_color")
genital_overlay.color = "#[H.dna.features["vag_color"]]" genital_overlay.color = "#[H.dna.features["vag_color"]]"
genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size]-s_[aroused_state]_[layertext]"
if(layer == GENITALS_FRONT_LAYER && CHECK_BITFIELD(G.genital_flags, GENITAL_THROUGH_CLOTHES)) if(layer == GENITALS_FRONT_LAYER && CHECK_BITFIELD(G.genital_flags, GENITAL_THROUGH_CLOTHES))
genital_overlay.layer = -GENITALS_EXPOSED_LAYER genital_overlay.layer = -GENITALS_EXPOSED_LAYER