diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 69612caa..1ba1677b 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2283,13 +2283,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) to_chat(user,"Invalid color. Your color is not bright enough.") 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,"Invalid color. Your color is not bright enough.") diff --git a/modular_citadel/code/modules/arousal/organs/belly.dm b/modular_citadel/code/modules/arousal/organs/belly.dm index c8d7636c..b4fb7d02 100644 --- a/modular_citadel/code/modules/arousal/organs/belly.dm +++ b/modular_citadel/code/modules/arousal/organs/belly.dm @@ -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 diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm index d8ede410..d832c28a 100644 --- a/modular_citadel/code/modules/arousal/organs/genitals.dm +++ b/modular_citadel/code/modules/arousal/organs/genitals.dm @@ -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)]"