Merge pull request #1396 from Sha-Seng/compact_armor_vests

compact armor vest
impstation · Jan 17, 2025 · 1ee247f · 1ee247f
2 parents 27bb947 + e55fa02
commit 1ee247f
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 2 deletions.
diff --git 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 #imp
+    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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,4 @@
+- type: loadout
+  id: ArmorVestCompact
+  equipment:
+    outerClothing: ClothingOuterArmorBasicCompact
diff --git a/...lothing/OuterClothing/Armor/security_compact.rsi/equipped-OUTERCLOTHING-vox.png b/...lothing/OuterClothing/Armor/security_compact.rsi/equipped-OUTERCLOTHING-vox.png
diff --git a/...on/Clothing/OuterClothing/Armor/security_compact.rsi/equipped-OUTERCLOTHING.png b/...on/Clothing/OuterClothing/Armor/security_compact.rsi/equipped-OUTERCLOTHING.png
diff --git a/...Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/icon.png b/...Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/icon.png
diff --git a/...s/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/inhand-left.png b/...s/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/inhand-left.png
diff --git a/.../_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/inhand-right.png b/.../_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/inhand-right.png
diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Sha-Seng (Github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}