Skip to content

Commit

Permalink
[MIRROR] Ports additional Felinid ears from Orbstation (#1538)
Browse files Browse the repository at this point in the history
* Ports additional Felinid ears from Orbstation (#82066)

## About The Pull Request
Adds 5 new ear options from Orbstation, originally PRed in
lizardqueenlexi/orbstation#360. Sprites by @Or-Fi-S.

Big:

![image](https://github.com/tgstation/tgstation/assets/7019927/5f847130-e5f5-44cc-adb4-c740c4c4f69b)

Coeurl (FFXIV Miqo'te style):

![image](https://github.com/tgstation/tgstation/assets/7019927/34448bee-d6af-4d3c-b796-384ec9904368)

Fold:

![image](https://github.com/tgstation/tgstation/assets/7019927/a7dafd05-f652-460e-9386-f7fcbef696e9)

Lynx:

![image](https://github.com/tgstation/tgstation/assets/7019927/174ff630-6eb8-4bb9-8f4f-791b70356c58)

Round:

![image](https://github.com/tgstation/tgstation/assets/7019927/b3a24d1b-66fa-4883-8c27-871ae8966d6c)

Also makes it so the code guarantees that custom ears on a felinid
actually count as felinid ears and not human ones, as the code wasn't
checking properly when preferences were applied. There's probably a
cleaner, more permanent way to do this and a refactor is needed
somewhere down the line (man that sprite accessories file is getting
long huh) but I'll leave that to a more competent coder.

## Why It's Good For The Game
More customization options are good also Cobby said I could


![image](https://github.com/tgstation/tgstation/assets/7019927/56bbe285-068f-41a1-92cc-9f3861875090)

## Changelog
:cl:
add: Added 5 new Felinid ear options, ported from Orbstation! (Sprites
by Or-Fi-S)
/:cl:

---------

Co-authored-by: _0Steven <[email protected]>

* Ports additional Felinid ears from Orbstation

* Update felinid.dm

* Revert "Update felinid.dm"

This reverts commit b5cb6f24d82424eceaada708c0b1a136bb15460c.

* Just put this back. We have the other part of this commented out

---------

Co-authored-by: Vekter <[email protected]>
Co-authored-by: _0Steven <[email protected]>
Co-authored-by: Mal <[email protected]>
  • Loading branch information
4 people authored and StealsThePRs committed Mar 23, 2024
1 parent 9aba8d1 commit fe618d4
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 1 deletion.
20 changes: 20 additions & 0 deletions code/datums/sprite_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1916,6 +1916,26 @@
hasinner = TRUE
color_src = HAIR_COLOR

/datum/sprite_accessory/ears/cat/big
name = "Big"
icon_state = "big"

/datum/sprite_accessory/ears/cat/miqo
name = "Coeurl"
icon_state = "miqo"

/datum/sprite_accessory/ears/cat/fold
name = "Fold"
icon_state = "fold"

/datum/sprite_accessory/ears/cat/lynx
name = "Lynx"
icon_state = "lynx"

/datum/sprite_accessory/ears/cat/round
name = "Round"
icon_state = "round"

/datum/sprite_accessory/ears/fox
icon = 'icons/mob/human/fox_features.dmi'
name = "Fox"
Expand Down
8 changes: 8 additions & 0 deletions code/modules/mob/living/carbon/human/species_types/felinid.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,19 @@
target_human.dna.features["tail_cat"] = "Cat"
if(target_human.dna.features["ears"] == "None")
target_human.dna.features["ears"] = "Cat"
/* NOVA EDIT CHANGE START - ORIGINAL
if(target_human.dna.features["ears"] == "None")
mutantears = /obj/item/organ/internal/ears
else
var/obj/item/organ/internal/ears/cat/ears = new(FALSE, target_human.dna.features["ears"])
ears.Insert(target_human, movement_flags = DELETE_IF_REPLACED)
*/
if(target_human.dna.features["ears"] == "Cat")
var/obj/item/organ/internal/ears/cat/ears = new
ears.Insert(target_human, movement_flags = DELETE_IF_REPLACED)
else
mutantears = /obj/item/organ/internal/ears
// NOVA EDIT CHANGE END
return ..()

/datum/species/human/felinid/randomize_features(mob/living/carbon/human/human_mob)
Expand Down
9 changes: 8 additions & 1 deletion code/modules/surgery/organs/internal/ears/_ears.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,21 @@
icon_state = "kitty"
visual = TRUE
damage_multiplier = 2
// Keeps track of which cat ears sprite is associated with this.
var/variant = "Cat"

/obj/item/organ/internal/ears/cat/Initialize(mapload, variant_pref)
. = ..()
if(variant_pref)
variant = variant_pref

//NOVA EDIT REMOVAL BEGIN - CUSTOMIZATION
/*
/obj/item/organ/internal/ears/cat/on_mob_insert(mob/living/carbon/human/ear_owner)
. = ..()
if(istype(ear_owner) && ear_owner.dna)
color = ear_owner.hair_color
ear_owner.dna.features["ears"] = ear_owner.dna.species.mutant_bodyparts["ears"] = "Cat"
ear_owner.dna.features["ears"] = ear_owner.dna.species.mutant_bodyparts["ears"] = variant
ear_owner.dna.update_uf_block(DNA_EARS_BLOCK)
ear_owner.update_body()
Expand Down
Binary file modified icons/mob/human/cat_features.dmi
Binary file not shown.

0 comments on commit fe618d4

Please sign in to comment.