Psionic Protection Bugfix + More Options.

Content.Server/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs

@@ -39,7 +39,8 @@ public override void Initialize()
         private void OnPowerUsed(MindSwapPowerActionEvent args)
         {
             if (!_psionics.OnAttemptPowerUse(args.Performer, "mind swap")
-                || !(TryComp<DamageableComponent>(args.Target, out var damageable) && damageable.DamageContainerID == "Biological"))
+                || !(TryComp<DamageableComponent>(args.Target, out var damageable) && damageable.DamageContainerID == "Biological")
+                || HasComp<PsionicInsulationComponent>(args.Target)) // WWDP fix
                 return;
 
             Swap(args.Performer, args.Target);

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -70,7 +70,7 @@
       - id: FlashlightSeclite
       - id: ClothingUniformJumpsuitSec # WD - Less random bloat
       - id: ClothingHeadHelmetBasic
-      - id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear
+      # - id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear # WWDP - all sec helmets are insulated now
       - id: ClothingOuterArmorBasic # WD - plate carrier and stabproof vest replaced back to regular bodyarmor
       - id: ClothingBeltSecurityFilled
       - id: ClothingEyesGlassesSecurity # WD - SecHuds

Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml

@@ -15,4 +15,6 @@
     ClothingOuterWinterSci: 2
     ClothingNeckScarfStripedPurple: 3
     ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics
+    ClothingHeadHelmetInsulated: 1 # WWDP - Helmets for Sci, Sec helmets have their own protection now
+    ClothingHeadCage: 2 # WWDP - moved from SecDrobe
     ClothingShoesBootsWinterSci: 2

Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml

@@ -8,8 +8,7 @@
 # WD edit start - moved clothes from SecTech & sorted by type
     ClothingHeadsetSecurity: 3
     ClothingHeadHelmetBasic: 2
-    ClothingHeadHelmetInsulated: 2
-    ClothingHeadCage: 2
+    # ClothingHeadHelmetInsulated: 2 # WWDP - all sec helmets are insulated now
     ClothingHeadHatBeretSecurity: 3
     ClothingHeadBandRed: 3
     ClothingHeadHatCowboyBlack: 1

Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml

@@ -191,6 +191,8 @@
     slots:
     - Hair
     - Snout
+  - type: TinfoilHat # WWDP
+    destroyOnFry: false
 
 - type: entity
   abstract: true
@@ -404,6 +406,8 @@
   - type: BatterySelfRecharger
     autoRecharge: true
     autoRechargeRate: 2 #recharge of 2 makes total drain 1w / s so max charge is 1:1 with time. Time to fully charge should be 5 minutes. Having recharge gives light an extended flicker period which gives you some warning to return to light area.
+  - type: TinfoilHat # WWDP
+    destroyOnFry: false
 
 - type: entity
   abstract: true

Resources/Prototypes/Entities/Clothing/Head/hats.yml

@@ -235,6 +235,8 @@
   name: captain's hardhat
   description: It's good being the king.
   components:
+  - type: TinfoilHat # WWDP
+    destroyOnFry: false
   - type: Sprite
     sprite: Clothing/Head/Hats/captain.rsi
   - type: Clothing

Resources/Prototypes/Entities/Clothing/Head/helmets.yml

@@ -12,6 +12,8 @@
     sprite: Clothing/Head/Helmets/security.rsi
   - type: Clothing
     sprite: Clothing/Head/Helmets/security.rsi
+  - type: TinfoilHat # WWDP
+    destroyOnFry: false
   - type: Armor #Values seem to let the user survive one extra hit if attacked consistently.
     modifiers:
       coefficients:
@@ -82,6 +84,8 @@
   name: light riot helmet
   description: It's a helmet specifically designed to protect against close range attacks.
   components:
+  - type: TinfoilHat # WWDP
+    destroyOnFry: false
   - type: Sprite
     sprite: DeltaV/Clothing/Head/Helmets/light_riot.rsi # DeltaV - resprite
   - type: Clothing
@@ -101,6 +105,8 @@
   name: bombsuit helmet
   description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce.
   components:
+  - type: TinfoilHat # WWDP
+    destroyOnFry: false
   - type: Sprite
     sprite: Clothing/Head/Helmets/bombsuit.rsi
   - type: Clothing
@@ -127,6 +133,8 @@
   description: A heavy helmet designed to withstand explosions formed from reactions between chemicals.
   suffix: DO NOT MAP
   components:
+  - type: TinfoilHat # WWDP
+    destroyOnFry: false
   - type: Sprite
     sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi
   - type: Clothing
@@ -139,6 +147,9 @@
   name: cult helmet
   description: A robust, evil-looking cult helmet.
   components:
+  - type: TinfoilHat # WWDP
+    passthrough: true
+    destroyOnFry: false
   - type: Sprite
     sprite: Clothing/Head/Helmets/cult.rsi
   - type: Clothing
@@ -159,6 +170,8 @@
   name: space ninja helmet
   description: What may appear to be a simple black garment is in fact a highly sophisticated nano-weave helmet. Standard issue ninja gear.
   components:
+  - type: TinfoilHat # WWDP
+    destroyOnFry: false
   - type: Sprite
     sprite: Clothing/Head/Helmets/spaceninja.rsi
   - type: Clothing
@@ -180,6 +193,8 @@
   name: templar helmet
   description: DEUS VULT!
   components:
+  - type: TinfoilHat
+    destroyOnFry: false
   - type: Sprite
     sprite: Clothing/Head/Helmets/templar.rsi
   - type: Clothing
@@ -194,6 +209,8 @@
   name: thunderdome helmet
   description: Let the battle commence!
   components:
+  - type: TinfoilHat # WWDP
+    destroyOnFry: true
   - type: Sprite
     sprite: Clothing/Head/Helmets/thunderdome.rsi
   - type: Clothing
@@ -206,6 +223,8 @@
   name: wizard helm
   description: Strange-looking helmet that most certainly belongs to a real magic user.
   components:
+  - type: TinfoilHat # WWDP
+    destroyOnFry: false
   - type: Sprite
     sprite: Clothing/Head/Helmets/wizardhelm.rsi
   - type: Clothing
@@ -220,6 +239,8 @@
   name: fire helmet
   description: An atmos tech's best friend. Provides some heat resistance and looks cool.
   components:
+  - type: TinfoilHat # WWDP
+    destroyOnFry: false
   - type: Sprite
     sprite: Clothing/Head/Helmets/firehelmet.rsi
   - type: Clothing
@@ -246,6 +267,8 @@
   name: atmos fire helmet
   description: An atmos fire helmet, able to keep the user cool in any situation.
   components:
+  - type: TinfoilHat # WWDP
+    destroyOnFry: false
   - type: Sprite
     sprite: Clothing/Head/Helmets/atmos_firehelmet.rsi
   - type: Clothing
@@ -275,6 +298,8 @@
   name: chitinous helmet
   description: An all-consuming chitinous mass of armor.
   components:
+  - type: TinfoilHat # WWDP
+    destroyOnFry: false
   - type: Sprite
     sprite: Clothing/Head/Helmets/linghelmet.rsi
   - type: Clothing