From 33849261abc667a9d412d0cae6bf28bac030d294 Mon Sep 17 00:00:00 2001 From: Inf0 <59097267+Infernal-0@users.noreply.github.com> Date: Mon, 18 May 2026 16:49:39 +0200 Subject: [PATCH 1/6] Tadaa! Done --- .../~nova_defines/traits/declarations.dm | 3 +++ .../master_files/code/datums/traits/neutral.dm | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/code/__DEFINES/~nova_defines/traits/declarations.dm b/code/__DEFINES/~nova_defines/traits/declarations.dm index c239474aa373..4c914731ecd2 100644 --- a/code/__DEFINES/~nova_defines/traits/declarations.dm +++ b/code/__DEFINES/~nova_defines/traits/declarations.dm @@ -75,6 +75,9 @@ // avian traits #define TRAIT_AVIAN "avian_aspect" +// feathered +#define TRAIT_FEATHERED "featherquirk" + // chameleon mutation #define TRAIT_CHAMELEON_SKIN "chameleon_skin" diff --git a/modular_nova/master_files/code/datums/traits/neutral.dm b/modular_nova/master_files/code/datums/traits/neutral.dm index 400fffb79075..5f1c7cf11925 100644 --- a/modular_nova/master_files/code/datums/traits/neutral.dm +++ b/modular_nova/master_files/code/datums/traits/neutral.dm @@ -251,6 +251,24 @@ human_holder.dna.remove_mutation(/datum/mutation/olfaction, MUTATION_SOURCE_ACTIVATED) +/datum/quirk/featherquirk + name = "Feathered" + desc = "You got feathers, wherever they are. One way or another, you drop them when hit." + mob_trait = TRAIT_FEATHERED + icon = FA_ICON_FEATHER + value = 0 + +/datum/quirk/featherquirk/add_unique(client/client_source) + var/mob/living/carbon/human/human_holder = quirk_holder + + human_holder.AddComponent(/datum/component/pinata, candy = list(/obj/item/feather)) + +/datum/quirk/featherquirk/remove() + var/mob/living/carbon/human/human_holder = quirk_holder + + var/datum/component/pinata/feathered_removal = quirk_holder.GetExactComponent(/datum/component/pinata) + feathered_removal.Destroy() + /datum/quirk/avian_aspect name = "Avian Traits" desc = "You're a birdbrain, or you've got a bird's brain. This will replace most other tongue-based speech quirks." From a4237886d8d7bf6b759dc16a1f0a836cbcec0ce4 Mon Sep 17 00:00:00 2001 From: Inf0 <59097267+Infernal-0@users.noreply.github.com> Date: Mon, 18 May 2026 17:37:27 +0200 Subject: [PATCH 2/6] uhhhhhhhhhh idk --- code/__DEFINES/~nova_defines/traits/declarations.dm | 2 +- modular_nova/master_files/code/datums/traits/neutral.dm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/~nova_defines/traits/declarations.dm b/code/__DEFINES/~nova_defines/traits/declarations.dm index 4c914731ecd2..b32ecd1569c8 100644 --- a/code/__DEFINES/~nova_defines/traits/declarations.dm +++ b/code/__DEFINES/~nova_defines/traits/declarations.dm @@ -75,7 +75,7 @@ // avian traits #define TRAIT_AVIAN "avian_aspect" -// feathered +// feathered, oculis addition #define TRAIT_FEATHERED "featherquirk" // chameleon mutation diff --git a/modular_nova/master_files/code/datums/traits/neutral.dm b/modular_nova/master_files/code/datums/traits/neutral.dm index 5f1c7cf11925..9d9794389a61 100644 --- a/modular_nova/master_files/code/datums/traits/neutral.dm +++ b/modular_nova/master_files/code/datums/traits/neutral.dm @@ -258,13 +258,14 @@ icon = FA_ICON_FEATHER value = 0 +//feathered quirk, oculis addition n shit /datum/quirk/featherquirk/add_unique(client/client_source) - var/mob/living/carbon/human/human_holder = quirk_holder + var/mob/living/carbon/human/human_holder = human_holder human_holder.AddComponent(/datum/component/pinata, candy = list(/obj/item/feather)) /datum/quirk/featherquirk/remove() - var/mob/living/carbon/human/human_holder = quirk_holder + var/mob/living/carbon/human/human_holder = human_holder var/datum/component/pinata/feathered_removal = quirk_holder.GetExactComponent(/datum/component/pinata) feathered_removal.Destroy() From e6b8fcddebbe1cba69be4526ceefc6f5240e1c6e Mon Sep 17 00:00:00 2001 From: Inf0 <59097267+Infernal-0@users.noreply.github.com> Date: Mon, 18 May 2026 17:53:07 +0200 Subject: [PATCH 3/6] uhmmmm --- modular_nova/master_files/code/datums/traits/neutral.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modular_nova/master_files/code/datums/traits/neutral.dm b/modular_nova/master_files/code/datums/traits/neutral.dm index 9d9794389a61..f602b85af29b 100644 --- a/modular_nova/master_files/code/datums/traits/neutral.dm +++ b/modular_nova/master_files/code/datums/traits/neutral.dm @@ -260,14 +260,14 @@ //feathered quirk, oculis addition n shit /datum/quirk/featherquirk/add_unique(client/client_source) - var/mob/living/carbon/human/human_holder = human_holder + var/mob/living/carbon/human/human_holder = quirk_holder human_holder.AddComponent(/datum/component/pinata, candy = list(/obj/item/feather)) /datum/quirk/featherquirk/remove() - var/mob/living/carbon/human/human_holder = human_holder + var/mob/living/carbon/human/human_holder = quirk_holder - var/datum/component/pinata/feathered_removal = quirk_holder.GetExactComponent(/datum/component/pinata) + var/datum/component/pinata/feathered_removal = human_holder.GetExactComponent(/datum/component/pinata) feathered_removal.Destroy() /datum/quirk/avian_aspect From 66dfb7885ac5ac80d7704f3894258ad9a3f9c862 Mon Sep 17 00:00:00 2001 From: Inf0 <59097267+Infernal-0@users.noreply.github.com> Date: Tue, 19 May 2026 20:08:36 +0200 Subject: [PATCH 4/6] uhh modularizes. i think? --- .../code/datums/traits/neutral.dm | 19 ------------------- .../code/datums/traits/neutral.dm | 6 ++++++ 2 files changed, 6 insertions(+), 19 deletions(-) create mode 100644 modular_oculis/master_files/code/datums/traits/neutral.dm diff --git a/modular_nova/master_files/code/datums/traits/neutral.dm b/modular_nova/master_files/code/datums/traits/neutral.dm index f602b85af29b..400fffb79075 100644 --- a/modular_nova/master_files/code/datums/traits/neutral.dm +++ b/modular_nova/master_files/code/datums/traits/neutral.dm @@ -251,25 +251,6 @@ human_holder.dna.remove_mutation(/datum/mutation/olfaction, MUTATION_SOURCE_ACTIVATED) -/datum/quirk/featherquirk - name = "Feathered" - desc = "You got feathers, wherever they are. One way or another, you drop them when hit." - mob_trait = TRAIT_FEATHERED - icon = FA_ICON_FEATHER - value = 0 - -//feathered quirk, oculis addition n shit -/datum/quirk/featherquirk/add_unique(client/client_source) - var/mob/living/carbon/human/human_holder = quirk_holder - - human_holder.AddComponent(/datum/component/pinata, candy = list(/obj/item/feather)) - -/datum/quirk/featherquirk/remove() - var/mob/living/carbon/human/human_holder = quirk_holder - - var/datum/component/pinata/feathered_removal = human_holder.GetExactComponent(/datum/component/pinata) - feathered_removal.Destroy() - /datum/quirk/avian_aspect name = "Avian Traits" desc = "You're a birdbrain, or you've got a bird's brain. This will replace most other tongue-based speech quirks." diff --git a/modular_oculis/master_files/code/datums/traits/neutral.dm b/modular_oculis/master_files/code/datums/traits/neutral.dm new file mode 100644 index 000000000000..0faf006755ca --- /dev/null +++ b/modular_oculis/master_files/code/datums/traits/neutral.dm @@ -0,0 +1,6 @@ +/datum/quirk/featherquirk + name = "Feathered" + desc = "You got feathers, wherever they are. One way or another, you drop them when hit." + mob_trait = TRAIT_FEATHERED + icon = FA_ICON_FEATHER + value = 0 From c09b7692ccc90dc35d24540f278f89a02a7e4caf Mon Sep 17 00:00:00 2001 From: Inf0 <59097267+Infernal-0@users.noreply.github.com> Date: Tue, 19 May 2026 20:10:01 +0200 Subject: [PATCH 5/6] woops --- .../master_files/code/datums/traits/neutral.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modular_oculis/master_files/code/datums/traits/neutral.dm b/modular_oculis/master_files/code/datums/traits/neutral.dm index 0faf006755ca..6de8884bf28d 100644 --- a/modular_oculis/master_files/code/datums/traits/neutral.dm +++ b/modular_oculis/master_files/code/datums/traits/neutral.dm @@ -4,3 +4,14 @@ mob_trait = TRAIT_FEATHERED icon = FA_ICON_FEATHER value = 0 +//feathered quirk, oculis addition n shit +/datum/quirk/featherquirk/add_unique(client/client_source) + var/mob/living/carbon/human/human_holder = quirk_holder + + human_holder.AddComponent(/datum/component/pinata, candy = list(/obj/item/feather)) + +/datum/quirk/featherquirk/remove() + var/mob/living/carbon/human/human_holder = quirk_holder + + var/datum/component/pinata/feathered_removal = human_holder.GetExactComponent(/datum/component/pinata) + feathered_removal.Destroy() From b4fb10b88a89baf54a7dfc46d4049802fd728592 Mon Sep 17 00:00:00 2001 From: Inf0 <59097267+Infernal-0@users.noreply.github.com> Date: Tue, 19 May 2026 20:20:50 +0200 Subject: [PATCH 6/6] uhmm --- .../code/datums/traits => modules/featheredquirk/code}/neutral.dm | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename modular_oculis/{master_files/code/datums/traits => modules/featheredquirk/code}/neutral.dm (100%) diff --git a/modular_oculis/master_files/code/datums/traits/neutral.dm b/modular_oculis/modules/featheredquirk/code/neutral.dm similarity index 100% rename from modular_oculis/master_files/code/datums/traits/neutral.dm rename to modular_oculis/modules/featheredquirk/code/neutral.dm