From b566c41d371d6fc784436b4b01eccccd5f63f88b Mon Sep 17 00:00:00 2001 From: Skies-Of-Blue Date: Wed, 8 Jan 2025 00:02:58 -0800 Subject: [PATCH 1/2] repaths tails so they aren't blank in char creator --- code/datums/sprite_accessories.dm | 58 +++++++++--------- .../dna_infuser/organ_sets/fish_organs.dm | 8 +-- icons/mob/human/fish_features.dmi | Bin 4841 -> 4837 bytes .../modules/emote_panel/code/emote_panel.dm | 1 - 4 files changed, 33 insertions(+), 34 deletions(-) diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm index 37bbd53aec25..3a04a4b72bf6 100644 --- a/code/datums/sprite_accessories.dm +++ b/code/datums/sprite_accessories.dm @@ -1747,35 +1747,6 @@ /// Describes which tail spine sprites to use, if any. var/spine_key = NONE -///Used for fish-infused tails, which come in different flavors. -/datum/sprite_accessory/tails/fish - icon = 'icons/mob/human/fish_features.dmi' - color_src = TRUE - -/datum/sprite_accessory/tails/fish/simple - name = "Simple" - icon_state = "simple" - -/datum/sprite_accessory/tails/fish/crescent - name = "Crescent" - icon_state = "crescent" - -/datum/sprite_accessory/tails/fish/long - name = "Long" - icon_state = "long" - center = TRUE - dimension_x = 38 - -/datum/sprite_accessory/tails/fish/shark - name = "Shark" - icon_state = "shark" - -/datum/sprite_accessory/tails/fish/chonky - name = "Chonky" - icon_state = "chonky" - center = TRUE - dimension_x = 36 - /datum/sprite_accessory/tails/lizard icon = 'icons/mob/human/species/lizard/lizard_tails.dmi' spine_key = SPINE_KEY_LIZARD @@ -1812,6 +1783,35 @@ icon_state = "default" color_src = HAIR_COLOR +///Used for fish-infused tails, which come in different flavors. +/datum/sprite_accessory/tails/fish + icon = 'icons/mob/human/fish_features.dmi' + color_src = USE_ONE_COLOR + +/datum/sprite_accessory/tails/fish/simple + name = "Simple" + icon_state = "simple" + +/datum/sprite_accessory/tails/fish/crescent + name = "Crescent" + icon_state = "crescent" + +/datum/sprite_accessory/tails/fish/long + name = "Long" + icon_state = "long" + center = TRUE + dimension_x = 38 + +/datum/sprite_accessory/tails/fish/shark + name = "Shark Alt" // IRIS EDIT: Allows this to co-exist with the Akula shark tail + icon_state = "shark" + +/datum/sprite_accessory/tails/fish/chonky + name = "Chonky" + icon_state = "chonky" + center = TRUE + dimension_x = 36 + /datum/sprite_accessory/tails/monkey /datum/sprite_accessory/tails/monkey/none diff --git a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm index 34325a7341ef..501fd8724005 100644 --- a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm @@ -228,14 +228,14 @@ source.add_traits(list(TRAIT_OFF_BALANCE_TACKLER, TRAIT_NO_STAGGER, TRAIT_NO_THROW_HITPUSH), type) /datum/bodypart_overlay/mutant/tail/fish - feature_key = "fish_tail" + feature_key = "tail" // IRIS EDIT: changed feature key to be consistent with other selectable tails color_source = ORGAN_COLOR_OVERRIDE /datum/bodypart_overlay/mutant/tail/fish/on_mob_insert(obj/item/organ/parent, mob/living/carbon/receiver) //Initialize the related dna feature block if we don't have any so it doesn't error out. //This isn't tied to any species, but I kinda want it to be mutable instead of having a fixed sprite accessory. - if(imprint_on_next_insertion && !receiver.dna.features["fish_tail"]) - receiver.dna.features["fish_tail"] = pick(SSaccessories.tails_list_fish) + if(imprint_on_next_insertion && !receiver.dna.features["tail"]) + receiver.dna.features["tail"] = pick(SSaccessories.tails_list_fish) receiver.dna.update_uf_block(DNA_FISH_TAIL_BLOCK) return ..() @@ -248,7 +248,7 @@ return pick("#B4B8DD", "#85C7D0", "#67BBEE", "#2F4450", "#55CCBB", "#999FD0", "#345066", "#585B69", "#7381A0", "#B6DDE5", "#4E4E50") /datum/bodypart_overlay/mutant/tail/fish/get_global_feature_list() - return SSaccessories.tails_list_fish + return SSaccessories.sprite_accessories["tail"] // IRIS EDIT: changed feature key to be consistent with other selectable tails ///Lungs that replace the need of oxygen with water vapor or being wet diff --git a/icons/mob/human/fish_features.dmi b/icons/mob/human/fish_features.dmi index 3a2906c68bb1950d4fe692cf480a4dc219d61561..7091a33196c9ed2709866fb30711e6a585d35407 100644 GIT binary patch delta 214 zcmV;{04e|JCFLcMB!9trR9JLGWpiV4X>fFDZ*Bkpc$}5cK?}kl7{>AQ{1h+SJ*w@{ z#Y4kY1~Z86BAcnqX{Z!^`wl_fBJaauF9%f7$Fw`4V zXlayAfT3Qam_(9*p;X4&$hYKJqGB{50)_?^*C1vY0mJIMoJ)BU#`0+9o0Yun4wRA1 zXm>ub%fHPKWE`YRnbarC!mM{H6SCf^JS1unrrhVW2vg>9+PmqQd)qtu302TB0;H$t Q1(?{n8m)17^0D&w5z5PF(f|Me delta 218 zcmV<0044wBCFv!QB!9(vR9JLGWpiV4X>fFDZ*Bkpc$}Tku?oU46ouird5TNBi`ot@ z87!$k=(^PVU;@dk2x(UsGem*!El-03rfi*RGNRMWAK%rQzN%Ay(&_E&I zkwiz1XZY3|P zQ{A$d@^HPhw?$#+C3ez<81&mNXYK4%3~6VlA~@8-k5RvB;m4R;_3Xx1)Ty8HFPTBr UGGI+j-u$G_bk={Mg|Y7U5r&Irg8%>k diff --git a/modular_nova/modules/emote_panel/code/emote_panel.dm b/modular_nova/modules/emote_panel/code/emote_panel.dm index c991ce0cdf06..4eed92677be4 100644 --- a/modular_nova/modules/emote_panel/code/emote_panel.dm +++ b/modular_nova/modules/emote_panel/code/emote_panel.dm @@ -131,7 +131,6 @@ /mob/living/proc/emote_caw, /mob/living/proc/emote_caw2, /mob/living/proc/emote_whistle, - /mob/living/proc/emote_blep, /mob/living/proc/emote_bork, /mob/living/proc/emote_hoot, /mob/living/proc/emote_growl, From 147f9f34d745a2916f07926d7e16b20e1d178643 Mon Sep 17 00:00:00 2001 From: Skies-Of-Blue Date: Wed, 8 Jan 2025 00:20:48 -0800 Subject: [PATCH 2/2] more descriptive tail names --- code/datums/sprite_accessories.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm index 3a04a4b72bf6..1f20f3afb370 100644 --- a/code/datums/sprite_accessories.dm +++ b/code/datums/sprite_accessories.dm @@ -1788,29 +1788,29 @@ icon = 'icons/mob/human/fish_features.dmi' color_src = USE_ONE_COLOR -/datum/sprite_accessory/tails/fish/simple - name = "Simple" - icon_state = "simple" +/datum/sprite_accessory/tails/fish/chonky + name = "Chonky Fish" + icon_state = "chonky" + center = TRUE + dimension_x = 36 /datum/sprite_accessory/tails/fish/crescent - name = "Crescent" + name = "Crescent Fish" icon_state = "crescent" /datum/sprite_accessory/tails/fish/long - name = "Long" + name = "Long Fish" icon_state = "long" center = TRUE dimension_x = 38 +/datum/sprite_accessory/tails/fish/simple + name = "Simple Fish" + icon_state = "simple" /datum/sprite_accessory/tails/fish/shark name = "Shark Alt" // IRIS EDIT: Allows this to co-exist with the Akula shark tail icon_state = "shark" -/datum/sprite_accessory/tails/fish/chonky - name = "Chonky" - icon_state = "chonky" - center = TRUE - dimension_x = 36 /datum/sprite_accessory/tails/monkey