diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml index a6ac5fa14b0b..576d6fe36842 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml @@ -19,4 +19,4 @@ ClothingHandsGlovesColorBlack: 2 ClothingHandsGlovesLatex: 2 ClothingHeadsetSecurity: 2 - ClothingNeckScarfStripedBlack: 2 + ClothingNeckScarfStripedBlack: 2 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 2c62af8a3579..249f31dbeae8 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -468,3 +468,25 @@ sprite: Clothing/OuterClothing/Coats/expensive_coat.rsi - type: Clothing sprite: Clothing/OuterClothing/Coats/expensive_coat.rsi + +- type: entity + parent: ClothingOuterArmorBasic + id: ClothingOuterCoatFieldBomber + name: field bomber + description: A red bomber jacket, worn open with the sleeves pushed up. The Nanotrasen logo on the front and the shield on the back are sewn with special high-vis thread. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Coats/field_bomber.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Coats/field_bomber.rsi #imp + +- type: entity + parent: ClothingOuterCoatDetective + id: ClothingOuterCoatFieldJacket + name: field jacket + description: A soft black suit jacket with loose cuffs. The white logos mark the wearer as Nanotrasen security. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Coats/field_jacket.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Coats/field_jacket.rsi #imp diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index c0a9979df5f2..8912479d4748 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1405,6 +1405,7 @@ - ArmorVestSlim #imp - ArmorVestCompact #imp - WardenWinterCoatUnarmored + - ClothingOuterCoatFieldBomber #imp - type: loadoutGroup id: WardenPDA @@ -1473,6 +1474,7 @@ - ArmorVestSlim - ArmorVestCompact #imp - SecurityOfficerWintercoat + - ClothingOuterCoatFieldBomber #imp - type: loadoutGroup id: SecurityShoes @@ -1532,6 +1534,7 @@ - DetectiveArmorVest - DetectiveCoatGrey - DetectiveCoat + - ClothingOuterCoatFieldJacket #imp - type: loadoutGroup id: DetectiveShoes diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/detective.yml index eb54ca88ca08..4b86f4f204d0 100644 --- a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/detective.yml @@ -16,4 +16,9 @@ - type: loadout id: ClothingUniformDetectiveSuitSkirt equipment: - jumpsuit: ClothingUniformDetectiveSuitSkirt #imp \ No newline at end of file + jumpsuit: ClothingUniformDetectiveSuitSkirt #imp + +- type: loadout + id: ClothingOuterCoatFieldJacket + equipment: + outerClothing: ClothingOuterCoatFieldJacket #imp diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/security_officer.yml index f9e964c2798f..7b55528a1d91 100644 --- a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/security_officer.yml @@ -2,3 +2,7 @@ id: ArmorVestCompact equipment: outerClothing: ClothingOuterArmorBasicCompact +- type: loadout + id: ClothingOuterCoatFieldBomber + equipment: + outerClothing: ClothingOuterCoatFieldBomber #imp diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 000000000000..5d8befb5d75e Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/icon.png new file mode 100644 index 000000000000..1e917024b9d6 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/inhand-left.png new file mode 100644 index 000000000000..d7c9a0d75d21 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/inhand-right.png new file mode 100644 index 000000000000..8a92e2c2cbbc Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/meta.json new file mode 100644 index 000000000000..25e1ebd158c1 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Ported from Frontier Station 14. Edited by sha-seng and hilda., original sprites by Imaginos16 from tgstation. Licensed under CC-BY-SA 3.0.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 000000000000..0086ce044620 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/icon.png new file mode 100644 index 000000000000..14da9d301502 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/inhand-left.png new file mode 100644 index 000000000000..e4136045fde2 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/inhand-right.png new file mode 100644 index 000000000000..a7ad5d908d93 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/meta.json new file mode 100644 index 000000000000..25e1ebd158c1 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Ported from Frontier Station 14. Edited by sha-seng and hilda., original sprites by Imaginos16 from tgstation. Licensed under CC-BY-SA 3.0.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}