This commit is contained in:
Metis
2024-09-14 15:29:13 -04:00
parent aadccce155
commit be7d332d85
12 changed files with 133 additions and 7 deletions
+11
View File
@@ -234,6 +234,8 @@
give_genital(/obj/item/organ/genital/penis)
if(dna.features["has_butt"])
give_genital(/obj/item/organ/genital/butt)
if(dna.features["has_belly"])
give_genital(/obj/item/organ/genital/belly)
/mob/living/carbon/human/proc/give_genital(obj/item/organ/genital/G)
if(!dna || (NOGENITALS in dna.species.species_traits) || getorganslot(initial(G.slot)))
@@ -293,6 +295,8 @@
S = GLOB.breasts_shapes_list[G.shape]
if(/obj/item/organ/genital/butt)
S = GLOB.butt_shapes_list[G.shape]
if(/obj/item/organ/genital/belly)
S = GLOB.belly_shapes_list[G.shape]
if(!S || S.icon_state == "none")
continue
@@ -327,6 +331,8 @@
genital_overlay.color = "#[dna.features["vag_color"]]"
if("butt_color")
genital_overlay.color = "#[dna.features["butt_color"]]"
if("belly_color")
genital_overlay.color = "#[dna.features["belly_color"]]"
genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size][(dna.species.use_skintones && !dna.skin_tone_override) ? "_s" : ""]_[aroused_state]_[layertext]"
@@ -358,6 +364,7 @@
var/willyCheck = getorganslot(ORGAN_SLOT_PENIS)
var/buttCheck = getorganslot(ORGAN_SLOT_BUTT)
var/ballCheck = getorganslot(ORGAN_SLOT_TESTICLES)
var/bellyCheck = getorganslot(ORGAN_SLOT_BELLY)
if(organCheck == FALSE)
if(ishuman(src) && dna.species.use_skintones)
@@ -366,12 +373,14 @@
dna.features["cock_color"] = "[dna.species.fixed_mut_color]"
dna.features["breasts_color"] = "[dna.species.fixed_mut_color]"
dna.features["butt_color"] = "[dna.species.fixed_mut_color]"
dna.features["belly_color"] = "[dna.species.fixed_mut_color]"
dna.features["testicles_color"] = "[dna.species.fixed_mut_color]"
return
//So people who haven't set stuff up don't get rainbow surprises.
dna.features["cock_color"] = "[dna.features["mcolor"]]"
dna.features["breasts_color"] = "[dna.features["mcolor"]]"
dna.features["butt_color"] = "[dna.features["mcolor"]]"
dna.features["belly_color"] = "[dna.features["mcolor"]]"
dna.features["testicles_color"] = "[dna.features["mcolor"]]"
else //If there's a new organ, make it the same colour.
if(breastCheck == FALSE)
@@ -380,6 +389,8 @@
dna.features["cock_color"] = dna.features["breasts_color"]
else if (buttCheck == FALSE)
dna.features["butt_color"] = dna.features["butt_color"]
else if (bellyCheck == FALSE)
dna.features["belly_color"] = dna.features["belly_color"]
else if (ballCheck == FALSE)
dna.features["testicles_color"] = dna.features["testicles_color"]
return TRUE
@@ -135,3 +135,14 @@
/datum/sprite_accessory/butt/pair
icon_state = "pair"
name = "Pair"
//BELLY BE HERE
/datum/sprite_accessory/belly
icon = 'hyperstation/icons/obj/genitals/belly.dmi'
icon_state = "belly"
name = "belly"
color_src = "belly_color"
/datum/sprite_accessory/belly/belly
icon_state = "belly"
name = "belly"