From 9f5608c8ad6e72fdd612a4ca73d6b275bf5365b2 Mon Sep 17 00:00:00 2001 From: juniwoofs <180479595+juniwoofs@users.noreply.github.com> Date: Mon, 15 Dec 2025 00:49:24 -0800 Subject: [PATCH] BSO Nerfs --- .../Jobs/Command/blueshield_officer.yml | 28 +- .../Jobs/Command/blueshield_officer.yml | 284 +++++++++--------- .../Jobs/Command/blueshield_officer.yml | 128 ++++---- .../NanoTrasen/Modsuits/praetorian.yml | 8 +- .../Clothing/OuterClothing/armour.yml | 7 +- .../Clothing/OuterClothing/hardsuits.yml | 2 +- .../_Goobstation/Entities/Shields/shields.yml | 2 +- 7 files changed, 231 insertions(+), 228 deletions(-) diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml index f7d266705e3..dc1be92134b 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml @@ -56,22 +56,22 @@ id: LoadoutBlueshieldOfficerPrimary maxItems: 1 items: - - type: loadout - id: LoadoutBSORifleChester - - type: loadout - id: LoadoutBSORifleBRDIR25 - - type: loadout - id: LoadoutBSOSMGWT550 - - type: loadout - id: LoadoutBSOGreatsword +# - type: loadout +# id: LoadoutBSORifleChester +# - type: loadout +# id: LoadoutBSORifleBRDIR25 +# - type: loadout +# id: LoadoutBSOSMGWT550 +# - type: loadout +# id: LoadoutBSOGreatsword - type: loadout id: LoadoutBSOShield - - type: loadout - id: LoadoutWeaponRiflBSOAk - - type: loadout - id: LoadoutBSOTerminus - - type: loadout - id: LoadoutBSOPulsePDW +# - type: loadout +# id: LoadoutWeaponRiflBSOAk +# - type: loadout +# id: LoadoutBSOTerminus +# - type: loadout +# id: LoadoutBSOPulsePDW - type: characterItemGroup id: LoadoutBlueshieldOfficerEyes #TheDen diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml index 5779dfb30dd..f34ca99d8f6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml @@ -111,23 +111,23 @@ items: - WeaponEnergyRevolverSecurity -- type: loadout - id: LoadoutBSOMace - category: JobsCommandBlueshieldOfficer - cost: 0 - canBeHeirloom: true - guideEntry: SecurityWeapons - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBlueshieldOfficerSecondary - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 18000 # 5 hours - - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer - items: - - BlueshieldMace +#- type: loadout +# id: LoadoutBSOMace +# category: JobsCommandBlueshieldOfficer +# cost: 0 +# canBeHeirloom: true +# guideEntry: SecurityWeapons +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutBlueshieldOfficerSecondary +# - !type:CharacterDepartmentTimeRequirement +# department: Security +# min: 18000 # 5 hours +# - !type:CharacterJobRequirement +# jobs: +# - BlueshieldOfficer +# items: +# - BlueshieldMace - type: loadout id: LoadoutBSOAxe @@ -147,98 +147,98 @@ items: - BlueshieldAxe -- type: loadout - id: LoadoutBSORifleChester - category: JobsCommandBlueshieldOfficer - cost: 6 - canBeHeirloom: true - guideEntry: SecurityWeapons - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBlueshieldOfficerPrimary - - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer - items: - - WeaponLeverChester - -- type: loadout - id: LoadoutMagazineShotgunLeverRifle - category: JobsCommandBlueshieldOfficer - cost: 2 - requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - - !type:CharacterItemGroupRequirement - group: LoadoutSecurityEquipment - - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer - items: - - MagazineShotgunLeverRifle - -- type: loadout - id: LoadoutMagazineRifleBRDIR25 - category: JobsCommandBlueshieldOfficer - cost: 2 - requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - - !type:CharacterItemGroupRequirement - group: LoadoutSecurityEquipment - - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer - items: - - MagazineRifle - -- type: loadout - id: LoadoutMagazineRifleBSOAk - category: JobsCommandBlueshieldOfficer - cost: 2 - requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - - !type:CharacterItemGroupRequirement - group: LoadoutSecurityEquipment - - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer - items: - - MagazineLightRifle - -- type: loadout - id: LoadoutBSORifleBRDIR25 - category: JobsCommandBlueshieldOfficer - cost: 6 # Significant upgrade over a Chester, offered here for the STYLE. Intentionally priced at you not being able to buy all 3 medical items alongside it, plus being unable to buy it alongside the CQC Manual. - canBeHeirloom: true - guideEntry: SecurityWeapons - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBlueshieldOfficerPrimary - - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer - items: - - WeaponSubMachineGunBRDIR25BSO # The Den sprites - -- type: loadout - id: LoadoutWeaponRiflBSOAk - category: JobsCommandBlueshieldOfficer - cost: 6 # upgrade over the chester, but a lot less subtle than the brdi - canBeHeirloom: true - guideEntry: SecurityWeapons - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBlueshieldOfficerPrimary - - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer - items: - - WeaponRiflBSOAk +#- type: loadout +# id: LoadoutBSORifleChester +# category: JobsCommandBlueshieldOfficer +# cost: 6 +# canBeHeirloom: true +# guideEntry: SecurityWeapons +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutBlueshieldOfficerPrimary +# - !type:CharacterJobRequirement +# jobs: +# - BlueshieldOfficer +# items: +# - WeaponLeverChester + +#- type: loadout +# id: LoadoutMagazineShotgunLeverRifle +# category: JobsCommandBlueshieldOfficer +# cost: 2 +# requirements: +# - !type:CharacterDepartmentTimeRequirement +# department: Security +# min: 3600 # 1 hours +# - !type:CharacterItemGroupRequirement +# group: LoadoutSecurityEquipment +# - !type:CharacterJobRequirement +# jobs: +# - BlueshieldOfficer +# items: +# - MagazineShotgunLeverRifle + +#- type: loadout +# id: LoadoutMagazineRifleBRDIR25 +# category: JobsCommandBlueshieldOfficer +# cost: 2 +# requirements: +# - !type:CharacterDepartmentTimeRequirement +# department: Security +# min: 3600 # 1 hours +# - !type:CharacterItemGroupRequirement +# group: LoadoutSecurityEquipment +# - !type:CharacterJobRequirement +# jobs: +# - BlueshieldOfficer +# items: +# - MagazineRifle + +#- type: loadout +# id: LoadoutMagazineRifleBSOAk +# category: JobsCommandBlueshieldOfficer +# cost: 2 +# requirements: +# - !type:CharacterDepartmentTimeRequirement +# department: Security +# min: 3600 # 1 hours +# - !type:CharacterItemGroupRequirement +# group: LoadoutSecurityEquipment +# - !type:CharacterJobRequirement +# jobs: +# - BlueshieldOfficer +# items: +# - MagazineLightRifle + +#- type: loadout +# id: LoadoutBSORifleBRDIR25 +# category: JobsCommandBlueshieldOfficer +# cost: 6 # Significant upgrade over a Chester, offered here for the STYLE. Intentionally priced at you not being able to buy all 3 medical items alongside it, plus being unable to buy it alongside the CQC Manual. +# canBeHeirloom: true +# guideEntry: SecurityWeapons +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutBlueshieldOfficerPrimary +# - !type:CharacterJobRequirement +# jobs: +# - BlueshieldOfficer +# items: +# - WeaponSubMachineGunBRDIR25BSO # The Den sprites + +#- type: loadout +# id: LoadoutWeaponRiflBSOAk +# category: JobsCommandBlueshieldOfficer +# cost: 6 # upgrade over the chester, but a lot less subtle than the brdi +# canBeHeirloom: true +# guideEntry: SecurityWeapons +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutBlueshieldOfficerPrimary +# - !type:CharacterJobRequirement +# jobs: +# - BlueshieldOfficer +# items: +# - WeaponRiflBSOAk - type: loadout id: LoadoutBSOShield @@ -255,20 +255,20 @@ items: - BlueShieldShield -- type: loadout - id: LoadoutBSOGreatsword - category: JobsCommandBlueshieldOfficer - cost: 4 - canBeHeirloom: true - guideEntry: SecurityWeapons - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBlueshieldOfficerPrimary - - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer - items: - - GreatswordBlueshield +#- type: loadout +# id: LoadoutBSOGreatsword +# category: JobsCommandBlueshieldOfficer +# cost: 4 +# canBeHeirloom: true +# guideEntry: SecurityWeapons +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutBlueshieldOfficerPrimary +# - !type:CharacterJobRequirement +# jobs: +# - BlueshieldOfficer +# items: +# - GreatswordBlueshield - type: loadout id: LoadoutBSOMedkitCombatFilled @@ -292,25 +292,25 @@ # items: # - NTCQCManual -- type: loadout - id: LoadoutBSOTerminus - category: JobsCommandBlueshieldOfficer - cost: 0 - canBeHeirloom: true - guideEntry: SecurityWeapons - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBlueshieldOfficerPrimary - - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer -# - !type:CharacterAgeRequirement - TheDen -# min: 21 - - !type:CharacterSpeciesRequirement - species: - - Oni - items: - - Terminus +#- type: loadout +# id: LoadoutBSOTerminus +# category: JobsCommandBlueshieldOfficer +# cost: 0 +# canBeHeirloom: true +# guideEntry: SecurityWeapons +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutBlueshieldOfficerPrimary +# - !type:CharacterJobRequirement +# jobs: +# - BlueshieldOfficer +## - !type:CharacterAgeRequirement - TheDen +## min: 21 +# - !type:CharacterSpeciesRequirement +# species: +# - Oni +# items: +# - Terminus # Eyes diff --git a/Resources/Prototypes/_DEN/Loadouts/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/_DEN/Loadouts/Jobs/Command/blueshield_officer.yml index 25faebe91dc..b1ac89a3b75 100644 --- a/Resources/Prototypes/_DEN/Loadouts/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/_DEN/Loadouts/Jobs/Command/blueshield_officer.yml @@ -119,41 +119,41 @@ - ClothingBeltBSOWebbingFilled #Primary -- type: loadout - id: LoadoutBSOSMGWT550 - category: JobsCommandBlueshieldOfficer - cost: 6 - canBeHeirloom: true - guideEntry: SecurityWeapons - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBlueshieldOfficerPrimary - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 18000 # 5 hours - - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer - items: - - WeaponSubMachineGunWt550BSO +#- type: loadout +# id: LoadoutBSOSMGWT550 +# category: JobsCommandBlueshieldOfficer +# cost: 6 +# canBeHeirloom: true +# guideEntry: SecurityWeapons +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutBlueshieldOfficerPrimary +# - !type:CharacterDepartmentTimeRequirement +# department: Security +# min: 18000 # 5 hours +# - !type:CharacterJobRequirement +# jobs: +# - BlueshieldOfficer +# items: +# - WeaponSubMachineGunWt550BSO -- type: loadout - id: LoadoutBSOPulsePDW - category: JobsCommandBlueshieldOfficer - cost: 6 - canBeHeirloom: true - guideEntry: SecurityWeapons - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBlueshieldOfficerPrimary - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 18000 # 5 hours - - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer - items: - - WeaponPulsePDW +#- type: loadout +# id: LoadoutBSOPulsePDW +# category: JobsCommandBlueshieldOfficer +# cost: 6 +# canBeHeirloom: true +# guideEntry: SecurityWeapons +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutBlueshieldOfficerPrimary +# - !type:CharacterDepartmentTimeRequirement +# department: Security +# min: 18000 # 5 hours +# - !type:CharacterJobRequirement +# jobs: +# - BlueshieldOfficer +# items: +# - WeaponPulsePDW # Secondary - type: loadout @@ -175,34 +175,34 @@ - WeaponPistolBRDIP15 #Spare Mags -- type: loadout - id: LoadoutMagazineBRDIP15 - category: JobsCommandBlueshieldOfficer - cost: 2 - requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - - !type:CharacterItemGroupRequirement - group: LoadoutSecurityEquipment - - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer - items: - - MagazineBRDIP15 +#- type: loadout +# id: LoadoutMagazineBRDIP15 +# category: JobsCommandBlueshieldOfficer +# cost: 2 +# requirements: +# - !type:CharacterDepartmentTimeRequirement +# department: Security +# min: 3600 # 1 hours +# - !type:CharacterItemGroupRequirement +# group: LoadoutSecurityEquipment +# - !type:CharacterJobRequirement +# jobs: +# - BlueshieldOfficer +# items: +# - MagazineBRDIP15 -- type: loadout - id: LoadoutMagazineWT550 - category: JobsCommandBlueshieldOfficer - cost: 2 - requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - - !type:CharacterItemGroupRequirement - group: LoadoutSecurityEquipment - - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer - items: - - MagazinePistolSubMachineGunTopMounted +#- type: loadout +# id: LoadoutMagazineWT550 +# category: JobsCommandBlueshieldOfficer +# cost: 2 +# requirements: +# - !type:CharacterDepartmentTimeRequirement +# department: Security +# min: 3600 # 1 hours +# - !type:CharacterItemGroupRequirement +# group: LoadoutSecurityEquipment +# - !type:CharacterJobRequirement +# jobs: +# - BlueshieldOfficer +# items: +# - MagazinePistolSubMachineGunTopMounted diff --git a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/praetorian.yml b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/praetorian.yml index e09dfba7511..9d109fd8491 100644 --- a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/praetorian.yml +++ b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/praetorian.yml @@ -111,11 +111,11 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.5 - Piercing: 0.5 + Blunt: 0.7 # DEN + Slash: 0.65 # DEN + Piercing: 0.6 Radiation: 0.5 - Heat: 0.5 + Heat: 0.7 # DEN Caustic: 0.6 - type: EmitsSoundOnMove soundCollection: diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml index 8287ffebd4a..1b74b72315f 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml @@ -20,8 +20,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.60 - Slash: 0.60 + Blunt: 0.70 + Slash: 0.70 Piercing: 0.65 Heat: 0.70 - type: StaminaDamageResistance #Den @@ -39,6 +39,9 @@ sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_jacket.rsi - type: Clothing sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_jacket.rsi + - type: TemperatureProtection # DEN + heatingCoefficient: 1.1 # DEN + coolingCoefficient: 0.1 # DEN - type: Item size: Normal diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/hardsuits.yml index ba0a0b242f7..7f288e65580 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/hardsuits.yml @@ -31,7 +31,7 @@ Slash: 0.5 Piercing: 0.5 Radiation: 0.5 - Heat: 0.5 + Heat: 0.6 Caustic: 0.6 - type: ClothingSpeedModifier walkModifier: 0.85 diff --git a/Resources/Prototypes/_Goobstation/Entities/Shields/shields.yml b/Resources/Prototypes/_Goobstation/Entities/Shields/shields.yml index a22776bbb9c..007ef372243 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Shields/shields.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Shields/shields.yml @@ -82,7 +82,7 @@ color: "#678AD9" - type: ItemTogglePointLight - type: Blocking - passiveBlockFraction: 0.7 + passiveBlockFraction: 0.60 passiveBlockModifier: coefficients: Blunt: 1