Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

raid suit resprite #2078

Merged
merged 3 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1704,7 +1704,8 @@
id: UplinkClothingOuterArmorRaid
name: uplink-syndie-raid-name
description: uplink-syndie-raid-desc
icon: { sprite: /Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon }
# icon: { sprite: /Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon }
icon: { sprite: /Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon } #ss220 raid suit resprite
productEntity: ClothingBackpackDuffelSyndicateRaidBundle
cost:
Telecrystal: 8
Expand Down
6 changes: 4 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Head/helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -384,9 +384,11 @@
description: An armored helmet for use with the syndicate raid suit. Very stylish.
components:
- type: Sprite
sprite: Clothing/Head/Helmets/syndie-raid.rsi
# sprite: Clothing/Head/Helmets/syndie-raid.rsi #ss220 raid suit resprite
sprite: SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi #ss220 raid suit resprite
- type: Clothing
sprite: Clothing/Head/Helmets/syndie-raid.rsi
# sprite: Clothing/Head/Helmets/syndie-raid.rsi #ss220 raid suit resprite
sprite: SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi #ss220 raid suit resprite
- type: Armor
modifiers: #There's gotta be SOME reason to use this over other helmets.
coefficients:
Expand Down
11 changes: 9 additions & 2 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,21 @@
description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect its wearer from space.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi
# sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi
sprite: SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi #ss220 raid suit resprite
layers:
- state: icon
#ss220 raid suit resprite begin
- state: icon-flash
visible: false
map: [ "light" ]
#ss220 raid suit resprite end
- state: light-overlay
visible: false
shader: unshaded
- type: Clothing
sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi
# sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi #ss220 raid suit resprite
sprite: SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi #ss220 raid suit resprite
- type: Armor
modifiers:
coefficients:
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by DaGo7393 (discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "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.
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,44 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by DaGo7393 (discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "light-overlay"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-light",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-light-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "icon-flash"
}
]
}
Loading