Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e519305
Update trait-categories.ftl
Raikyr0 Mar 15, 2026
aeee55d
Update categories.ftl
Raikyr0 Mar 15, 2026
66d6005
Update trait_categories.yml
Raikyr0 Mar 15, 2026
72ee258
Update categories.yml
Raikyr0 Mar 15, 2026
0b447c9
Update physical.yml
Raikyr0 Mar 15, 2026
c1e7f40
Update disabilities.yml
Raikyr0 Mar 15, 2026
d26030c
Update lewd.yml
Raikyr0 Mar 15, 2026
15b1313
Update mental.yml
Raikyr0 Mar 15, 2026
e0bc1e2
Update disabilities.yml
Raikyr0 Mar 15, 2026
58394c9
Update medical.yml
Raikyr0 Mar 15, 2026
fce53ed
Update mental.yml
Raikyr0 Mar 15, 2026
3ae0e41
Merge branch 'Floof-Station:master' into SortingTraits
Raikyr0 Mar 15, 2026
3e6416d
Update trait_categories.yml
Raikyr0 Mar 15, 2026
080cd91
Update trait_categories.yml
Raikyr0 Mar 15, 2026
c34572a
Update disabilities.yml
Raikyr0 Mar 15, 2026
216a303
Update mental.yml
Raikyr0 Mar 15, 2026
a9c1263
Update physical.yml
Raikyr0 Mar 15, 2026
a1eef31
Update trait-categories.ftl
Raikyr0 Mar 15, 2026
ea5b5d9
Update categories.ftl
Raikyr0 Mar 15, 2026
bf4dec7
Update categories.yml
Raikyr0 Mar 15, 2026
73f6ae0
Update trait_categories.yml
Raikyr0 Mar 15, 2026
5fba871
Update disabilities.yml
Raikyr0 Mar 15, 2026
8b704fc
Update mental.yml
Raikyr0 Mar 15, 2026
b836338
Update physical.yml
Raikyr0 Mar 15, 2026
0c799f2
Update Resources/Prototypes/_Floof/Traits/categories.yml
Raikyr0 Mar 15, 2026
567160f
Update disabilities.yml
Raikyr0 Mar 15, 2026
9e6ef91
Update medical.yml
Raikyr0 Mar 15, 2026
151103c
Update mental.yml
Raikyr0 Mar 15, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Resources/Locale/en-US/_Floof/traits/categories.ftl
Original file line number Diff line number Diff line change
@@ -1,3 +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
22 changes: 11 additions & 11 deletions Resources/Prototypes/_DV/Traits/disabilities.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
id: Blindness
name: trait-blindness-name
description: trait-blindness-desc
category: Disabilities
category: DisabilitiesPhysical # Euphoria
cost: -10 #floof
conditions:
- !type:HasCompCondition
Expand All @@ -20,7 +20,7 @@
id: PoorVision
name: trait-poor-vision-name
description: trait-poor-vision-desc
category: Disabilities
category: DisabilitiesPhysical # Euphoria
cost: -1 #floof
conditions:
- !type:HasCompCondition
Expand All @@ -37,7 +37,7 @@
id: Monochromacy
name: trait-monochromacy-name
description: trait-monochromacy-desc
category: Disabilities
category: DisabilitiesPhysical # Euphoria
cost: 0 #floof
effects:
- !type:AddCompsEffect
Expand All @@ -48,7 +48,7 @@
id: Deuteranopia
name: trait-deuteranopia-name
description: trait-deuteranopia-desc
category: Disabilities
category: DisabilitiesPhysical # Euphoria
cost: 0 #floof
effects:
- !type:AddCompsEffect
Expand All @@ -59,7 +59,7 @@
id: UltraVision
name: trait-ultravision-name
description: trait-ultravision-desc
category: Disabilities
category: DisabilitiesPhysical # Euphoria
cost: 0 #floof
effects:
- !type:AddCompsEffect
Expand All @@ -70,7 +70,7 @@
id: ImpairedMobility
name: trait-impaired-mobility-name
description: trait-impaired-mobility-desc
category: Disabilities
category: DisabilitiesPhysical # Euphoria
cost: -3 #floof
effects:
- !type:AddCompsEffect
Expand All @@ -83,7 +83,7 @@
id: ArmAmputeeLeft
name: trait-amputee-left-arm-name
description: trait-amputee-left-arm-desc
category: Disabilities
category: DisabilitiesPhysical # Euphoria
cost: -3 #floof
conflicts:
- ArmAmputeeRight # TODO: AmputeeComponent doesn't stack, should be an effect instead
Expand All @@ -98,7 +98,7 @@
id: ArmAmputeeRight
name: trait-amputee-right-arm-name
description: trait-amputee-right-arm-desc
category: Disabilities
category: DisabilitiesPhysical # Euphoria
cost: -3 #floof
conflicts:
- ArmAmputeeLeft
Expand All @@ -113,7 +113,7 @@
id: Dysgraphia
name: trait-dysgraphia-name
description: trait-dysgraphia-desc
category: Disabilities
category: DisabilitiesPhysical # Euphoria
cost: -2 #floof
effects:
- !type:AddCompsEffect
Expand All @@ -124,7 +124,7 @@
id: PainNumbness
name: trait-painnumbness-name
description: trait-painnumbness-desc
category: Disabilities
category: DisabilitiesPhysical # Euphoria
effects:
- !type:AddCompsEffect
components:
Expand All @@ -134,7 +134,7 @@
id: Hemophilia
name: trait-hemophilia-name
description: trait-hemophilia-desc
category: Disabilities
category: DisabilitiesPhysical # Euphoria
cost: -2 #floof
effects:
- !type:AddCompsEffect
Expand Down
16 changes: 8 additions & 8 deletions Resources/Prototypes/_DV/Traits/medical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
id: Narcolepsy
name: trait-narcolepsy-name
description: trait-narcolepsy-desc
category: Medical
category: DisabilitiesMental # Euphoria
cost: -2 #floof
effects:
- !type:AddCompsEffect
Expand All @@ -19,7 +19,7 @@
id: ChronicPain
name: trait-chronic-pain-name
description: trait-chronic-pain-desc
category: Medical
category: DisabilitiesMental # Euphoria
effects:
- !type:AddCompsEffect
components:
Expand All @@ -31,7 +31,7 @@
id: LightweightDrunk
name: trait-lightweight-name
description: trait-lightweight-desc
category: Medical
category: DisabilitiesMental # Euphoria
cost: -1 #floof
effects:
- !type:AddCompsEffect
Expand All @@ -43,7 +43,7 @@
id: Unrevivable
name: trait-unrevivable-name
description: trait-unrevivable-desc
category: Medical
category: DisabilitiesPhysical # Euphoria
cost: -6 #floof
effects:
- !type:AddCompsEffect
Expand All @@ -55,7 +55,7 @@
id: Uncloneable
name: trait-uncloneable-name
description: trait-uncloneable-desc
category: Medical
category: DisabilitiesPhysical # Euphoria
cost: -1 #floof
effects:
- !type:AddCompsEffect
Expand All @@ -66,7 +66,7 @@
id: Unborgable
name: trait-unborgable-name
description: trait-unborgable-desc
category: Medical
category: DisabilitiesPhysical # Euphoria
cost: -1 #floof
effects:
- !type:AddCompsEffect
Expand All @@ -77,7 +77,7 @@
id: Redshirt
name: trait-redshirt-name
description: trait-redshirt-desc
category: Medical
category: DisabilitiesPhysical # Euphoria
cost: -6 #floof
effects:
- !type:AddCompsEffect
Expand All @@ -95,7 +95,7 @@
id: Synthetic
name: trait-synth-name
description: trait-synth-desc
category: Medical
category: Cybernetics # Euphoria
conditions:
- !type:HasCompCondition
component: Silicon
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/_DV/Traits/mental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
id: Paracusia
name: trait-paracusia-name
description: trait-paracusia-desc
category: Mental
category: DisabilitiesMental # Euphoria
cost: -2 #floof
effects:
- !type:AddCompsEffect
Expand All @@ -20,7 +20,7 @@
id: Depression
name: trait-depression-name
description: trait-depression-desc
category: Mental
category: DisabilitiesMental # Euphoria
cost: -1 #floof
effects:
- !type:SpawnItemInHandEffect
Expand All @@ -30,7 +30,7 @@
id: Addicted
name: trait-addicted-name
description: trait-addicted-desc
category: Mental
category: DisabilitiesMental # Euphoria
cost: -1 #floof
effects:
- !type:AddCompsEffect
Expand All @@ -41,7 +41,7 @@
id: Liar
name: trait-liar-name
description: trait-liar-desc
category: Mental
category: DisabilitiesMental # Euphoria
cost: -1 #floof
effects:
- !type:AddCompsEffect
Expand All @@ -53,7 +53,7 @@
id: Pacifist
name: trait-pacifist-name
description: trait-pacifist-desc
category: Mental
category: DisabilitiesMental # Euphoria
cost: -6 #floof
effects:
- !type:AddCompsEffect
Expand Down
31 changes: 31 additions & 0 deletions Resources/Prototypes/_Floof/Traits/categories.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
- 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
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
Expand All @@ -19,3 +43,10 @@
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
defaultExpanded: false
4 changes: 2 additions & 2 deletions Resources/Prototypes/_Floof/Traits/disabilities.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/_Floof/Traits/lewd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
id: CumProducer
name: trait-name-CumProducer
description: trait-description-CumProducer
category: Medical
category: Lewd
cost: 0
conditions:
- !type:HasCompCondition
Expand All @@ -18,7 +18,7 @@
id: MilkProducer
name: trait-name-MilkProducer
description: trait-description-MilkProducer
category: Medical
category: Lewd
cost: 0
conditions:
- !type:HasCompCondition
Expand All @@ -34,7 +34,7 @@
id: SquirtProducer
name: trait-name-SquirtProducer
description: trait-description-SquirtProducer
category: Medical
category: Lewd
cost: 0
conditions:
- !type:HasCompCondition
Expand Down
14 changes: 7 additions & 7 deletions Resources/Prototypes/_Floof/Traits/mental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
id: TraitDispel
name: trait-dispel-name
description: trait-dispel-desc
category: Mental
category: Psionics
cost: 5
conditions:
- !type:HasJobCondition
Expand All @@ -18,7 +18,7 @@
id: TraitPrecognition
name: trait-precognition-name
description: trait-precognition-desc
category: Mental
category: Psionics
cost: 4
effects:
- !type:AddCompsEffect
Expand All @@ -30,7 +30,7 @@
id: TraitMetapsionic
name: trait-metapsionic-name
description: trait-metapsionic-desc
category: Mental
category: Psionics
cost: 2
conditions:
- !type:HasJobCondition
Expand All @@ -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
Expand All @@ -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
Expand All @@ -70,7 +70,7 @@
id: TraitReligious
name: trait-religious-name
description: trait-religious-desc
category: Mental
category: Skills
cost: 10
conditions:
- !type:HasJobCondition
Expand All @@ -82,4 +82,4 @@
effects:
- !type:AddCompsEffect
components:
- type: BibleUser
- type: BibleUser
Loading
Loading