Fixes oversized tennis balls, testing and fixing.

This commit is contained in:
Ghommie
2019-07-25 04:29:21 +02:00
parent 30292c385b
commit 56f2a8f884
6 changed files with 162 additions and 145 deletions
@@ -22,11 +22,11 @@
return
var/new_size
switch(length)
if(-INFINITY to 5)
if(-INFINITY to 6)
new_size = 1
if(5 to 9)
if(6 to 12)
new_size = 2
if(15 to INFINITY)
if(12 to INFINITY)
new_size = 3 //no new sprites for anything larger yet.
girth = (length * girth_ratio)
cached_length = length
@@ -9,7 +9,7 @@
linked_organ_slot = ORGAN_SLOT_PENIS
genital_flags = CAN_MASTURBATE_WITH|MASTURBATE_LINKED_ORGAN|GENITAL_FUID_PRODUCTION
var/size_name = "average"
shape = "single"
shape = "Single"
var/sack_size = BALLS_SACK_SIZE_DEF
fluid_id = "semen"
masturbation_verb = "massage"
@@ -20,20 +20,16 @@
if(!linked_organ && !update_link())
return FALSE
. = ..()
if(.)
send_full_message()
if(. && reagents.holder_full())
to_chat(owner, "Your balls finally feel full, again.")
/obj/item/organ/genital/testicles/update_link(removing = FALSE)
. = ..()
if(. && !size_linked)
size = linked_organ.size
update()
size_linked = TRUE
/obj/item/organ/genital/testicles/proc/send_full_message(msg = "Your balls finally feel full, again.")
if(owner && istext(msg))
to_chat(owner, msg)
return TRUE
/obj/item/organ/genital/testicles/update_size(new_size)
if(new_size)
size = CLAMP(size + new_size, BALLS_SIZE_MIN, BALLS_SIZE_MAX)
@@ -71,7 +67,6 @@
color = "#[skintone2hex(H.skin_tone)]"
else
color = "#[D.features["balls_color"]]"
size = D.features["balls_size"]
sack_size = D.features["balls_sack_size"]
shape = D.features["balls_shape"]
if(D.features["balls_shape"] == "Hidden")