diff --git a/Resources/Locale/en-US/traits/ds14traits.ftl b/Resources/Locale/en-US/traits/ds14traits.ftl new file mode 100644 index 0000000000..f19bc6a258 --- /dev/null +++ b/Resources/Locale/en-US/traits/ds14traits.ftl @@ -0,0 +1,6 @@ +trait-name-Mk3LoyaltyImplant = Mk3 Loyalty Implant +trait-description-Mk3LoyaltyImplant = + The latest innovation in beligerent employee management, courtesy of Nanotrasen's "Xenos Affairs" research division. + The Mk3 Loyalty Implant consists of a series of synthetic-mycotoxin sacs surgically implanted inside the user's lymph nodes. + These sacs are biocoded to detonate and disperse their lethal payload once a period of 24 hours have passed. + In order to ensure user "Loyalty", a "Delaying Serum" is provided to users at the end of each shift. diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index dccbb21a28..df3c399bf3 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -5,11 +5,16 @@ playTimeTracker: JobQuartermaster antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - - !type:CharacterSpeciesRequirement - species: - - Human - - Harpy - - Dwarf + - !type:CharacterLogicOrRequirement + requirements: + - !type:CharacterSpeciesRequirement + species: + - Human + - Harpy + - Dwarf + - !type:CharacterTraitRequirement + traits: + - Mk3LoyaltyImplant - !type:CharacterOverallTimeRequirement min: 3600 #1 hrs weight: 10 diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 792b25cfe6..a6564cfd89 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -6,11 +6,20 @@ requirements: - !type:CharacterOverallTimeRequirement min: 3600 + - !type:CharacterLogicOrRequirement + requirements: + - !type:CharacterSpeciesRequirement + species: + - Human + - Harpy + - Dwarf + - !type:CharacterTraitRequirement + traits: + - Mk3LoyaltyImplant - !type:CharacterSpeciesRequirement + inverted: true species: - - Human - - Harpy - - Dwarf + - Shadowkin weight: 20 startingGear: CaptainGear icon: "JobIconCaptain" diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index e1a13198f6..50c477a667 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -7,11 +7,20 @@ requirements: - !type:CharacterOverallTimeRequirement min: 3600 + - !type:CharacterLogicOrRequirement + requirements: + - !type:CharacterSpeciesRequirement + species: + - Human + - Harpy + - Dwarf + - !type:CharacterTraitRequirement + traits: + - Mk3LoyaltyImplant - !type:CharacterSpeciesRequirement + inverted: true species: - - Human - - Harpy - - Dwarf + - Shadowkin weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads startingGear: HoPGear icon: "JobIconHeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 08da6bf682..425899e47f 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -6,11 +6,20 @@ requirements: - !type:CharacterOverallTimeRequirement min: 3600 + - !type:CharacterLogicOrRequirement + requirements: + - !type:CharacterSpeciesRequirement + species: + - Human + - Harpy + - Dwarf + - !type:CharacterTraitRequirement + traits: + - Mk3LoyaltyImplant - !type:CharacterSpeciesRequirement + inverted: true species: - - Human - - Harpy - - Dwarf + - Shadowkin weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 545147f220..aac8e7c531 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -9,11 +9,20 @@ requirements: - !type:CharacterOverallTimeRequirement min: 3600 + - !type:CharacterLogicOrRequirement + requirements: + - !type:CharacterSpeciesRequirement + species: + - Human + - Harpy + - Dwarf + - !type:CharacterTraitRequirement + traits: + - Mk3LoyaltyImplant - !type:CharacterSpeciesRequirement + inverted: true species: - - Human - - Harpy - - Dwarf + - Shadowkin weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 5416d934b2..6eebab4a70 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -16,11 +16,20 @@ - !type:CharacterTraitRequirement traits: - AnomalousPositronics + - !type:CharacterLogicOrRequirement + requirements: + - !type:CharacterSpeciesRequirement + species: + - Human + - Harpy + - Dwarf + - !type:CharacterTraitRequirement + traits: + - Mk3LoyaltyImplant - !type:CharacterSpeciesRequirement + inverted: true species: - - Human - - Harpy - - Dwarf + - Shadowkin weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 753e93d70c..c005934c95 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,13 +6,22 @@ requirements: - !type:CharacterOverallTimeRequirement min: 3600 + - !type:CharacterLogicOrRequirement + requirements: + - !type:CharacterSpeciesRequirement + species: + - Human + - Harpy + - Dwarf + - Reptilian + - Oni + - !type:CharacterTraitRequirement + traits: + - Mk3LoyaltyImplant - !type:CharacterSpeciesRequirement + inverted: true species: - - Human - - Reptilian - - Harpy - - Dwarf - - Oni + - Shadowkin weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml index afaaf0b2cb..0d4b6f6f1b 100644 --- a/Resources/Prototypes/Traits/physical.yml +++ b/Resources/Prototypes/Traits/physical.yml @@ -601,3 +601,15 @@ - Biological - Inorganic - Silicon + +- type: trait + id: Mk3LoyaltyImplant + category: Physical + points: -3 + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Human + - Harpy + - Dwarf diff --git a/Resources/Prototypes/_ds14/Traits/ds14traits b/Resources/Prototypes/_ds14/Traits/ds14traits new file mode 100644 index 0000000000..e69de29bb2