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.

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

Added Combat Helmet and Mask for Security #194

Merged
merged 1 commit into from
Jan 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@
id: LoadoutClothingHeadHelmetBasic
- type: loadout
id: LoadoutSecurityHeadHelmetInsulated
- type: loadout
id: LoadoutSecurityHeadHelmetCombat

#- type: characterItemGroup
# id: LoadoutSecurityId
Expand All @@ -187,6 +189,8 @@
items:
- type: loadout
id: LoadoutSecurityMaskGasSwat
- type: loadout
id: LoadoutSecurityMaskGasCombat

- type: characterItemGroup
id: LoadoutSecurityOuter
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/_DEN/Entities/Clothing/Head/helmets.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingHeadHelmetBasic
id: ClothingHeadHelmetSecurityCombat
name: security combat helmet
description: A repainted tactical helmet commonly used by mercenaries around the sol system, it has a distinct jungle smell.
components:
- type: Sprite
sprite: _DEN/Clothing/Head/Helmets/securitycombathelmet.rsi
- type: Clothing
sprite: _DEN/Clothing/Head/Helmets/securitycombathelmet.rsi
11 changes: 10 additions & 1 deletion Resources/Prototypes/_DEN/Entities/Clothing/Masks/masks.yml
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
# smile
- type: entity
parent: ClothingMaskGasExplorer
id: ClothingMaskGasSecurityCombat
name: security combat gas mask
description: Slightly outdated, but reliable military-style gas mask, painted in security's colors.
components:
- type: Sprite
sprite: _DEN/Clothing/Mask/securitycombatgasmask.rsi
- type: Clothing
sprite: _DEN/Clothing/Mask/securitycombatgasmask.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,31 @@
- Security
items:
- ClothingUniformJumpsuitSeniorTrooper

- type: loadout
id: LoadoutSecurityHeadHelmetCombat
category: JobsSecurityAUncategorized
cost: 0
exclusive: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutSecurityHead
- !type:CharacterDepartmentRequirement
departments:
- Security
items:
- ClothingHeadHelmetSecurityCombat

- type: loadout
id: LoadoutSecurityMaskGasCombat
category: JobsSecurityAUncategorized
cost: 2 # Slightly tougher than the normal security mask
exclusive: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutSecurityMask
- !type:CharacterDepartmentRequirement
departments:
- Security
items:
- ClothingMaskGasSecurityCombat
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "modified sprite from Jackal298 based on the sprite from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1, Modified for The Den by PatchFM on GitHub.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version edited by Floofers | Modified for The Den by PatchFM on Github.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-MASK",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK-vulpkanin",
"directions": 4
},
{
"name": "equipped-MASK-reptilian",
"directions": 4
}
]
}
Loading