Skip to content

Commit

Permalink
Reworked riot suit, resprited helmets
Browse files Browse the repository at this point in the history
Riot suit now fits palette and theme, and should be more balanced as compared to plate carrier and duravest

Also helmets now resprited
  • Loading branch information
TadJohnson00 committed Oct 13, 2023
1 parent 62b12a6 commit ca2d6cd
Show file tree
Hide file tree
Showing 22 changed files with 120 additions and 10 deletions.
6 changes: 3 additions & 3 deletions Resources/Prototypes/Catalog/Cargo/cargo_security.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: cargoProduct
id: SecurityArmor
icon:
sprite: Clothing/OuterClothing/Armor/security.rsi
sprite: DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi # DeltaV - resprite
state: icon
product: CrateSecurityArmor
cost: 1000 # DeltaV - raise price for buffed armour
Expand All @@ -11,7 +11,7 @@
- type: cargoProduct
id: SecurityHelmet
icon:
sprite: Clothing/Head/Helmets/security.rsi
sprite: DeltaV/Clothing/Head/Helmets/security.rsi # DeltaV - resprite
state: icon
product: CrateSecurityHelmet
cost: 550
Expand All @@ -31,7 +31,7 @@
- type: cargoProduct
id: SecurityRiot
icon:
sprite: Clothing/OuterClothing/Armor/riot.rsi
sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi # DeltaV - resprite
state: icon
product: CrateSecurityRiot
cost: 5500
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/Crates/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
components:
- type: StorageFill
contents:
- id: ClothingOuterArmorRiot
- id: ClothingOuterArmorARC # DeltaV - ClothingOuterArmorRiot replaced in favour of ARC suit
amount: 2
- id: ClothingHeadHelmetRiot
amount: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
Heat: 0.80
- type: ClothingSpeedModifier
walkModifier: 0.90
sprintModifier: 0.8
sprintModifier: 0.80
- type: ExplosionResistance # More protective against explosives than you think. Helps in preventing all those vital organs from jiggling around o.o
damageCoefficient: 0.70

Expand All @@ -42,3 +42,27 @@
Heat: 0.90
- type: ExplosionResistance # Better than nothing against a blast or shockwave.
damageCoefficient: 0.90

- type: entity
parent: ClothingOuterBaseLarge
id: ClothingOuterArmorARC
name: ARCS
description: The Advanced Riot Control Suit, or ARCS for short, is generally regarded as far too bulky and overly hot for any practical use - but when the riots are raging, most officers invariably take great comfort from the thick and claustrophobic padding.
components:
- type: Sprite
sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.40
Slash: 0.40
Piercing: 0.70
Heat: 0.70
- type: ClothingSpeedModifier
walkModifier: 0.80
sprintModifier: 0.70
- type: ExplosionResistance # Almost as good as a plate carrier! Still not going to save you from most bombs though.
damageCoefficient: 0.80
- type: GroupExamine
8 changes: 4 additions & 4 deletions Resources/Prototypes/Entities/Clothing/Head/helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
description: Standard security gear. Protects the head from impacts.
components:
- type: Sprite
sprite: Clothing/Head/Helmets/security.rsi
sprite: DeltaV/Clothing/Head/Helmets/security.rsi # DeltaV - resprite
- type: Clothing
sprite: Clothing/Head/Helmets/security.rsi
sprite: DeltaV/Clothing/Head/Helmets/security.rsi # DeltaV - resprite
- type: Armor #Values seem to let the user survive one extra hit if attacked consistently.
modifiers:
coefficients:
Expand Down Expand Up @@ -79,9 +79,9 @@
description: It's a helmet specifically designed to protect against close range attacks.
components:
- type: Sprite
sprite: Clothing/Head/Helmets/light_riot.rsi
sprite: DeltaV/Clothing/Head/Helmets/light_riot.rsi # DeltaV - resprite
- type: Clothing
sprite: Clothing/Head/Helmets/light_riot.rsi
sprite: DeltaV/Clothing/Head/Helmets/light_riot.rsi # DeltaV - resprite
- type: IngestionBlocker
- type: Armor
modifiers:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Procedural/salvage_rewards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
CrateArmoryShotgun: 1.0
CrateArmoryPistols: 1.0
# rare armor
ClothingOuterArmorRiot: 1.0
ClothingOuterArmorARC: 1.0 # DeltaV - ClothingOuterArmorRiot replaced in favour of ARC suit
# rare chemicals
CognizineChemistryBottle: 1.0
OmnizineChemistryBottle: 1.0
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Original work by TJohnson.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by TJohnson.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "light-equipped-HELMET",
"directions": 4
},
{
"name": "lighton-equipped-HELMET",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Original work by TJohnson.",
"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 ca2d6cd

Please sign in to comment.