diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 3b1ae98855..8634ae6702 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -162,9 +162,9 @@ components: - type: BreathMask - type: Sprite - sprite: Clothing/Head/Hardsuits/security.rsi + sprite: _FTL/Clothing/Head/Hardsuits/mercsuit.rsi - type: Clothing - sprite: Clothing/Head/Hardsuits/security.rsi + sprite: _FTL/Clothing/Head/Hardsuits/mercsuit.rsi - type: PointLight color: "#ffeead" - type: PressureProtection @@ -234,14 +234,14 @@ - type: entity parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitCap - name: gold-trimmed spacesuit helmet - description: A fancy spacesuit helmet, favored by aristocrats. + name: light combat performance suit helmet + description: A durable spacesuit helmet, modified for light combat use. components: - type: BreathMask - type: Sprite - sprite: Clothing/Head/Hardsuits/capspace.rsi + sprite: _FTL/Clothing/Head/Hardsuits/capsuit.rsi - type: Clothing - sprite: Clothing/Head/Hardsuits/capspace.rsi + sprite: _FTL/Clothing/Head/Hardsuits/capsuit.rsi - type: PressureProtection highPressureMultiplier: 0.3 lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 5359c04e89..571a48d3ee 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -195,9 +195,9 @@ description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. components: - type: Sprite - sprite: Clothing/OuterClothing/Hardsuits/security.rsi + sprite: _FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi - type: Clothing - sprite: Clothing/OuterClothing/Hardsuits/security.rsi + sprite: _FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi - type: PressureProtection highPressureMultiplier: 0.5 lowPressureMultiplier: 1000 @@ -278,13 +278,13 @@ - type: entity parent: ClothingOuterHardsuitBase id: ClothingOuterHardsuitCap - name: gold-trimmed spacesuit - description: A formal and lightly armored spacesuit, favored by aristocrats. + name: light combat performance suit + description: A mobile lightly armored spacesuit. Modified for limited combat use. components: - type: Sprite - sprite: Clothing/OuterClothing/Hardsuits/capspace.rsi + sprite: _FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi - type: Clothing - sprite: Clothing/OuterClothing/Hardsuits/capspace.rsi + sprite: _FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi - type: PressureProtection highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png index 0eeda1fee8..35f9d27313 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png index 569b834b57..22e1f3dafb 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json index 3ea58d6824..75d37bdc8e 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Hyenh#6078(313846233099927552)", + "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e,", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png index cf3f335643..c2e7ae2a1f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png index 6651eb4752..2850d1eaaf 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png index c29c9fd20c..410b63a5e7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png index 48e4cd3ac7..bc66c46d35 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/inhand-left.png index c431445097..3cf57e8f26 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/inhand-right.png index ed430877eb..0bc7ecd657 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json index 88f06742e9..32d6d8901a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Hyenh#6078(313846233099927552)", + "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/icon-flash.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/icon-flash.png new file mode 100644 index 0000000000..b204e5733e Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/icon-flash.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/icon.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/icon.png new file mode 100644 index 0000000000..74ce6fd776 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/icon.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/meta.json b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/meta.json new file mode 100644 index 0000000000..6b41647110 --- /dev/null +++ b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Hyenh#6078(313846233099927552)", + "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 + } + ] +} diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/off-equipped-HELMET.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..c99d437686 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/off-inhand-left.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/off-inhand-left.png new file mode 100644 index 0000000000..8a23a198b8 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/off-inhand-right.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/off-inhand-right.png new file mode 100644 index 0000000000..a06804c6e3 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/on-equipped-HELMET.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..113e79d803 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/on-inhand-left.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/on-inhand-left.png new file mode 100644 index 0000000000..10e94a8392 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/on-inhand-right.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/on-inhand-right.png new file mode 100644 index 0000000000..df98b712ee Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/capsuit.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/icon-flash.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/icon-flash.png new file mode 100644 index 0000000000..0eeda1fee8 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/icon-flash.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/icon.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/icon.png new file mode 100644 index 0000000000..569b834b57 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/icon.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/meta.json b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/meta.json new file mode 100644 index 0000000000..6b41647110 --- /dev/null +++ b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Hyenh#6078(313846233099927552)", + "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 + } + ] +} diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/off-equipped-HELMET.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..cf3f335643 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/off-inhand-left.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/off-inhand-left.png new file mode 100644 index 0000000000..7134542e2c Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/off-inhand-right.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/off-inhand-right.png new file mode 100644 index 0000000000..7ca8119713 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/on-equipped-HELMET.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..6651eb4752 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/on-inhand-left.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/on-inhand-left.png new file mode 100644 index 0000000000..e9baee5588 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/on-inhand-right.png b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/on-inhand-right.png new file mode 100644 index 0000000000..3a5c394d75 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/Head/Hardsuits/mercsuit.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..f01a970de5 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/icon.png b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/icon.png new file mode 100644 index 0000000000..368756f6e8 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/icon.png differ diff --git a/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/inhand-left.png b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/inhand-left.png new file mode 100644 index 0000000000..96704cc75e Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/inhand-right.png b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/inhand-right.png new file mode 100644 index 0000000000..c203c60c71 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/meta.json b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/meta.json new file mode 100644 index 0000000000..88f06742e9 --- /dev/null +++ b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/capsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Hyenh#6078(313846233099927552)", + "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/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..d34c3c5717 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/icon.png b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/icon.png new file mode 100644 index 0000000000..48e4cd3ac7 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/icon.png differ diff --git a/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/inhand-left.png b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/inhand-left.png new file mode 100644 index 0000000000..c431445097 Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/inhand-right.png b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/inhand-right.png new file mode 100644 index 0000000000..ed430877eb Binary files /dev/null and b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/meta.json b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/meta.json new file mode 100644 index 0000000000..88f06742e9 --- /dev/null +++ b/Resources/Textures/_FTL/Clothing/OuterClothing/Hardsuits/mercsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Hyenh#6078(313846233099927552)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}