Skip to content

Commit

Permalink
[IDB IGNORE]Kepori Visual Overhaul (shiptest-ss13#2892)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

KEPORI.... TWO!!
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

![PEGGLETWO](https://github.com/shiptest-ss13/Shiptest/assets/81882910/834f7caa-909c-44fc-9da1-959af0df189c)

![image](https://github.com/shiptest-ss13/Shiptest/assets/81882910/20990212-0539-4812-985a-d000d83127af)

This PR aims mostly for parity with existing Kepori customization. A few
customization options were removed as they didn't offer much. Also adds
a new "Head Feathers" sprite accessory type so it's not tied to body, as
well as cleaning up existing sprite accessories.

I believe this iteration of Kepori is closer to the original vision of
what they should be, and was held back for various reasons during the
past iteration. I've spent a long time on this, and I think it has come
out very very well. Credits to `spookypineapple` for his great help
during this process.

This doesn't include everything for now. I cut out some old jumpsuits
that needed updating as I'd have to fully resprite them anyways. Some of
them don't even have resprited human versions, so whatever.

TODO:

Literally everything else (not in this PR)

:cl:
imageadd: Kepori have been given a full visual overhaul.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: retlaw34 <[email protected]>
Co-authored-by: CoreyLee Hassell <[email protected]>
  • Loading branch information
3 people authored and MrCat15352 committed Jun 22, 2024
1 parent d8fc857 commit f224249
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 23 deletions.
6 changes: 3 additions & 3 deletions code/modules/client/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -968,9 +968,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "</td>"
mutant_category = 0

// begin generic adjective
if(!mutant_category)
dat += APPEARANCE_CATEGORY_COLUMN
if(generic_adjective)
if(!mutant_category)
dat += APPEARANCE_CATEGORY_COLUMN

dat += "<h3>Character Adjective</h3>"

Expand Down
5 changes: 0 additions & 5 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
item_state = "armoralt"
//supports_variations = KEPORI_VARIATION

/obj/item/clothing/suit/armor/vest/trauma
name = "cybersun trauma team armor vest"
icon_state = "traumavest"
desc = "A set of stamped plasteel armor plates decorated with a medical cross and colors associated with the medical division of Cybersun."

/obj/item/clothing/suit/armor/vest/marine
name = "tactical armor vest"
desc = "A heavy set of the finest mass-produced stamped plasteel armor plates money can buy."
Expand Down
15 changes: 0 additions & 15 deletions code/modules/mob/living/carbon/human/update_icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -487,11 +487,6 @@ There are several things that need to be remembered:
else
handled_by_bodytype = TRUE

// [CELADON-ADD] - TAJARA
if((I.supports_variations & TAJARA_VARIATION) && (dna.species.bodytype & BODYTYPE_TAJARA))
icon_file = TAJARA_HEAD_PATH
// [/CELADON-ADD]

if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(I))))
handled_by_bodytype = TRUE
icon_file = DEFAULT_HEAD_PATH
Expand Down Expand Up @@ -600,11 +595,6 @@ There are several things that need to be remembered:
else
handled_by_bodytype = TRUE

// [CELADON-ADD] - TAJARA
else if((dna.species.bodytype & BODYTYPE_TAJARA) && (I.supports_variations & TAJARA_VARIATION))
icon_file = TAJARA_SUIT_PATH
// [/CELADON-ADD]

if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(I))))
handled_by_bodytype = TRUE
icon_file = I.mob_overlay_icon
Expand Down Expand Up @@ -688,11 +678,6 @@ There are several things that need to be remembered:
else
handled_by_bodytype = TRUE

// [CELADON-ADD] - TAJARA
if((dna.species.bodytype & BODYTYPE_TAJARA) && (I.supports_variations & TAJARA_VARIATION))
icon_file = TAJARA_MASK_PATH
// [/CELADON-ADD]

if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(I))))
icon_file = DEFAULT_MASK_PATH
handled_by_bodytype = TRUE
Expand Down

0 comments on commit f224249

Please sign in to comment.