Several BSO gear tweaks / fixes

Resources/Prototypes/Entities/Objects/base_contraband.yml

@@ -154,6 +154,7 @@
   abstract: true
   components:
   - type: Contraband
+    allowedJobs: [ BlueshieldOfficer ] # Omu - BSO has access to security contraband, should include multi-department sec contraband.
     allowedDepartments: [ Security, Command ]
 
 - type: entity
@@ -162,6 +163,7 @@
   abstract: true
   components:
   - type: Contraband
+    allowedJobs: [ BlueshieldOfficer ] # Omu - BSO has access to security contraband, should include multi-department sec contraband.
     allowedDepartments: [ Security, Science, Command ]
 
 - type: entity
@@ -170,6 +172,7 @@
   abstract: true
   components:
   - type: Contraband
+    allowedJobs: [ BlueshieldOfficer ] # Omu - BSO has access to security contraband, should include multi-department sec contraband.
     allowedDepartments: [ Security, Engineering ]
 
 - type: entity
@@ -186,6 +189,7 @@
   abstract: true
   components:
   - type: Contraband
+    allowedJobs: [ BlueshieldOfficer ] # Omu - BSO has access to security contraband, should include multi-department sec contraband.
     allowedDepartments: [ Security, Cargo ]
 
 - type: entity
@@ -204,7 +208,7 @@
   components:
   - type: Contraband
     allowedDepartments: [ Security ]
-    allowedJobs: [ Bartender ]
+    allowedJobs: [ Bartender, BlueshieldOfficer ] # Omu - BSO added as it has access to security contraband, should include multi-department sec contraband.
 
 - type: entity
   id: BaseSecurityBartenderZookeeperContraband
@@ -213,7 +217,7 @@
   components:
   - type: Contraband
     allowedDepartments: [ Security ]
-    allowedJobs: [ Bartender, Zookeeper ]
+    allowedJobs: [ Bartender, Zookeeper, BlueshieldOfficer ] # Omu - BSO added as it has access to security contraband, should include multi-department sec contraband.
 
 - type: entity
   id: BaseSecurityLawyerContraband
@@ -222,7 +226,7 @@
   components:
   - type: Contraband
     allowedDepartments: [ Security ]
-    allowedJobs: [ Lawyer ]
+    allowedJobs: [ Lawyer, BlueshieldOfficer ] # Omu - BSO added as it has access to security contraband, should include multi-department sec contraband.
 
 - type: entity
   id: BaseJanitorContraband

Resources/Prototypes/_EinsteinEngines/Entities/Modsuits/praetorian.yml

@@ -177,6 +177,8 @@
       lowPressureMultiplier: 1000
     - type: ExplosionResistance
       damageCoefficient: 0.45
+    - type: StaminaResistance
+      damageCoefficient: 0.6 # Omu - Matches the BSO armor and hardsuit.
 
 - type: entity
   parent: ClothingModsuitBootsStandard

Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets_alt.yml

@@ -108,10 +108,9 @@
   - type: ContainerFill
     containers:
       key_slots:
-      - EncryptionKeyCommand
+      - EncryptionKeyBSO # Omu - Command, Sec, and Medical, but not prison. Does not include CC comms, which is seperate.
       - EncryptionKeyCentCom
       - EncryptionKeyCommon
-      - EncryptionKeySecurity # Omu - Added because sec info is relevant to head safety
   - type: Sprite
     sprite: _Goobstation/Clothing/Ears/Headsets/blueshield.rsi
   - type: Clothing

Resources/Prototypes/_Goobstation/Entities/Objects/Shields/shields.yml

@@ -98,9 +98,13 @@
     - type: Battery
       maxCharge: 600
       startingCharge: 600
-    - type: RechargeableBlocking
-      dischargedRechargeRate: 0
-      chargedRechargeRate: 0
+    - type: RechargeableBlocking # Omu - Re-added self recharge
+      dischargedRechargeRate: 15 # 40 seconds to fully recharge if completely depleted.
+      chargedRechargeRate: 10 # 60 seconds to fully recharge if just above depleted.
+      rechargePercentage: 1 # Recharge faster if completely depleted, but prevent use before fully recharged.
+    - type: BatterySelfRecharger # Omu - Re-added self recharge
+      autoRechargeRate: 10
+      autoRecharge: true
     - type: ItemSlots
       slots:
         item:

Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/blueshield.yml

@@ -79,6 +79,11 @@
   - type: Battery
     maxCharge: 600
     startingCharge: 600
+  - type: BatterySelfRecharger # Omu - Re-added self recharge, takes 50 seconds to fully recharge after not being used for 10 seconds.
+    autoRecharge: true
+    autoRechargeRate: 12
+    autoRechargePause: true
+    autoRechargePauseTime: 10
   - type: UseDelay
   - type: Item
     heldPrefix: off

Resources/Prototypes/_Goobstation/Entities/Objects/base_contraband.yml

@@ -28,6 +28,7 @@
   abstract: true
   components:
   - type: Contraband
+    allowedJobs: [ BlueshieldOfficer ] # Omu - BSO can spawn with combat gloves.
     allowedDepartments: [ Security, Engineering, Cargo ]
 
 - type: entity

Resources/Prototypes/_Omu/Entities/Objects/Devices/encryption_keys.yml

@@ -0,0 +1,16 @@
+- type: entity
+  parent: [ EncryptionKey, BaseCentcommContraband ]
+  id: EncryptionKeyBSO
+  name: blueshield encryption key
+  description: An encryption key used by blueshield officers.
+  components:
+  - type: EncryptionKey
+    channels:
+    - Command
+    - Security
+    - Medical
+    defaultChannel: Command
+  - type: Sprite
+    layers:
+    - state: crypt_gold
+    - state: nano_label