cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-09 15:05:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix genital layering

Browse Source 
Ensures butts are layered in front of uniforms, but behind hands. Fixes belly changes from fix-hiding-butt.
This commit is contained in:
haha26
2021-08-04 00:12:17 -04:00
parent f2a1ebff33
commit c07263a2ac
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+5 -5
View File
@@ -2283,13 +2283,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
if("butt_color")
var/new_bellycolor = input(user, "Butt Color:", "Character Preference") as color|null
if(new_bellycolor)
var/temp_hsv = RGBtoHSV(new_bellycolor)
if(new_bellycolor == "#000000")
var/new_buttcolor = input(user, "Butt Color:", "Character Preference") as color|null
if(new_buttcolor)
var/temp_hsv = RGBtoHSV(new_buttcolor)
if(new_buttcolor == "#000000")
features["butt_color"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
features["butt_color"] = sanitize_hexcolor(new_bellycolor)
features["butt_color"] = sanitize_hexcolor(new_buttcolor)
else
to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
modular_citadel/code/modules/arousal/organs/belly.dm
+1 -1
View File
@@ -8,7 +8,7 @@
w_class = 3
size = 0
var/statuscheck = FALSE
shape = "round"
shape = "Pair"
masturbation_verb = "massage"
can_masturbate_with = FALSE
can_climax = FALSE
modular_citadel/code/modules/arousal/organs/genitals.dm
+1 -1
View File
@@ -472,7 +472,7 @@
if(G.slot == "anus") //we have a different size system
genital_overlay.icon = 'hyperstation/icons/obj/genitals/butt.dmi'
genital_overlay.icon_state = "butt_[size]"
genital_overlay.layer = -FRONT_MUTATIONS_LAYER
genital_overlay.layer = -ID_LAYER //in front of suit, behind bellies.
colourcode = "butt_color"
if(use_skintones) //butts are forced a colour, either skin tones, or main colour. how ever, mutants use a darker version, because of their body tone.
genital_overlay.color = "#[skintone2hex(H.skin_tone)]"