Merge remote-tracking branch 'WD-core/master' into upstream-core

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
+{
+
+}

Content.Shared/_White/Implants/Mindslave/SharedMindslaveSystem.cs

@@ -43,6 +43,7 @@ public abstract class SharedMindslaveSystem : EntitySystem
         if (HasComp<MindShieldComponent>(args.Target) ||
             HasComp<MindSlaveComponent>(args.Target) ||
             HasComp<CultistComponent>(args.Target) ||
+            HasComp<UnslavableComponent>(args.Target) ||
             HasComp<Revolutionary.Components.RevolutionaryComponent>(args.Target))
         {
             message = Loc.GetString("mindslave-cant-insert");

Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml

@@ -37,6 +37,6 @@
 - type: startingGear
   id: BomzhGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitCaptain
+    jumpsuit: ClothingUniformJumpsuitWhiteBomzh
     outerClothing: ClothingOuterOverCoatBomzh
     id: BomzhPDA

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

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: