Merge pull request #11059 from Citadel-Station-13/Ghommie-patch-1

oh damn, forgot those are numbers
This commit is contained in:
deathride58
2020-02-13 02:53:22 -05:00
committed by GitHub

View File

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