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

Armour Rework (lyndo please cook) #1687

Closed
wants to merge 15 commits into from
Closed
Show file tree
Hide file tree
Changes from 10 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
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
- type: PointLight
color: "#ffeead"
- type: PressureProtection
highPressureMultiplier: 0.50
highPressureMultiplier: 0.5
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.90
Slash: 0.90
Piercing: 0.90
Heat: 0.90
Blunt: 0.8
Slash: 0.8
Piercing: 0.8
Heat: 0.8

- type: entity
parent: ClothingHeadHelmetHardsuitCombatStandard
Expand All @@ -46,15 +46,15 @@
- type: PointLight
color: "#00FFFF"
- type: PressureProtection
highPressureMultiplier: 0.60
highPressureMultiplier: 0.6
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.95
Slash: 0.95
Piercing: 0.95
Heat: 0.95
Blunt: 0.8
Slash: 0.8
Piercing: 0.8
Heat: 0.8

- type: entity
parent: ClothingHeadHelmetHardsuitCombatMedical
Expand Down Expand Up @@ -85,10 +85,10 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.85
Slash: 0.85
Piercing: 0.85
Heat: 0.85
Blunt: 0.8
Slash: 0.8
Piercing: 0.8
Heat: 0.8

- type: entity
parent: ClothingHeadHelmetHardsuitCombatRiot
Expand Down Expand Up @@ -119,10 +119,10 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.85
Slash: 0.85
Piercing: 0.85
Heat: 0.85
Blunt: 0.8
Slash: 0.8
Piercing: 0.8
Heat: 0.8
- type: FlashImmunity # Counterpoint: the HoS can't see
- type: EyeProtection # They're blind as hell

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@
- type: Armor # Good against gunshots, decent against everything else. Balanced by reduced movement speed.
modifiers:
coefficients:
Blunt: 0.80
Slash: 0.80
Piercing: 0.50
Heat: 0.80
Blunt: 0.8
Slash: 0.8
Piercing: 0.5
Shock: 0.9
Heat: 0.8
- type: ClothingSpeedModifier
walkModifier: 0.90
sprintModifier: 0.90
walkModifier: 1.0
sprintModifier: 0.9
- type: ExplosionResistance # More protective against explosives than you think. Helps in preventing all those vital organs from jiggling around o.o
damageCoefficient: 0.70
damageCoefficient: 0.7
- type: AllowSuitStorage
- type: Tag
tags:
Expand All @@ -40,12 +41,12 @@
- type: Armor # Good against stabs and knocks, offers minimal protection from gunshots and lasfire.
modifiers:
coefficients:
Blunt: 0.60
Slash: 0.60
Piercing: 0.90
Heat: 0.90
Blunt: 0.6
Slash: 0.6
Piercing: 0.9
Heat: 0.9
- type: ExplosionResistance # Better than nothing against a blast or shockwave.
damageCoefficient: 0.90
damageCoefficient: 0.9
- type: AllowSuitStorage
- type: Tag
tags:
Expand All @@ -64,15 +65,15 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.40
Slash: 0.40
Piercing: 0.70
Heat: 0.70
Blunt: 0.25
Slash: 0.25
Piercing: 0.7
Heat: 0.7
- type: ClothingSpeedModifier
walkModifier: 0.75
sprintModifier: 0.75
- type: ExplosionResistance # Almost as good as a plate carrier! Still not going to save you from most bombs though.
damageCoefficient: 0.80
- type: ExplosionResistance # As good as a plate carrier! Still not going to save you from most bombs though.
damageCoefficient: 0.7
- type: GroupExamine
- type: AllowSuitStorage
- type: Tag
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,23 @@
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi
- type: PressureProtection
highPressureMultiplier: 0.50
highPressureMultiplier: 0.5
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.50
- type: Armor # Good armour resistance across the board, comparable to the standard security hardsuit.
damageCoefficient: 0.5
- type: Armor # Great armour resistance across the board, but slow to make up for it.
modifiers:
coefficients:
Blunt: 0.60
Slash: 0.60
Piercing: 0.60
Blunt: 0.55
Slash: 0.55
Piercing: 0.55
Shock: 0.75
Radiation: 0.75
Caustic: 0.75
Heat: 0.75
- type: ClothingSpeedModifier
walkModifier: 0.75
sprintModifier: 0.75
walkModifier: 0.8
sprintModifier: 0.65
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitCombatStandard
- type: AllowSuitStorage
Expand Down Expand Up @@ -55,22 +56,23 @@
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi
- type: PressureProtection # Less protective from high pressure than a standard hardsuit due to less plating.
highPressureMultiplier: 0.60
highPressureMultiplier: 0.6
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.60
damageCoefficient: 0.6
- type: Armor # Slightly less armour than the standard hardsuit, but far higher mobility.
modifiers:
coefficients:
Blunt: 0.65
Slash: 0.65
Piercing: 0.65
Radiation: 0.80
Caustic: 0.80
Heat: 0.80
Shock: 0.8
Radiation: 0.8
Caustic: 0.8
Heat: 0.8
- type: ClothingSpeedModifier
walkModifier: 0.85
sprintModifier: 0.85
walkModifier: 0.8
sprintModifier: 0.7
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitCombatMedical
- type: AllowSuitStorage
Expand Down Expand Up @@ -103,19 +105,20 @@
highPressureMultiplier: 0.45
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.40
- type: Armor # More protective than a standard security hardsuit, but far slower.
damageCoefficient: 0.3
- type: Armor # FAR more protective than a standard security hardsuit, but far slower.
modifiers:
coefficients:
Blunt: 0.50
Slash: 0.50
Piercing: 0.50
Radiation: 0.70
Caustic: 0.70
Heat: 0.70
Blunt: 0.25
Slash: 0.25
Piercing: 0.25
Shock: 0.5
Radiation: 0.4
Caustic: 0.4
Heat: 0.4
- type: ClothingSpeedModifier
walkModifier: 0.65
sprintModifier: 0.65
walkModifier: 0.6
sprintModifier: 0.4
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitCombatRiot
- type: AllowSuitStorage
Expand Down Expand Up @@ -145,22 +148,23 @@
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi
- type: PressureProtection
highPressureMultiplier: 0.40
highPressureMultiplier: 0.45
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.40
- type: Armor # About as protective as a riot hardsuit but with far less movement penalty.
damageCoefficient: 0.3
- type: Armor # More protection than standard security hardsuits and lower movement penalty.
modifiers:
coefficients:
Blunt: 0.50
Slash: 0.50
Piercing: 0.50
Blunt: 0.5
Slash: 0.5
Piercing: 0.5
Shock: 0.75
Radiation: 0.75
Caustic: 0.75
Heat: 0.75
- type: ClothingSpeedModifier
walkModifier: 0.80
sprintModifier: 0.80
walkModifier: 0.8
sprintModifier: 0.75
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitCombatAdvanced
- type: AllowSuitStorage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
- type: Armor
modifiers:
coefficients:
Caustic: 0.25
Caustic: 0.75
- type: TemperatureProtection
coefficient: 1
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.75
Heat: 0.9
Blunt: 0.8
Slash: 0.8
Piercing: 0.7
Heat: 0.8
- type: ExplosionResistance
damageCoefficient: 0.9

Expand All @@ -31,10 +31,10 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.75
Heat: 0.9
Blunt: 0.8
Slash: 0.8
Piercing: 0.7
Heat: 0.8
- type: ExplosionResistance
damageCoefficient: 0.9

Expand Down
8 changes: 6 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,12 @@
- type: Armor
modifiers:
coefficients:
Heat: 0.90
Radiation: 0.75
Blunt: 0.95 # DeltaV - general armour rebalance
Slash: 0.95 # DeltaV - general armour rebalance
Piercing: 0.95 # DeltaV - general armour rebalance
Heat: 0.95 # DeltaV - general armour rebalance
# Radiation: 0.75 # DeltaV - general armour rebalance
Caustic: 0.75 # DeltaV - general armour rebalance

#Ancient Void Helmet
- type: entity
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
autoRot: true
radius: 7
netsync: false
- type: Armor # DeltaV - general armour rebalance
modifiers:
coefficients:
Blunt: 0.9
- type: Appearance
- type: HandheldLight
addPrefix: false
Expand Down
Loading