diff --git a/Resources/Locale/en-US/_EE/contractors/employer.ftl b/Resources/Locale/en-US/_EE/contractors/employer.ftl index 786bcd6eec..f0508b6f65 100644 --- a/Resources/Locale/en-US/_EE/contractors/employer.ftl +++ b/Resources/Locale/en-US/_EE/contractors/employer.ftl @@ -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 diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl index 6931e5ca83..4f70c7536d 100644 --- a/Resources/Locale/en-US/traits/traits.ftl +++ b/Resources/Locale/en-US/traits/traits.ftl @@ -347,7 +347,7 @@ 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, @@ -355,7 +355,7 @@ trait-description-Talons = 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, diff --git a/Resources/Locale/ru-RU/_EE/contractors/employer.ftl b/Resources/Locale/ru-RU/_EE/contractors/employer.ftl index bf5a75b296..ef43399032 100644 --- a/Resources/Locale/ru-RU/_EE/contractors/employer.ftl +++ b/Resources/Locale/ru-RU/_EE/contractors/employer.ftl @@ -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 = Командование Нанотрейзен diff --git a/Resources/Locale/ru-RU/traits/traits.ftl b/Resources/Locale/ru-RU/traits/traits.ftl index 6c949b5302..3f50216b32 100644 --- a/Resources/Locale/ru-RU/traits/traits.ftl +++ b/Resources/Locale/ru-RU/traits/traits.ftl @@ -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 = Кончики ваших пальцев заменены тонкими и длинными когтями. Ваши атаки ближнего боя без оружия наносят режущий урон вместо стандартного типа урона для вашего вида. diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index 07d4e7747c..5112a5f572 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -1,7 +1,7 @@ - type: species id: Arachnid name: species-name-arachnid - roundStart: true + roundStart: false prototype: MobArachnid # WD EDIT START bodyTypes: diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml index 949e19c6c6..0e15116347 100644 --- a/Resources/Prototypes/Species/diona.yml +++ b/Resources/Prototypes/Species/diona.yml @@ -1,7 +1,7 @@ - type: species id: Diona name: species-name-diona - roundStart: true + roundStart: false prototype: MobDiona # WD EDIT START bodyTypes: diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml index 76b57b02d8..83a6245bcf 100644 --- a/Resources/Prototypes/Species/dwarf.yml +++ b/Resources/Prototypes/Species/dwarf.yml @@ -1,7 +1,7 @@ - type: species id: Dwarf name: species-name-dwarf - roundStart: true + roundStart: false prototype: MobDwarf # WD EDIT START bodyTypes: diff --git a/Resources/Prototypes/Species/harpy.yml b/Resources/Prototypes/Species/harpy.yml index f7f84d900c..c3724e9a8c 100644 --- a/Resources/Prototypes/Species/harpy.yml +++ b/Resources/Prototypes/Species/harpy.yml @@ -1,7 +1,7 @@ - type: species id: Harpy name: species-name-harpy - roundStart: true + roundStart: false prototype: MobHarpy # WD EDIT START bodyTypes: diff --git a/Resources/Prototypes/Species/ipc.yml b/Resources/Prototypes/Species/ipc.yml index dd58a62e17..bba9c1d39b 100644 --- a/Resources/Prototypes/Species/ipc.yml +++ b/Resources/Prototypes/Species/ipc.yml @@ -1,7 +1,7 @@ - type: species id: IPC name: species-name-ipc - roundStart: true + roundStart: false prototype: MobIPC # WD EDIT START bodyTypes: diff --git a/Resources/Prototypes/Species/moth.yml b/Resources/Prototypes/Species/moth.yml index 2411e947d2..9805b6a5d8 100644 --- a/Resources/Prototypes/Species/moth.yml +++ b/Resources/Prototypes/Species/moth.yml @@ -1,7 +1,7 @@ - type: species id: Moth name: species-name-moth - roundStart: true + roundStart: false prototype: MobMoth # WD EDIT START bodyTypes: diff --git a/Resources/Prototypes/Species/plasmaman.yml b/Resources/Prototypes/Species/plasmaman.yml index b13c23651a..0d93f665df 100644 --- a/Resources/Prototypes/Species/plasmaman.yml +++ b/Resources/Prototypes/Species/plasmaman.yml @@ -1,7 +1,7 @@ - type: species id: Plasmaman name: species-name-plasmaman - roundStart: true + roundStart: false prototype: MobPlasmaman # WD EDIT START bodyTypes: diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml index 2a90803f8d..f1f1b69c7d 100644 --- a/Resources/Prototypes/Species/reptilian.yml +++ b/Resources/Prototypes/Species/reptilian.yml @@ -1,7 +1,7 @@ - type: species id: Reptilian name: species-name-reptilian - roundStart: true + roundStart: false prototype: MobReptilian # WD EDIT START bodyTypes: diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml index 5b7975d284..b3b34a2dbf 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -1,7 +1,7 @@ - type: species id: SlimePerson name: species-name-slime - roundStart: true + roundStart: false prototype: MobSlimePerson # WD EDIT START bodyTypes: diff --git a/Resources/Prototypes/Traits/Psionics/casterTypes.yml b/Resources/Prototypes/Traits/Psionics/casterTypes.yml index bf23163d97..0aef4ec44d 100644 --- a/Resources/Prototypes/Traits/Psionics/casterTypes.yml +++ b/Resources/Prototypes/Traits/Psionics/casterTypes.yml @@ -24,7 +24,7 @@ - !type:CharacterSpeciesRequirement inverted: true species: - - IPC + # - IPC - !type:CharacterTraitRequirement traits: - AnomalousPositronics @@ -55,7 +55,7 @@ - !type:CharacterSpeciesRequirement inverted: true species: - - IPC + # - IPC - !type:CharacterTraitRequirement traits: - AnomalousPositronics @@ -93,7 +93,7 @@ - !type:CharacterSpeciesRequirement inverted: true species: - - IPC + # - IPC - !type:CharacterTraitRequirement traits: - AnomalousPositronics diff --git a/Resources/Prototypes/Traits/Psionics/feats.yml b/Resources/Prototypes/Traits/Psionics/feats.yml index 106d2c3f2e..9418455a05 100644 --- a/Resources/Prototypes/Traits/Psionics/feats.yml +++ b/Resources/Prototypes/Traits/Psionics/feats.yml @@ -20,7 +20,7 @@ - !type:CharacterSpeciesRequirement inverted: true species: - - IPC + # - IPC - !type:CharacterTraitRequirement traits: - AnomalousPositronics @@ -28,7 +28,7 @@ inverted: true species: - Oni - - Shadowkin + # - Shadowkin functions: - !type:TraitReplaceComponent components: @@ -57,7 +57,7 @@ - !type:CharacterSpeciesRequirement inverted: true species: - - IPC + # - IPC - !type:CharacterTraitRequirement traits: - AnomalousPositronics diff --git a/Resources/Prototypes/Traits/categories.yml b/Resources/Prototypes/Traits/categories.yml index c94ecd9b80..a6f9a7fc6f 100644 --- a/Resources/Prototypes/Traits/categories.yml +++ b/Resources/Prototypes/Traits/categories.yml @@ -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 @@ -43,4 +44,7 @@ - type: traitCategory id: Language - root: true + root: false + +- type: traitCategory + id: TraitsHidden diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml index 964b39eec0..39a4e4844f 100644 --- a/Resources/Prototypes/Traits/disabilities.yml +++ b/Resources/Prototypes/Traits/disabilities.yml @@ -63,10 +63,10 @@ jobs: - Borg - MedicalBorg - - !type:CharacterSpeciesRequirement - inverted: true - species: - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - IPC functions: - !type:TraitAddComponent components: @@ -132,10 +132,10 @@ inverted: true lifepaths: - Clone - - !type:CharacterSpeciesRequirement - inverted: true - species: - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - IPC functions: - !type:TraitAddComponent components: @@ -155,7 +155,7 @@ - !type:CharacterSpeciesRequirement inverted: true species: - - IPC + # - IPC - !type:CharacterItemGroupRequirement group: TraitsAccents functions: @@ -172,10 +172,10 @@ jobs: - Borg - MedicalBorg - - !type:CharacterSpeciesRequirement - inverted: true - species: - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - IPC functions: - !type:TraitAddComponent components: @@ -190,10 +190,10 @@ inverted: true traits: - ParkourTraining - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Diona + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Diona functions: - !type:TraitAddComponent components: @@ -216,10 +216,10 @@ - ParkourTraining - SnailPaced - WheelchairBound - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Diona + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Diona functions: - !type:TraitAddComponent components: @@ -239,10 +239,10 @@ - ParkourTraining - Sluggish - WheelchairBound - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Diona + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Diona functions: - !type:TraitAddComponent components: @@ -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: @@ -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: @@ -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 diff --git a/Resources/Prototypes/Traits/inconveniences.yml b/Resources/Prototypes/Traits/inconveniences.yml index 030500d418..b4a5baf4d8 100644 --- a/Resources/Prototypes/Traits/inconveniences.yml +++ b/Resources/Prototypes/Traits/inconveniences.yml @@ -12,11 +12,11 @@ traits: - HeavyweightDrunk - LiquorLifeline - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Dwarf - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Dwarf + # - IPC functions: - !type:TraitAddComponent components: @@ -47,8 +47,9 @@ - type: trait id: ForeignerLight - category: TraitsSpeechLanguages + category: TraitsHidden points: 2 + enable: false requirements: - !type:CharacterTraitRequirement inverted: true @@ -68,8 +69,9 @@ - type: trait id: Foreigner - category: TraitsSpeechLanguages + category: TraitsHidden points: 4 + enable: false requirements: # TODO: Add a requirement to know at least 1 non-gc language - !type:CharacterTraitRequirement inverted: true diff --git a/Resources/Prototypes/Traits/languages.yml b/Resources/Prototypes/Traits/languages.yml index 3aa98595a6..42110870e4 100644 --- a/Resources/Prototypes/Traits/languages.yml +++ b/Resources/Prototypes/Traits/languages.yml @@ -1,7 +1,8 @@ - type: trait id: SignLanguage - category: TraitsSpeechLanguages + category: TraitsHidden points: -1 + enable: false # slots: 1 # itemGroupSlots: 0 requirements: @@ -20,8 +21,9 @@ - type: trait id: SolCommon - category: TraitsSpeechLanguages + category: TraitsHidden points: 0 + enable: false # slots: 1 # itemGroupSlots: 0 requirements: @@ -46,17 +48,18 @@ - type: trait id: Tradeband - category: TraitsSpeechLanguages + category: TraitsHidden points: 0 + enable: false # slots: 1 # itemGroupSlots: 0 requirements: # - !type:CharacterItemGroupRequirement # group: TraitsLanguagesBasic - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Harpy + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Harpy functions: - !type:TraitModifyLanguages languagesSpoken: @@ -66,8 +69,9 @@ - type: trait id: Freespeak - category: TraitsSpeechLanguages + category: TraitsHidden points: 0 + enable: false # slots: 1 # itemGroupSlots: 0 # requirements: @@ -82,8 +86,9 @@ - type: trait id: Elyran - category: TraitsSpeechLanguages + category: TraitsHidden points: 0 + enable: false # slots: 1 # itemGroupSlots: 0 requirements: [] @@ -104,8 +109,9 @@ - type: trait id: ValyrianStandard - category: TraitsSpeechLanguages + category: TraitsHidden points: -1 + enable: false # slots: 1 # itemGroupSlots: 0 requirements: @@ -117,10 +123,10 @@ # nationalities: # - Valyrian #AWS-end - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Harpy + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Harpy functions: - !type:TraitModifyLanguages languagesSpoken: @@ -130,8 +136,9 @@ - type: trait id: NovuNederic - category: TraitsSpeechLanguages + category: TraitsHidden points: 0 + enable: false # slots: 1 # itemGroupSlots: 0 # requirements: @@ -152,14 +159,15 @@ - type: trait id: Azaziba - category: TraitsSpeechLanguages + category: TraitsHidden points: -1 + enable: false # slots: 1 # itemGroupSlots: 0 requirements: - - !type:CharacterSpeciesRequirement - species: - - Reptilian + # - !type:CharacterSpeciesRequirement + # species: + # - Reptilian # - !type:CharacterItemGroupRequirement # group: TraitsLanguagesBasic functions: @@ -168,3 +176,4 @@ - Azaziba languagesUnderstood: - Azaziba + diff --git a/Resources/Prototypes/Traits/neutral.yml b/Resources/Prototypes/Traits/neutral.yml index 118fa1a35d..3866034db7 100644 --- a/Resources/Prototypes/Traits/neutral.yml +++ b/Resources/Prototypes/Traits/neutral.yml @@ -117,12 +117,13 @@ # slots: 0 # itemGroupSlots: 0 category: TraitsSpeechAccents + enable: false requirements: - !type:CharacterItemGroupRequirement group: TraitsAccents - - !type:CharacterSpeciesRequirement - species: - - Plasmaman + # - !type:CharacterSpeciesRequirement + # species: + # - Plasmaman functions: - !type:TraitAddComponent components: @@ -134,7 +135,7 @@ requirements: - !type:CharacterSpeciesRequirement species: - - Harpy + -# - Harpy - Vulpkanin functions: - !type:TraitRemoveComponent @@ -190,10 +191,10 @@ jobs: - Borg - MedicalBorg - - !type:CharacterSpeciesRequirement - inverted: true - species: - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - IPC functions: - !type:TraitAddMoodlets moodEffects: @@ -260,3 +261,4 @@ - !type:TraitRemoveComponent components: - type: Mood + diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml index 9da1ad38fa..d053d17c64 100644 --- a/Resources/Prototypes/Traits/physical.yml +++ b/Resources/Prototypes/Traits/physical.yml @@ -8,10 +8,10 @@ jobs: - Borg - MedicalBorg - - !type:CharacterSpeciesRequirement - inverted: true - species: - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -33,10 +33,10 @@ jobs: - Borg - MedicalBorg - - !type:CharacterSpeciesRequirement - inverted: true - species: - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -58,10 +58,10 @@ jobs: - Borg - MedicalBorg - - !type:CharacterSpeciesRequirement - inverted: true - species: - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -84,10 +84,10 @@ jobs: - Borg - MedicalBorg - - !type:CharacterSpeciesRequirement - inverted: true - species: - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -112,11 +112,11 @@ inverted: true traits: - Lethargy - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Oni - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Oni + # # - IPC functions: - !type:TraitModifyStamina staminaModifier: 10 @@ -158,10 +158,10 @@ jobs: - Borg - MedicalBorg - - !type:CharacterSpeciesRequirement - inverted: true - species: - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -183,10 +183,10 @@ jobs: - Borg - MedicalBorg - - !type:CharacterSpeciesRequirement - inverted: true - species: - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -352,7 +352,7 @@ inverted: true species: - Vulpkanin # This trait functions exactly as-is for the Vulpkanin trait. - - Plasmaman # Plasmamen have cold immunity so this trait is unnecessary + # - Plasmaman # Plasmamen have cold immunity so this trait is unnecessary functions: - !type:TraitReplaceComponent components: @@ -368,12 +368,12 @@ category: Physical points: 0 requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Harpy # Harpies already have talons - - Arachnid # Apparently they have a "piercing" bite - - Xelthia # Talons don't make sense on tentacle arms + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # # - Harpy # Harpies already have talons + # # - Arachnid # Apparently they have a "piercing" bite + # # - Xelthia # Talons don't make sense on tentacle arms - !type:CharacterTraitRequirement inverted: true traits: @@ -405,9 +405,9 @@ species: - Felinid # Felinids already have cat claws. - Tajaran # Tajaran also have cat claws - - Reptilian # Reptilians also have cat claws. - - Shadowkin # Shadowkins also have claws. - - Xelthia # Claws don't make sense on tentacle arms + # - Reptilian # Reptilians also have cat claws. + # - Shadowkin # Shadowkins also have claws. + # - Xelthia # Claws don't make sense on tentacle arms # - Vulpkanin # Vulpkanin have "Blunt" claws. One could argue this trait "Sharpens" their claws. - !type:CharacterTraitRequirement inverted: true @@ -439,13 +439,13 @@ species: - Human - Oni - - SlimePerson - - Diona - - Dwarf - - Arachne - - IPC # Other species could justify getting this trait for Blunt stamina damage, + # - SlimePerson + # - Diona + # - Dwarf + # - Arachne + # - IPC # Other species could justify getting this trait for Blunt stamina damage, # but 6 blunt -> 5 blunt is a straight up downgrade. - - Xelthia # Their tentacles aren't really weapons probably + # - Xelthia # Their tentacles aren't really weapons probably - !type:CharacterTraitRequirement inverted: true traits: @@ -480,10 +480,10 @@ traits: - Claws - Talons - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Xelthia # this would fall off + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Xelthia # this would fall off functions: - !type:TraitModifyUnarmed flatDamageIncrease: @@ -499,14 +499,14 @@ inverted: true jobs: - Prisoner # Bionics should be "Confiscated" from long term prisoners. - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Arachnid - - Arachne - - Shadowkin - - IPC - - Xelthia # this would fall off + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Arachnid + # - Arachne + # - Shadowkin + # - IPC + # - Xelthia # this would fall off functions: - !type:TraitAddComponent components: @@ -539,10 +539,10 @@ inverted: true traits: - BionicPryArm - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Xelthia # this would fall off + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Xelthia # this would fall off functions: - !type:TraitCyberneticLimbReplacement removeBodyPart: Arm @@ -572,7 +572,7 @@ - !type:CharacterSpeciesRequirement inverted: true species: - - IPC + # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -627,7 +627,7 @@ - !type:CharacterSpeciesRequirement inverted: true species: - - IPC + # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -817,7 +817,7 @@ - !type:CharacterSpeciesRequirement inverted: true species: - - IPC + # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -843,7 +843,7 @@ - !type:CharacterSpeciesRequirement inverted: true species: - - IPC + # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -906,9 +906,9 @@ inverted: true jobs: - Prisoner # Bionics should be "Confiscated" from long term prisoners. - - !type:CharacterSpeciesRequirement - species: - - IPC + # - !type:CharacterSpeciesRequirement + # species: + # - IPC functions: # TODO: Code Platelet factories as an actual obtainable implant, and replace this with TraitAddImplant - !type:TraitReplaceComponent components: @@ -1014,7 +1014,7 @@ # - Dignitary # WD EDIT - !type:CharacterSpeciesRequirement species: - - IPC + # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -1040,7 +1040,7 @@ - Prisoner # Bionics should be "Confiscated" from long term prisoners. - !type:CharacterSpeciesRequirement species: - - IPC + # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -1072,7 +1072,7 @@ - Prisoner # Bionics should be "Confiscated" from long term prisoners. - !type:CharacterSpeciesRequirement species: - - IPC + # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -1108,7 +1108,7 @@ # - Dignitary - WD EDIT - !type:CharacterSpeciesRequirement species: - - IPC + # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -1149,7 +1149,7 @@ - Prisoner # Bionics should be "Confiscated" from long term prisoners. - !type:CharacterSpeciesRequirement species: - - IPC + # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -1173,7 +1173,7 @@ - Prisoner # Bionics should be "Confiscated" from long term prisoners. - !type:CharacterSpeciesRequirement species: - - IPC + # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -1240,10 +1240,10 @@ jobs: - Borg - MedicalBorg - - !type:CharacterSpeciesRequirement - inverted: true - species: - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - IPC functions: - !type:TraitAddComponent components: @@ -1269,10 +1269,10 @@ inverted: true traits: - BionicArm - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Xelthia # this would fall off + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Xelthia # this would fall off functions: - !type:TraitCyberneticLimbReplacement removeBodyPart: Arm @@ -1295,9 +1295,9 @@ category: Physical points: -4 requirements: - - !type:CharacterSpeciesRequirement - species: - - IPC + # - !type:CharacterSpeciesRequirement + # species: + # - IPC functions: - !type:TraitAddArmor damageModifierSets: @@ -1308,9 +1308,9 @@ category: Physical points: -5 requirements: - - !type:CharacterSpeciesRequirement - species: - - IPC + # - !type:CharacterSpeciesRequirement + # species: + # - IPC functions: - !type:TraitAddComponent components: @@ -1329,7 +1329,7 @@ requirements: - !type:CharacterSpeciesRequirement species: - - IPC + # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -1372,7 +1372,7 @@ requirements: - !type:CharacterSpeciesRequirement species: - - Reptilian + # - Reptilian - !type:CharacterHeightRequirement max: 150 - !type:CharacterWidthRequirement @@ -1395,9 +1395,9 @@ category: Physical points: -2 requirements: - - !type:CharacterSpeciesRequirement - species: - - Reptilian + # - !type:CharacterSpeciesRequirement + # species: + # - Reptilian functions: - !type:TraitAddComponent components: diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml index 1e31e6c04c..358325c11c 100644 --- a/Resources/Prototypes/Traits/skills.yml +++ b/Resources/Prototypes/Traits/skills.yml @@ -54,11 +54,11 @@ traits: - LightweightDrunk - LiquorLifeline - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Dwarf - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Dwarf + # - IPC functions: - !type:TraitReplaceComponent components: @@ -80,11 +80,11 @@ traits: - LightweightDrunk - HeavyweightDrunk - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Dwarf - - IPC + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Dwarf + # - IPC functions: - !type:TraitReplaceComponent components: @@ -125,7 +125,7 @@ inverted: true species: - Vulpkanin - - IPC + -# - IPC - type: trait id: ParkourTraining @@ -139,10 +139,10 @@ - SnailPaced - BadKnees - WheelchairBound - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Diona + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Diona functions: - !type:TraitReplaceComponent components: @@ -176,10 +176,10 @@ category: Auditory points: -1 requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Harpy + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Harpy - !type:CharacterTraitRequirement inverted: true traits: @@ -194,11 +194,12 @@ id: LyreBird category: Auditory points: -3 + enable: false requirements: - - !type:CharacterSpeciesRequirement - species: - - Harpy - - IPC + # - !type:CharacterSpeciesRequirement + # species: + # - Harpy + # - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -230,20 +231,21 @@ species: - Felinid - Tajaran - - Harpy + -# - Harpy - type: trait id: AnomalousPositronics category: Psionics points: -4 + enable: false functions: - !type:TraitRemoveComponent components: - type: PsionicInsulation requirements: - - !type:CharacterSpeciesRequirement - species: - - IPC + # - !type:CharacterSpeciesRequirement + # species: + # - IPC # - type: trait # id: AnimalFriend @@ -293,3 +295,4 @@ - Brigmedic - SeniorPhysician + diff --git a/Resources/Prototypes/Traits/species.yml b/Resources/Prototypes/Traits/species.yml index 6a14c49271..298927d5e1 100644 --- a/Resources/Prototypes/Traits/species.yml +++ b/Resources/Prototypes/Traits/species.yml @@ -2,6 +2,7 @@ id: Swashbuckler category: Physical points: 0 + enable: false functions: - !type:TraitReplaceComponent components: @@ -12,9 +13,9 @@ Slash: 1.35 Piercing: 1.25 requirements: - - !type:CharacterSpeciesRequirement - species: - - Oni + # - !type:CharacterSpeciesRequirement + # species: + # - Oni - !type:CharacterTraitRequirement inverted: true traits: @@ -27,6 +28,7 @@ id: Spearmaster category: Physical points: 0 + enable: false functions: - !type:TraitReplaceComponent components: @@ -37,9 +39,9 @@ Slash: 1.25 Piercing: 1.35 requirements: - - !type:CharacterSpeciesRequirement - species: - - Oni + # - !type:CharacterSpeciesRequirement + # species: + # - Oni - !type:CharacterTraitRequirement inverted: true traits: @@ -51,6 +53,7 @@ id: WeaponsGeneralist category: Physical points: 0 + enable: false functions: - !type:TraitReplaceComponent components: @@ -61,9 +64,9 @@ Slash: 1.30 Piercing: 1.30 requirements: - - !type:CharacterSpeciesRequirement - species: - - Oni + # - !type:CharacterSpeciesRequirement + # species: + # - Oni - !type:CharacterTraitRequirement inverted: true traits: @@ -75,6 +78,7 @@ id: Mystic category: Mental points: 0 + enable: false functions: - !type:TraitReplaceComponent components: @@ -87,9 +91,9 @@ - type: PotentiaModifier potentiaMultiplier: 1.15 requirements: - - !type:CharacterSpeciesRequirement - species: - - Oni + # - !type:CharacterSpeciesRequirement + # species: + # - Oni - !type:CharacterTraitRequirement inverted: true traits: @@ -112,6 +116,7 @@ id: ShadowkinBlackeye category: Mental points: 5 + enable: false functions: - !type:TraitReplaceComponent components: @@ -121,14 +126,15 @@ components: - type: Psionic requirements: - - !type:CharacterSpeciesRequirement - species: - - Shadowkin + # - !type:CharacterSpeciesRequirement + # species: + # - Shadowkin - type: trait id: MothFlight category: Physical points: -2 + enable: false functions: - !type:TraitAddComponent components: @@ -137,9 +143,9 @@ flapInterval: 0.75 needsHands: false requirements: - - !type:CharacterSpeciesRequirement - species: - - Moth + # - !type:CharacterSpeciesRequirement + # species: + # - Moth - !type:CharacterWeightRequirement # big moffs are too heavy to fly max: 60 @@ -147,6 +153,7 @@ id: IPCInefficientCogitator category: Physical points: 3 + enable: false functions: - !type:TraitReplaceComponent components: @@ -164,14 +171,15 @@ 1: 0.45 0: 0.00 requirements: - - !type:CharacterSpeciesRequirement - species: - - IPC + # - !type:CharacterSpeciesRequirement + # species: + # - IPC - type: trait id: IPCBrittleBoneDisease category: Physical points: 6 + enable: false functions: - !type:TraitReplaceComponent components: @@ -182,27 +190,29 @@ - type: DeadModifier deadThresholdModifier: -60 requirements: - - !type:CharacterSpeciesRequirement - species: - - IPC + # - !type:CharacterSpeciesRequirement + # species: + # - IPC - type: trait id: IPCFragileCircuits category: Physical points: 4 # shock is rare as-is, maybe raise if it becomes more common + enable: false functions: - !type:TraitAddComponent components: - type: KillOnDamage requirements: - - !type:CharacterSpeciesRequirement - species: - - IPC + # - !type:CharacterSpeciesRequirement + # species: + # - IPC - type: trait id: IPCFaultyWaterproofing category: Physical points: 3 + enable: false functions: - !type:TraitReplaceComponent components: @@ -230,10 +240,11 @@ messages: [ "faultyWaterproofing-damage-popup" ] probability: 1 requirements: - - !type:CharacterSpeciesRequirement - species: - - IPC + # - !type:CharacterSpeciesRequirement + # species: + # - IPC - !type:CharacterTraitRequirement inverted: true traits: - HardenedCircuits + diff --git a/Resources/Prototypes/_EE/Species/tajaran.yml b/Resources/Prototypes/_EE/Species/tajaran.yml index 031079d341..d4f4517378 100644 --- a/Resources/Prototypes/_EE/Species/tajaran.yml +++ b/Resources/Prototypes/_EE/Species/tajaran.yml @@ -1,7 +1,7 @@ - type: species id: Tajaran name: species-name-tajaran - roundStart: false # WD EDIT + roundStart: true prototype: MobTajaran # WD EDIT START bodyTypes: diff --git a/Resources/Prototypes/_EE/Traits/languages.yml b/Resources/Prototypes/_EE/Traits/languages.yml index 166af3fa78..669cb47829 100644 --- a/Resources/Prototypes/_EE/Traits/languages.yml +++ b/Resources/Prototypes/_EE/Traits/languages.yml @@ -1,7 +1,8 @@ - type: trait id: SiikMaas - category: TraitsSpeechLanguages + category: TraitsHidden points: -1 + enable: false # slots: 1 # itemGroupSlots: 0 requirements: @@ -26,8 +27,9 @@ - type: trait id: NalRasan - category: TraitsSpeechLanguages + category: TraitsHidden points: -1 + enable: false # slots: 1 # itemGroupSlots: 0 requirements: @@ -45,8 +47,9 @@ - type: trait id: SiikTajr - category: TraitsSpeechLanguages + category: TraitsHidden points: -2 + enable: false # slots: 1 # itemGroupSlots: 0 requirements: @@ -64,8 +67,9 @@ - type: trait id: YaSsa - category: TraitsSpeechLanguages + category: TraitsHidden points: -2 + enable: false # slots: 1 # itemGroupSlots: 0 requirements: @@ -83,8 +87,9 @@ - type: trait id: Delvahii - category: TraitsSpeechLanguages + category: TraitsHidden points: -2 + enable: false # slots: 1 # itemGroupSlots: 0 requirements: @@ -102,18 +107,19 @@ - type: trait id: Moffic - category: TraitsSpeechLanguages + category: TraitsHidden points: -1 + enable: false # slots: 1 # itemGroupSlots: 0 requirements: # - !type:CharacterItemGroupRequirement # group: TraitsLanguagesBasic - - !type:CharacterSpeciesRequirement - species: - - Harpy - - Chitinid - - IPC + # - !type:CharacterSpeciesRequirement + # species: + # - Harpy + # - Chitinid + # - IPC functions: - !type:TraitModifyLanguages languagesSpoken: @@ -123,21 +129,23 @@ - type: trait id: Chittin - category: TraitsSpeechLanguages + category: TraitsHidden points: -1 + enable: false # slots: 1 # itemGroupSlots: 0 requirements: # - !type:CharacterItemGroupRequirement # group: TraitsLanguagesBasic - - !type:CharacterSpeciesRequirement - species: - - Harpy - - Moth - - IPC + # - !type:CharacterSpeciesRequirement + # species: + # - Harpy + # - Moth + # - IPC functions: - !type:TraitModifyLanguages languagesSpoken: - Chittin languagesUnderstood: - Chittin + diff --git a/Resources/Prototypes/_White/Traits/vision.yml b/Resources/Prototypes/_White/Traits/vision.yml index c0dc48e7f0..fab0ae6d10 100644 --- a/Resources/Prototypes/_White/Traits/vision.yml +++ b/Resources/Prototypes/_White/Traits/vision.yml @@ -2,10 +2,11 @@ id: StudioVisor category: Visual points: -1 + enable: false requirements: - - !type:CharacterSpeciesRequirement - species: - - IPC + # - !type:CharacterSpeciesRequirement + # species: + # - IPC functions: - !type:TraitAddComponent components: