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.
90 lines
2.1 KiB
Plaintext
90 lines
2.1 KiB
Plaintext
/datum/sprite_accessory
|
|
var/alt_aroused = FALSE //CIT CODE if this is TRUE, then the genitals will use an alternate icon_state when aroused.
|
|
|
|
|
|
//DICKS,COCKS,PENISES,WHATEVER YOU WANT TO CALL THEM
|
|
/datum/sprite_accessory/penis
|
|
icon = 'code/citadel/icons/penis_onmob.dmi'
|
|
icon_state = null
|
|
name = "penis" //the preview name of the accessory
|
|
gender_specific = 0 //Might be needed somewhere down the list.
|
|
color_src = "cock_color"
|
|
locked = 0
|
|
|
|
/datum/sprite_accessory/penis/human
|
|
icon_state = "human"
|
|
name = "Human"
|
|
|
|
/datum/sprite_accessory/penis/knotted
|
|
icon_state = "knotted"
|
|
name = "Knotted"
|
|
|
|
/datum/sprite_accessory/penis/flared
|
|
icon_state = "flared"
|
|
name = "Flared"
|
|
|
|
/datum/sprite_accessory/penis/barbknot
|
|
icon_state = "barbknot"
|
|
name = "Barbed, Knotted"
|
|
|
|
/datum/sprite_accessory/penis/tapered
|
|
icon_state = "tapered"
|
|
name = "Tapered"
|
|
|
|
//Vaginas
|
|
/datum/sprite_accessory/vagina
|
|
icon = 'code/citadel/icons/vagina_onmob.dmi'
|
|
icon_state = null
|
|
name = "vagina"
|
|
gender_specific = 0
|
|
color_src = "vag_color"
|
|
locked = 0
|
|
alt_aroused = FALSE //if this is TRUE, then the genitals will use an alternate sprite for aroused states
|
|
|
|
/datum/sprite_accessory/vagina/human
|
|
icon_state = "human"
|
|
name = "Human"
|
|
alt_aroused = TRUE
|
|
|
|
/datum/sprite_accessory/vagina/tentacles
|
|
icon_state = "tentacle"
|
|
name = "Tentacle"
|
|
alt_aroused = TRUE
|
|
|
|
/datum/sprite_accessory/vagina/dentata
|
|
icon_state = "dentata"
|
|
name = "Dentata"
|
|
alt_aroused = TRUE
|
|
|
|
/datum/sprite_accessory/vagina/hairy
|
|
icon_state = "hairy"
|
|
name = "Hairy"
|
|
|
|
|
|
//BREASTS BE HERE
|
|
/datum/sprite_accessory/breasts
|
|
icon = 'code/citadel/icons/breasts_onmob.dmi'
|
|
icon_state = null
|
|
name = "breasts"
|
|
gender_specific = 0
|
|
color_src = "breasts_color"
|
|
locked = 0
|
|
|
|
/datum/sprite_accessory/breasts/pair
|
|
icon_state = "pair"
|
|
name = "Pair"
|
|
|
|
|
|
//OVIPOSITORS BE HERE
|
|
/datum/sprite_accessory/ovipositor
|
|
icon = 'code/citadel/icons/penis_onmob.dmi'
|
|
icon_state = null
|
|
name = "Ovipositor" //the preview name of the accessory
|
|
gender_specific = 0 //Might be needed somewhere down the list.
|
|
color_src = "cock_color"
|
|
locked = 0
|
|
|
|
/datum/sprite_accessory/ovipositor/knotted
|
|
icon_state = "knotted"
|
|
name = "Knotted"
|