diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Hands/gloves.yml index 8b5dd1f41c..55192c4d75 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Hands/gloves.yml @@ -10,3 +10,16 @@ sprite: Corvax/Clothing/Hands/Gloves/kim.rsi HeatResistance: 1400 - type: Insulated + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGlovesCentcomNaval + name: nanotrasen naval gloves + description: A high quality pair of thick gloves covered in gold stitching, given to Nanotrasen's Naval Commanders. + components: + - type: Sprite + sprite: Corvax/Clothing/Hands/Gloves/centcom_naval.rsi + - type: Clothing + sprite: Corvax/Clothing/Hands/Gloves/centcom_naval.rsi + HeatResistance: 1400 + - type: Insulated diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml index cd8efb5065..4f722c48fd 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml @@ -8,3 +8,25 @@ sprite: Corvax/Clothing/Head/Hats/centcom_officer_black.rsi - type: Clothing sprite: Corvax/Clothing/Head/Hats/centcom_officer_black.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadCapCentcomNaval + name: naval cap + description: A cap worn by those in the Nanotrasen Navy. + components: + - type: Sprite + sprite: Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi + - type: Clothing + sprite: Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretCentcomNaval + name: naval beret + description: A beret worn by those in the Nanotrasen Navy. + components: + - type: Sprite + sprite: Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi + - type: Clothing + sprite: Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/cloaks.yml index 85d3db00c9..38f9699535 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/cloaks.yml @@ -6,3 +6,12 @@ components: - type: Sprite sprite: Corvax/Clothing/Neck/Cloaks/centcom_officer_black.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakCentcomAdmiral + name: admiral's cape + description: A vibrant green cape with gold stitching, worn by Nanotrasen Navy Admirals. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Cloaks/admiral.rsi diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml new file mode 100644 index 0000000000..98511c9eb3 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml @@ -0,0 +1,19 @@ +- type: entity + parent: ClothingOuterBaseLarge + id: ClothingOuterArmorCentcomCarapace + name: naval carapace + description: A carapace worn by Naval Command members. + components: + - type: Sprite + sprite: Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi + - type: Clothing + sprite: Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.6 + Heat: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.65 diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpsuits.yml index 4620820317..642c1e2a39 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpsuits.yml @@ -30,3 +30,14 @@ sprite: Corvax/Clothing/Uniforms/Jumpsuit/centcom_officer_black.rsi - type: Clothing sprite: Corvax/Clothing/Uniforms/Jumpsuit/centcom_officer_black.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCentcomAdmiral + name: admiral's uniform + description: A uniform worn by those with the rank Admiral in the Nanotrasen Navy. + components: + - type: Sprite + sprite: Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi + - type: Clothing + sprite: Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom_admiral.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom_admiral.yml new file mode 100644 index 0000000000..a652fc346e --- /dev/null +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom_admiral.yml @@ -0,0 +1,15 @@ +# Just equipment preset, no custom role + +- type: startingGear + id: CentcomAdmiralGear + equipment: + jumpsuit: ClothingUniformJumpsuitCentcomAdmiral + shoes: ClothingShoesBootsJack + head: ClothingHeadCapCentcomNaval + eyes: ClothingEyesGlassesSunglasses + gloves: ClothingHandsGlovesCentcomNaval + outerClothing: ClothingOuterArmorCentcomCarapace + neck: ClothingNeckCloakCentcomAdmiral + id: CentcomPDA + ears: ClothingHeadsetCentCom + pocket1: RubberStampCentcom diff --git a/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/equipped-HAND.png b/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/equipped-HAND.png new file mode 100644 index 0000000000..4960c1af20 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/icon.png new file mode 100644 index 0000000000..c6b1a151b2 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/inhand-left.png new file mode 100644 index 0000000000..07c80bada8 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/inhand-left.png differ diff --git a/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/inhand-right.png new file mode 100644 index 0000000000..11c318ace7 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/inhand-right.png differ diff --git a/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/meta.json new file mode 100644 index 0000000000..ae6939af56 --- /dev/null +++ b/Resources/Textures/Corvax/Clothing/Hands/Gloves/centcom_naval.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/equipped-HELMET.png b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..f151813ba7 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/icon.png new file mode 100644 index 0000000000..be8229ae5c Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/inhand-left.png new file mode 100644 index 0000000000..bdabc11282 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/inhand-left.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/inhand-right.png new file mode 100644 index 0000000000..5077571ce7 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/inhand-right.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/meta.json new file mode 100644 index 0000000000..0819051eaa --- /dev/null +++ b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_beret.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", + "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/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/equipped-HELMET.png b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..b1a3d540b7 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/icon.png new file mode 100644 index 0000000000..e5c438f561 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/inhand-left.png new file mode 100644 index 0000000000..179a072456 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/inhand-left.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/inhand-right.png new file mode 100644 index 0000000000..7f8c13d021 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/inhand-right.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/meta.json new file mode 100644 index 0000000000..0819051eaa --- /dev/null +++ b/Resources/Textures/Corvax/Clothing/Head/Hats/centcom_naval_cap.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", + "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/Corvax/Clothing/Neck/Cloaks/admiral.rsi/equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/admiral.rsi/equipped-NECK.png new file mode 100644 index 0000000000..63a10e4164 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/admiral.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Corvax/Clothing/Neck/Cloaks/admiral.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/admiral.rsi/icon.png new file mode 100644 index 0000000000..a1f79dea40 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/admiral.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Clothing/Neck/Cloaks/admiral.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/admiral.rsi/meta.json new file mode 100644 index 0000000000..248aea1659 --- /dev/null +++ b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/admiral.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..22c4b0a22d Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/icon.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/icon.png new file mode 100644 index 0000000000..e0d7872b8a Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/inhand-left.png new file mode 100644 index 0000000000..aea0f39676 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/inhand-left.png differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/inhand-right.png new file mode 100644 index 0000000000..cef6f162c7 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/inhand-right.png differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/meta.json b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/meta.json new file mode 100644 index 0000000000..408b993bc9 --- /dev/null +++ b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", + "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/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..5a02cbaf7c Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/icon.png new file mode 100644 index 0000000000..d97cade684 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/inhand-left.png new file mode 100644 index 0000000000..942a5247ab Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/inhand-left.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/inhand-right.png new file mode 100644 index 0000000000..65f7b91a71 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/inhand-right.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/meta.json new file mode 100644 index 0000000000..d4ea147538 --- /dev/null +++ b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}