diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml index d157ae8f5f..c2aa975be5 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml @@ -170,6 +170,8 @@ id: LoadoutClothingHeadHelmetBasic - type: loadout id: LoadoutSecurityHeadHelmetInsulated + - type: loadout + id: LoadoutSecurityHeadHelmetCombat #- type: characterItemGroup # id: LoadoutSecurityId @@ -187,6 +189,8 @@ items: - type: loadout id: LoadoutSecurityMaskGasSwat + - type: loadout + id: LoadoutSecurityMaskGasCombat - type: characterItemGroup id: LoadoutSecurityOuter diff --git a/Resources/Prototypes/_DEN/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_DEN/Entities/Clothing/Head/helmets.yml new file mode 100644 index 0000000000..a36107581c --- /dev/null +++ b/Resources/Prototypes/_DEN/Entities/Clothing/Head/helmets.yml @@ -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 diff --git a/Resources/Prototypes/_DEN/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_DEN/Entities/Clothing/Masks/masks.yml index 8389d3dcc3..31d51e084e 100644 --- a/Resources/Prototypes/_DEN/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_DEN/Entities/Clothing/Masks/masks.yml @@ -1 +1,10 @@ -# smile \ No newline at end of file +- 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 diff --git a/Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml index e7fc18c2d5..c6202063e9 100644 --- a/Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml @@ -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 diff --git a/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/equipped-HELMET.png b/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..17da18f947 Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/icon.png b/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/icon.png new file mode 100644 index 0000000000..9a35f06e09 Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/icon.png differ diff --git a/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/inhand-left.png b/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/inhand-left.png new file mode 100644 index 0000000000..a9b09e99ce Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/inhand-right.png b/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/inhand-right.png new file mode 100644 index 0000000000..ae78f9bf58 Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/meta.json b/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/meta.json new file mode 100644 index 0000000000..8514a8e1d1 --- /dev/null +++ b/Resources/Textures/_DEN/Clothing/Head/Helmets/securitycombathelmet.rsi/meta.json @@ -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 + } + ] +} diff --git a/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/equipped-MASK-reptilian.png b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/equipped-MASK-reptilian.png new file mode 100644 index 0000000000..d14e137070 Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..2dc732b350 Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/equipped-MASK.png b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/equipped-MASK.png new file mode 100644 index 0000000000..97ce798a2e Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/icon.png b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/icon.png new file mode 100644 index 0000000000..e5e3b740ea Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/icon.png differ diff --git a/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/inhand-left.png b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/inhand-left.png new file mode 100644 index 0000000000..c1c25c969f Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/inhand-right.png b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/inhand-right.png new file mode 100644 index 0000000000..179c129153 Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/meta.json b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/meta.json new file mode 100644 index 0000000000..2d8065e938 --- /dev/null +++ b/Resources/Textures/_DEN/Clothing/Mask/securitycombatgasmask.rsi/meta.json @@ -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 + } + ] +}