From d5e61708f1fb3578f253afc2e1cde25d53a78a5f Mon Sep 17 00:00:00 2001 From: szyefan Date: Fri, 15 May 2026 19:36:50 +0200 Subject: [PATCH] zmieniono: Resources/Prototypes/Entities/Structures/Machines/lathe.yml zmieniono: Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml zmieniono: Resources/Prototypes/Traits/languages.yml zmieniono: Resources/Prototypes/_Crescent/Entities/Structures/lathe.yml zmieniono: Resources/Prototypes/_Crescent/Research/electronics.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/DSM/adjutant.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/DSM/advocatus.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/DSM/archscribe.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/DSM/courtier.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/DSM/foreman.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/DSM/governor.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/DSM/ministeroflabor.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/DSM/wealth.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_artificer.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_commandant.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_coordinator.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_director.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_dockhand.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_doctor.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_fleetkapitan.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_kommissar.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_mvdgrunt.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_mvdofficer.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_partisan.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_taskmaster.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_worker.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/SHI/board.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/SHI/corpsec.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/SHI/employee.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/SHI/executive.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/SHI/highsec.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/SHI/medtech.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/coordinator.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/foreman.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/infanteer.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/intelligenceofficer.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/lieutenant.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/operative.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/researcher.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/ringleader.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/ripperdoc.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/shipbreaker.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/technician.yml zmieniono: Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/traumasec.yml zmieniono: Resources/Prototypes/_Crescent/Traits/traits.yml --- .../Entities/Structures/Machines/lathe.yml | 30 +-- .../Nyanotrasen/Entities/Mobs/Species/Oni.yml | 3 - Resources/Prototypes/Traits/languages.yml | 20 +- .../_Crescent/Entities/Structures/lathe.yml | 24 +-- .../_Crescent/Research/electronics.yml | 6 +- .../_Crescent/Roles/Jobs/DSM/adjutant.yml | 2 - .../_Crescent/Roles/Jobs/DSM/advocatus.yml | 2 - .../_Crescent/Roles/Jobs/DSM/archscribe.yml | 2 - .../_Crescent/Roles/Jobs/DSM/courtier.yml | 2 - .../_Crescent/Roles/Jobs/DSM/foreman.yml | 2 - .../_Crescent/Roles/Jobs/DSM/governor.yml | 2 - .../Roles/Jobs/DSM/ministeroflabor.yml | 2 - .../_Crescent/Roles/Jobs/DSM/wealth.yml | 2 - .../Roles/Jobs/NCWL/ncwl_artificer.yml | 4 +- .../Roles/Jobs/NCWL/ncwl_commandant.yml | 4 +- .../Roles/Jobs/NCWL/ncwl_coordinator.yml | 4 +- .../Roles/Jobs/NCWL/ncwl_director.yml | 4 +- .../Roles/Jobs/NCWL/ncwl_dockhand.yml | 6 +- .../_Crescent/Roles/Jobs/NCWL/ncwl_doctor.yml | 4 +- .../Roles/Jobs/NCWL/ncwl_fleetkapitan.yml | 2 + .../Roles/Jobs/NCWL/ncwl_kommissar.yml | 4 +- .../Roles/Jobs/NCWL/ncwl_mvdgrunt.yml | 2 + .../Roles/Jobs/NCWL/ncwl_mvdofficer.yml | 4 +- .../Roles/Jobs/NCWL/ncwl_partisan.yml | 4 +- .../Roles/Jobs/NCWL/ncwl_taskmaster.yml | 3 +- .../_Crescent/Roles/Jobs/NCWL/ncwl_worker.yml | 4 +- .../_Crescent/Roles/Jobs/SHI/board.yml | 4 +- .../_Crescent/Roles/Jobs/SHI/corpsec.yml | 2 + .../_Crescent/Roles/Jobs/SHI/employee.yml | 4 +- .../_Crescent/Roles/Jobs/SHI/executive.yml | 4 +- .../_Crescent/Roles/Jobs/SHI/highsec.yml | 2 + .../_Crescent/Roles/Jobs/SHI/medtech.yml | 2 + .../_Crescent/Roles/Jobs/TFSC/coordinator.yml | 6 +- .../_Crescent/Roles/Jobs/TFSC/foreman.yml | 6 +- .../_Crescent/Roles/Jobs/TFSC/infanteer.yml | 4 +- .../Roles/Jobs/TFSC/intelligenceofficer.yml | 10 +- .../_Crescent/Roles/Jobs/TFSC/lieutenant.yml | 6 +- .../_Crescent/Roles/Jobs/TFSC/operative.yml | 6 +- .../_Crescent/Roles/Jobs/TFSC/researcher.yml | 8 +- .../_Crescent/Roles/Jobs/TFSC/ringleader.yml | 6 +- .../_Crescent/Roles/Jobs/TFSC/ripperdoc.yml | 4 +- .../_Crescent/Roles/Jobs/TFSC/shipbreaker.yml | 4 +- .../_Crescent/Roles/Jobs/TFSC/technician.yml | 4 +- .../_Crescent/Roles/Jobs/TFSC/traumasec.yml | 4 +- .../Prototypes/_Crescent/Traits/traits.yml | 182 ++++++++++-------- 45 files changed, 201 insertions(+), 215 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index c82c509b582..e0a57921666 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -210,14 +210,14 @@ - FauxTileJungleAstroGrass - FauxTileAstroIce - FauxTileAstroSnow - - CanilunztTranslator - - BubblishTranslator - - NekomimeticTranslator +# - CanilunztTranslator +# - BubblishTranslator +# - NekomimeticTranslator +# - SolCommonTranslator +# - NovuNedericTranslator +# - RootSpeakTranslator +# - BasicGalaticCommonTranslatorImplanter - DraconicTranslator - - SolCommonTranslator - - NovuNedericTranslator - - RootSpeakTranslator - - BasicGalaticCommonTranslatorImplanter - MofficTranslator - N14MaterialCircuitry - VehicleWheelchairFolded # Goobstation @@ -408,15 +408,15 @@ - PKAUpgradeDamage # Lavaland Change - PKAUpgradeRange # Lavaland Change - PKAUpgradeFireRate # Lavaland Change - - XenoTranslator - - AdvancedGalaticCommonTranslatorImplanter - - BubblishTranslatorImplanter - - NekomimeticTranslatorImplanter +# - XenoTranslator +# - AdvancedGalaticCommonTranslatorImplanter +# - BubblishTranslatorImplanter +# - NekomimeticTranslatorImplanter - DraconicTranslatorImplanter - - CanilunztTranslatorImplanter - - SolCommonTranslatorImplanter - - RootSpeakTranslatorImplanter - - AnimalTranslator +# - CanilunztTranslatorImplanter +# - SolCommonTranslatorImplanter +# - RootSpeakTranslatorImplanter +# - AnimalTranslator - MofficTranslatorImplanter - ClothingEyesNightVisionGoggles - ClothingEyesNightVisionDiagnosticGoggles diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml index 3b9179f605b..3b6cda145a4 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml @@ -43,11 +43,8 @@ - type: TypingIndicator proto: oni - type: LanguageKnowledge - speaks: - - Nekomimetic understands: - TauCetiBasic - - Nekomimetic - type: PotentiaModifier potentiaMultiplier: 0 - type: Mindbroken diff --git a/Resources/Prototypes/Traits/languages.yml b/Resources/Prototypes/Traits/languages.yml index 2a84af3f016..4601caf0aaf 100644 --- a/Resources/Prototypes/Traits/languages.yml +++ b/Resources/Prototypes/Traits/languages.yml @@ -16,13 +16,13 @@ #languagesUnderstood: # - Sign -- type: trait - id: Tradeband - category: TraitsSpeechLanguages - points: -2 - functions: - - !type:TraitModifyLanguages - languagesSpoken: - - Tradeband - languagesUnderstood: - - Tradeband +#- type: trait +# id: Tradeband +# category: TraitsSpeechLanguages +# points: -2 +# functions: +# - !type:TraitModifyLanguages +# languagesSpoken: +# - Tradeband +# languagesUnderstood: +# - Tradeband diff --git a/Resources/Prototypes/_Crescent/Entities/Structures/lathe.yml b/Resources/Prototypes/_Crescent/Entities/Structures/lathe.yml index 773e65b2ecd..37092262318 100644 --- a/Resources/Prototypes/_Crescent/Entities/Structures/lathe.yml +++ b/Resources/Prototypes/_Crescent/Entities/Structures/lathe.yml @@ -355,7 +355,6 @@ - ClothingHeadHatWelding - ClothingOuterSuitEmergency - ClothingHeadHelmetEVALarge # Frontier - - TradebandTranslator - ClothingBeltSalvageWebbing - ArmorPlateSteelInsertHardsuitCraft - ArmorPlateCeramicInsertBasicHardsuitCraft @@ -384,8 +383,9 @@ #MinutemenEnd - CreoleTranslator - LowImperialTranslator - - FreespeakTranslator - KaishagoTranslator + - DraconicTranslator + - MofficTranslator - ThrusterFlatpackAstronautics - GyroscopeFlatpackAstronautics - MiniGravityFlatpack @@ -1094,16 +1094,16 @@ - PKAUpgradeDamage # Lavaland Change - PKAUpgradeRange # Lavaland Change - PKAUpgradeFireRate # Lavaland Change - - XenoTranslator - - AdvancedGalaticCommonTranslatorImplanter - - BubblishTranslatorImplanter - - NekomimeticTranslatorImplanter - - DraconicTranslatorImplanter - - CanilunztTranslatorImplanter - - SolCommonTranslatorImplanter - - RootSpeakTranslatorImplanter - - AnimalTranslator - - MofficTranslatorImplanter + #- XenoTranslator + #- AdvancedGalaticCommonTranslatorImplanter + #- BubblishTranslatorImplanter + #- NekomimeticTranslatorImplanter + #- DraconicTranslatorImplanter + #- CanilunztTranslatorImplanter + #- SolCommonTranslatorImplanter + #- RootSpeakTranslatorImplanter + #- AnimalTranslator + #- MofficTranslatorImplanter - ClothingEyesNightVisionGoggles - ClothingEyesNightVisionDiagnosticGoggles - ClothingEyesThermalVisionGoggles diff --git a/Resources/Prototypes/_Crescent/Research/electronics.yml b/Resources/Prototypes/_Crescent/Research/electronics.yml index 2b1c2abc4f5..4a2a1afaeda 100644 --- a/Resources/Prototypes/_Crescent/Research/electronics.yml +++ b/Resources/Prototypes/_Crescent/Research/electronics.yml @@ -35,10 +35,12 @@ tier: 1 cost: 1000 recipeUnlocks: - - CreoleTranslator - LowImperialTranslator - - FreespeakTranslator + - DraconicTranslator + - MofficTranslator - KaishagoTranslator +# - CreoleTranslator +# - FreespeakTranslator - type: technology id: BasicComponentsElectronics diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/adjutant.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/adjutant.yml index 24e00970f4b..f84e202b070 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/adjutant.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/adjutant.yml @@ -35,11 +35,9 @@ addSpoken: - HighImperial - LowImperial - - Tradeband addUnderstood: - HighImperial - LowImperial - - Tradeband access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/advocatus.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/advocatus.yml index 7a2ace866ee..004be467270 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/advocatus.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/advocatus.yml @@ -37,11 +37,9 @@ addSpoken: - HighImperial - LowImperial - - Tradeband addUnderstood: - HighImperial - LowImperial - - Tradeband access: - EmergencyShuttleRepealAll diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/archscribe.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/archscribe.yml index 5beeb73eeb2..439dbc651b2 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/archscribe.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/archscribe.yml @@ -35,11 +35,9 @@ addSpoken: - HighImperial - LowImperial - - Tradeband addUnderstood: - HighImperial - LowImperial - - Tradeband access: - Command - Empire diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/courtier.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/courtier.yml index d0b82d377dc..f3772912749 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/courtier.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/courtier.yml @@ -30,11 +30,9 @@ addSpoken: - HighImperial - LowImperial - - Tradeband addUnderstood: - HighImperial - LowImperial - - Tradeband access: - Command - Empire diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/foreman.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/foreman.yml index 14e38c70b70..b1b7325fc44 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/foreman.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/foreman.yml @@ -36,10 +36,8 @@ - type: LanguageAdder addSpoken: - LowImperial - - Tradeband addUnderstood: - LowImperial - - Tradeband access: - Command - Empire diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/governor.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/governor.yml index 5065d4029f8..6c059b9175c 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/governor.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/governor.yml @@ -37,11 +37,9 @@ addSpoken: - HighImperial - LowImperial - - Tradeband addUnderstood: - HighImperial - LowImperial - - Tradeband access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/ministeroflabor.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/ministeroflabor.yml index f0185930f01..925072f78d1 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/ministeroflabor.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/ministeroflabor.yml @@ -35,11 +35,9 @@ addSpoken: - HighImperial - LowImperial - - Tradeband addUnderstood: - HighImperial - LowImperial - - Tradeband access: - Command - Empire diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/wealth.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/wealth.yml index efda66de461..b0cffc71cf4 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/wealth.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/DSM/wealth.yml @@ -34,11 +34,9 @@ addSpoken: - HighImperial - LowImperial - - Tradeband addUnderstood: - HighImperial - LowImperial - - Tradeband access: - Command - Empire diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_artificer.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_artificer.yml index 617a3232255..ddf6d765a16 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_artificer.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_artificer.yml @@ -35,9 +35,9 @@ faction: NCWL - type: LanguageAdder addSpoken: - - Dockta + - LowImperial addUnderstood: - - Dockta + - LowImperial access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_commandant.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_commandant.yml index 3ef90915ce1..cfa6220664d 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_commandant.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_commandant.yml @@ -37,10 +37,10 @@ - type: LanguageAdder addSpoken: - Dockta - - Tradeband + - LowImperial addUnderstood: - Dockta - - Tradeband + - LowImperial access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_coordinator.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_coordinator.yml index e8c6b06befc..88397f328c9 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_coordinator.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_coordinator.yml @@ -36,10 +36,10 @@ - type: LanguageAdder addSpoken: - Dockta - - Tradeband + - LowImperial addUnderstood: - Dockta - - Tradeband + - LowImperial access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_director.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_director.yml index 6764cc42118..15cb3e3fdfc 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_director.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_director.yml @@ -39,10 +39,10 @@ - type: LanguageAdder addSpoken: - Dockta - - Tradeband + - LowImperial addUnderstood: - Dockta - - Tradeband + - LowImperial access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_dockhand.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_dockhand.yml index 826ae1980ed..bedda6dbffd 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_dockhand.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_dockhand.yml @@ -35,11 +35,9 @@ faction: NCWL - type: LanguageAdder addSpoken: - - Dockta - - Tradeband + - LowImperial addUnderstood: - - Dockta - - Tradeband + - LowImperial access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_doctor.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_doctor.yml index adaaf7df2aa..3f4a5bee94d 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_doctor.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_doctor.yml @@ -38,9 +38,9 @@ speedModifier: 1.75 - type: LanguageAdder addSpoken: - - Dockta + - LowImperial addUnderstood: - - Dockta + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_fleetkapitan.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_fleetkapitan.yml index 087e2b9f2be..f0bb81ee18d 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_fleetkapitan.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_fleetkapitan.yml @@ -37,8 +37,10 @@ - type: LanguageAdder addSpoken: - Dockta + - LowImperial addUnderstood: - Dockta + - LowImperial access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_kommissar.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_kommissar.yml index 5e0fdc68c0c..67364e98792 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_kommissar.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_kommissar.yml @@ -37,10 +37,10 @@ - type: LanguageAdder addSpoken: - Dockta - - Tradeband + - LowImperial addUnderstood: - Dockta - - Tradeband + - LowImperial access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_mvdgrunt.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_mvdgrunt.yml index 9d6494ed7bb..2a544e06e6d 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_mvdgrunt.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_mvdgrunt.yml @@ -36,8 +36,10 @@ - type: LanguageAdder addSpoken: - Dockta + - LowImperial addUnderstood: - Dockta + - LowImperial access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_mvdofficer.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_mvdofficer.yml index b9dab916fbd..d1ce04051fc 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_mvdofficer.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_mvdofficer.yml @@ -36,10 +36,10 @@ - type: LanguageAdder addSpoken: - Dockta - - Tradeband + - LowImperial addUnderstood: - Dockta - - Tradeband + - LowImperial access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_partisan.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_partisan.yml index 8132eb1b437..b73547eb310 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_partisan.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_partisan.yml @@ -35,9 +35,9 @@ faction: NCWL - type: LanguageAdder addSpoken: - - Dockta + - LowImperial addUnderstood: - - Dockta + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_taskmaster.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_taskmaster.yml index 86792191b1e..0f82bff9cf3 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_taskmaster.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_taskmaster.yml @@ -35,11 +35,10 @@ faction: NCWL - type: LanguageAdder addSpoken: + - LowImperial - Dockta - - Tradeband addUnderstood: - Dockta - - Tradeband access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_worker.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_worker.yml index 63025079b88..b868f96ac10 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_worker.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_worker.yml @@ -26,9 +26,9 @@ faction: NCWL - type: LanguageAdder addSpoken: - - Dockta + - LowImperial addUnderstood: - - Dockta + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/board.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/board.yml index 589454fc5b7..ab18b982d5d 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/board.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/board.yml @@ -36,10 +36,10 @@ - type: LanguageAdder addSpoken: - Kaishago - - Tradeband + - LowImperial addUnderstood: - Kaishago - - Tradeband + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/corpsec.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/corpsec.yml index d3150388449..95fabf8d744 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/corpsec.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/corpsec.yml @@ -36,8 +36,10 @@ - type: LanguageAdder addSpoken: - Kaishago + - LowImperial addUnderstood: - Kaishago + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/employee.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/employee.yml index 1b09301d850..1bf08cc873d 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/employee.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/employee.yml @@ -34,10 +34,10 @@ - type: LanguageAdder addSpoken: - Kaishago - - Tradeband + - LowImperial addUnderstood: - Kaishago - - Tradeband + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/executive.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/executive.yml index e1be292ef30..e98f6a7164b 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/executive.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/executive.yml @@ -36,10 +36,10 @@ - type: LanguageAdder addSpoken: - Kaishago - - Tradeband + - LowImperial addUnderstood: - Kaishago - - Tradeband + - LowImperial access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/highsec.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/highsec.yml index 131ba63ea3c..582a4906359 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/highsec.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/highsec.yml @@ -33,8 +33,10 @@ - type: LanguageAdder addSpoken: - Kaishago + - LowImperial addUnderstood: - Kaishago + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/medtech.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/medtech.yml index 32a2dbae78a..9302b149fbb 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/medtech.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/SHI/medtech.yml @@ -37,8 +37,10 @@ - type: LanguageAdder addSpoken: - Kaishago + - LowImperial addUnderstood: - Kaishago + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/coordinator.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/coordinator.yml index f50d1b27045..af6f95c2da6 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/coordinator.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/coordinator.yml @@ -38,11 +38,9 @@ speedModifier: 2.5 - type: LanguageAdder addSpoken: - - Freespeak - - Tradeband + - LowImperial addUnderstood: - - Freespeak - - Tradeband + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/foreman.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/foreman.yml index b2387bc2801..e1590aa391c 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/foreman.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/foreman.yml @@ -34,11 +34,9 @@ faction: SAW - type: LanguageAdder addSpoken: - - Freespeak - - Tradeband + - LowImperial addUnderstood: - - Freespeak - - Tradeband + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/infanteer.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/infanteer.yml index 11011fcf06e..fe1c10dd0e3 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/infanteer.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/infanteer.yml @@ -35,9 +35,9 @@ faction: GSC - type: LanguageAdder addSpoken: - - Freespeak + - LowImperial addUnderstood: - - Freespeak + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/intelligenceofficer.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/intelligenceofficer.yml index 29271b8501f..79ec0c29019 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/intelligenceofficer.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/intelligenceofficer.yml @@ -37,15 +37,9 @@ faction: CD - type: LanguageAdder addSpoken: - - Freespeak - - SolCommon - - Tradeband - - RobotTalk # one of the main facets of cybersun was AI so they probably understand it + - LowImperial addUnderstood: - - Freespeak - - SolCommon - - Tradeband - - RobotTalk + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/lieutenant.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/lieutenant.yml index a0c7e97b9e2..47d92885b5b 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/lieutenant.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/lieutenant.yml @@ -34,11 +34,9 @@ faction: GSC - type: LanguageAdder addSpoken: - - Freespeak - - Tradeband + - LowImperial addUnderstood: - - Freespeak - - Tradeband + - LowImperial access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/operative.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/operative.yml index 59037b1f522..2520bdd9a1e 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/operative.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/operative.yml @@ -34,11 +34,9 @@ faction: CD - type: LanguageAdder addSpoken: - - Freespeak - - SolCommon + - LowImperial addUnderstood: - - Freespeak - - SolCommon + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/researcher.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/researcher.yml index c93fc3f0017..868a5d12e8c 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/researcher.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/researcher.yml @@ -34,13 +34,9 @@ faction: CD - type: LanguageAdder addSpoken: - - Freespeak - - SolCommon - - RobotTalk # one of the main facets of cybersun was AI so they probably understand it + - LowImperial addUnderstood: - - Freespeak - - SolCommon - - RobotTalk + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/ringleader.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/ringleader.yml index 0239d6f638f..d1ce4d1a9fb 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/ringleader.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/ringleader.yml @@ -35,11 +35,9 @@ faction: GSC - type: LanguageAdder addSpoken: - - Freespeak - - Tradeband + - LowImperial addUnderstood: - - Freespeak - - Tradeband + - LowImperial access: - EmergencyShuttleRepealAll - Captain diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/ripperdoc.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/ripperdoc.yml index 5e91298aa42..f837c3e4555 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/ripperdoc.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/ripperdoc.yml @@ -36,9 +36,9 @@ speedModifier: 1.75 - type: LanguageAdder addSpoken: - - Freespeak + - LowImperial addUnderstood: - - Freespeak + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/shipbreaker.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/shipbreaker.yml index 8f8d7be2513..f560ab0f1be 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/shipbreaker.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/shipbreaker.yml @@ -33,9 +33,9 @@ faction: SAW - type: LanguageAdder addSpoken: - - Freespeak + - LowImperial addUnderstood: - - Freespeak + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/technician.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/technician.yml index 4f9ca4bfbdd..4aa7126b4a0 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/technician.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/technician.yml @@ -34,9 +34,9 @@ faction: GSC - type: LanguageAdder addSpoken: - - Freespeak + - LowImperial addUnderstood: - - Freespeak + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/traumasec.yml b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/traumasec.yml index 0eddeaae22e..83546f4749d 100644 --- a/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/traumasec.yml +++ b/Resources/Prototypes/_Crescent/Roles/Jobs/TFSC/traumasec.yml @@ -35,9 +35,9 @@ speedModifier: 1.75 - type: LanguageAdder addSpoken: - - Freespeak + - LowImperial addUnderstood: - - Freespeak + - LowImperial access: - Command - Maintenance diff --git a/Resources/Prototypes/_Crescent/Traits/traits.yml b/Resources/Prototypes/_Crescent/Traits/traits.yml index 4c7c8ce32c5..eeae328738f 100644 --- a/Resources/Prototypes/_Crescent/Traits/traits.yml +++ b/Resources/Prototypes/_Crescent/Traits/traits.yml @@ -1,85 +1,101 @@ -- type: trait - id: LowImperial - category: TraitsSpeechLanguages - points: -4 - requirements: - - !type:CharacterTraitRequirement - inverted: true - traits: - - Dockta - - Freespeak - - Kaishago - functions: - - !type:TraitModifyLanguages - languagesSpoken: - - LowImperial - languagesUnderstood: - - LowImperial - #- type: trait -# id: HighImperial +# id: LowImperial # category: TraitsSpeechLanguages -# points: -6 +# points: -4 +# requirements: +# - !type:CharacterTraitRequirement +# inverted: true +# traits: +# - Dockta +# - Freespeak +# - Kaishago # functions: # - !type:TraitModifyLanguages # languagesSpoken: -# - HighImperial +# - LowImperial # languagesUnderstood: -# - HighImperial +# - LowImperial -- type: trait - id: Dockta - category: TraitsSpeechLanguages - points: -4 - requirements: - - !type:CharacterTraitRequirement - inverted: true - traits: - - LowImperial - - Freespeak - - Kaishago - functions: - - !type:TraitModifyLanguages - languagesSpoken: - - Dockta - languagesUnderstood: - - Dockta +#- type: trait +# id: HighImperial +# category: TraitsSpeechLanguages +# points: -4 +# requirements: +# - !type:CharacterJobRequirement +# inverted: true +# jobs: +# - AdjutantDSM +# - AdvocatusDSM +# - ArchmaesterDSM +# - GovernorDSM +# - KnightDSM +# - RitterDSM +# - LaborDSM +# - CourtierDSM +# - TemplarDSM +# - WealthDSM +# functions: +# - !type:TraitModifyLanguages +# languagesSpoken: +# - HighImperial +# languagesUnderstood: +# - HighImperial -- type: trait - id: Freespeak - category: TraitsSpeechLanguages - points: -4 - requirements: - - !type:CharacterTraitRequirement - inverted: true - traits: - - LowImperial - - Dockta - - Kaishago - functions: - - !type:TraitModifyLanguages - languagesSpoken: - - Freespeak - languagesUnderstood: - - Freespeak +# - type: trait +# id: Dockta +# category: TraitsSpeechLanguages +# points: -4 +# requirements: +# - !type:CharacterJobRequirement +# inverted: true +# jobs: +# - CommandantNCWL +# - WorkerOverbossNCWL +# - DirectorNCWL +# - FleetkapitanNCWL +# - KommissarNCWL +# - MVDGruntNCWL +# - MVDOfficerNCWL +# - IndustryTaskmasterNCWL +# functions: +# - !type:TraitModifyLanguages +# languagesSpoken: +# - Dockta +# languagesUnderstood: +# - Dockta -- type: trait - id: Kaishago - category: TraitsSpeechLanguages - points: -4 - requirements: - - !type:CharacterTraitRequirement - inverted: true - traits: - - LowImperial - - Dockta - - Freespeak - functions: - - !type:TraitModifyLanguages - languagesSpoken: - - Kaishago - languagesUnderstood: - - Kaishago +#- type: trait +# id: Freespeak +# category: TraitsSpeechLanguages +# points: -4 +# requirements: +# - !type:CharacterTraitRequirement +# inverted: true +# traits: +# - LowImperial +# - Dockta +# - Kaishago +# functions: +# - !type:TraitModifyLanguages +# languagesSpoken: +# - Freespeak +# languagesUnderstood: +# - Freespeak + + - type: trait + id: Kaishago + category: TraitsSpeechLanguages + points: -4 + requirements: + - !type:FactionRequirement + inverted: true + factionID: "SHI" + functions: + - !type:TraitModifyLanguages + languagesSpoken: + - Kaishago + languagesUnderstood: + - Kaishago # - type: trait # id: Clarizian @@ -118,16 +134,16 @@ # languagesUnderstood: # - OldTaypani -- type: trait - id: American - category: TraitsSpeechLanguages - points: -2 - functions: - - !type:TraitModifyLanguages - languagesSpoken: - - American - languagesUnderstood: - - American +#- type: trait +# id: American +# category: TraitsSpeechLanguages +# points: -2 +# functions: +# - !type:TraitModifyLanguages +# languagesSpoken: +# - American +# languagesUnderstood: +# - American # example prototypes for round start cybernetics. name and description are set in /Resources/Locale/en-US/_Crescent/traits/traits.ftl # - type: trait