Skip to content

Commit

Permalink
Captain's suit resprite (#297)
Browse files Browse the repository at this point in the history
* capadd

* Revert "capadd"

This reverts commit 92849ae.

* rsirelocate

* rsifix
  • Loading branch information
Hyenh authored Apr 20, 2024
1 parent ec58a4b commit a5c8aa4
Show file tree
Hide file tree
Showing 40 changed files with 148 additions and 14 deletions.
12 changes: 6 additions & 6 deletions Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Original file line number Diff line number Diff line change
@@ -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
}
]
}

0 comments on commit a5c8aa4

Please sign in to comment.