diff --git a/Content.Shared/Implants/Components/RattleComponent.cs b/Content.Shared/Implants/Components/RattleComponent.cs index ab1ccdb069..3ec63e8e15 100644 --- a/Content.Shared/Implants/Components/RattleComponent.cs +++ b/Content.Shared/Implants/Components/RattleComponent.cs @@ -16,6 +16,6 @@ public sealed partial class RattleComponent : Component public LocId CritMessage = "deathrattle-implant-critical-message"; // The message that the implant will send when dead - [DataField("deathMessage")] + [DataField] public LocId DeathMessage = "deathrattle-implant-dead-message"; } diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 9e28d01f0b..2d63d48bdc 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -14,6 +14,14 @@ - type: MindShield - type: AntagImmune +- type: randomHumanoidSettings + id: EventHumanoidCentcomm + parent: EventHumanoidMindShielded + components: + - type: AutoImplant + implants: + - DeathRattleImplantCentcomm + ## Death Squad - type: entity @@ -33,7 +41,7 @@ - type: randomHumanoidSettings id: DeathSquad - parent: EventHumanoidMindShielded + parent: EventHumanoidCentcomm randomizeName: false components: - type: GhostRole @@ -72,7 +80,7 @@ - type: randomHumanoidSettings id: ERTLeader - parent: EventHumanoidMindShielded + parent: EventHumanoidCentcomm randomizeName: false components: - type: GhostRole @@ -500,7 +508,7 @@ - type: randomHumanoidSettings id: CBURNAgent - parent: EventHumanoidMindShielded + parent: EventHumanoidCentcomm components: - type: Loadout prototypes: [CBURNGear] @@ -530,7 +538,7 @@ - type: randomHumanoidSettings id: CentcomOfficial - parent: EventHumanoidMindShielded + parent: EventHumanoidCentcomm components: - type: GhostRole name: ghost-role-information-centcom-official-name diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml index 29589cd7e8..79e010f1a4 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml @@ -308,3 +308,11 @@ components: - type: Implanter implant: RadioImplantCentcomm + +- type: entity + id: DeathRattleImplanterCentcomm + suffix: centcomm death rattle + parent: BaseImplantOnlyImplanter + components: + - type: Implanter + implant: DeathRattleImplantCentcomm diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index 9dddcd6c5c..6dd3c83665 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -365,3 +365,13 @@ - type: RadioImplant radioChannels: - CentCom + +- type: entity + parent: DeathRattleImplant + id: DeathRattleImplantCentcomm + name: centcomm death rattle implant + description: This implant will inform the Centcomm radio channel should the user fall into critical condition or die. + categories: [ HideSpawnMenu ] + components: + - type: Rattle + radioChannel: CentCom diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml index 3f8d07092c..aeabd38e41 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml @@ -12,6 +12,9 @@ - AllAccess access: - CentralCommand + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear id: CBURNGear diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml index ae890f7061..e46c114ef4 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml @@ -12,6 +12,9 @@ - AllAccess access: - CentralCommand + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear id: DeathSquadGear diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml index d57430ef95..2e47f1f864 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml @@ -13,6 +13,9 @@ - AllAccess access: - CentralCommand + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear id: ERTLeaderGear @@ -107,6 +110,8 @@ - !type:AddComponentSpecial components: - type: BibleUser #Lets them heal with bibles + - !type:AddImplantSpecial + implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear id: ERTChaplainGear @@ -185,6 +190,9 @@ - AllAccess access: - CentralCommand + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear id: ERTEngineerGear @@ -257,6 +265,9 @@ - AllAccess access: - CentralCommand + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear id: ERTSecurityGear @@ -347,6 +358,9 @@ - AllAccess access: - CentralCommand + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear id: ERTMedicalGear @@ -411,6 +425,9 @@ - AllAccess access: - CentralCommand + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear id: ERTJanitorGear diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml index 37c73f38e0..be9a0675ad 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml @@ -12,6 +12,9 @@ - AllAccess access: - CentralCommand + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear id: CentcomGear