From 0b174bddbac8e84c8c4ab825b6db2df46e077680 Mon Sep 17 00:00:00 2001 From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Date: Tue, 11 Feb 2025 02:11:05 -0600 Subject: [PATCH 01/11] Update blueshield_officer.yml Removes sec loadout tag from chester --- .../Loadouts/Jobs/Command/blueshield_officer.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml index e9f24340ec..b336ae865c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml @@ -72,14 +72,7 @@ category: JobsCommandBlueshieldOfficer cost: 0 canBeHeirloom: true - guideEntry: SecurityWeapons requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapons - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 18000 # 5 hours - - !type:CharacterJobRequirement jobs: - BlueshieldOfficer - !type:CharacterAgeRequirement From 3e6bd82d548aa77e72fd722fc9873c6856ef3806 Mon Sep 17 00:00:00 2001 From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Date: Tue, 11 Feb 2025 02:12:49 -0600 Subject: [PATCH 02/11] Update uncategorized.yml Removes chester from sec loadout item group --- .../CharacterItemGroups/Jobs/Security/uncategorized.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml index 976b831e43..31c44456c8 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml @@ -133,8 +133,6 @@ id: LoadoutSecurityPistolEnergyRevolver - type: loadout id: LoadoutBSOEnergyRevolver - - type: loadout - id: LoadoutBSORifleChester - type: characterItemGroup id: LoadoutSecurityEyes From cf4153601961a1991f99d09dd4fb25f874bc4d5b Mon Sep 17 00:00:00 2001 From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Date: Tue, 11 Feb 2025 02:17:16 -0600 Subject: [PATCH 03/11] Update blueshield_officer.yml Adds new item group for BSO officer loadout --- .../Jobs/Command/blueshield_officer.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml index f900bfe3b5..731c299002 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml @@ -47,3 +47,13 @@ id: LoadoutClothingBlueshieldBeretOfficer - type: loadout id: LoadoutClothingBlueshieldCowboyHat + +- type: characterItemGroup + id: LoadoutBlueshieldOfficerPrimaries + maxItems: 1 + items: + - type: loadout + id: LoadoutBSORifleChester + - type: loadout + id: LoadoutBSOEnergyShotgun + From b2daff4d2256c7b911dc5d8438851e127db402e6 Mon Sep 17 00:00:00 2001 From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Date: Tue, 11 Feb 2025 02:22:19 -0600 Subject: [PATCH 04/11] Update blueshield_officer.yml Adds the energy shotgun to BSOs loadout as a primary --- .../Jobs/Command/blueshield_officer.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml index b336ae865c..fa796a2239 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml @@ -73,6 +73,9 @@ cost: 0 canBeHeirloom: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBlueshieldOfficerPrimaries + - !type:CharacterJobRequirement jobs: - BlueshieldOfficer - !type:CharacterAgeRequirement @@ -80,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 From 4c5f434286039cbd6f77c4819d4b30d3d3dff3cd Mon Sep 17 00:00:00 2001 From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Date: Tue, 11 Feb 2025 02:27:25 -0600 Subject: [PATCH 05/11] Update blueshield_officer.yml made stuff more uniform --- .../Jobs/Command/blueshield_officer.yml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml index fa796a2239..34714e2765 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml @@ -55,13 +55,13 @@ guideEntry: SecurityWeapons requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapons + group: LoadoutSecurityWeapons - !type:CharacterDepartmentTimeRequirement - department: Security - min: 18000 # 5 hours + department: Security + min: 18000 # 5 hours - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer + jobs: + - BlueshieldOfficer - !type:CharacterAgeRequirement min: 21 items: @@ -73,13 +73,13 @@ cost: 0 canBeHeirloom: true requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBlueshieldOfficerPrimaries - - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer + - !type:CharacterItemGroupRequirement + group: LoadoutBlueshieldOfficerPrimaries + - !type:CharacterJobRequirement + jobs: + - BlueshieldOfficer - !type:CharacterAgeRequirement - min: 21 + min: 21 items: - WeaponLeverChester @@ -89,11 +89,11 @@ cost: 0 canBeHeirloom: true requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBlueshieldOfficerPrimaries - - !type:CharacterJobRequirement + - !type:CharacterItemGroupRequirement + group: LoadoutBlueshieldOfficerPrimaries + - !type:CharacterJobRequirement jobs: - - BlueshieldOfficer + - BlueshieldOfficer - !type:CharacterAgeRequirement min: 21 items: From 782ece1114419723c97b2d4eeb4e452adcf390f4 Mon Sep 17 00:00:00 2001 From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Date: Tue, 11 Feb 2025 03:37:07 -0600 Subject: [PATCH 06/11] Update blueshield_officer.yml --- .../CharacterItemGroups/Jobs/Command/blueshield_officer.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml index 731c299002..25511f83e8 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml @@ -52,8 +52,8 @@ id: LoadoutBlueshieldOfficerPrimaries maxItems: 1 items: - - type: loadout + - type: loadout id: LoadoutBSORifleChester - - type: loadout + - type: loadout id: LoadoutBSOEnergyShotgun From 6d9f7312fe0643f71df92c948cdf4e6ef0f721d2 Mon Sep 17 00:00:00 2001 From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Date: Tue, 11 Feb 2025 03:49:01 -0600 Subject: [PATCH 07/11] Update blueshield_officer.yml fucking linter --- .../CharacterItemGroups/Jobs/Command/blueshield_officer.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml index 25511f83e8..1434cde80d 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml @@ -56,4 +56,3 @@ id: LoadoutBSORifleChester - type: loadout id: LoadoutBSOEnergyShotgun - From 12ab2c395349561f1410ef0ad98969bf2665a738 Mon Sep 17 00:00:00 2001 From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Date: Tue, 11 Feb 2025 04:11:50 -0600 Subject: [PATCH 08/11] Update blueshield_officer.yml alia ash carry perhaps --- .../Jobs/Command/blueshield_officer.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml index 34714e2765..496b13bc73 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml @@ -55,13 +55,13 @@ guideEntry: SecurityWeapons requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapons + group: LoadoutSecurityWeapons - !type:CharacterDepartmentTimeRequirement - department: Security - min: 18000 # 5 hours + department: Security + min: 18000 # 5 hours - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer + jobs: + - BlueshieldOfficer - !type:CharacterAgeRequirement min: 21 items: @@ -74,10 +74,10 @@ canBeHeirloom: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBlueshieldOfficerPrimaries + group: LoadoutBlueshieldOfficerPrimaries - !type:CharacterJobRequirement - jobs: - - BlueshieldOfficer + jobs: + - BlueshieldOfficer - !type:CharacterAgeRequirement min: 21 items: @@ -90,10 +90,10 @@ canBeHeirloom: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBlueshieldOfficerPrimaries + group: LoadoutBlueshieldOfficerPrimaries - !type:CharacterJobRequirement jobs: - - BlueshieldOfficer + - BlueshieldOfficer - !type:CharacterAgeRequirement min: 21 items: From 348373e7c89a9ff5a5205ad4f3f398564f03e52a Mon Sep 17 00:00:00 2001 From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Date: Tue, 11 Feb 2025 04:16:21 -0600 Subject: [PATCH 09/11] Update blueshield_officer.yml --- .../Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml index 496b13bc73..7e606a778f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml @@ -79,7 +79,7 @@ jobs: - BlueshieldOfficer - !type:CharacterAgeRequirement - min: 21 + min: 21 items: - WeaponLeverChester From 977d611dec7a4e0b6d539ceb7eac90ced7104350 Mon Sep 17 00:00:00 2001 From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Date: Tue, 11 Feb 2025 04:26:09 -0600 Subject: [PATCH 10/11] Update blueshield_officer.yml --- .../Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml index 7e606a778f..967cdd4503 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml @@ -77,13 +77,13 @@ group: LoadoutBlueshieldOfficerPrimaries - !type:CharacterJobRequirement jobs: - - BlueshieldOfficer + - BlueshieldOfficer - !type:CharacterAgeRequirement min: 21 items: - WeaponLeverChester - - type: loadout +- type: loadout id: LoadoutBSOEnergyShotgun category: JobsCommandBlueshieldOfficer cost: 0 From bf475f1f692d56a8807ea3bbc113b49ce1cf2476 Mon Sep 17 00:00:00 2001 From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Date: Tue, 11 Feb 2025 04:27:56 -0600 Subject: [PATCH 11/11] Update blueshield_officer.yml --- .../Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml index 967cdd4503..08230822cb 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml @@ -77,7 +77,7 @@ group: LoadoutBlueshieldOfficerPrimaries - !type:CharacterJobRequirement jobs: - - BlueshieldOfficer + - BlueshieldOfficer - !type:CharacterAgeRequirement min: 21 items: