From a925a2b055b8c843f7f53f8a28afebfdbfb6877e Mon Sep 17 00:00:00 2001 From: VigersRay Date: Sat, 27 Jul 2024 01:11:41 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=A3=D0=BC=D0=B5=D0=BD=D1=8C=D1=88=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=83=D1=80=D0=BE=D0=BD=D0=B0=20=D0=BE?= =?UTF-8?q?=D1=82=20=D1=83=D0=B4=D1=83=D1=88=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Shared/Atmos/Atmospherics.cs | 4 ++-- Resources/Prototypes/Entities/Mobs/Player/arachnid.yml | 4 ++-- Resources/Prototypes/Entities/Mobs/Species/base.yml | 2 +- Resources/Prototypes/Entities/Mobs/Species/dwarf.yml | 2 +- Resources/Prototypes/Entities/Mobs/Species/slime.yml | 2 +- Resources/Prototypes/Entities/Mobs/base.yml | 2 +- .../Prototypes/_Sunrise/Entities/Mobs/Player/vulpkanin.yml | 2 +- .../Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml | 4 ++-- .../_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs index 1e40daf3dde..3105db8e581 100644 --- a/Content.Shared/Atmos/Atmospherics.cs +++ b/Content.Shared/Atmos/Atmospherics.cs @@ -274,12 +274,12 @@ public static class Atmospherics /// The amount of pressure damage someone takes is equal to ((pressure / HAZARD_HIGH_PRESSURE) - 1)*PRESSURE_DAMAGE_COEFFICIENT, /// with the maximum of MaxHighPressureDamage. /// - public const float PressureDamageCoefficient = 4; + public const float PressureDamageCoefficient = 1; // Sunrise-Casual /// /// Maximum amount of damage that can be endured with high pressure. /// - public const int MaxHighPressureDamage = 4; + public const int MaxHighPressureDamage = 1; // Sunrise-Casual /// /// The amount of damage someone takes when in a low pressure area diff --git a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml index d9dea3c18d9..5ea115355c2 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml @@ -7,7 +7,7 @@ - type: Respirator damage: types: - Asphyxiation: 1.5 # This makes space and crit more lethal to arachnids. + Asphyxiation: 0.5 # Sunrise-Casual damageRecovery: types: - Asphyxiation: -0.5 + Asphyxiation: -1.0 diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 459511bfdb2..2a6752a0129 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -277,7 +277,7 @@ - type: Respirator damage: types: - Asphyxiation: 1.0 + Asphyxiation: 0.5 # Sunrise-Casual damageRecovery: types: Asphyxiation: -1.0 diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml index 6ce9c80a250..57db842a78d 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml @@ -13,7 +13,7 @@ - type: Respirator damage: types: - Asphyxiation: 2 + Asphyxiation: 0.5 # Sunrise-Casual damageRecovery: types: Asphyxiation: -1.0 diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index c423a42688b..3424dbe4a0e 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -104,7 +104,7 @@ - type: Respirator damage: types: - Asphyxiation: 0.2 + Asphyxiation: 0.5 # Sunrise-Casual damageRecovery: types: Asphyxiation: -1.0 diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml index 9de747bd537..7df6191c00b 100644 --- a/Resources/Prototypes/Entities/Mobs/base.yml +++ b/Resources/Prototypes/Entities/Mobs/base.yml @@ -212,7 +212,7 @@ - type: Respirator damage: types: - Asphyxiation: 2 + Asphyxiation: 0.5 # Sunrise-Casual damageRecovery: types: Asphyxiation: -1.0 diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/vulpkanin.yml index 8d22b35ab84..0e31488f1e5 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/vulpkanin.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/vulpkanin.yml @@ -35,7 +35,7 @@ - type: Respirator damage: types: - Asphyxiation: 1.0 + Asphyxiation: 0.5 damageRecovery: types: Asphyxiation: -1.0 diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml index 3027e5dd2b6..7eb475bd473 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml @@ -54,10 +54,10 @@ - type: Respirator damage: types: - Asphyxiation: 1.5 + Asphyxiation: 0.5 damageRecovery: types: - Asphyxiation: -1.5 + Asphyxiation: -1.0 - type: NpcFactionMember factions: - NanoTrasen diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml index a8e45394166..884f2d8665d 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml @@ -8,7 +8,7 @@ - type: Respirator damage: types: - Asphyxiation: 0.2 + Asphyxiation: 0.5 damageRecovery: types: Asphyxiation: -1.0 From 0b547932f1231c6f3f42acefcee2a7f15a68b8c5 Mon Sep 17 00:00:00 2001 From: VigersRay Date: Sat, 27 Jul 2024 01:13:26 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=A3=D0=BC=D0=B5=D0=BD=D1=8C=D1=88=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=83=D1=80=D0=BE=D0=BD=D0=B0=20=D0=BE?= =?UTF-8?q?=D1=82=20=D0=B4=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml | 2 +- Resources/Prototypes/Entities/Mobs/Species/base.yml | 3 +-- Resources/Prototypes/Entities/Mobs/Species/slime.yml | 3 +-- Resources/Prototypes/Entities/Mobs/base.yml | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index d14da1a8b38..2d169c89cb3 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -67,7 +67,7 @@ - type: Barotrauma damage: types: - Blunt: 0.45 + Blunt: 0.1 # Sunrise-Casual - type: Reactive groups: Flammable: [ Touch ] diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 2a6752a0129..2c184f26937 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -235,8 +235,7 @@ - type: Barotrauma damage: types: - Blunt: 0.50 #per second, scales with pressure and other constants. - Heat: 0.1 + Blunt: 0.1 # Sunrise-Casual - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute. allowedStates: - Alive diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 3424dbe4a0e..acb68cd867a 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -72,8 +72,7 @@ - type: Barotrauma damage: types: - Blunt: 0.50 #per second, scales with pressure and other constants. - Heat: 0.2 # 0.1 more than humans, i feel like low pressure would make slime boil more than blunt stretch them so i decided on this instead. + Blunt: 0.1 # Sunrise-Casual - type: Reactive groups: Flammable: [ Touch ] diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml index 7df6191c00b..863dd4e6fe6 100644 --- a/Resources/Prototypes/Entities/Mobs/base.yml +++ b/Resources/Prototypes/Entities/Mobs/base.yml @@ -184,7 +184,7 @@ - type: Barotrauma damage: types: - Blunt: 0.15 #per second, scales with pressure and other constants. + Blunt: 0.1 # Sunrise-Casual # Used for mobs that can be set on fire - type: entity