diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index 3f8e3fc6f1..1223f0b616 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -41,8 +41,8 @@ desc = "You see a pair of breasts." if("quad") desc = "You see two pairs of breast, one just under the other." - if("six") - desc = "You see three pairs of breasts, running from their chest to their belly." + if("sextuple") + desc = "You see three sets of breasts, running from their chest to their belly." else desc = "You see some breasts, they seem to be quite exotic." if (size) @@ -57,10 +57,10 @@ if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow... var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need. color = "#[skintone2hex(H.skin_tone)]" - string = "breasts_[GLOB.breasts_shapes_icons[lowertext(shape)]]_[size]-s" + string = "breasts_[GLOB.breasts_shapes_icons[shape]]_[size]-s" else color = "#[owner.dna.features["breasts_color"]]" - string = "breasts_[GLOB.breasts_shapes_icons[lowertext(shape)]]_[size]" + string = "breasts_[GLOB.breasts_shapes_icons[shape]]_[size]" if(ishuman(owner)) var/mob/living/carbon/human/H = owner icon_state = sanitize_text(string) diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm index 0415199415..0cf698392c 100644 --- a/modular_citadel/code/modules/arousal/organs/testicles.dm +++ b/modular_citadel/code/modules/arousal/organs/testicles.dm @@ -26,14 +26,6 @@ if(reagents && producing) generate_cum() -/obj/item/organ/genital/testicles/update_size() - if(size == 1) - size_name = "average" - if(size == 2) - size_name = "enlarged" - if(size >= 3) - size_name = "engorged" - /obj/item/organ/genital/testicles/proc/generate_cum() reagents.maximum_volume = fluid_max_volume if(reagents.total_volume >= reagents.maximum_volume) @@ -53,8 +45,7 @@ linked_organ = (owner.getorganslot("penis")) if(linked_organ) linked_organ.linked_organ = src - size = linked_organ.size - update_size() + else if(linked_organ) linked_organ.linked_organ = null @@ -67,8 +58,17 @@ /obj/item/organ/genital/testicles/update_appearance() if(owner) + if(size == 0) + size_name = "nonexistant" + if(size == 1) + size_name = "average" + if(size == 2) + size_name = "enlarged" + if(size >= 3) + size_name = "engorged" + if(!internal) - desc = "You see an [lowertext(size_name)] pair of testicles dangling." + desc = "You see an [size_name] pair of testicles dangling." else desc = "They don't have any testicles you can see." var/string