From 348fe081285fae04c189f1828daf283441d5d76b Mon Sep 17 00:00:00 2001 From: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com> Date: Fri, 13 Feb 2026 15:05:00 +0100 Subject: [PATCH 1/2] Several BSO gear tweaks / fixes --- .../Entities/Objects/base_contraband.yml | 10 +++++++--- .../Entities/Modsuits/praetorian.yml | 2 ++ .../_Goobstation/Catalog/Fills/Lockers/heads.yml | 1 + .../Entities/Clothing/Ears/headsets_alt.yml | 3 +-- .../Entities/Objects/Shields/shields.yml | 10 +++++++--- .../Objects/Weapons/Melee/blueshield.yml | 5 +++++ .../Entities/Objects/base_contraband.yml | 1 + .../Entities/Objects/Devices/encryption_keys.yml | 16 ++++++++++++++++ 8 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 Resources/Prototypes/_Omu/Entities/Objects/Devices/encryption_keys.yml diff --git a/Resources/Prototypes/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml index 67fe932ccc6..8ce6248e6d5 100644 --- a/Resources/Prototypes/Entities/Objects/base_contraband.yml +++ b/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 diff --git a/Resources/Prototypes/_EinsteinEngines/Entities/Modsuits/praetorian.yml b/Resources/Prototypes/_EinsteinEngines/Entities/Modsuits/praetorian.yml index cac3b952031..b8e9b393ff0 100644 --- a/Resources/Prototypes/_EinsteinEngines/Entities/Modsuits/praetorian.yml +++ b/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 diff --git a/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml index ddec710a4da..8b33be4a164 100644 --- a/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml @@ -66,6 +66,7 @@ - id: BlueshieldUndeterminedWeapon - id: BlueshieldUndeterminedHardsuit - id: FlashlightSeclite + - id: ClothingHandsGlovesSurgical # Omu - type: entity id: LockerBlueshieldOfficerFilled diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets_alt.yml index 8cc6b680219..96ac20eb36d 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets_alt.yml +++ b/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 diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Shields/shields.yml index 4e5885b71f3..97294722999 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Shields/shields.yml +++ b/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: diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/blueshield.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/blueshield.yml index 0f066d8e9a0..600e90ab4ac 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/blueshield.yml +++ b/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 diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/base_contraband.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/base_contraband.yml index 8a9c003d84f..e7fa81ea341 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/base_contraband.yml +++ b/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 diff --git a/Resources/Prototypes/_Omu/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/_Omu/Entities/Objects/Devices/encryption_keys.yml new file mode 100644 index 00000000000..448c9f8ce05 --- /dev/null +++ b/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 From 84c0766264db0995089f294a23d450185d0f0a1b Mon Sep 17 00:00:00 2001 From: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com> Date: Fri, 13 Feb 2026 17:11:28 +0100 Subject: [PATCH 2/2] Remove the gloves --- .../Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml index 8b33be4a164..ddec710a4da 100644 --- a/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml @@ -66,7 +66,6 @@ - id: BlueshieldUndeterminedWeapon - id: BlueshieldUndeterminedHardsuit - id: FlashlightSeclite - - id: ClothingHandsGlovesSurgical # Omu - type: entity id: LockerBlueshieldOfficerFilled