diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 88d9f044a848a8..e82fa04c9e530d 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -352,3 +352,22 @@ - type: Clothing sprite: Clothing/Hands/Gloves/forensic.rsi - type: FingerprintMask + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsChronoLegionnaire + name: chrono legionnaire combat gloves + description: High-quality combat gloves form pa... Future. + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/chronogloves.rsi + - type: Clothing + sprite: Clothing/Hands/Gloves/chronogloves.rsi + - type: GloveHeatResistance + heatResistance: 1400 + - type: Insulated + - type: Fiber + fiberMaterial: fibers-insulative + fiberColor: fibers-olive + - type: FingerprintMask + - type: Unremoveable diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index e256a431e3cb4d..63bd7cd9bc965b 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -712,3 +712,21 @@ sprite: Clothing/Head/Hardsuits/clown.rsi equipSound: /Audio/Mecha/mechmove03.ogg unequipSound: /Audio/Effects/Emotes/parp1.ogg + +# Chrono Legionnaire Hardsuit +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitChronoLegionnaire + noSpawn: true + name: chrono legionnaire hardsuit helmet + description: An advanced and stylish helmet right from the future. Or from the past? + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/chronolegionnaire.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/chronolegionnaire.rsi + - type: PointLight + color: "#3385ff" + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 7792e2809d87f9..8d28d188596e48 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -867,3 +867,37 @@ node: clownHardsuit - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitClown + +#Chrono Legionnaire Hardsuit +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitChronoLegionnaire + name: chrono legionnaire hardsuit + description: An advanced and stylish hardsuit right from the future. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/chronolegionnaire.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/chronolegionnaire.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + coefficient: 0.001 + - type: ExplosionResistance + damageCoefficient: 0.2 + - type: Armor + modifiers: + coefficients: + Blunt: 0.2 + Slash: 0.2 + Piercing: 0.2 + Heat: 0.1 + Radiation: 0 + Caustic: 0.2 + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 1 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitChronoLegionnaire + - type: Unremoveable diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index 7d91e20c4663fb..c477ce4b6c59ce 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -100,3 +100,29 @@ walkModifier: 0.85 sprintModifier: 0.8 enabled: false + +- type: entity + parent: ClothingShoesBootsMag + id: ChronoLegionnaireBoots + name: advanced chrono boots + description: Minimalist shoes with magnetic soles, allowing the wearer to move at an impressive speed and not worry about clowns with banana peels. + components: + - type: Sprite + sprite: Clothing/Shoes/Boots/chronoboots.rsi + state: icon + - type: Clothing + sprite: Clothing/Shoes/Boots/chronoboots.rsi + - type: Magboots + toggleAction: + icon: { sprite: Clothing/Shoes/Boots/magboots-advanced.rsi, state: icon } + iconOn: Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png + name: action-name-magboot-toggle + description: action-decription-magboot-toggle + itemIconStyle: NoItem + event: !type:ToggleActionEvent + - type: ClothingSpeedModifier + walkModifier: 1.5 + sprintModifier: 1.5 + enabled: false + - type: NoSlip + - type: Unremoveable diff --git a/Resources/Textures/Clothing/Hands/Gloves/chronogloves.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/chronogloves.rsi/equipped-HAND.png new file mode 100644 index 00000000000000..97f23e522c6d99 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/chronogloves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/chronogloves.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/chronogloves.rsi/icon.png new file mode 100644 index 00000000000000..ab373c9c7ca947 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/chronogloves.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/chronogloves.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/chronogloves.rsi/meta.json new file mode 100644 index 00000000000000..72efc1de94e740 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/chronogloves.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from https://github.com/tgstation/tgstation/pull/71761", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hardsuits/chronolegionnaire.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/chronolegionnaire.rsi/equipped-HELMET.png new file mode 100644 index 00000000000000..99b1a9017dd2eb Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/chronolegionnaire.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/chronolegionnaire.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/chronolegionnaire.rsi/icon-flash.png new file mode 100644 index 00000000000000..f7da6f21111be1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/chronolegionnaire.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/chronolegionnaire.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/chronolegionnaire.rsi/icon.png new file mode 100644 index 00000000000000..f7da6f21111be1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/chronolegionnaire.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/chronolegionnaire.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/chronolegionnaire.rsi/meta.json new file mode 100644 index 00000000000000..1052425ee9d2bb --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/chronolegionnaire.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/pull/71761", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/chronolegionnaire.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/chronolegionnaire.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000000..9aef4e30788e79 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/chronolegionnaire.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/chronolegionnaire.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/chronolegionnaire.rsi/icon.png new file mode 100644 index 00000000000000..d68e4659ba75dd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/chronolegionnaire.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/chronolegionnaire.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/chronolegionnaire.rsi/meta.json new file mode 100644 index 00000000000000..f0abc1a9ccbd2a --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/chronolegionnaire.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/pull/71761", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} + diff --git a/Resources/Textures/Clothing/Shoes/Boots/chronoboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/chronoboots.rsi/equipped-FEET.png new file mode 100644 index 00000000000000..4f1ee90655a200 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/chronoboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/chronoboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/chronoboots.rsi/icon.png new file mode 100644 index 00000000000000..bfbd609435cd05 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/chronoboots.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/chronoboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/chronoboots.rsi/meta.json new file mode 100644 index 00000000000000..01368c2a6f41bb --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/Boots/chronoboots.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from https://github.com/tgstation/tgstation/pull/71761", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] + }