diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm index 13d4a6d44e..b7f178bca5 100644 --- a/modular_citadel/code/modules/arousal/genitals.dm +++ b/modular_citadel/code/modules/arousal/genitals.dm @@ -247,13 +247,13 @@ /mob/living/carbon/human/proc/update_genitals() if(QDELETED(src)) return - var/static/list/relevant_layers - if(!relevant_layers) - relevant_layers = list() - relevant_layers[GENITALS_BEHIND_LAYER] = "BEHIND" - relevant_layers[GENITALS_FRONT_LAYER] = "FRONT" + var/static/list/relevant_layers = list("[GENITALS_BEHIND_LAYER]" = "BEHIND", "[GENITALS_FRONT_LAYER]" = "FRONT") + var/static/list/layers_num + if(!layers_num) + for(var/L in relevant_layers) + LAZYSET(layers_num, L, text2num(L)) for(var/L in relevant_layers) //Less hardcode - remove_overlay(L) + remove_overlay(layers_num[L]) remove_overlay(GENITALS_EXPOSED_LAYER) if(!LAZYLEN(internal_organs) || ((NOGENITALS in dna.species.species_traits) && !genital_override) || HAS_TRAIT(src, TRAIT_HUSK)) return @@ -320,14 +320,14 @@ standing += genital_overlay if(LAZYLEN(standing)) - overlays_standing[layer] = standing + overlays_standing[layers_num[layer]] = standing if(LAZYLEN(fully_exposed)) overlays_standing[GENITALS_EXPOSED_LAYER] = fully_exposed apply_overlay(GENITALS_EXPOSED_LAYER) for(var/L in relevant_layers) - apply_overlay(L) + apply_overlay(layers_num[L]) //Checks to see if organs are new on the mob, and changes their colours so that they don't get crazy colours.