diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 02275d5a2f..c2e921bcbf 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -58,6 +58,21 @@ - HamsterWearable - WhitelistChameleon +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatSecurityTrooper + name: trooper hat + description: A campaign hat for the Nanotrasen Troopers, comes with a case too, but you lost it. + components: + - type: Sprite + sprite: Clothing/Head/Hats/security_trooper_hat.rsi + - type: Clothing + sprite: Clothing/Head/Hats/security_trooper_hat.rsi + - type: Tag + tags: + - ClothMade + - WhitelistChameleon + - type: entity parent: ClothingHeadBase id: ClothingHeadHatCasa diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 8a265c5811..a3ffc5952a 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -634,6 +634,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi +- type: entity + parent: [ClothingUniformBase, BaseRestrictedContraband] + id: ClothingUniformSecurityTrooper + name: trooper uniform + description: A formal uniform issued to the Nanotrasen Troopers, usually it comes with a car. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/security_trooper.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/security_trooper.rsi + - type: entity parent: [ClothingUniformBase, BaseRestrictedContraband] id: ClothingUniformJumpsuitWarden diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index e479d822dd..6cc0dedf72 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -39,6 +39,11 @@ equipment: head: ClothingHeadHatBeretSecurity +- type: loadout + id: TrooperHat + equipment: + head: ClothingHeadHatSecurityTrooper + # Jumpsuit - type: loadout id: SecurityJumpsuit @@ -60,6 +65,11 @@ equipment: jumpsuit: ClothingUniformJumpskirtSecGrey +- type: loadout + id: TrooperUniform + equipment: + jumpsuit: ClothingUniformSecurityTrooper + - type: loadout id: SeniorOfficerJumpsuit effects: diff --git a/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..e2415d48d4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/icon.png new file mode 100644 index 0000000000..ed64010e81 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-left.png new file mode 100644 index 0000000000..1bb0b35282 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-right.png new file mode 100644 index 0000000000..a0a36dc72a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/meta.json new file mode 100644 index 0000000000..187e5b7e68 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DieselMohawk for use in ss14", + "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/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..fec358aa49 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..59fdc6a720 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/icon.png new file mode 100644 index 0000000000..6da72364d9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-left.png new file mode 100644 index 0000000000..4899fb66e3 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png new file mode 100644 index 0000000000..7a4841f09b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/meta.json new file mode 100644 index 0000000000..ffbdd2c8df --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DieselMohawk for use in ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}