Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

- fix: Revert flammable changes. (#408)

Browse Source
This commit is contained in:
Aviu00
2024-07-01 13:27:22 +00:00
committed by GitHub
parent ddf9bea8a2
commit b24cff72c9
3 changed files with 65 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Content.Server/Atmos/Components/FlammableComponent.cs
View File

@@ -11,65 +11,49 @@ namespace Content.Server.Atmos.Components
[ViewVariables(VVAccess.ReadWrite)]
[DataField]
public bool OnFire;
public bool OnFire { get; set; }
[ViewVariables(VVAccess.ReadWrite)]
[DataField]
public float FireStacks;
public float FireStacks { get; set; }
[ViewVariables(VVAccess.ReadWrite)]
[DataField]
public float MaximumFireStacks = 10f;
[ViewVariables(VVAccess.ReadWrite)]
[DataField]
public float MinimumFireStacks = -10f;
[ViewVariables(VVAccess.ReadWrite)]
[DataField]
public string FlammableFixtureID = "flammable";
[ViewVariables(VVAccess.ReadWrite)]
[DataField]
public float MinIgnitionTemperature = 373.15f;
[ViewVariables(VVAccess.ReadWrite)]
[DataField]
[DataField("fireSpread")]
public bool FireSpread { get; private set; } = false;
[ViewVariables(VVAccess.ReadWrite)]
[DataField]
[DataField("canResistFire")]
public bool CanResistFire { get; private set; } = false;
[DataField(required: true)]
[DataField("damage", required: true)]
[ViewVariables(VVAccess.ReadWrite)]
public DamageSpecifier Damage = new(); // Empty by default, we don't want any funny NREs.
/// <summary>
/// Used for the fixture created to handle passing firestacks when two flammable objects collide.
/// </summary>
[DataField]
[DataField("flammableCollisionShape")]
public IPhysShape FlammableCollisionShape = new PhysShapeCircle(0.35f);
/// <summary>
/// Should the component be set on fire by interactions with isHot entities
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField]
[DataField("alwaysCombustible")]
public bool AlwaysCombustible = false;
/// <summary>
/// Can the component anyhow lose its FireStacks?
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField]
[DataField("canExtinguish")]
public bool CanExtinguish = true;
/// <summary>
/// How many firestacks should be applied to component when being set on fire?
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField]
[DataField("firestacksOnIgnite")]
public float FirestacksOnIgnite = 2.0f;
/// <summary>