From 25624a6148fde843c6467dc906b7e1be39087dcd Mon Sep 17 00:00:00 2001 From: Shaman <56280352+Sha-Seng@users.noreply.github.com> Date: Thu, 16 Jan 2025 18:18:13 -0700 Subject: [PATCH 1/2] compact armor vest adds a compact plate carrier for security, identical stats to the other ones (even irl they're as effective as the big armor, just more expensive) secoff/warden/hos can spawn with it, and i've removed one slim armor vest from the sectech at dark/stony's recommendation to add one of these instead (so there's the same overall number of armor vests) --- .../VendingMachines/Inventories/secdrobe.yml | 3 +- .../Jobs/Security/security_officer.yml | 2 +- .../Prototypes/Loadouts/loadout_groups.yml | 5 +++ .../Entities/Clothing/OuterClothing/armor.yml | 10 ++++++ .../Jobs/Security/security_officer.yml | 4 +++ .../equipped-OUTERCLOTHING-vox.png | Bin 0 -> 4601 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 4632 bytes .../Armor/security_compact.rsi/icon.png | Bin 0 -> 4659 bytes .../security_compact.rsi/inhand-left.png | Bin 0 -> 4350 bytes .../security_compact.rsi/inhand-right.png | Bin 0 -> 4362 bytes .../Armor/security_compact.rsi/meta.json | 30 ++++++++++++++++++ 11 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/security_officer.yml create mode 100644 Resources/Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/equipped-OUTERCLOTHING-vox.png create mode 100644 Resources/Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index b3f4008f61b5..414c09eda101 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -22,7 +22,8 @@ ClothingOuterWinterSec: 2 ClothingNeckScarfStripedRed: 3 ClothingOuterArmorBasic: 2 - ClothingOuterArmorBasicSlim: 2 + ClothingOuterArmorBasicSlim: 1 + ClothingOuterArmorBasicCompact: 1 #imp ClothingEyesBlindfold: 1 ClothingShoesBootsCombat: 1 ClothingShoesBootsWinterSec: 2 diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index dfc0dec2f709..2f73957187d7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -67,7 +67,7 @@ - type: loadout id: TrooperUniform - equipment: + equipment: jumpsuit: ClothingUniformSecurityTrooper - type: loadout diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index a04c4654decd..08788cc85c7c 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1354,6 +1354,7 @@ - HeadofSecurityWinterCoatUnarmored - ArmorVest #imp - ArmorVestSlim #imp + - ArmorVestCompact #imp - HeadofSecurityEliteArmor #imp - type: loadoutGroup @@ -1394,6 +1395,9 @@ loadouts: - WardenCoat - WardenArmoredWinterCoat + - ArmorVest #imp + - ArmorVestSlim #imp + - ArmorVestCompact #imp - WardenWinterCoatUnarmored - type: loadoutGroup @@ -1461,6 +1465,7 @@ loadouts: - ArmorVest - ArmorVestSlim + - ArmorVestCompact #imp - SecurityOfficerWintercoat - type: loadoutGroup diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/OuterClothing/armor.yml index 644bae2473e6..3de35b919a02 100644 --- a/Resources/Prototypes/_Impstation/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_Impstation/Entities/Clothing/OuterClothing/armor.yml @@ -35,3 +35,13 @@ - type: Clothing sprite: _Impstation/Clothing/OuterClothing/Armor/hoselitearmor.rsi +- type: entity + parent: ClothingOuterArmorBasic + id: ClothingOuterArmorBasicCompact + name: compact armor vest + description: A compact Type I armored vest that provides decent protection against most types of damage. + components: + - type: Sprite + sprite: _Impstation/Clothing/OuterClothing/Armor/security_compact.rsi + - type: Clothing + sprite: _Impstation/Clothing/OuterClothing/Armor/security_compact.rsi diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/security_officer.yml new file mode 100644 index 000000000000..f9e964c2798f --- /dev/null +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/security_officer.yml @@ -0,0 +1,4 @@ +- type: loadout + id: ArmorVestCompact + equipment: + outerClothing: ClothingOuterArmorBasicCompact diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..634015bef4283c3189f7123a8f1c88e23903ba28 GIT binary patch literal 4601 zcmeHKeNYo;8egOWMRE8L0nd*$o*!s8*(95
2mW7tI8p}Vju_~d
zmcgS7o`m@5Q8>&OjP;xR4A