Buff heat and flame damage (#23238)

diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index f2434a54becf4e29157d0184e8d10380ffd2cb36..069429481c4331cb2a58b93f82811f32202b5357 100644 (file)
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -394,10 +394,9 @@ namespace Content.Server.Atmos.EntitySystems
                     EnsureComp<IgnitionSourceComponent>(uid);
                     _ignitionSourceSystem.SetIgnited(uid);
 
-                    // TODO FLAMMABLE: further balancing
-                    var damageScale = Math.Min((int)flammable.FireStacks, 5);
+                    var damageScale = MathF.Min(flammable.FireStacks, 5);
 
-                    if(TryComp(uid, out TemperatureComponent? temp))
+                    if (TryComp(uid, out TemperatureComponent? temp))
                         _temperatureSystem.ChangeHeat(uid, 12500 * damageScale, false, temp);
 
                     _damageableSystem.TryChangeDamage(uid, flammable.Damage * damageScale);

diff --git a/Content.Server/Lathe/Components/LatheHeatProducingComponent.cs b/Content.Server/Lathe/Components/LatheHeatProducingComponent.cs
index ea5912ad2fb33c1ce4e6fafc0b77b00b819bb562..9da535eed832b702b1e182234c5966375390bba0 100644 (file)
--- a/Content.Server/Lathe/Components/LatheHeatProducingComponent.cs
+++ b/Content.Server/Lathe/Components/LatheHeatProducingComponent.cs
@@ -14,7 +14,7 @@ public sealed partial class LatheHeatProducingComponent : Component
     /// The amount of energy produced each second when producing an item.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float EnergyPerSecond = 40000;
+    public float EnergyPerSecond = 30000;
 
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan NextSecond;

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 6ed65d685675f63fdfeb0d56076843b4d3c40089..8f8cb59d5efba66e57b24199adb8b913ddba7931 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1187,16 +1187,10 @@
       types:
         Piercing: 9
   - type: Temperature
-    heatDamageThreshold: 400
+    heatDamageThreshold: 360
     coldDamageThreshold: 285
     currentTemperature: 310.15
     specificHeat: 42
-    coldDamage:
-      types:
-        Cold : 0.1 #per second, scales with temperature & other constants
-    heatDamage:
-      types:
-        Heat : 0.1 #per second, scales with temperature & other constants
   - type: Sprite
     drawdepth: Mobs
     layers:

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
index 4c36efa1773c4f528b1b5cf329363e9b6a8bb19b..472daed59b7a271b91798ad905383ac4fd71814b 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
@@ -43,7 +43,7 @@
     canResistFire: true
     damage:
       types:
-        Heat: 3
+        Heat: 9
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Generic_mob_burning

diff --git a/Resources/Prototypes/Entities/Mobs/Player/terminator.yml b/Resources/Prototypes/Entities/Mobs/Player/terminator.yml
index 0867419f8b2c9d9a197a585daa0d488784d42d40..c65b367393ecc79b89e7665b334c9e1193e22b54 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Player/terminator.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/terminator.yml
@@ -47,7 +47,7 @@
   - type: Flammable
     damage:
       types:
-        Heat: 2.0
+        Heat: 6.0
   # slightly wider thresholds
   - type: Temperature
     heatDamageThreshold: 390

diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 9f1a146f7f58396e73c4b83c37278b317e1acb46..71a60e9aa4fb46cdcb955716884dbfc310155a66 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -266,7 +266,7 @@
   - type: Blindable
   # Other
   - type: Temperature
-    heatDamageThreshold: 360
+    heatDamageThreshold: 325
     coldDamageThreshold: 260
     currentTemperature: 310.15
     specificHeat: 42
@@ -275,7 +275,7 @@
         Cold: 0.1 #per second, scales with temperature & other constants
     heatDamage:
       types:
-        Heat: 0.1 #per second, scales with temperature & other constants
+        Heat: 1.5 #per second, scales with temperature & other constants
   - type: ThermalRegulator
     metabolismHeat: 800
     radiatedHeat: 100

diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index acb5abcda18a986beb758d18fc097dd2f6dc6458..5dc1fba97980565fa2a406a74b03c9e6e8f685e6 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -47,9 +47,9 @@
   - type: Flammable
     damage:
       types:
-        Heat: 1.5 # moths burn more easily
+        Heat: 4.5 # moths burn more easily
   - type: Temperature # Moths hate the heat and thrive in the cold.
-    heatDamageThreshold: 335
+    heatDamageThreshold: 320
     coldDamageThreshold: 230
     currentTemperature: 310.15
     specificHeat: 46
@@ -58,7 +58,7 @@
         Cold : 0.05 #per second, scales with temperature & other constants
     heatDamage:
       types:
-        Heat : 0.2 #per second, scales with temperature & other constants
+        Heat : 3 #per second, scales with temperature & other constants
   - type: Sprite # sprite again because we want different layer ordering
     noRot: true
     drawdepth: Mobs

diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
index 7d5f3cdddc33ac2a2010b770df02c978ad912764..b01f838119920e2ab10184fdf87daa1e108f8ce7 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -57,7 +57,7 @@
         Cold : 0.1 #per second, scales with temperature & other constants
     heatDamage:
       types:
-        Heat : 0.1 #per second, scales with temperature & other constants
+        Heat : 1.5 #per second, scales with temperature & other constants
 
 - type: entity
   parent: BaseSpeciesDummy

diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index 8fb534e9fa072896742ecb3ee2595c1f06c2cdab..788b14f322076e4de8e904a4d8fa3583c5ec31ef 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -114,7 +114,7 @@
   components:
   - type: AtmosExposed
   - type: Temperature
-    heatDamageThreshold: 360
+    heatDamageThreshold: 325
     coldDamageThreshold: 0
     currentTemperature: 310.15
     coldDamage: #per second, scales with temperature & other constants
@@ -123,7 +123,7 @@
     specificHeat: 42
     heatDamage: #per second, scales with temperature & other constants
       types:
-        Heat : 0.1
+        Heat : 1.5
   - type: ThermalRegulator
     metabolismHeat: 800
     radiatedHeat: 100
@@ -149,7 +149,7 @@
     normalBodyTemperature: 310.15
     thermalRegulationTemperatureThreshold: 25
   - type: Temperature
-    heatDamageThreshold: 360
+    heatDamageThreshold: 325
     coldDamageThreshold: 260
     currentTemperature: 310.15
     specificHeat: 42
@@ -158,7 +158,7 @@
         Cold: 1 #per second, scales with temperature & other constants
     heatDamage:
       types:
-        Heat: 1 #per second, scales with temperature & other constants
+        Heat: 1.5 #per second, scales with temperature & other constants
   - type: Barotrauma
     damage:
       types:
@@ -175,7 +175,7 @@
     canResistFire: true
     damage: #per second, scales with number of fire 'stacks'
       types:
-        Heat: 1
+        Heat: 3
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Generic_mob_burning

diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index 48b0068d9419ba1749a36210b5fecd34cc0b1d08..5f3f8bb5cb65d6a275df973b3807a7f1d703b6c3 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -54,7 +54,7 @@
         types: {}
       damage:
         types:
-          Heat: 1
+          Heat: 3
     - type: Reactive
       groups:
         Flammable: [Touch]
@@ -179,7 +179,7 @@
       fireSpread: true
       damage:
        types:
-         Heat: 1
+         Heat: 3
     - type: GrowingKudzu
       growthTickChance: 0.3
     - type: AtmosExposed

diff --git a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
index 0cba7656cb3c335fb01e0f83643618a61f66fd43..af65ac95a8a7c8338ab53592f6bb5e71c3c8ea33 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
@@ -66,7 +66,7 @@
         types: {}
       damage:
         types:
-          Heat: 1
+          Heat: 5
     - type: Reactive
       groups:
         Flammable: [Touch]
@@ -153,7 +153,7 @@
         types: {}
       damage:
         types:
-          Heat: 1
+          Heat: 5
     - type: Reactive
       groups:
         Flammable: [Touch]

diff --git a/Resources/Prototypes/Entities/Structures/barricades.yml b/Resources/Prototypes/Entities/Structures/barricades.yml
index a66376c0d9d64857c68f79094a0f97b47d09cd45..7f697519cd6bcb7709ceec60316f49244678ee8d 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/barricades.yml
+++ b/Resources/Prototypes/Entities/Structures/barricades.yml
@@ -59,7 +59,7 @@
     fireSpread: true
     damage:
       types:
-        Heat: 1 #per second, scales with number of fire 'stacks'
+        Heat: 3 #per second, scales with number of fire 'stacks'
   - type: Appearance
   - type: FireVisuals
     sprite: Effects/fire.rsi
@@ -107,7 +107,7 @@
     fireSpread: true
     damage:
       types:
-        Heat: 1 #per second, scales with number of fire 'stacks'
+        Heat: 3 #per second, scales with number of fire 'stacks'
   - type: Appearance
   - type: FireVisuals
     sprite: Effects/fire.rsi