diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 2175906a7..6bc05fff6 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -130,11 +130,10 @@ if(LAZYLEN(internal_organs) && user.client?.prefs.cit_toggles) for(var/obj/item/organ/genital/dicc in internal_organs) if(istype(dicc) && dicc.is_exposed()) - if(!dicc.limited) - if(!dicc.equipment) - . += "[dicc.desc]" - else - . += "[dicc.desc] Equipt with a [dicc.equipment.name]" + if(!dicc.equipment) + . += "[dicc.desc]" + else + . += "[dicc.desc] Equipt with a [dicc.equipment.name]" if(user.client?.prefs.cit_toggles & VORE_EXAMINE) diff --git a/hyperstation/code/obj/cockrings.dm b/hyperstation/code/obj/cockrings.dm index 891e89ec2..271774ef6 100644 --- a/hyperstation/code/obj/cockrings.dm +++ b/hyperstation/code/obj/cockrings.dm @@ -68,6 +68,7 @@ var/mob/living/carbon/human/H = usr var/obj/item/organ/genital/penis/P = H.getorganslot("penis") P.limited = TRUE + P.update_appearance() H.update_genitals() /obj/item/equipment/penis/ring/limiter/proc/detach(mob/living/user) @@ -75,4 +76,5 @@ var/mob/living/carbon/human/H = usr var/obj/item/organ/genital/penis/P = H.getorganslot("penis") P.limited = FALSE + P.update_appearance() H.update_genitals() diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm index 8db04d858..7865b976f 100644 --- a/modular_citadel/code/modules/arousal/organs/penis.dm +++ b/modular_citadel/code/modules/arousal/organs/penis.dm @@ -86,7 +86,10 @@ if(owner) var/length_new = length*owner.size_multiplier var/girth_new = girth*owner.size_multiplier - desc = "You see [aroused_state ? "an erect" : "a flaccid"] [lowershape] penis. You estimate it's about [round(length_new, 0.25)] inch[round(length_new, 0.25) != 1 ? "es" : ""] long and [round(girth_new, 0.25)] inch[round(girth_new, 0.25) != 1 ? "es" : ""] in girth." + if(!limited) + desc = "You see [aroused_state ? "an erect" : "a flaccid"] [lowershape] penis. You estimate it's about [round(length_new, 0.25)] inch[round(length_new, 0.25) != 1 ? "es" : ""] long and [round(girth_new, 0.25)] inch[round(girth_new, 0.25) != 1 ? "es" : ""] in girth." + else + desc = "You see [aroused_state ? "an erect" : "a flaccid"] [lowershape] penis. You estimate it's about [round(length_new/3, 0.25)] inch[round(length_new/3, 0.25) != 1 ? "es" : ""] long and [round(girth_new/3, 0.25)] inch[round(girth_new/3, 0.25) != 1 ? "es" : ""] in girth." if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"]) 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.