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

compact armor vest #1396

Merged
merged 2 commits into from
Jan 17, 2025
Merged

compact armor vest #1396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25624a6
compact armor vest
Sha-Seng Jan 17, 2025
e55fa02
imped it
Sha-Seng Jan 17, 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
3 changes: 2 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
ClothingOuterWinterSec: 2
ClothingNeckScarfStripedRed: 3
ClothingOuterArmorBasic: 2
ClothingOuterArmorBasicSlim: 2
ClothingOuterArmorBasicSlim: 1 #imp
ClothingOuterArmorBasicCompact: 1 #imp
ClothingEyesBlindfold: 1
ClothingShoesBootsCombat: 1
ClothingShoesBootsWinterSec: 2
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

- type: loadout
id: TrooperUniform
equipment:
equipment:
Sha-Seng marked this conversation as resolved.
Show resolved Hide resolved
jumpsuit: ClothingUniformSecurityTrooper

- type: loadout
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,6 +1354,7 @@
- HeadofSecurityWinterCoatUnarmored
- ArmorVest #imp
- ArmorVestSlim #imp
- ArmorVestCompact #imp
- HeadofSecurityEliteArmor #imp

- type: loadoutGroup
Expand Down Expand Up @@ -1394,6 +1395,9 @@
loadouts:
- WardenCoat
- WardenArmoredWinterCoat
- ArmorVest #imp
- ArmorVestSlim #imp
- ArmorVestCompact #imp
- WardenWinterCoatUnarmored

- type: loadoutGroup
Expand Down Expand Up @@ -1461,6 +1465,7 @@
loadouts:
- ArmorVest
- ArmorVestSlim
- ArmorVestCompact #imp
- SecurityOfficerWintercoat

- type: loadoutGroup
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/_Impstation/Entities/Clothing/OuterClothing/armor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/security_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- type: loadout
id: ArmorVestCompact
equipment:
outerClothing: ClothingOuterArmorBasicCompact
Binary file added ...lothing/OuterClothing/Armor/security_compact.rsi/equipped-OUTERCLOTHING-vox.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...on/Clothing/OuterClothing/Armor/security_compact.rsi/equipped-OUTERCLOTHING.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .../_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions Resources/Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading