Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Resources/Locale/en-US/_EE/contractors/employer.ftl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
humanoid-profile-editor-employer-label = Employer

character-employer-requirement = You must{$inverted ->
[true]{" "}not
*[other]{""}
} be employed by one of these: {$employers}
# character-employer-requirement = You must{$inverted ->
# [true]{" "}not
# *[other]{""}
# } be employed by one of these: {$employers}

employer_name_nanotrasen = NanoTrasen
employer_name_nanotrasen_command = NanoTrasen Command
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/traits/traits.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -347,15 +347,15 @@ trait-description-TemperatureTolerance =
in conditions just slightly below freezing, such as the inside of a kitchen fridge,
or the sunlit mountainside of the famous Glacier station.

trait-name-Talons = Talons
trait-name-Talons = Piercing Claws
trait-description-Talons =
Your fingertips have been replaced with piercing talons.
These could come from gene modifications, vatgrown implants,
or even hard plastic retractable talons incorpoated into a prosthetic limb.
Your unarmed melee attacks deal Piercing damage instead of the standard damage type for your species.
This has no effect on damage dealt with any form of armed melee.

trait-name-Claws = Claws
trait-name-Claws = Slashing Claws
trait-description-Claws =
Your fingertips have been replaced with sharp claws.
These could come from gene modifications, vatgrown implants,
Expand Down
8 changes: 4 additions & 4 deletions Resources/Locale/ru-RU/_EE/contractors/employer.ftl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
humanoid-profile-editor-employer-label = Работодатель

character-employer-requirement = Вам{$inverted ->
[true]{" "}нельзя
*[other]{""}
} иметь один из следующих вариантов трудоустройства: {$employers}
# character-employer-requirement = Вам{$inverted ->
# [true]{" "}нельзя
# *[other]{""}
# } иметь один из следующих вариантов трудоустройства: {$employers}

employer_name_nanotrasen = Нанотрейзен
employer_name_nanotrasen_command = Командование Нанотрейзен
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/ru-RU/traits/traits.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,12 @@ trait-description-TemperatureTolerance =
Вы хорошо переносите низкие температуры. Вы можете длительное время находиться в условиях чуть ниже нуля,
например, внутри кухонного холодильника или на освещенном солнцем склоне знаменитой станции «Glacier».

trait-name-Talons = Длинные когти
trait-name-Talons = Пронзающие когти
trait-description-Talons =
Кончики ваших пальцев заменены тонкими и длинными когтями.
Ваши атаки ближнего боя без оружия наносят колющий урон вместо стандартного типа урона для вашего вида.

trait-name-Claws = Когти
trait-name-Claws = Рубящие когти
trait-description-Claws =
Кончики ваших пальцев заменены тонкими и длинными когтями.
Ваши атаки ближнего боя без оружия наносят режущий урон вместо стандартного типа урона для вашего вида.
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/arachnid.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Arachnid
name: species-name-arachnid
roundStart: true
roundStart: false
prototype: MobArachnid
# WD EDIT START
bodyTypes:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/diona.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Diona
name: species-name-diona
roundStart: true
roundStart: false
prototype: MobDiona
# WD EDIT START
bodyTypes:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/dwarf.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Dwarf
name: species-name-dwarf
roundStart: true
roundStart: false
prototype: MobDwarf
# WD EDIT START
bodyTypes:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/harpy.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Harpy
name: species-name-harpy
roundStart: true
roundStart: false
prototype: MobHarpy
# WD EDIT START
bodyTypes:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/ipc.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: IPC
name: species-name-ipc
roundStart: true
roundStart: false
prototype: MobIPC
# WD EDIT START
bodyTypes:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/moth.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Moth
name: species-name-moth
roundStart: true
roundStart: false
prototype: MobMoth
# WD EDIT START
bodyTypes:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/plasmaman.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Plasmaman
name: species-name-plasmaman
roundStart: true
roundStart: false
prototype: MobPlasmaman
# WD EDIT START
bodyTypes:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/reptilian.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Reptilian
name: species-name-reptilian
roundStart: true
roundStart: false
prototype: MobReptilian
# WD EDIT START
bodyTypes:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/slime.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: SlimePerson
name: species-name-slime
roundStart: true
roundStart: false
prototype: MobSlimePerson
# WD EDIT START
bodyTypes:
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Traits/Psionics/casterTypes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
- !type:CharacterSpeciesRequirement
inverted: true
species:
- IPC
# - IPC
- !type:CharacterTraitRequirement
traits:
- AnomalousPositronics
Expand Down Expand Up @@ -55,7 +55,7 @@
- !type:CharacterSpeciesRequirement
inverted: true
species:
- IPC
# - IPC
- !type:CharacterTraitRequirement
traits:
- AnomalousPositronics
Expand Down Expand Up @@ -93,7 +93,7 @@
- !type:CharacterSpeciesRequirement
inverted: true
species:
- IPC
# - IPC
- !type:CharacterTraitRequirement
traits:
- AnomalousPositronics
6 changes: 3 additions & 3 deletions Resources/Prototypes/Traits/Psionics/feats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
- !type:CharacterSpeciesRequirement
inverted: true
species:
- IPC
# - IPC
- !type:CharacterTraitRequirement
traits:
- AnomalousPositronics
- !type:CharacterSpeciesRequirement
inverted: true
species:
- Oni
- Shadowkin
# - Shadowkin
functions:
- !type:TraitReplaceComponent
components:
Expand Down Expand Up @@ -57,7 +57,7 @@
- !type:CharacterSpeciesRequirement
inverted: true
species:
- IPC
# - IPC
- !type:CharacterTraitRequirement
traits:
- AnomalousPositronics
Expand Down
10 changes: 7 additions & 3 deletions Resources/Prototypes/Traits/categories.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@
id: Speech
root: true
subCategories:
- TraitsSpeechUncategorized
# - TraitsSpeechUncategorized # hidden to avoid empty tab
- TraitsSpeechAccents
- TraitsSpeechLanguages
# - TraitsSpeechLanguages # hidden while language traits disabled

- type: traitCategory
id: TraitsSpeechUncategorized
root: false

- type: traitCategory
id: TraitsSpeechAccents
Expand All @@ -43,4 +44,7 @@

- type: traitCategory
id: Language
root: true
root: false

- type: traitCategory
id: TraitsHidden
76 changes: 38 additions & 38 deletions Resources/Prototypes/Traits/disabilities.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@
jobs:
- Borg
- MedicalBorg
- !type:CharacterSpeciesRequirement
inverted: true
species:
- IPC
# - !type:CharacterSpeciesRequirement
# inverted: true
# species:
# - IPC
functions:
- !type:TraitAddComponent
components:
Expand Down Expand Up @@ -132,10 +132,10 @@
inverted: true
lifepaths:
- Clone
- !type:CharacterSpeciesRequirement
inverted: true
species:
- IPC
# - !type:CharacterSpeciesRequirement
# inverted: true
# species:
# - IPC
functions:
- !type:TraitAddComponent
components:
Expand All @@ -155,7 +155,7 @@
- !type:CharacterSpeciesRequirement
inverted: true
species:
- IPC
# - IPC
- !type:CharacterItemGroupRequirement
group: TraitsAccents
functions:
Expand All @@ -172,10 +172,10 @@
jobs:
- Borg
- MedicalBorg
- !type:CharacterSpeciesRequirement
inverted: true
species:
- IPC
# - !type:CharacterSpeciesRequirement
# inverted: true
# species:
# - IPC
functions:
- !type:TraitAddComponent
components:
Expand All @@ -190,10 +190,10 @@
inverted: true
traits:
- ParkourTraining
- !type:CharacterSpeciesRequirement
inverted: true
species:
- Diona
# - !type:CharacterSpeciesRequirement
# inverted: true
# species:
# - Diona
functions:
- !type:TraitAddComponent
components:
Expand All @@ -216,10 +216,10 @@
- ParkourTraining
- SnailPaced
- WheelchairBound
- !type:CharacterSpeciesRequirement
inverted: true
species:
- Diona
# - !type:CharacterSpeciesRequirement
# inverted: true
# species:
# - Diona
functions:
- !type:TraitAddComponent
components:
Expand All @@ -239,10 +239,10 @@
- ParkourTraining
- Sluggish
- WheelchairBound
- !type:CharacterSpeciesRequirement
inverted: true
species:
- Diona
# - !type:CharacterSpeciesRequirement
# inverted: true
# species:
# - Diona
functions:
- !type:TraitAddComponent
components:
Expand All @@ -261,12 +261,12 @@
jobs:
- Borg
- MedicalBorg
- !type:CharacterSpeciesRequirement
inverted: true
species:
- IPC
- Lamia
- Plasmaman
# - !type:CharacterSpeciesRequirement
# inverted: true
# species:
# - IPC
# - Lamia
# - Plasmaman
- !type:CharacterTraitRequirement
inverted: true
traits:
Expand All @@ -287,12 +287,12 @@
jobs:
- Borg
- MedicalBorg
- !type:CharacterSpeciesRequirement
inverted: true
species:
- IPC
- Lamia
- Plasmaman
# - !type:CharacterSpeciesRequirement
# inverted: true
# species:
# - IPC
# - Lamia
# - Plasmaman
functions:
- !type:TraitAddComponent
components:
Expand All @@ -311,7 +311,7 @@
inverted: true
species:
- Vulpkanin # This trait functions exactly as-is for the Vulpkanin trait.
- Shadowkin
# - Shadowkin
- Tajaran
- !type:CharacterTraitRequirement
inverted: true
Expand Down
Loading
Loading