From e6252b5db1e73e6d841b46b5529f7cd7dda46308 Mon Sep 17 00:00:00 2001 From: Atakku Date: Wed, 10 Sep 2025 01:35:02 +0200 Subject: [PATCH 1/2] Assistants are no longer killtargets --- .../Components/TraitorTargetImmuneComponent.cs | 10 ++++++++++ Resources/Prototypes/Objectives/traitor.yml | 2 ++ .../Roles/Jobs/Engineering/technical_assistant.yml | 9 ++++++++- .../Prototypes/Roles/Jobs/Medical/medical_intern.yml | 9 ++++++++- .../Roles/Jobs/Science/research_assistant.yml | 9 ++++++++- .../Prototypes/Roles/Jobs/Security/security_cadet.yml | 6 ++++++ 6 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 Content.Server/_Ronstation/Objectives/Components/TraitorTargetImmuneComponent.cs diff --git a/Content.Server/_Ronstation/Objectives/Components/TraitorTargetImmuneComponent.cs b/Content.Server/_Ronstation/Objectives/Components/TraitorTargetImmuneComponent.cs new file mode 100644 index 0000000000000..214a4a560b223 --- /dev/null +++ b/Content.Server/_Ronstation/Objectives/Components/TraitorTargetImmuneComponent.cs @@ -0,0 +1,10 @@ +namespace Content.Server._Ronstation.Objectives.Components; + +/// +/// Blacklists from being a traitor's killtarget +/// +[RegisterComponent] +public sealed partial class TraitorTargetImmuneComponent : Component +{ + +} diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index b7e207563747b..20d9afb766fc4 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -99,6 +99,7 @@ blacklist: components: - KillPersonCondition + - TraitorTargetImmuneComponent # Ronstation - modification. - type: KillPersonCondition requireMaroon: true @@ -125,6 +126,7 @@ blacklist: components: - KillPersonCondition + - TraitorTargetImmuneComponent # Ronstation - modification. - type: KillPersonCondition # don't count missing evac as killing as heads are higher profile, so you really need to do the dirty work # if ce flies a shittle to centcom you better find a way onto it diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 24cef50e1a7f7..a064f1c9a2539 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -1,4 +1,5 @@ -- type: job +# Modified by Ronstation contributor(s), therefore this file is licensed as MIT sublicensed with AGPL-v3.0. +- type: job id: TechnicalAssistant name: job-name-technical-assistant description: job-description-technical-assistant @@ -18,6 +19,12 @@ - Maintenance - Engineering - External + # Ronstation - start of modifications. + special: + - !type:AddComponentSpecial + components: + - type: TraitorTargetImmune + # Ronstation - end of modifications. - type: startingGear id: TechnicalAssistantGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index d313d12d9b7a0..8565c578348e4 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -1,4 +1,5 @@ -- type: job +# Modified by Ronstation contributor(s), therefore this file is licensed as MIT sublicensed with AGPL-v3.0. +- type: job id: MedicalIntern name: job-name-intern description: job-description-intern @@ -15,6 +16,12 @@ access: - Medical - Maintenance + # Ronstation - start of modifications. + special: + - !type:AddComponentSpecial + components: + - type: TraitorTargetImmune + # Ronstation - end of modifications. - type: startingGear id: MedicalInternGear diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index e824368cb77a9..b9087a7ea871b 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -1,4 +1,5 @@ -- type: job +# Modified by Ronstation contributor(s), therefore this file is licensed as MIT sublicensed with AGPL-v3.0. +- type: job id: ResearchAssistant name: job-name-research-assistant description: job-description-research-assistant @@ -15,6 +16,12 @@ access: - Research - Maintenance + # Ronstation - start of modifications. + special: + - !type:AddComponentSpecial + components: + - type: TraitorTargetImmune + # Ronstation - end of modifications. - type: startingGear id: ResearchAssistantGear diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index cac79f4822711..348dd14b15f9d 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -1,3 +1,4 @@ +# Modified by Ronstation contributor(s), therefore this file is licensed as MIT sublicensed with AGPL-v3.0. - type: job id: SecurityCadet name: job-name-cadet @@ -24,6 +25,11 @@ special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] + # Ronstation - start of modifications. + - !type:AddComponentSpecial + components: + - type: TraitorTargetImmune + # Ronstation - end of modifications. - type: startingGear id: SecurityCadetGear From f32a0d8e55502cfad369f2c4d910a245d0bdbacf Mon Sep 17 00:00:00 2001 From: Atakku Date: Wed, 10 Sep 2025 17:54:54 +0200 Subject: [PATCH 2/2] fix --- Resources/Prototypes/Objectives/traitor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index 20d9afb766fc4..bf2ce975a246d 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -99,7 +99,7 @@ blacklist: components: - KillPersonCondition - - TraitorTargetImmuneComponent # Ronstation - modification. + - TraitorTargetImmune # Ronstation - modification. - type: KillPersonCondition requireMaroon: true @@ -126,7 +126,7 @@ blacklist: components: - KillPersonCondition - - TraitorTargetImmuneComponent # Ronstation - modification. + - TraitorTargetImmune # Ronstation - modification. - type: KillPersonCondition # don't count missing evac as killing as heads are higher profile, so you really need to do the dirty work # if ce flies a shittle to centcom you better find a way onto it