From da76cc02c71c0dd1c9aa08f2980573d9172f1342 Mon Sep 17 00:00:00 2001 From: M1tht1c Date: Sat, 14 Jun 2025 00:43:41 +1000 Subject: [PATCH] Fix visitor mindshields (#36537) * Make visitor mindshields removable, and give disaster victims mindshields. * Fix whitespace * Fix ALL the whitespace --- .../Mobs/Player/ShuttleRoles/roles.yml | 54 ------------------- .../Mobs/Player/ShuttleRoles/settings.yml | 6 +++ .../Entities/Mobs/Player/humanoid.yml | 5 +- 3 files changed, 10 insertions(+), 55 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/roles.yml b/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/roles.yml index ccbb13ee41..121d239177 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/roles.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/roles.yml @@ -13,9 +13,6 @@ state: captain - type: RandomHumanoidSpawner settings: VisitorCaptain - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidVisitorCE @@ -26,9 +23,6 @@ state: ce - type: RandomHumanoidSpawner settings: VisitorCE - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidVisitorCMO @@ -39,9 +33,6 @@ state: cmo - type: RandomHumanoidSpawner settings: VisitorCMO - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidVisitorHOP @@ -52,9 +43,6 @@ state: hop - type: RandomHumanoidSpawner settings: VisitorHOP - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidVisitorHOS @@ -65,9 +53,6 @@ state: hos - type: RandomHumanoidSpawner settings: VisitorHOS - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidVisitorRD @@ -78,9 +63,6 @@ state: rd - type: RandomHumanoidSpawner settings: VisitorResearchDirector - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidVisitorQM @@ -91,9 +73,6 @@ state: qm - type: RandomHumanoidSpawner settings: VisitorQM - - type: AutoImplant - implants: - - MindShieldImplant # Security @@ -106,9 +85,6 @@ state: security_cadet - type: RandomHumanoidSpawner settings: VisitorSecurityCadet - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidVisitorSecurityOfficer @@ -119,9 +95,6 @@ state: security_officer - type: RandomHumanoidSpawner settings: VisitorSecurityOfficer - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidVisitorDetective @@ -132,9 +105,6 @@ state: detective - type: RandomHumanoidSpawner settings: VisitorDetective - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidVisitorWarden @@ -145,9 +115,6 @@ state: warden - type: RandomHumanoidSpawner settings: VisitorWarden - - type: AutoImplant - implants: - - MindShieldImplant # Cargo @@ -504,9 +471,6 @@ state: skull_icon - type: RandomHumanoidSpawner settings: ChallengeVictimCaptain - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidChallengeVictimCE @@ -517,9 +481,6 @@ components: - type: RandomHumanoidSpawner settings: ChallengeVictimChiefEngineer - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidChallengeVictimCMO @@ -530,9 +491,6 @@ components: - type: RandomHumanoidSpawner settings: ChallengeVictimCMO - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidChallengeVictimHOP @@ -543,9 +501,6 @@ components: - type: RandomHumanoidSpawner settings: ChallengeVictimHeadOfPersonnel - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidChallengeVictimHOS @@ -556,9 +511,6 @@ components: - type: RandomHumanoidSpawner settings: ChallengeVictimHeadOfSecurity - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidChallengeVictimRD @@ -569,9 +521,6 @@ components: - type: RandomHumanoidSpawner settings: ChallengeVictimResearchDirector - - type: AutoImplant - implants: - - MindShieldImplant - type: entity id: RandomHumanoidChallengeVictimQM @@ -582,9 +531,6 @@ components: - type: RandomHumanoidSpawner settings: ChallengeVictimQuartermaster - - type: AutoImplant - implants: - - MindShieldImplant # Security diff --git a/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml b/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml index 5debd3f8a3..4a149c1749 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml @@ -581,6 +581,7 @@ - type: randomHumanoidSettings id: ChallengeVictimChiefEngineer + parent: EventHumanoidMindShielded randomizeName: false components: - type: GhostRole @@ -601,6 +602,7 @@ - type: randomHumanoidSettings id: ChallengeVictimCMO + parent: EventHumanoidMindShielded randomizeName: false components: - type: GhostRole @@ -621,6 +623,7 @@ - type: randomHumanoidSettings id: ChallengeVictimHeadOfPersonnel + parent: EventHumanoidMindShielded randomizeName: false components: - type: GhostRole @@ -641,6 +644,7 @@ - type: randomHumanoidSettings id: ChallengeVictimHeadOfSecurity + parent: EventHumanoidMindShielded randomizeName: false components: - type: GhostRole @@ -661,6 +665,7 @@ - type: randomHumanoidSettings id: ChallengeVictimResearchDirector + parent: EventHumanoidMindShielded randomizeName: false components: - type: GhostRole @@ -681,6 +686,7 @@ - type: randomHumanoidSettings id: ChallengeVictimQuartermaster + parent: EventHumanoidMindShielded randomizeName: false components: - type: GhostRole diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index dea065a021..1f7ab7ac5c 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -12,7 +12,9 @@ id: EventHumanoidMindShielded parent: EventHumanoid components: - - type: MindShield + - type: AutoImplant + implants: + - MindShieldImplant - type: AntagImmune - type: randomHumanoidSettings @@ -22,6 +24,7 @@ components: - type: AutoImplant implants: + - MindShieldImplant - DeathRattleImplantCentcomm ## Death Squad -- 2.51.2