From e519305e4e0039889b0698db2db7592cf0d1c643 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 13:42:46 +1100 Subject: [PATCH 01/27] Update trait-categories.ftl Signed-off-by: Raikyr0 --- Resources/Locale/en-US/_DV/traits/trait-categories.ftl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/_DV/traits/trait-categories.ftl b/Resources/Locale/en-US/_DV/traits/trait-categories.ftl index fef3f7debe8..f43c52c957f 100644 --- a/Resources/Locale/en-US/_DV/traits/trait-categories.ftl +++ b/Resources/Locale/en-US/_DV/traits/trait-categories.ftl @@ -1,5 +1,8 @@ -trait-category-disabilities = Disabilities +trait-category-disabilitiesphysical = Disabilities - Physical +trait-category-disabilitiesmental = Disabilities - Mental +trait-category-cybernetics = Cybernetics +trait-category-psionic = Psionics trait-category-medical = Medical -trait-category-mental = Mental +trait-category-feats = Feats trait-category-accents = Accents trait-category-meta = Meta From aeee55d5790c0433159815134b461a6ec3904d2b Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 13:52:13 +1100 Subject: [PATCH 02/27] Update categories.ftl Signed-off-by: Raikyr0 --- Resources/Locale/en-US/_Floof/traits/categories.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Locale/en-US/_Floof/traits/categories.ftl b/Resources/Locale/en-US/_Floof/traits/categories.ftl index 57c83ac4949..b96fd3c4f18 100644 --- a/Resources/Locale/en-US/_Floof/traits/categories.ftl +++ b/Resources/Locale/en-US/_Floof/traits/categories.ftl @@ -1,3 +1,4 @@ trait-category-languages = Languages trait-category-natural-languages = Natural languages trait-category-skills = Skills +trait-category-lewd = Lewd From 66d600560a1cc6a08d0efa25e7bfa2892a01c9f5 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 13:55:06 +1100 Subject: [PATCH 03/27] Update trait_categories.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_DV/Traits/trait_categories.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_DV/Traits/trait_categories.yml b/Resources/Prototypes/_DV/Traits/trait_categories.yml index c197b2ee3f1..7910644c851 100644 --- a/Resources/Prototypes/_DV/Traits/trait_categories.yml +++ b/Resources/Prototypes/_DV/Traits/trait_categories.yml @@ -1,9 +1,15 @@ -- type: traitCategory - id: Disabilities - name: trait-category-disabilities +- type: traitCategory # Euphoria + id: DisabilitiesPhysical + name: trait-category-disabilitiesphysical priority: 0 accentColor: "#64748b" # Slate / muted gray +- type: traitCategory # Euphoria + id: DisabilitiesMental + name: trait-category-disabilitiesmental + priority: 5 + accentColor: "#7A687F" # purplish grey + - type: traitCategory id: Mental name: trait-category-mental From 72ee258a60181eba49d12e8d1f920fe175d3a3a9 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 13:55:09 +1100 Subject: [PATCH 04/27] Update categories.yml Signed-off-by: Raikyr0 --- .../Prototypes/_Floof/Traits/categories.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Resources/Prototypes/_Floof/Traits/categories.yml b/Resources/Prototypes/_Floof/Traits/categories.yml index ea7aa27e7b3..5a27f27496e 100644 --- a/Resources/Prototypes/_Floof/Traits/categories.yml +++ b/Resources/Prototypes/_Floof/Traits/categories.yml @@ -1,3 +1,15 @@ +- type: traitCategory # Euphoria + id: Cybernetics + name: trait-category-cybernetics + priority: 10 + accentColor: "#5F081F" # royal red + +- type: traitCategory # Euphoria + id: Psionics + name: trait-category-psionic + priority: 15 + accentColor: "#a855f7" # purple + - type: traitCategory id: Languages name: trait-category-languages @@ -19,3 +31,9 @@ name: trait-category-skills priority: 45 # Under Medical accentColor: "#3242ef" + +- type: traitCategory + id: Lewd + name: trait-category-lewd + priority: 50 # Under Medical + accentColor: "#6e304b" # pink From 0b447c9ffe97ac6fbf17dcecaea3b5cbb8ecd901 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 13:58:19 +1100 Subject: [PATCH 05/27] Update physical.yml Signed-off-by: Raikyr0 --- .../Prototypes/_Floof/Traits/physical.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/_Floof/Traits/physical.yml b/Resources/Prototypes/_Floof/Traits/physical.yml index e7d182cdf11..40380e6cbc2 100644 --- a/Resources/Prototypes/_Floof/Traits/physical.yml +++ b/Resources/Prototypes/_Floof/Traits/physical.yml @@ -3,7 +3,7 @@ id: LeftBionicPryArm name: trait-name-LeftBionicPryArm description: trait-description-BionicPryArm - category: Disabilities + category: Cybernetics cost: 2 conflicts: - ArmAmputeeRight @@ -22,7 +22,7 @@ id: RightBionicPryArm name: trait-name-RightBionicPryArm description: trait-description-BionicPryArm - category: Disabilities + category: Cybernetics cost: 2 conflicts: - ArmAmputeeRight @@ -41,7 +41,7 @@ id: CyberEyesFlare name: trait-name-CyberEyesFlare description: trait-description-CyberEyesFlare - category: Medical + category: Cybernetics cost: 8 conflicts: - Blindness @@ -55,7 +55,7 @@ - type: trait id: CyberEyesNightVision - category: Medical + category: Cybernetics name: trait-name-CyberEyesNightVision description: trait-description-CyberEyesNightVision cost: 8 @@ -80,7 +80,7 @@ - type: trait id: CyberEyesSecurity - category: Medical + category: Cybernetics name: trait-name-CyberEyesSecurity description: trait-description-CyberEyesSecurity cost: 4 @@ -98,7 +98,7 @@ - type: trait id: CyberEyesMedical - category: Medical + category: Cybernetics name: trait-name-CyberEyesMedical description: trait-description-CyberEyesMedical cost: 4 @@ -118,7 +118,7 @@ - type: trait id: CyberEyesOmni - category: Medical + category: Cybernetics name: trait-name-CyberEyesOmni description: trait-description-CyberEyesOmni cost: 6 @@ -150,7 +150,7 @@ id: Vigor name: trait-vigor-name description: trait-vigor-desc - category: Medical + category: Skills cost: 4 # I don't think it's extremely useful in combat, but it can help you survive one extra stunbaton hit. conflicts: - Vigor @@ -173,7 +173,7 @@ id: Lethargy name: trait-lethargy-name description: trait-lethargy-desc - category: Medical + category: DisabilitiesPhysical cost: -2 conflicts: - Vigor @@ -191,7 +191,7 @@ id: Weakness name: trait-weakness-name description: trait-weakness-desc - category: Medical + category: DisabilitiesPhysical cost: -5 # Getting stunned from 1-2 stunbaton or disabler hits is worth a lot. conflicts: - Vigor From c1e7f408062a24f5d87688c681db31ed2c8234a7 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 13:58:50 +1100 Subject: [PATCH 06/27] Update disabilities.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_Floof/Traits/disabilities.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Floof/Traits/disabilities.yml b/Resources/Prototypes/_Floof/Traits/disabilities.yml index 7755382a26a..f0c1d5e7f1b 100644 --- a/Resources/Prototypes/_Floof/Traits/disabilities.yml +++ b/Resources/Prototypes/_Floof/Traits/disabilities.yml @@ -2,7 +2,7 @@ id: Lightweight name: trait-weightlight-name description: trait-weightlight-desc - category: Disabilities + category: Skills cost: 2 # Has pros and cons, not sure conditions: - !type:HasCompCondition @@ -25,7 +25,7 @@ id: Heavyweight name: trait-weightheavy-name description: trait-weightheavy-desc - category: Disabilities + category: Skills cost: 2 # Has pros and cons, not sure conditions: - !type:HasCompCondition From d26030c9268caf9f5cb2204f4af55fe0bad516e5 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 13:59:08 +1100 Subject: [PATCH 07/27] Update lewd.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_Floof/Traits/lewd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Floof/Traits/lewd.yml b/Resources/Prototypes/_Floof/Traits/lewd.yml index d04d1c724e9..41f1cc0b4be 100644 --- a/Resources/Prototypes/_Floof/Traits/lewd.yml +++ b/Resources/Prototypes/_Floof/Traits/lewd.yml @@ -2,7 +2,7 @@ id: CumProducer name: trait-name-CumProducer description: trait-description-CumProducer - category: Medical + category: Lewd cost: 0 conditions: - !type:HasCompCondition @@ -18,7 +18,7 @@ id: MilkProducer name: trait-name-MilkProducer description: trait-description-MilkProducer - category: Medical + category: Lewd cost: 0 conditions: - !type:HasCompCondition @@ -34,7 +34,7 @@ id: SquirtProducer name: trait-name-SquirtProducer description: trait-description-SquirtProducer - category: Medical + category: Lewd cost: 0 conditions: - !type:HasCompCondition From 15b1313d31e9ec9f8a62be1986dacd1a47d43220 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 13:59:39 +1100 Subject: [PATCH 08/27] Update mental.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_Floof/Traits/mental.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/_Floof/Traits/mental.yml b/Resources/Prototypes/_Floof/Traits/mental.yml index 5c5b310df73..d55a44d6309 100644 --- a/Resources/Prototypes/_Floof/Traits/mental.yml +++ b/Resources/Prototypes/_Floof/Traits/mental.yml @@ -2,7 +2,7 @@ id: TraitDispel name: trait-dispel-name description: trait-dispel-desc - category: Mental + category: Psionics cost: 5 conditions: - !type:HasJobCondition @@ -18,7 +18,7 @@ id: TraitPrecognition name: trait-precognition-name description: trait-precognition-desc - category: Mental + category: Psionics cost: 4 effects: - !type:AddCompsEffect @@ -30,7 +30,7 @@ id: TraitMetapsionic name: trait-metapsionic-name description: trait-metapsionic-desc - category: Mental + category: Psionics cost: 2 conditions: - !type:HasJobCondition @@ -46,7 +46,7 @@ id: TraitPsychokineticScream name: trait-psychokinetic-scream-name description: trait-psychokinetic-scream-desc - category: Mental + category: Psionics cost: 6 effects: - !type:AddCompsEffect @@ -58,7 +58,7 @@ id: TraitPsionicRegeneration name: trait-psionic-regeneration-name description: trait-psionic-regeneration-desc - category: Mental + category: Psionics cost: 6 effects: - !type:AddCompsEffect @@ -70,7 +70,7 @@ id: TraitReligious name: trait-religious-name description: trait-religious-desc - category: Mental + category: Skills cost: 10 conditions: - !type:HasJobCondition @@ -82,4 +82,4 @@ effects: - !type:AddCompsEffect components: - - type: BibleUser \ No newline at end of file + - type: BibleUser From e0bc1e29403a420b09988220c536977f9107c9f6 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 14:01:09 +1100 Subject: [PATCH 09/27] Update disabilities.yml Signed-off-by: Raikyr0 --- .../Prototypes/_DV/Traits/disabilities.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/_DV/Traits/disabilities.yml b/Resources/Prototypes/_DV/Traits/disabilities.yml index 6b8f75b0fd8..45e4f8884e1 100644 --- a/Resources/Prototypes/_DV/Traits/disabilities.yml +++ b/Resources/Prototypes/_DV/Traits/disabilities.yml @@ -4,7 +4,7 @@ id: Blindness name: trait-blindness-name description: trait-blindness-desc - category: Disabilities + category: DisabilitiesPhysical cost: -10 #floof conditions: - !type:HasCompCondition @@ -20,7 +20,7 @@ id: PoorVision name: trait-poor-vision-name description: trait-poor-vision-desc - category: Disabilities + category: DisabilitiesPhysical cost: -1 #floof conditions: - !type:HasCompCondition @@ -37,7 +37,7 @@ id: Monochromacy name: trait-monochromacy-name description: trait-monochromacy-desc - category: Disabilities + category: DisabilitiesPhysical cost: 0 #floof effects: - !type:AddCompsEffect @@ -48,7 +48,7 @@ id: Deuteranopia name: trait-deuteranopia-name description: trait-deuteranopia-desc - category: Disabilities + category: DisabilitiesPhysical cost: 0 #floof effects: - !type:AddCompsEffect @@ -59,7 +59,7 @@ id: UltraVision name: trait-ultravision-name description: trait-ultravision-desc - category: Disabilities + category: DisabilitiesPhysical cost: 0 #floof effects: - !type:AddCompsEffect @@ -70,7 +70,7 @@ id: ImpairedMobility name: trait-impaired-mobility-name description: trait-impaired-mobility-desc - category: Disabilities + category: DisabilitiesPhysical cost: -3 #floof effects: - !type:AddCompsEffect @@ -83,7 +83,7 @@ id: ArmAmputeeLeft name: trait-amputee-left-arm-name description: trait-amputee-left-arm-desc - category: Disabilities + category: DisabilitiesPhysical cost: -3 #floof conflicts: - ArmAmputeeRight # TODO: AmputeeComponent doesn't stack, should be an effect instead @@ -98,7 +98,7 @@ id: ArmAmputeeRight name: trait-amputee-right-arm-name description: trait-amputee-right-arm-desc - category: Disabilities + category: DisabilitiesPhysical cost: -3 #floof conflicts: - ArmAmputeeLeft @@ -113,7 +113,7 @@ id: Dysgraphia name: trait-dysgraphia-name description: trait-dysgraphia-desc - category: Disabilities + category: DisabilitiesPhysical cost: -2 #floof effects: - !type:AddCompsEffect @@ -124,7 +124,7 @@ id: PainNumbness name: trait-painnumbness-name description: trait-painnumbness-desc - category: Disabilities + category: DisabilitiesPhysical effects: - !type:AddCompsEffect components: @@ -134,7 +134,7 @@ id: Hemophilia name: trait-hemophilia-name description: trait-hemophilia-desc - category: Disabilities + category: DisabilitiesPhysical cost: -2 #floof effects: - !type:AddCompsEffect From 58394c90776f74f26a163d06d348cbe4ab5b5231 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 14:02:20 +1100 Subject: [PATCH 10/27] Update medical.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_DV/Traits/medical.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/_DV/Traits/medical.yml b/Resources/Prototypes/_DV/Traits/medical.yml index b01199206ce..ca2d942e927 100644 --- a/Resources/Prototypes/_DV/Traits/medical.yml +++ b/Resources/Prototypes/_DV/Traits/medical.yml @@ -4,7 +4,7 @@ id: Narcolepsy name: trait-narcolepsy-name description: trait-narcolepsy-desc - category: Medical + category: DisabilitiesMental cost: -2 #floof effects: - !type:AddCompsEffect @@ -19,7 +19,7 @@ id: ChronicPain name: trait-chronic-pain-name description: trait-chronic-pain-desc - category: Medical + category: DisabilitiesMental effects: - !type:AddCompsEffect components: @@ -31,7 +31,7 @@ id: LightweightDrunk name: trait-lightweight-name description: trait-lightweight-desc - category: Medical + category: DisabilitiesMental cost: -1 #floof effects: - !type:AddCompsEffect @@ -43,7 +43,7 @@ id: Unrevivable name: trait-unrevivable-name description: trait-unrevivable-desc - category: Medical + category: DisabilitiesPhysical cost: -6 #floof effects: - !type:AddCompsEffect @@ -55,7 +55,7 @@ id: Uncloneable name: trait-uncloneable-name description: trait-uncloneable-desc - category: Medical + category: DisabilitiesPhysical cost: -1 #floof effects: - !type:AddCompsEffect @@ -66,7 +66,7 @@ id: Unborgable name: trait-unborgable-name description: trait-unborgable-desc - category: Medical + category: DisabilitiesPhysical cost: -1 #floof effects: - !type:AddCompsEffect @@ -77,7 +77,7 @@ id: Redshirt name: trait-redshirt-name description: trait-redshirt-desc - category: Medical + category: DisabilitiesPhysical cost: -6 #floof effects: - !type:AddCompsEffect @@ -95,7 +95,7 @@ id: Synthetic name: trait-synth-name description: trait-synth-desc - category: Medical + category: Cybernetics conditions: - !type:HasCompCondition component: Silicon From fce53ed064bb6492b82a9f92ecaf7a57f54023cd Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 14:02:44 +1100 Subject: [PATCH 11/27] Update mental.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_DV/Traits/mental.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_DV/Traits/mental.yml b/Resources/Prototypes/_DV/Traits/mental.yml index 32c38d6db6c..5be66cffc2b 100644 --- a/Resources/Prototypes/_DV/Traits/mental.yml +++ b/Resources/Prototypes/_DV/Traits/mental.yml @@ -4,7 +4,7 @@ id: Paracusia name: trait-paracusia-name description: trait-paracusia-desc - category: Mental + category: DisabilitiesMental cost: -2 #floof effects: - !type:AddCompsEffect @@ -20,7 +20,7 @@ id: Depression name: trait-depression-name description: trait-depression-desc - category: Mental + category: DisabilitiesMental cost: -1 #floof effects: - !type:SpawnItemInHandEffect @@ -30,7 +30,7 @@ id: Addicted name: trait-addicted-name description: trait-addicted-desc - category: Mental + category: DisabilitiesMental cost: -1 #floof effects: - !type:AddCompsEffect @@ -41,7 +41,7 @@ id: Liar name: trait-liar-name description: trait-liar-desc - category: Mental + category: DisabilitiesMental cost: -1 #floof effects: - !type:AddCompsEffect @@ -53,7 +53,7 @@ id: Pacifist name: trait-pacifist-name description: trait-pacifist-desc - category: Mental + category: DisabilitiesMental cost: -6 #floof effects: - !type:AddCompsEffect From 3e6416df610f61da552c5705568c355715f3832c Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 14:04:25 +1100 Subject: [PATCH 12/27] Update trait_categories.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_DV/Traits/trait_categories.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_DV/Traits/trait_categories.yml b/Resources/Prototypes/_DV/Traits/trait_categories.yml index 7910644c851..aa12ef1803c 100644 --- a/Resources/Prototypes/_DV/Traits/trait_categories.yml +++ b/Resources/Prototypes/_DV/Traits/trait_categories.yml @@ -11,8 +11,8 @@ accentColor: "#7A687F" # purplish grey - type: traitCategory - id: Mental - name: trait-category-mental + id: Feats + name: trait-category-feats priority: 20 accentColor: "#a855f7" # Purple From 080cd9145f840964bd9c97a1cd7660103ef0a5da Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 14:06:07 +1100 Subject: [PATCH 13/27] Update trait_categories.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_DV/Traits/trait_categories.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_DV/Traits/trait_categories.yml b/Resources/Prototypes/_DV/Traits/trait_categories.yml index aa12ef1803c..e3a534c82cf 100644 --- a/Resources/Prototypes/_DV/Traits/trait_categories.yml +++ b/Resources/Prototypes/_DV/Traits/trait_categories.yml @@ -1,4 +1,4 @@ -- type: traitCategory # Euphoria +- type: traitCategory # Euphoria - Split Between Physical and Mental id: DisabilitiesPhysical name: trait-category-disabilitiesphysical priority: 0 @@ -11,10 +11,10 @@ accentColor: "#7A687F" # purplish grey - type: traitCategory - id: Feats + id: Feats # Euphoria - Previously Mental - Like a DnD Feat name: trait-category-feats priority: 20 - accentColor: "#a855f7" # Purple + accentColor: "#d4af37" # golden - type: traitCategory id: Accents From c34572a4b3a22643b15c3b1fbc09b2f73f0c29ea Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 14:06:57 +1100 Subject: [PATCH 14/27] Update disabilities.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_Floof/Traits/disabilities.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Floof/Traits/disabilities.yml b/Resources/Prototypes/_Floof/Traits/disabilities.yml index f0c1d5e7f1b..bb88e477f62 100644 --- a/Resources/Prototypes/_Floof/Traits/disabilities.yml +++ b/Resources/Prototypes/_Floof/Traits/disabilities.yml @@ -2,7 +2,7 @@ id: Lightweight name: trait-weightlight-name description: trait-weightlight-desc - category: Skills + category: Feats cost: 2 # Has pros and cons, not sure conditions: - !type:HasCompCondition @@ -25,7 +25,7 @@ id: Heavyweight name: trait-weightheavy-name description: trait-weightheavy-desc - category: Skills + category: Feats cost: 2 # Has pros and cons, not sure conditions: - !type:HasCompCondition From 216a30340f7874968f9ba0e1eac14bb15c81ee65 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 14:07:33 +1100 Subject: [PATCH 15/27] Update mental.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_Floof/Traits/mental.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Floof/Traits/mental.yml b/Resources/Prototypes/_Floof/Traits/mental.yml index d55a44d6309..2c6ad295458 100644 --- a/Resources/Prototypes/_Floof/Traits/mental.yml +++ b/Resources/Prototypes/_Floof/Traits/mental.yml @@ -70,7 +70,7 @@ id: TraitReligious name: trait-religious-name description: trait-religious-desc - category: Skills + category: Feats cost: 10 conditions: - !type:HasJobCondition From a9c1263656bef2ebb521cec4f80ba17438603951 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 14:08:16 +1100 Subject: [PATCH 16/27] Update physical.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_Floof/Traits/physical.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Floof/Traits/physical.yml b/Resources/Prototypes/_Floof/Traits/physical.yml index 40380e6cbc2..3e350c08a9f 100644 --- a/Resources/Prototypes/_Floof/Traits/physical.yml +++ b/Resources/Prototypes/_Floof/Traits/physical.yml @@ -150,7 +150,7 @@ id: Vigor name: trait-vigor-name description: trait-vigor-desc - category: Skills + category: Feats cost: 4 # I don't think it's extremely useful in combat, but it can help you survive one extra stunbaton hit. conflicts: - Vigor From a1eef318812c5871028e9680e8b8a93d93d13b7f Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 19:53:06 +1100 Subject: [PATCH 17/27] Update trait-categories.ftl Signed-off-by: Raikyr0 --- Resources/Locale/en-US/_DV/traits/trait-categories.ftl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/en-US/_DV/traits/trait-categories.ftl b/Resources/Locale/en-US/_DV/traits/trait-categories.ftl index f43c52c957f..fef3f7debe8 100644 --- a/Resources/Locale/en-US/_DV/traits/trait-categories.ftl +++ b/Resources/Locale/en-US/_DV/traits/trait-categories.ftl @@ -1,8 +1,5 @@ -trait-category-disabilitiesphysical = Disabilities - Physical -trait-category-disabilitiesmental = Disabilities - Mental -trait-category-cybernetics = Cybernetics -trait-category-psionic = Psionics +trait-category-disabilities = Disabilities trait-category-medical = Medical -trait-category-feats = Feats +trait-category-mental = Mental trait-category-accents = Accents trait-category-meta = Meta From ea5b5d9d8c34a68f4d242ef0b6c3630dc0852e4f Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 19:53:13 +1100 Subject: [PATCH 18/27] Update categories.ftl Signed-off-by: Raikyr0 --- Resources/Locale/en-US/_Floof/traits/categories.ftl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_Floof/traits/categories.ftl b/Resources/Locale/en-US/_Floof/traits/categories.ftl index b96fd3c4f18..5ac35fb4c4f 100644 --- a/Resources/Locale/en-US/_Floof/traits/categories.ftl +++ b/Resources/Locale/en-US/_Floof/traits/categories.ftl @@ -1,4 +1,8 @@ +trait-category-disabilitiesphysical = Disabilities - Physical +trait-category-disabilitiesmental = Disabilities - Mental +trait-category-cybernetics = Cybernetics +trait-category-psionic = Psionics trait-category-languages = Languages trait-category-natural-languages = Natural languages -trait-category-skills = Skills +trait-category-skills = Feats trait-category-lewd = Lewd From bf4dec7aaba967b0f1a372c11a88f20d90e4bf9b Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 19:54:30 +1100 Subject: [PATCH 19/27] Update categories.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_Floof/Traits/categories.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Resources/Prototypes/_Floof/Traits/categories.yml b/Resources/Prototypes/_Floof/Traits/categories.yml index 5a27f27496e..239486893df 100644 --- a/Resources/Prototypes/_Floof/Traits/categories.yml +++ b/Resources/Prototypes/_Floof/Traits/categories.yml @@ -1,3 +1,15 @@ +- type: traitCategory # Euphoria - Split Between Physical and Mental + id: DisabilitiesPhysical + name: trait-category-disabilitiesphysical + priority: 1 + accentColor: "#64748b" # Slate / muted gray + +- type: traitCategory # Euphoria + id: DisabilitiesMental + name: trait-category-disabilitiesmental + priority: 5 + accentColor: "#7A687F" # purplish grey + - type: traitCategory # Euphoria id: Cybernetics name: trait-category-cybernetics From 73f6ae0a1971cf6f14a3e1e8497ab81133053b1e Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 19:55:01 +1100 Subject: [PATCH 20/27] Update trait_categories.yml Signed-off-by: Raikyr0 --- .../Prototypes/_DV/Traits/trait_categories.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/_DV/Traits/trait_categories.yml b/Resources/Prototypes/_DV/Traits/trait_categories.yml index e3a534c82cf..c197b2ee3f1 100644 --- a/Resources/Prototypes/_DV/Traits/trait_categories.yml +++ b/Resources/Prototypes/_DV/Traits/trait_categories.yml @@ -1,20 +1,14 @@ -- type: traitCategory # Euphoria - Split Between Physical and Mental - id: DisabilitiesPhysical - name: trait-category-disabilitiesphysical +- type: traitCategory + id: Disabilities + name: trait-category-disabilities priority: 0 accentColor: "#64748b" # Slate / muted gray -- type: traitCategory # Euphoria - id: DisabilitiesMental - name: trait-category-disabilitiesmental - priority: 5 - accentColor: "#7A687F" # purplish grey - - type: traitCategory - id: Feats # Euphoria - Previously Mental - Like a DnD Feat - name: trait-category-feats + id: Mental + name: trait-category-mental priority: 20 - accentColor: "#d4af37" # golden + accentColor: "#a855f7" # Purple - type: traitCategory id: Accents From 5fba8718cb494bbff2e0709891d7a34b35a8c514 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 19:55:36 +1100 Subject: [PATCH 21/27] Update disabilities.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_Floof/Traits/disabilities.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Floof/Traits/disabilities.yml b/Resources/Prototypes/_Floof/Traits/disabilities.yml index bb88e477f62..f0c1d5e7f1b 100644 --- a/Resources/Prototypes/_Floof/Traits/disabilities.yml +++ b/Resources/Prototypes/_Floof/Traits/disabilities.yml @@ -2,7 +2,7 @@ id: Lightweight name: trait-weightlight-name description: trait-weightlight-desc - category: Feats + category: Skills cost: 2 # Has pros and cons, not sure conditions: - !type:HasCompCondition @@ -25,7 +25,7 @@ id: Heavyweight name: trait-weightheavy-name description: trait-weightheavy-desc - category: Feats + category: Skills cost: 2 # Has pros and cons, not sure conditions: - !type:HasCompCondition From 8b704fc22d121a208deda119eebbcc6e1fcab58a Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 19:56:32 +1100 Subject: [PATCH 22/27] Update mental.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_Floof/Traits/mental.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Floof/Traits/mental.yml b/Resources/Prototypes/_Floof/Traits/mental.yml index 2c6ad295458..d55a44d6309 100644 --- a/Resources/Prototypes/_Floof/Traits/mental.yml +++ b/Resources/Prototypes/_Floof/Traits/mental.yml @@ -70,7 +70,7 @@ id: TraitReligious name: trait-religious-name description: trait-religious-desc - category: Feats + category: Skills cost: 10 conditions: - !type:HasJobCondition From b8363381792d81fedd19e202b0fbe24788bc093b Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 15 Mar 2026 19:56:56 +1100 Subject: [PATCH 23/27] Update physical.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_Floof/Traits/physical.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Floof/Traits/physical.yml b/Resources/Prototypes/_Floof/Traits/physical.yml index 3e350c08a9f..40380e6cbc2 100644 --- a/Resources/Prototypes/_Floof/Traits/physical.yml +++ b/Resources/Prototypes/_Floof/Traits/physical.yml @@ -150,7 +150,7 @@ id: Vigor name: trait-vigor-name description: trait-vigor-desc - category: Feats + category: Skills cost: 4 # I don't think it's extremely useful in combat, but it can help you survive one extra stunbaton hit. conflicts: - Vigor From 0c799f2943f7b703f785a82a77fcd7e2e9aa1ee3 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Mon, 16 Mar 2026 04:27:13 +1100 Subject: [PATCH 24/27] Update Resources/Prototypes/_Floof/Traits/categories.yml Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Signed-off-by: Raikyr0 --- Resources/Prototypes/_Floof/Traits/categories.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_Floof/Traits/categories.yml b/Resources/Prototypes/_Floof/Traits/categories.yml index 239486893df..b938d71080c 100644 --- a/Resources/Prototypes/_Floof/Traits/categories.yml +++ b/Resources/Prototypes/_Floof/Traits/categories.yml @@ -49,3 +49,4 @@ name: trait-category-lewd priority: 50 # Under Medical accentColor: "#6e304b" # pink + defaultExpanded: false From 567160f8fd1a5666b97bef08b3afb40888897dee Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Mon, 16 Mar 2026 04:28:17 +1100 Subject: [PATCH 25/27] Update disabilities.yml Signed-off-by: Raikyr0 --- .../Prototypes/_DV/Traits/disabilities.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/_DV/Traits/disabilities.yml b/Resources/Prototypes/_DV/Traits/disabilities.yml index 45e4f8884e1..dcba8ee7f6e 100644 --- a/Resources/Prototypes/_DV/Traits/disabilities.yml +++ b/Resources/Prototypes/_DV/Traits/disabilities.yml @@ -4,7 +4,7 @@ id: Blindness name: trait-blindness-name description: trait-blindness-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria cost: -10 #floof conditions: - !type:HasCompCondition @@ -20,7 +20,7 @@ id: PoorVision name: trait-poor-vision-name description: trait-poor-vision-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria cost: -1 #floof conditions: - !type:HasCompCondition @@ -37,7 +37,7 @@ id: Monochromacy name: trait-monochromacy-name description: trait-monochromacy-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria cost: 0 #floof effects: - !type:AddCompsEffect @@ -48,7 +48,7 @@ id: Deuteranopia name: trait-deuteranopia-name description: trait-deuteranopia-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria cost: 0 #floof effects: - !type:AddCompsEffect @@ -59,7 +59,7 @@ id: UltraVision name: trait-ultravision-name description: trait-ultravision-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria cost: 0 #floof effects: - !type:AddCompsEffect @@ -70,7 +70,7 @@ id: ImpairedMobility name: trait-impaired-mobility-name description: trait-impaired-mobility-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria cost: -3 #floof effects: - !type:AddCompsEffect @@ -83,7 +83,7 @@ id: ArmAmputeeLeft name: trait-amputee-left-arm-name description: trait-amputee-left-arm-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria cost: -3 #floof conflicts: - ArmAmputeeRight # TODO: AmputeeComponent doesn't stack, should be an effect instead @@ -98,7 +98,7 @@ id: ArmAmputeeRight name: trait-amputee-right-arm-name description: trait-amputee-right-arm-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria cost: -3 #floof conflicts: - ArmAmputeeLeft @@ -113,7 +113,7 @@ id: Dysgraphia name: trait-dysgraphia-name description: trait-dysgraphia-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria cost: -2 #floof effects: - !type:AddCompsEffect @@ -124,7 +124,7 @@ id: PainNumbness name: trait-painnumbness-name description: trait-painnumbness-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria effects: - !type:AddCompsEffect components: @@ -134,7 +134,7 @@ id: Hemophilia name: trait-hemophilia-name description: trait-hemophilia-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria cost: -2 #floof effects: - !type:AddCompsEffect From 9e6ef91ad21f5ccaf7a370beefaebdd58d4aa2a1 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Mon, 16 Mar 2026 04:28:56 +1100 Subject: [PATCH 26/27] Update medical.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_DV/Traits/medical.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/_DV/Traits/medical.yml b/Resources/Prototypes/_DV/Traits/medical.yml index ca2d942e927..e44fecf27e4 100644 --- a/Resources/Prototypes/_DV/Traits/medical.yml +++ b/Resources/Prototypes/_DV/Traits/medical.yml @@ -4,7 +4,7 @@ id: Narcolepsy name: trait-narcolepsy-name description: trait-narcolepsy-desc - category: DisabilitiesMental + category: DisabilitiesMental # Euphoria cost: -2 #floof effects: - !type:AddCompsEffect @@ -19,7 +19,7 @@ id: ChronicPain name: trait-chronic-pain-name description: trait-chronic-pain-desc - category: DisabilitiesMental + category: DisabilitiesMental # Euphoria effects: - !type:AddCompsEffect components: @@ -31,7 +31,7 @@ id: LightweightDrunk name: trait-lightweight-name description: trait-lightweight-desc - category: DisabilitiesMental + category: DisabilitiesMental # Euphoria cost: -1 #floof effects: - !type:AddCompsEffect @@ -43,7 +43,7 @@ id: Unrevivable name: trait-unrevivable-name description: trait-unrevivable-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria cost: -6 #floof effects: - !type:AddCompsEffect @@ -55,7 +55,7 @@ id: Uncloneable name: trait-uncloneable-name description: trait-uncloneable-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria cost: -1 #floof effects: - !type:AddCompsEffect @@ -66,7 +66,7 @@ id: Unborgable name: trait-unborgable-name description: trait-unborgable-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria cost: -1 #floof effects: - !type:AddCompsEffect @@ -77,7 +77,7 @@ id: Redshirt name: trait-redshirt-name description: trait-redshirt-desc - category: DisabilitiesPhysical + category: DisabilitiesPhysical # Euphoria cost: -6 #floof effects: - !type:AddCompsEffect @@ -95,7 +95,7 @@ id: Synthetic name: trait-synth-name description: trait-synth-desc - category: Cybernetics + category: Cybernetics # Euphoria conditions: - !type:HasCompCondition component: Silicon From 151103ceffa26833c23bc9c02a885a30901f39c7 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Mon, 16 Mar 2026 04:29:26 +1100 Subject: [PATCH 27/27] Update mental.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/_DV/Traits/mental.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_DV/Traits/mental.yml b/Resources/Prototypes/_DV/Traits/mental.yml index 5be66cffc2b..15a92b5499c 100644 --- a/Resources/Prototypes/_DV/Traits/mental.yml +++ b/Resources/Prototypes/_DV/Traits/mental.yml @@ -4,7 +4,7 @@ id: Paracusia name: trait-paracusia-name description: trait-paracusia-desc - category: DisabilitiesMental + category: DisabilitiesMental # Euphoria cost: -2 #floof effects: - !type:AddCompsEffect @@ -20,7 +20,7 @@ id: Depression name: trait-depression-name description: trait-depression-desc - category: DisabilitiesMental + category: DisabilitiesMental # Euphoria cost: -1 #floof effects: - !type:SpawnItemInHandEffect @@ -30,7 +30,7 @@ id: Addicted name: trait-addicted-name description: trait-addicted-desc - category: DisabilitiesMental + category: DisabilitiesMental # Euphoria cost: -1 #floof effects: - !type:AddCompsEffect @@ -41,7 +41,7 @@ id: Liar name: trait-liar-name description: trait-liar-desc - category: DisabilitiesMental + category: DisabilitiesMental # Euphoria cost: -1 #floof effects: - !type:AddCompsEffect @@ -53,7 +53,7 @@ id: Pacifist name: trait-pacifist-name description: trait-pacifist-desc - category: DisabilitiesMental + category: DisabilitiesMental # Euphoria cost: -6 #floof effects: - !type:AddCompsEffect