you can now examine people with exposed genitals to see details

This commit is contained in:
deathride58
2018-01-08 20:45:08 -05:00
parent 079311331c
commit b3ff238cb8
4 changed files with 23 additions and 18 deletions
+5 -5
View File
@@ -41,17 +41,17 @@
var/lowershape = lowertext(shape)
switch(lowershape)
if("pair")
desc = "That's a pair of breasts."
desc = "You see a pair of breasts."
else
desc = "That's breasts, they seem to be quite exotic."
desc = "You see some breasts, they seem to be quite exotic."
if (size)
desc += " You estimate they're about [size]-cup size."
else
desc += " You wouldn't measure them in cup sizes."
if(producing)
desc += "\nThey're leaking [fluid_id]."
desc += " They're leaking [fluid_id]."
else
desc += "\nThey do not seem to be producing liquids."
desc += " They do not seem to be producing liquids."
if(owner)
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...
@@ -64,4 +64,4 @@
. = ..()
if(.)
return TRUE
return owner.is_chest_exposed()
return owner.is_chest_exposed()
+3 -4
View File
@@ -43,10 +43,9 @@
if(lowershape in knotted_types)
if(lowershape == "barbknot")
lowershape = "barbed, knotted"
desc = "That's a [lowershape] penis. You estimate it's about [round(length, 0.25)] inch[length > 1 ? "es" : ""] long, [round(girth, 0.25)] inch[girth > 1 ? "es" : ""] around the shaft \
and [round(length * knot_girth_ratio, 0.25)] inch[length > 1 ? "es" : ""] around the knot."
desc = "You see a [lowershape] penis. You estimate it's about [round(length, 0.25)] inch[length > 1 ? "es" : ""] long, [round(girth, 0.25)] inch[girth > 1 ? "es" : ""] around the shaft, and [round(length * knot_girth_ratio, 0.25)] inch[length > 1 ? "es" : ""] around the knot."
else
desc = "That's a [lowershape] penis. You estimate it's about [round(length, 0.25)] inch[length > 1 ? "es" : ""] long and [round(girth, 0.25)] inch[length > 1 ? "es" : ""] around."
desc = "You see a [lowershape] penis. You estimate it's about [round(length, 0.25)] inch[length > 1 ? "es" : ""] long and [round(girth, 0.25)] inch[length > 1 ? "es" : ""] around."
if(owner)
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...
@@ -69,4 +68,4 @@
. = ..()
if(.)
return TRUE
return owner.is_groin_exposed()
return owner.is_groin_exposed()
+8 -9
View File
@@ -28,24 +28,23 @@
switch(lowershape)
if("tentacle")
details = "\nIts opening is lined with several tentacles and "
details = " Its opening is lined with several tentacles and "
if("dentata")
details = "\nThere's teeth inside it and it is "
details = " There's teeth inside it and it is "
if("hairy")
details = "\nIt has quite a bit of hair growing on it and is "
details = " It has quite a bit of hair growing on it and is "
if("human")
details = "\nIt is taut with smooth skin, though without much hair and "
details = " It is taut with smooth skin, though without much hair and "
if("gaping")
details = "\nIt is gaping slightly open, though without much hair and "
details = " It is gaping slightly open, though without much hair and "
else
details = "\nIt has an exotic shape and is "
details = " It has an exotic shape and is "
if(aroused_state)
details += "slick with female arousal."
else
details += "not very wet."
desc = "That's a [lowershape] vagina. You estimate it to be around [round(cap_length, 0.5)] inch[cap_length > 1 ? "es" : ""] deep and could stretch around something [round(cap_girth, 0.5)] inch[cap_girth > 1 ? "es" : ""] in girth. \
It has [clits > 1 ? "[clits] clits" : "a clit"] about [round(clit_len,0.25)] inch[clit_len > 1 ? "es" : ""] long and [round(clit_diam, 0.25)] inch[clit_diam > 1 ? "es" : ""] in diameter.[details]"
desc = "You see a [lowershape] vagina. You estimate it to be around [round(cap_length, 0.5)] inch[cap_length > 1 ? "es" : ""] deep and could stretch around something [round(cap_girth, 0.5)] inch[cap_girth > 1 ? "es" : ""] in girth. It has [clits > 1 ? "[clits] clits" : "a clit"] about [round(clit_len,0.25)] inch[clit_len > 1 ? "es" : ""] long and [round(clit_diam, 0.25)] inch[clit_diam > 1 ? "es" : ""] in diameter.[details]"
if(owner)
if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
@@ -70,4 +69,4 @@
. = ..()
if(.)
return TRUE
return owner.is_groin_exposed()
return owner.is_groin_exposed()
@@ -85,6 +85,13 @@
if(wear_id)
msg += "[t_He] [t_is] wearing [wear_id.get_examine_string(user)].\n"
//CIT CHANGES START HERE - adds genital details to examine text
if(LAZYLEN(internal_organs))
for(var/obj/item/organ/genital/dicc in internal_organs)
if(istype(dicc) && dicc.is_exposed())
msg += "[dicc.desc]\n"
//END OF CIT CHANGES
//Status effects
msg += status_effect_examines()