ktccdandTalkingCactus
c785038994
* Revert "Revert "Huge Sprite Rework"" * Compilation of all feedback fixes This commit contains all the suggested fixes so far and the changes we came up with through discussion about the code. For example, genitals **may** now use alternate icons for aroused states, but does not have to, this is decided by a boolean variable in the sprite accessory itself, defaulting to not using alternate icons. Genital icon_state names now follow a new format to match these new options in a modular way for all kinds of genitals. * Conflict solving reformats all the taurs to use the TAUR layer instead of the BODY_FRONT layer. Same for the new Eevee sprites. * Committing the old, unfixed file. This will cause errors if used, but at least it won't cause conflicts. * Contains fixed sprite names The shepherd taur body should STILL have a hole in the body due to a pixel error. I have forgotten which pixes these are, so.... **le shrug** * Anger commit Commiting this in anger. I WILL make it work damnit! * Proper name fixes. Also renames the taur cow to no longer have an incorrectly duplicate icon_state. * Shepherd taur pixel fix Fixes the missing pixels from the taur body that caused a hole to appear when viewed from the sides. * Conflict resolution This PR will cause some sprite-breaking overlay errors. But it's the only way to handle the conflicting .dmi. So I'll make a separate PR to fix the sprites later. * Fixes global lists Now they use whatever weird new system we got for them.
58 lines
1.8 KiB
Plaintext
58 lines
1.8 KiB
Plaintext
/obj/item/organ/genital/breasts
|
|
name = "breasts"
|
|
desc = "Female milk producing organs."
|
|
icon_state = "breasts"
|
|
icon = 'code/citadel/icons/breasts.dmi'
|
|
zone = "chest"
|
|
slot = "breasts"
|
|
w_class = 3
|
|
size = BREASTS_SIZE_DEF
|
|
fluid_id = "milk"
|
|
var/amount = 2
|
|
producing = TRUE
|
|
shape = "pair"
|
|
|
|
/obj/item/organ/genital/breasts/Initialize()
|
|
create_reagents(fluid_max_volume)
|
|
reagents.add_reagent(fluid_id, fluid_max_volume)
|
|
update()
|
|
|
|
/obj/item/organ/genital/breasts/on_life()
|
|
if(QDELETED(src))
|
|
return
|
|
if(!reagents || !owner)
|
|
return
|
|
reagents.maximum_volume = fluid_max_volume
|
|
if(fluid_id && producing)
|
|
generate_milk()
|
|
|
|
/obj/item/organ/genital/breasts/proc/generate_milk()
|
|
if(owner.stat == DEAD)
|
|
return FALSE
|
|
reagents.isolate_reagent(fluid_id)
|
|
reagents.add_reagent(fluid_id, (fluid_mult * fluid_rate))
|
|
|
|
/obj/item/organ/genital/breasts/update_appearance()
|
|
var/string = "breasts_[lowertext(shape)]_[size]"
|
|
icon_state = sanitize_text(string)
|
|
var/lowershape = lowertext(shape)
|
|
switch(lowershape)
|
|
if("pair")
|
|
desc = "That's a pair of breasts."
|
|
else
|
|
desc = "That's 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]."
|
|
else
|
|
desc += "\nThey 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...
|
|
var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need.
|
|
color = "#[skintone2hex(H.skin_tone)]"
|
|
else
|
|
color = "#[owner.dna.features["breasts_color"]]" |