diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 894422add9..71bac31e75 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -284,7 +284,7 @@ itemId: ClothingBackpackDuffelSyndicateHardsuitBundle description: The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant. price: 8 - + - type: uplinkListing id: UplinkClothingShoesBootsMagSyndie category: Armor diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 8ea11b7204..26e77b2388 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -337,7 +337,7 @@ - type: PressureProtection highPressureMultiplier: 0.72 lowPressureMultiplier: 10000 - + - type: entity parent: ClothingHeadHardsuitBase id: ClothingHeadHelmetHardsuitCybersun @@ -352,3 +352,55 @@ - type: PressureProtection highPressureMultiplier: 0.3 lowPressureMultiplier: 1000 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitSyndieCommander + noSpawn: true + name: syndicate commander helmet + description: A syndicate hardsuit helmet custom designed for commanders of syndicate operative squads. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/syndiecommander.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/syndiecommader.rsi + - type: PointLight + color: green + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.8 + Radiation: 0.5 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitSyndieElite + noSpawn: true + name: syndicate elite helmet + description: A variant of the blood red helmet designed by the gorlax marauders to be exceptionally fireproof and pressure proof. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/syndieelite.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/syndieelite.rsi + - type: PointLight + color: red + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + coefficient: 0.005 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.2 + Radiation: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 935292eaf0..0df27157bb 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -479,7 +479,7 @@ Slash: 0.95 Heat: 0.90 Radiation: 0.75 - + - type: entity parent: ClothingOuterHardsuitBase id: ClothingOuterHardsuitJuggernaut @@ -509,3 +509,62 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitCybersun +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitSyndieCommander + name: syndicate commander hardsuit + description: A blood red hardsuit heavily modified for use by the commander of operative squads. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/syndiecommander.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/syndiecommander.rsi + - type: PressureProtection + highPressureMultiplier: 0.05 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: Armor + modifiers: + coefficients: + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.3 + Heat: 0.3 + Radiation: 0.20 + - type: ExplosionResistance + resistance: 0.5 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitSyndieCommander + +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitSyndieElite + name: syndicate elite hardsuit + description: An upgraded version of the blood red hardsuit that features enhanced fireproofing, pressure resist, and superior armor. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/syndiecommander.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/syndiecommander.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: TemperatureProtection + coefficient: 0.001 + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.4 + Heat: 0.2 + Radiation: 0.20 + - type: ExplosionResistance + resistance: 0.3 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitSyndieElite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 327f3bdff4..15bd8e6311 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -98,3 +98,23 @@ innerclothingskirt: ClothingUniformJumpsuitOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative + +- type: startingGear + id: SyndicateCommanderGearFull + equipment: + jumpsuit: ClothingUniformJumpsuitOperative + back: ClothingBackpackDuffelSyndicateOperative + mask: ClothingMaskGasSyndicate + # eyes: Night Vision Goggles whenever they're made + eyes: ClothingEyesGlassesMeson + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitSyndieCommander + shoes: ClothingShoesBootsCombat + id: SyndiPDA + pocket1: ExtendedEmergencyOxygenTankFilled + belt: ClothingBeltMilitaryWebbing + innerclothingskirt: ClothingUniformJumpsuitOperative + satchel: ClothingBackpackDuffelSyndicateOperative + duffelbag: ClothingBackpackDuffelSyndicateOperative + diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png new file mode 100644 index 0000000000..8d5c3f58a5 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png new file mode 100644 index 0000000000..08b6d1d87c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json new file mode 100644 index 0000000000..038aabe605 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..42926ed988 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png new file mode 100644 index 0000000000..79a96cd711 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png new file mode 100644 index 0000000000..0c7b0caddf Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..7be67fee63 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png new file mode 100644 index 0000000000..505808fc9d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png new file mode 100644 index 0000000000..862f6294fb Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png new file mode 100644 index 0000000000..bbd6cdcfaf Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png new file mode 100644 index 0000000000..638b2358ff Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json new file mode 100644 index 0000000000..038aabe605 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..6a1d34f452 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png new file mode 100644 index 0000000000..22a8dd14b1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png new file mode 100644 index 0000000000..71572c0ffd Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..6d330d446d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png new file mode 100644 index 0000000000..5a40993d72 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png new file mode 100644 index 0000000000..27a27d1e8e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..ecf87e190a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png new file mode 100644 index 0000000000..7a423e798d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png new file mode 100644 index 0000000000..2102993402 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png new file mode 100644 index 0000000000..e4113194a3 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json new file mode 100644 index 0000000000..7863947d1c --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..8a88030e8e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png new file mode 100644 index 0000000000..28c21b611b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png new file mode 100644 index 0000000000..0f415d109b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png new file mode 100644 index 0000000000..75076efb12 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json new file mode 100644 index 0000000000..7863947d1c --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file