diff --git a/code/__DEFINES/~skyrat_defines/traits/declarations.dm b/code/__DEFINES/~skyrat_defines/traits/declarations.dm index 41958b3c3c2..073ada366b7 100644 --- a/code/__DEFINES/~skyrat_defines/traits/declarations.dm +++ b/code/__DEFINES/~skyrat_defines/traits/declarations.dm @@ -62,7 +62,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_ELECTRICAL_DAMAGE_REPAIRING "electrical_damage_repairing" // felinid traits -#define TRAIT_FELINE "feline_aspect" +#define TRAIT_FELINID "felinid_aspect" // canine traits #define TRAIT_CANINE "canine_aspect" diff --git a/code/__HELPERS/~skyrat_helpers/is_helpers.dm b/code/__HELPERS/~skyrat_helpers/is_helpers.dm index 75aa3ca1001..04c46a9e515 100644 --- a/code/__HELPERS/~skyrat_helpers/is_helpers.dm +++ b/code/__HELPERS/~skyrat_helpers/is_helpers.dm @@ -27,7 +27,7 @@ #define ishumanoid(A) (is_species(A,/datum/species/humanoid)) #define ismammal(A) (is_species(A,/datum/species/mammal)) #define isinsect(A) (is_species(A,/datum/species/insect)) -#define isfeline(A) (isfelinid(A) || istajaran(A) || HAS_TRAIT(A, TRAIT_FELINE)) +#define isfeline(A) (isfelinid(A) || istajaran(A) || HAS_TRAIT(A, TRAIT_FELINID)) #define iscanine(A) (isvulpkanin(A) || HAS_TRAIT(A, TRAIT_CANINE)) #define isavian(A) (isteshari(A) || isvox(A) || isvoxprimalis(A) || HAS_TRAIT(A, TRAIT_AVIAN)) diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index cd7d9eec15c..00d8be0defd 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -683,7 +683,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_DETECTIVE" = TRAIT_DETECTIVE, "TRAIT_DNR" = TRAIT_DNR, "TRAIT_EXCITABLE" = TRAIT_EXCITABLE, - "TRAIT_FELINE" = TRAIT_FELINE, + "TRAIT_FELINID" = TRAIT_FELINID, "TRAIT_FLORAL_ASPECT" = TRAIT_FLORAL_ASPECT, "TRAIT_FREE_GHOST" = TRAIT_FREE_GHOST, "TRAIT_GHOSTROLE" = TRAIT_GHOSTROLE, diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm index 621d1a842c8..84f65ae5868 100644 --- a/code/_globalvars/traits/admin_tooling.dm +++ b/code/_globalvars/traits/admin_tooling.dm @@ -372,7 +372,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_DETECTIVE" = TRAIT_DETECTIVE, "TRAIT_DNR" = TRAIT_DNR, "TRAIT_EXCITABLE" = TRAIT_EXCITABLE, - "TRAIT_FELINE" = TRAIT_FELINE, + "TRAIT_FELINID" = TRAIT_FELINID, "TRAIT_FLORAL_ASPECT" = TRAIT_FLORAL_ASPECT, "TRAIT_FREE_GHOST" = TRAIT_FREE_GHOST, "TRAIT_GHOSTROLE" = TRAIT_GHOSTROLE, diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 77bd066f547..6a0b2bd05c0 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -32,7 +32,7 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( list(/datum/quirk/no_guns, /datum/quirk/bighands, /datum/quirk/poor_aim), list(/datum/quirk/no_guns, /datum/quirk/nonviolent), list(/datum/quirk/spacer_born, /datum/quirk/oversized), - list(/datum/quirk/feline_aspect, /datum/quirk/item_quirk/canine, /datum/quirk/item_quirk/avian), + list(/datum/quirk/felinid_aspect, /datum/quirk/item_quirk/canine, /datum/quirk/item_quirk/avian), list(/datum/quirk/all_nighter, /datum/quirk/heavy_sleeper), list(/datum/quirk/light_drinker, /datum/quirk/drunkhealing), list(/datum/quirk/oversized, /datum/quirk/freerunning), diff --git a/modular_skyrat/modules/quirks/neutral.dm b/modular_skyrat/modules/quirks/neutral.dm index 06e62a94578..897b88bff68 100644 --- a/modular_skyrat/modules/quirks/neutral.dm +++ b/modular_skyrat/modules/quirks/neutral.dm @@ -227,16 +227,16 @@ GLOBAL_VAR_INIT(DNR_trait_overlay, generate_DNR_trait_overlay()) balloon_alert(user, "card flipped") return CLICK_ACTION_SUCCESS -/datum/quirk/feline_aspect - name = "Feline Traits" - desc = "You happen to act like a feline, for whatever reason. This will replace most other tongue-based speech quirks." +/datum/quirk/felinid_aspect + name = "Felinid Traits" + desc = "You happen to act like a felinid, for whatever reason. This will replace other tongue-based quirks." gain_text = span_notice("Nya could go for some catnip right about now...") lose_text = span_notice("You feel less attracted to lasers.") - medical_record_text = "Patient seems to possess behavior much like a feline." - mob_trait = TRAIT_FELINE + medical_record_text = "Patient seems to possess behavior much like a felinid." + mob_trait = TRAIT_FELINID icon = FA_ICON_CAT -/datum/quirk/feline_aspect/add_unique(client/client_source) +/datum/quirk/felinid_aspect/add_unique(client/client_source) var/mob/living/carbon/human/human_holder = quirk_holder var/obj/item/organ/internal/tongue/cat/new_tongue = new(get_turf(human_holder))