Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304)

* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e9.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a, reversing
changes made to 6fc65a28fa.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a63.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
This commit is contained in:
BlueWildrose
2022-03-30 20:06:00 -07:00
committed by GitHub
co-authored by SandPoot Putnam3145
parent 9d6ec35125
commit 3687361ba5
25 changed files with 375 additions and 11 deletions
@@ -22,7 +22,7 @@
/datum/action/innate/ability/humanoid_customization/proc/change_form()
var/mob/living/carbon/human/H = owner
var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Body Color", "Eye Color","Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Penis", "Vagina", "Penis Length", "Breast Size", "Breast Shape", "Cancel")
var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Body Color", "Eye Color","Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Penis", "Vagina", "Penis Length", "Breast Size", "Breast Shape", "Butt Size", "Cancel")
if(select_alteration == "Body Color")
var/new_color = input(owner, "Choose your skin color:", "Race change","#"+H.dna.features["mcolor"]) as color|null
@@ -227,5 +227,17 @@
H.apply_overlay()
H.give_genital(/obj/item/organ/genital/breasts)
else if (select_alteration == "Butt Size")
for(var/obj/item/organ/genital/butt/X in H.internal_organs)
qdel(X)
var/min_B = CONFIG_GET(number/butt_min_size_prefs)
var/max_B = CONFIG_GET(number/butt_max_size_prefs)
var/new_length = input(owner, "Butt size:\n([min_B]-[max_B])", "Genital Alteration") as num|null
if(new_length)
H.dna.features["butt_size"] = clamp(round(new_length), min_B, max_B)
H.update_genitals()
H.apply_overlay()
H.give_genital(/obj/item/organ/genital/butt)
else
return