diff --git a/Content.Server/Atmos/Components/FlammableComponent.cs b/Content.Server/Atmos/Components/FlammableComponent.cs index 1ca436d165..73718cdaa8 100644 --- a/Content.Server/Atmos/Components/FlammableComponent.cs +++ b/Content.Server/Atmos/Components/FlammableComponent.cs @@ -85,7 +85,7 @@ namespace Content.Server.Atmos.Components /// Determines how quickly the object will fade out. With positive values, the object will flare up instead of going out. /// [DataField, ViewVariables(VVAccess.ReadWrite)] - public float FirestackFade = -0.1f; + public float FirestackFade = -0.3f; // WWDP; 3.3 seconds per stack /// /// How stronger will firestack increases be? diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs index 72e46ba00f..9fdfc70ac0 100644 --- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs +++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs @@ -441,7 +441,7 @@ namespace Content.Server.Atmos.EntitySystems _ignitionSourceSystem.SetIgnited((uid, source)); if (TryComp(uid, out TemperatureComponent? temp)) - _temperatureSystem.ChangeHeat(uid, 12500 * flammable.FireStacks, false, temp); + _temperatureSystem.ChangeHeat(uid, 3000 * flammable.FireStacks, false, temp); // WWDP less heat var multiplier = 1f; if (!flammable.IgnoreFireProtection) diff --git a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs index a8bf4184ac..e8af5ed3df 100644 --- a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs +++ b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs @@ -74,7 +74,7 @@ public sealed class ThermalRegulatorSystem : EntitySystem // if body temperature is not within comfortable, thermal regulation // processes starts - if (tempDiff > ent.Comp1.ThermalRegulationTemperatureThreshold) + if (tempDiff <= ent.Comp1.ThermalRegulationTemperatureThreshold) // WWDP fix return; if (ent.Comp2.CurrentTemperature > ent.Comp1.NormalBodyTemperature) diff --git a/Content.Server/Temperature/Components/TemperatureComponent.cs b/Content.Server/Temperature/Components/TemperatureComponent.cs index ae2c373b14..8eb184e216 100644 --- a/Content.Server/Temperature/Components/TemperatureComponent.cs +++ b/Content.Server/Temperature/Components/TemperatureComponent.cs @@ -63,7 +63,7 @@ public sealed partial class TemperatureComponent : Component /// Okay it genuinely reaches this basically immediately for a plasma fire. /// [DataField, ViewVariables(VVAccess.ReadWrite)] - public FixedPoint2 DamageCap = FixedPoint2.New(8); + public FixedPoint2 DamageCap = FixedPoint2.New(1); // WWDP - its effectively just a damage multiplier /// /// Used to keep track of when damage starts/stops. Useful for logs. diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs index b8f430b6a4..f34f47c1a0 100644 --- a/Content.Server/Temperature/Systems/TemperatureSystem.cs +++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs @@ -312,8 +312,7 @@ public sealed class TemperatureSystem : EntitySystem } var diff = Math.Abs(temperature.CurrentTemperature - coldDamageThreshold); - var tempDamage = - Math.Sqrt(diff * (Math.Pow(temperature.DamageCap.Double(), 2) / coldDamageThreshold)); + var tempDamage = c / (1 + a * Math.Pow(Math.E, -heatK * diff)) - y; // WWDP _damageable.TryChangeDamage(uid, temperature.ColdDamage * tempDamage, ignoreResistances: true, interruptsDoAfters: false); } else if (temperature.TakingDamage) diff --git a/Content.Shared/Atmos/GetFireProtectionEvent.cs b/Content.Shared/Atmos/GetFireProtectionEvent.cs index e243295449..9947794220 100644 --- a/Content.Shared/Atmos/GetFireProtectionEvent.cs +++ b/Content.Shared/Atmos/GetFireProtectionEvent.cs @@ -28,6 +28,6 @@ public sealed class GetFireProtectionEvent : EntityEventArgs, IInventoryRelayEve /// public void Reduce(float by) { - Multiplier -= by; + Multiplier *= Math.Max(0, 1 - by); // WWDP } } diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs index 9eb3f607bb..94703966e8 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs @@ -427,12 +427,9 @@ public partial class SharedBodySystem var gibs = new HashSet(); // Todo: Kill this in favor of husking. - DropSlotContents((partId, part)); - RemovePartChildren((partId, part), bodyEnt); - foreach (var organ in GetPartOrgans(partId, part)) - _gibbingSystem.TryGibEntityWithRef(bodyEnt, organ.Id, GibType.Drop, GibContentsOption.Skip, - ref gibs, playAudio: false, launchImpulse: GibletLaunchImpulse, launchImpulseVariance: GibletLaunchImpulseVariance); - + // WWDP edit start + RemovePartChildren((partId, part), bodyEnt, dropChildren: false); + // WWDP edit end _gibbingSystem.TryGibEntityWithRef(partId, partId, GibType.Gib, GibContentsOption.Gib, ref gibs, playAudio: false, launchGibs: true, launchImpulse: GibletLaunchImpulse, launchImpulseVariance: GibletLaunchImpulseVariance); diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs index 695f199542..847404ac4f 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs @@ -176,7 +176,7 @@ public partial class SharedBodySystem RemovePartChildren(partEnt, bodyEnt, bodyEnt.Comp); } - protected void RemovePartChildren(Entity partEnt, EntityUid bodyEnt, BodyComponent? body = null) + protected void RemovePartChildren(Entity partEnt, EntityUid bodyEnt, BodyComponent? body = null, bool dropChildren = true) // WWDP edit { if (!Resolve(bodyEnt, ref body, logMissing: false)) return; @@ -192,7 +192,12 @@ public partial class SharedBodySystem { var ev = new BodyPartEnableChangedEvent(false); RaiseLocalEvent(childEntity, ref ev); - DropPart((childEntity, childPart)); + // WWDP edit start + if (dropChildren) + DropPart((childEntity, childPart)); + else + QueueDel(childEntity); + // WWDP edit end } } diff --git a/Resources/Prototypes/Body/Parts/arachnid.yml b/Resources/Prototypes/Body/Parts/arachnid.yml index d275bd91c6..14bee56f15 100644 --- a/Resources/Prototypes/Body/Parts/arachnid.yml +++ b/Resources/Prototypes/Body/Parts/arachnid.yml @@ -33,7 +33,7 @@ - type: entity id: HeadArachnid name: "arachnid head" - parent: [PartArachnid, BaseHead] + parent: [BaseHead, PartArachnid] # WWDP components: - type: Sprite sprite: Mobs/Species/Arachnid/parts.rsi diff --git a/Resources/Prototypes/Body/Parts/base.yml b/Resources/Prototypes/Body/Parts/base.yml index e2a0f8e4ad..0545608598 100644 --- a/Resources/Prototypes/Body/Parts/base.yml +++ b/Resources/Prototypes/Body/Parts/base.yml @@ -40,7 +40,7 @@ - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 200 + damage: 400 # WWDP behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true @@ -85,7 +85,7 @@ - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 400 + damage: 1500 # WWDP same as MobDamageable behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true @@ -124,6 +124,37 @@ types: Blunt: 5 staminaCost: 5 + # WWDP edit start + - type: Destructible + thresholds: + - trigger: + !type:DamageTypeTrigger + damageType: Blunt + damage: 150 + behaviors: + - !type:GibPartBehavior { } + - trigger: + !type:DamageTypeTrigger + damageType: Slash + damage: 250 + behaviors: + - !type:GibPartBehavior { } + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 1500 + behaviors: + - !type:SpawnEntitiesBehavior + spawnInContainer: true + spawn: + Ash: + min: 1 + max: 1 + - !type:BurnBodyBehavior { } + - !type:PlaySoundBehavior + sound: + collection: MeatLaserImpact + # WWDP edit end - type: entity id: BaseLeftArm diff --git a/Resources/Prototypes/Body/Parts/diona.yml b/Resources/Prototypes/Body/Parts/diona.yml index 5257512aaa..1b2a14947a 100644 --- a/Resources/Prototypes/Body/Parts/diona.yml +++ b/Resources/Prototypes/Body/Parts/diona.yml @@ -18,7 +18,7 @@ - type: entity id: HeadDiona name: "diona head" - parent: [PartDiona, BaseHead] + parent: [BaseHead, PartDiona] # WWDP components: - type: Sprite state: "head_m" diff --git a/Resources/Prototypes/Body/Parts/gingerbread.yml b/Resources/Prototypes/Body/Parts/gingerbread.yml index 661835ab84..db1dd86902 100644 --- a/Resources/Prototypes/Body/Parts/gingerbread.yml +++ b/Resources/Prototypes/Body/Parts/gingerbread.yml @@ -31,7 +31,7 @@ - type: entity id: HeadGingerbread name: "gingerbread head" - parent: [PartGingerbread, BaseHead] + parent: [BaseHead, PartGingerbread] # WWDP components: - type: Sprite sprite: Mobs/Species/Gingerbread/parts.rsi diff --git a/Resources/Prototypes/Body/Parts/human.yml b/Resources/Prototypes/Body/Parts/human.yml index a1510fcdbb..195f895277 100644 --- a/Resources/Prototypes/Body/Parts/human.yml +++ b/Resources/Prototypes/Body/Parts/human.yml @@ -33,7 +33,7 @@ - type: entity id: HeadHuman name: "human head" - parent: [PartHuman, BaseHead] + parent: [BaseHead, PartHuman] # WWDP components: - type: Sprite sprite: Mobs/Species/Human/parts.rsi diff --git a/Resources/Prototypes/Body/Parts/moth.yml b/Resources/Prototypes/Body/Parts/moth.yml index bb96430383..701ef115fd 100644 --- a/Resources/Prototypes/Body/Parts/moth.yml +++ b/Resources/Prototypes/Body/Parts/moth.yml @@ -34,7 +34,7 @@ - type: entity id: HeadMoth name: "moth head" - parent: [PartMoth, BaseHead] + parent: [BaseHead, PartMoth] # WWDP components: - type: Sprite sprite: Mobs/Species/Moth/parts.rsi diff --git a/Resources/Prototypes/Body/Parts/plasmaman.yml b/Resources/Prototypes/Body/Parts/plasmaman.yml index 2fdec53085..96bb9020f4 100644 --- a/Resources/Prototypes/Body/Parts/plasmaman.yml +++ b/Resources/Prototypes/Body/Parts/plasmaman.yml @@ -35,7 +35,7 @@ - type: entity id: HeadPlasmaman name: plasmaman head - parent: [PartPlasmaman, BaseHead] + parent: [BaseHead, PartPlasmaman] # WWDP components: - type: Sprite state: head_m diff --git a/Resources/Prototypes/Body/Parts/reptilian.yml b/Resources/Prototypes/Body/Parts/reptilian.yml index a299636352..2d1fc2301a 100644 --- a/Resources/Prototypes/Body/Parts/reptilian.yml +++ b/Resources/Prototypes/Body/Parts/reptilian.yml @@ -33,7 +33,7 @@ - type: entity id: HeadReptilian name: "reptilian head" - parent: [PartReptilian, BaseHead] + parent: [BaseHead, PartReptilian] # WWDP components: - type: Sprite sprite: Mobs/Species/Reptilian/parts.rsi diff --git a/Resources/Prototypes/Body/Parts/slime.yml b/Resources/Prototypes/Body/Parts/slime.yml index 4b0e94b008..87b0df3a17 100644 --- a/Resources/Prototypes/Body/Parts/slime.yml +++ b/Resources/Prototypes/Body/Parts/slime.yml @@ -17,12 +17,12 @@ - type: entity id: HeadSlime name: "slime head" - parent: [PartSlime, BaseHead] + parent: [BaseHead, PartSlime] # WWDP components: - type: Sprite sprite: Mobs/Species/Slime/parts.rsi state: "head_m" - + - type: entity id: LeftArmSlime name: "left slime arm" diff --git a/Resources/Prototypes/DeltaV/Body/Parts/chitinid.yml b/Resources/Prototypes/DeltaV/Body/Parts/chitinid.yml index 507ba70f48..d91492559b 100644 --- a/Resources/Prototypes/DeltaV/Body/Parts/chitinid.yml +++ b/Resources/Prototypes/DeltaV/Body/Parts/chitinid.yml @@ -35,7 +35,7 @@ - type: entity id: HeadChitinid name: "chitinid head" - parent: [PartChitinidBase, BaseHead] + parent: [BaseHead, PartChitinidBase] # WWDP components: - type: Sprite state: "head_m" diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml index b9defd5fcd..d9f06a2814 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml @@ -47,7 +47,7 @@ - type: Clothing sprite: DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP - type: Armor modifiers: coefficients: @@ -65,7 +65,7 @@ - type: Clothing sprite: DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP - type: Armor # MAKE SURE THE STATS ALIGN WITH SEC WINTER COAT!!! modifiers: coefficients: @@ -86,7 +86,7 @@ - type: Clothing sprite: DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP - type: Armor modifiers: coefficients: @@ -104,7 +104,7 @@ - type: Clothing sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP - type: Armor modifiers: coefficients: @@ -134,7 +134,7 @@ - state: equipped-OUTERCLOTHING-unshaded shader: unshaded - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP - type: Armor modifiers: coefficients: @@ -152,7 +152,7 @@ - type: Clothing sprite: DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP - type: entity parent: ClothingOuterStorageBase @@ -165,5 +165,5 @@ - type: Clothing sprite: DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml index 091013fc9d..1c7aa8e526 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml @@ -91,7 +91,7 @@ - type: Damageable damageModifierSet: Vulpkanin - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP - type: Vocal sounds: Male: MaleVulpkanin diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index 17b50c3214..1bf42b7c9e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -197,7 +197,7 @@ highPressureMultiplier: 0.3 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.2 # WWDP - type: FireProtection reduction: 0.2 - type: IgniteFromGasImmunity diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index bef349c516..94dc3bea00 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -59,7 +59,9 @@ highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.005 + coefficient: 0.1 # WWDP + - type: FireProtection # WWDP + reduction: 1 #Engineering Hardsuit - type: entity @@ -108,6 +110,8 @@ - type: PressureProtection highPressureMultiplier: 0.1 lowPressureMultiplier: 1000 + - type: FireProtection # WWDP + reduction: 1 #Spationaut Hardsuit - type: entity @@ -178,6 +182,8 @@ - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 + - type: FireProtection # WWDP + reduction: 1 - type: Armor modifiers: coefficients: @@ -568,7 +574,7 @@ - Snout - Hair - type: TemperatureProtection - coefficient: 0.005 + coefficient: 0.1 # WWDP - type: FireProtection reduction: 0.2 - type: Armor @@ -818,6 +824,8 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 + - type: FireProtection # WWDP + reduction: 1 #ERT Medical Hardsuit - type: entity @@ -937,7 +945,7 @@ highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.005 + coefficient: 0.1 # WWDP - type: Armor modifiers: coefficients: diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index e3f2847561..92ec7c4fe5 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -249,7 +249,7 @@ quickEquip: true - type: IngestionBlocker - type: TemperatureProtection - coefficient: 0.005 + coefficient: 0.1 # WWDP - type: FireProtection reduction: 0.15 # not fully sealed so less protection - type: IdentityBlocker @@ -277,9 +277,9 @@ quickEquip: true - type: IngestionBlocker - type: TemperatureProtection - coefficient: 0.005 + coefficient: 0.1 # WWDP - type: FireProtection - reduction: 0.2 + reduction: 0.4 # WWDP - type: PressureProtection highPressureMultiplier: 0.25 lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 25398ca0cd..12eba3369d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -134,9 +134,9 @@ highPressureMultiplier: 0.3 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.01 + coefficient: 0.2 # WWDP - type: FireProtection - reduction: 0.75 # almost perfectly sealed, atmos firesuit is better + reduction: 0.5 # WWDP - type: IgniteFromGasImmunity parts: - Torso @@ -324,7 +324,7 @@ highPressureMultiplier: 0.6 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.01 # Not complete protection from fire + coefficient: 0.2 # WWDP - type: IgniteFromGasImmunity parts: - Torso diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 977922509c..3e4f3baa62 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -9,7 +9,7 @@ - type: Clothing sprite: Clothing/OuterClothing/Coats/bomber.rsi - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.7 # WWDP - type: entity parent: [ClothingOuterStorageBase, AllowSuitStorageClothing] @@ -151,7 +151,7 @@ - type: Clothing sprite: Clothing/OuterClothing/Coats/trenchcoat.rsi - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.7 # WWDP - type: Armor modifiers: coefficients: diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 253a66b51e..0caf2f1069 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -48,9 +48,9 @@ highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.001 + coefficient: 0.1 # WWDP - type: FireProtection - reduction: 1 + reduction: 0.5 # WWDP, most protection is on the helmet - type: ExplosionResistance damageCoefficient: 0.5 - type: Armor @@ -129,9 +129,9 @@ - type: GuideHelp guides: [ HephaestusIndustries ] - type: TemperatureProtection - coefficient: 0.001 + coefficient: 0.1 # WWDP - type: FireProtection - reduction: 1 + reduction: 0.5 # WWDP, most protection is on the helmet #Spationaut Hardsuit - type: entity @@ -209,7 +209,7 @@ - type: Clothing sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.2 # WWDP - type: PressureProtection highPressureMultiplier: 0.5 lowPressureMultiplier: 1000 @@ -258,9 +258,9 @@ - type: ExplosionResistance damageCoefficient: 0.2 - type: TemperatureProtection - coefficient: 0.001 + coefficient: 0.1 # WWDP - type: FireProtection - reduction: 1 + reduction: 0.5 # WWDP, most protection is on the helmet - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitMaxim - type: GuideHelp @@ -443,9 +443,9 @@ - type: GuideHelp guides: [ HephaestusIndustries ] - type: TemperatureProtection - coefficient: 0.001 + coefficient: 0.1 # WWDP - type: FireProtection - reduction: 1 + reduction: 0.5 # WWDP, most protection is on the helmet #Chief Medical Officer's Hardsuit - type: entity @@ -709,7 +709,7 @@ highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.001 + coefficient: 0.1 # WWDP - type: ExplosionResistance damageCoefficient: 0.2 - type: Armor @@ -1040,9 +1040,9 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitERTEngineer - type: TemperatureProtection - coefficient: 0.001 + coefficient: 0.1 # WWDP - type: FireProtection - reduction: 1 + reduction: 0.5 # WWDP, most protection is on the helmet #WWDP edit delete StaminaDamageResistance #ERT Medic Hardsuit @@ -1126,7 +1126,7 @@ highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.001 + coefficient: 0.1 # WWDP - type: ExplosionResistance damageCoefficient: 0.7 - type: Armor diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index ae954a293b..b475a78a5a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -333,7 +333,7 @@ - state: equipped-OUTERCLOTHING-lines color: "#000000" - type: TemperatureProtection - coefficient: 0.3 + coefficient: 0.7 # WWDP - type: entity parent: ClothingOuterBase @@ -369,7 +369,7 @@ - state: equipped-OUTERCLOTHING-lines color: "#000000" - type: TemperatureProtection - coefficient: 0.3 + coefficient: 0.7 # WWDP - type: entity parent: ClothingOuterBase @@ -405,7 +405,7 @@ - state: equipped-OUTERCLOTHING-lines color: "#000000" - type: TemperatureProtection - coefficient: 0.3 + coefficient: 0.7 # WWDP - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 81afd8d975..8946c1e7cb 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -68,7 +68,7 @@ - type: PressureProtection highPressureMultiplier: 0.04 - type: TemperatureProtection - coefficient: 0.005 + coefficient: 0.1 # WWDP - type: FireProtection reduction: 0.65 # doesnt have a full seal so not as good - type: Armor @@ -104,9 +104,9 @@ highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.001 + coefficient: 0.1 # WWDP - type: FireProtection - reduction: 0.8 # atmos firesuit offers best protection, hardsuits are a little vulnerable + reduction: 0.85 # WWDP - type: Armor modifiers: coefficients: @@ -173,7 +173,7 @@ highPressureMultiplier: 0.6 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.01 + coefficient: 0.1 # WWDP - type: Armor modifiers: coefficients: @@ -319,7 +319,7 @@ highPressureMultiplier: 0.6 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.01 + coefficient: 0.1 # WWDP - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitCarp diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 5839925166..40a7a35b65 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -9,7 +9,7 @@ - type: Clothing sprite: Clothing/OuterClothing/WinterCoats/coat.rsi - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP - type: Item size: Normal - type: Armor diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index decfb678a1..a4ac860ad7 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -310,10 +310,10 @@ specificHeat: 42 coldDamage: types: - Cold: 0.1 #per second, scales with temperature & other constants + Cold: 1 #per second, scales with temperature & other constants # WWDP heatDamage: types: - Heat: 1.5 #per second, scales with temperature & other constants + Heat: 1 #per second, scales with temperature & other constants # WWDP - type: TemperatureSpeed thresholds: 293: 0.8 @@ -326,7 +326,7 @@ sweatHeatRegulation: 2000 shiveringHeatRegulation: 2000 normalBodyTemperature: 310.15 - thermalRegulationTemperatureThreshold: 25 + thermalRegulationTemperatureThreshold: 10 # WWDP - type: Perishable - type: Butcherable butcheringType: Spike # TODO human. diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index 9e98752e77..cf7fb7665f 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -71,7 +71,7 @@ sweatHeatRegulation: 2000 shiveringHeatRegulation: 2000 normalBodyTemperature: 310.15 - thermalRegulationTemperatureThreshold: 25 + thermalRegulationTemperatureThreshold: 10 # WWDP - type: Perishable - type: FireVisuals alternateState: Standing diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml index b81e4b525e..3d0a1de083 100644 --- a/Resources/Prototypes/Entities/Mobs/base.yml +++ b/Resources/Prototypes/Entities/Mobs/base.yml @@ -163,7 +163,7 @@ sweatHeatRegulation: 2000 shiveringHeatRegulation: 2000 normalBodyTemperature: 310.15 - thermalRegulationTemperatureThreshold: 25 + thermalRegulationTemperatureThreshold: 10 # WWDP - type: MovedByPressure # Used for mobs that require regular atmospheric conditions. @@ -179,7 +179,7 @@ sweatHeatRegulation: 500 shiveringHeatRegulation: 500 normalBodyTemperature: 310.15 - thermalRegulationTemperatureThreshold: 25 + thermalRegulationTemperatureThreshold: 10 # WWDP - type: Temperature heatDamageThreshold: 325 coldDamageThreshold: 260 @@ -190,7 +190,7 @@ Cold: 1 #per second, scales with temperature & other constants heatDamage: types: - Heat: 1.5 #per second, scales with temperature & other constants + Heat: 1 #per second, scales with temperature & other constants # WWDP less damage - type: Barotrauma damage: types: @@ -207,7 +207,7 @@ canResistFire: true damage: #per second, scales with number of fire 'stacks' types: - Heat: 1.5 + Heat: 1 # WWDP - type: FireVisuals sprite: Mobs/Effects/onfire.rsi normalState: Generic_mob_burning diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml index 75f8c7ddd0..76f31e5ad8 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml @@ -16,7 +16,7 @@ Piercing: 0.8 Heat: 0.8 - type: TemperatureProtection - coefficient: 0.3 + coefficient: 0.5 # WWDP - type: entity parent: ClothingOuterStorageToggleableBase diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/misc.yml index 090a1a86f0..729fb0c1ec 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/misc.yml @@ -9,7 +9,7 @@ - type: Clothing sprite: Nyanotrasen/Clothing/Misc/letterman_jacket_blue.rsi - type: TemperatureProtection - coefficient: 0.4 + coefficient: 0.7 # WWDP - type: entity parent: ClothingOuterStorageBase @@ -22,7 +22,7 @@ - type: Clothing sprite: Nyanotrasen/Clothing/Misc/letterman_jacket_red.rsi - type: TemperatureProtection - coefficient: 0.4 + coefficient: 0.7 # WWDP ## mnk - type: entity @@ -36,7 +36,7 @@ - type: Clothing sprite: Nyanotrasen/Clothing/Misc/hoodie_white.rsi - type: TemperatureProtection - coefficient: 0.4 + coefficient: 0.7 # WWDP - type: entity parent: ClothingOuterStorageBase id: ClothingOuterCoatMNKBlackTopCoat @@ -48,7 +48,7 @@ - type: Clothing sprite: Nyanotrasen/Clothing/Misc/black_top_coat.rsi - type: TemperatureProtection - coefficient: 0.4 + coefficient: 0.5 # WWDP - type: entity parent: ClothingOuterStorageBase id: ClothingOuterCoatMNKBlackJacket @@ -60,7 +60,7 @@ - type: Clothing sprite: Nyanotrasen/Clothing/Misc/black_jacket.rsi - type: TemperatureProtection - coefficient: 0.2 + coefficient: 0.5 # WWDP - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml index 40116418b8..2f29730bf9 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml @@ -9,7 +9,7 @@ - type: Clothing sprite: Nyanotrasen/Clothing/OuterClothing/Robes/brown.rsi - type: TemperatureProtection - coefficient: 0.2 + coefficient: 0.5 # WWDP - type: entity parent: ClothingOuterBase @@ -22,4 +22,4 @@ - type: Clothing sprite: Nyanotrasen/Clothing/OuterClothing/Robes/techpriest.rsi - type: TemperatureProtection - coefficient: 0.2 + coefficient: 0.5 # WWDP diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml index 75bfa3355b..e68c92d250 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml @@ -9,7 +9,7 @@ - type: Clothing sprite: Nyanotrasen/Clothing/OuterClothing/WinterCoats/hyenh.rsi - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP - type: entity parent: ClothingOuterWinterCoat diff --git a/Resources/Prototypes/WhiteDream/Entities/Clothing/Cult/armor.yml b/Resources/Prototypes/WhiteDream/Entities/Clothing/Cult/armor.yml index fdaca46eee..b32e91ef89 100644 --- a/Resources/Prototypes/WhiteDream/Entities/Clothing/Cult/armor.yml +++ b/Resources/Prototypes/WhiteDream/Entities/Clothing/Cult/armor.yml @@ -26,7 +26,7 @@ - type: ExplosionResistance damageCoefficient: 0.5 - type: TemperatureProtection - coefficient: 0.001 + coefficient: 0.1 # WWDP - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetCultArmor - type: CultItem diff --git a/Resources/Prototypes/_EE/Body/Parts/tajaran.yml b/Resources/Prototypes/_EE/Body/Parts/tajaran.yml index 4115f2bf98..647bad63e2 100644 --- a/Resources/Prototypes/_EE/Body/Parts/tajaran.yml +++ b/Resources/Prototypes/_EE/Body/Parts/tajaran.yml @@ -32,7 +32,7 @@ - type: entity id: HeadTajaran name: "Tajaran head" - parent: [PartTajaran, BaseHead] + parent: [BaseHead, PartTajaran] # WWDP components: - type: Sprite sprite: _EE/Mobs/Species/Tajaran/parts.rsi diff --git a/Resources/Prototypes/_EE/Body/Parts/xelthia.yml b/Resources/Prototypes/_EE/Body/Parts/xelthia.yml index 6843190a2a..6a74ea276f 100644 --- a/Resources/Prototypes/_EE/Body/Parts/xelthia.yml +++ b/Resources/Prototypes/_EE/Body/Parts/xelthia.yml @@ -31,7 +31,7 @@ - type: entity id: HeadXelthia name: "xelthia head" - parent: [PartXelthia, BaseHead] + parent: [BaseHead, PartXelthia] # WWDP components: - type: Sprite sprite: _EE/Mobs/Species/Xelthia/parts.rsi diff --git a/Resources/Prototypes/_EE/Entities/Clothing/BieselRepublic/outerwear.yml b/Resources/Prototypes/_EE/Entities/Clothing/BieselRepublic/outerwear.yml index f85e161416..904365f913 100644 --- a/Resources/Prototypes/_EE/Entities/Clothing/BieselRepublic/outerwear.yml +++ b/Resources/Prototypes/_EE/Entities/Clothing/BieselRepublic/outerwear.yml @@ -103,4 +103,4 @@ Piercing: 0.95 Heat: 0.85 - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP diff --git a/Resources/Prototypes/_EE/Entities/Clothing/Zavodskoi/outerwear.yml b/Resources/Prototypes/_EE/Entities/Clothing/Zavodskoi/outerwear.yml index 4e4e736e9b..df45a7dcd4 100644 --- a/Resources/Prototypes/_EE/Entities/Clothing/Zavodskoi/outerwear.yml +++ b/Resources/Prototypes/_EE/Entities/Clothing/Zavodskoi/outerwear.yml @@ -17,7 +17,7 @@ Piercing: 0.95 Heat: 0.85 - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP - type: entity parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, ZavodInfo] @@ -38,7 +38,7 @@ Piercing: 0.95 Heat: 0.85 - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP - type: entity parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, ZavodInfo] @@ -59,4 +59,4 @@ Piercing: 0.95 Heat: 0.85 - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml index 02867bb4db..1a26d071ba 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml @@ -65,7 +65,7 @@ Piercing: 0.65 Heat: 0.70 - type: TemperatureProtection - coefficient: 0.1 + coefficient: 0.5 # WWDP - type: entity parent: [ClothingOuterStorageFoldableBaseOpened, ClothingBlueshieldArmoredCoat] diff --git a/Resources/Prototypes/_Impstation/Body/Parts/thaven.yml b/Resources/Prototypes/_Impstation/Body/Parts/thaven.yml index c297575f8e..15a810d1a9 100644 --- a/Resources/Prototypes/_Impstation/Body/Parts/thaven.yml +++ b/Resources/Prototypes/_Impstation/Body/Parts/thaven.yml @@ -20,7 +20,7 @@ - type: entity id: HeadThaven name: "thaven head" - parent: [PartThaven, BaseHead] + parent: [BaseHead, PartThaven] # WWDP components: - type: Sprite state: "head" diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/kobold.yml b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/kobold.yml index 5493846e35..faa6c002a5 100644 --- a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/kobold.yml +++ b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/kobold.yml @@ -33,7 +33,7 @@ - type: entity id: HeadKobold name: "kobold head" - parent: [PartKobold, BaseHead] + parent: [BaseHead, PartKobold] # WWDP components: - type: Sprite sprite: Mobs/Animals/kobold.rsi diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/monkey.yml b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/monkey.yml index 01b8aa4de8..b15333a74d 100644 --- a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/monkey.yml +++ b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/monkey.yml @@ -33,7 +33,7 @@ - type: entity id: HeadMonkey name: "monkey head" - parent: [PartMonkey, BaseHead] + parent: [BaseHead, PartMonkey] # WWDP components: - type: Sprite sprite: Mobs/Animals/monkey.rsi diff --git a/Resources/Prototypes/_Shitmed/Body/Parts/animal.yml b/Resources/Prototypes/_Shitmed/Body/Parts/animal.yml index 91c452ee96..d48e2a2499 100644 --- a/Resources/Prototypes/_Shitmed/Body/Parts/animal.yml +++ b/Resources/Prototypes/_Shitmed/Body/Parts/animal.yml @@ -1,6 +1,6 @@ # Monkey head for borging/transplanting pun pun - type: entity - parent: [PartAnimal, BaseHead] + parent: [BaseHead, PartAnimal] # WWDP id: HeadAnimal name: animal head categories: [ HideSpawnMenu ] diff --git a/Resources/Prototypes/_White/Body/Parts/resomi.yml b/Resources/Prototypes/_White/Body/Parts/resomi.yml index 4701a7c4cf..f4ac1dfb98 100644 --- a/Resources/Prototypes/_White/Body/Parts/resomi.yml +++ b/Resources/Prototypes/_White/Body/Parts/resomi.yml @@ -32,7 +32,7 @@ - type: entity id: HeadResomi name: "resomi head" - parent: [PartHuman, BaseHead] + parent: [BaseHead, PartHuman] components: - type: Sprite sprite: _White/Mobs/Species/Resomi/parts.rsi