Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make BSO Great Again #80

Merged
merged 12 commits into from
Feb 14, 2025
Merged

Make BSO Great Again #80

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0b174bd
Update blueshield_officer.yml
EctoplasmIsGood Feb 11, 2025
3e6bd82
Update uncategorized.yml
EctoplasmIsGood Feb 11, 2025
cf41536
Update blueshield_officer.yml
EctoplasmIsGood Feb 11, 2025
b2daff4
Update blueshield_officer.yml
EctoplasmIsGood Feb 11, 2025
4c5f434
Update blueshield_officer.yml
EctoplasmIsGood Feb 11, 2025
782ece1
Update blueshield_officer.yml
EctoplasmIsGood Feb 11, 2025
6d9f731
Update blueshield_officer.yml
EctoplasmIsGood Feb 11, 2025
12ab2c3
Update blueshield_officer.yml
EctoplasmIsGood Feb 11, 2025
348373e
Update blueshield_officer.yml
EctoplasmIsGood Feb 11, 2025
977d611
Update blueshield_officer.yml
EctoplasmIsGood Feb 11, 2025
bf475f1
Update blueshield_officer.yml
EctoplasmIsGood Feb 11, 2025
dac2956
Merge branch 'master' into patch-1
Aidenkrz Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,12 @@
id: LoadoutClothingBlueshieldBeretOfficer
- type: loadout
id: LoadoutClothingBlueshieldCowboyHat

- type: characterItemGroup
id: LoadoutBlueshieldOfficerPrimaries
maxItems: 1
items:
- type: loadout
id: LoadoutBSORifleChester
- type: loadout
id: LoadoutBSOEnergyShotgun
2 changes: 0 additions & 2 deletions Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,6 @@
id: LoadoutSecurityPistolEnergyRevolver
- type: loadout
id: LoadoutBSOEnergyRevolver
- type: loadout
id: LoadoutBSORifleChester

- type: characterItemGroup
id: LoadoutSecurityEyes
Expand Down
22 changes: 17 additions & 5 deletions Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,9 @@
category: JobsCommandBlueshieldOfficer
cost: 0
canBeHeirloom: true
guideEntry: SecurityWeapons
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutSecurityWeapons
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 18000 # 5 hours
group: LoadoutBlueshieldOfficerPrimaries
- !type:CharacterJobRequirement
jobs:
- BlueshieldOfficer
Expand All @@ -87,6 +83,22 @@
items:
- WeaponLeverChester

- type: loadout
id: LoadoutBSOEnergyShotgun
category: JobsCommandBlueshieldOfficer
cost: 0
canBeHeirloom: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutBlueshieldOfficerPrimaries
- !type:CharacterJobRequirement
jobs:
- BlueshieldOfficer
- !type:CharacterAgeRequirement
min: 21
items:
- WeaponEnergyShotgun

# Eyes

# Gloves
Expand Down
Loading