diff --git a/Content.Shared/_White/Implants/Mindslave/Components/UnslavableComponent.cs b/Content.Shared/_White/Implants/Mindslave/Components/UnslavableComponent.cs new file mode 100644 index 0000000000..27e9f21560 --- /dev/null +++ b/Content.Shared/_White/Implants/Mindslave/Components/UnslavableComponent.cs @@ -0,0 +1,7 @@ +namespace Content.Shared._White.Implants.Mindslave.Components; + +[RegisterComponent] +public sealed partial class UnslavableComponent : Component +{ + +} diff --git a/Content.Shared/_White/Implants/Mindslave/SharedMindslaveSystem.cs b/Content.Shared/_White/Implants/Mindslave/SharedMindslaveSystem.cs index fe1e266cf3..c22d7e07dc 100644 --- a/Content.Shared/_White/Implants/Mindslave/SharedMindslaveSystem.cs +++ b/Content.Shared/_White/Implants/Mindslave/SharedMindslaveSystem.cs @@ -43,6 +43,7 @@ public abstract class SharedMindslaveSystem : EntitySystem if (HasComp(args.Target) || HasComp(args.Target) || HasComp(args.Target) || + HasComp(args.Target) || HasComp(args.Target)) { message = Loc.GetString("mindslave-cant-insert"); diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml index 58eec8735f..d6e56902a4 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml @@ -37,6 +37,6 @@ - type: startingGear id: BomzhGear equipment: - jumpsuit: ClothingUniformJumpsuitCaptain + jumpsuit: ClothingUniformJumpsuitWhiteBomzh outerClothing: ClothingOuterOverCoatBomzh id: BomzhPDA diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 5388fefdc4..aac72af410 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -17,6 +17,7 @@ species: - Human - Felinid + - Moth weight: 10 icon: "JobIconChiefMedicalOfficer" arrivalNotificationPrototype: ChiefMedicalOfficerArrivalNotification @@ -25,6 +26,7 @@ whitelistedSpecies: - Human - Felinid + - Moth canBeAntag: true access: - Medical diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml index 12870ddf55..5fac07eb5a 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml @@ -33,6 +33,7 @@ suffix: mindslave components: - type: Implanter + implantTime: 3 implant: MindslaveImplant - type: entity @@ -50,6 +51,7 @@ components: - type: Implanter implant: VoiceActivatedBombImplant + implantTime: 3 - type: TriggerOnVoice - type: Tag tags: diff --git a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET.png index 7f2f880a73..eb2225b3fa 100644 Binary files a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/i have no idea why original is the way it is.txt b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/i have no idea why original is the way it is.txt new file mode 100644 index 0000000000..e69de29bb2