From 233b493865d297f79d6cd0fd3fe35ed1698fd571 Mon Sep 17 00:00:00 2001 From: Ed Date: Tue, 17 Sep 2024 11:40:23 +0300 Subject: [PATCH] remove autoignite --- .../_CP14/Temperature/CP14AutoIgniteComponent.cs | 8 -------- Content.Server/_CP14/Temperature/CP14FireSpreadSystem.cs | 9 --------- Resources/Prototypes/_CP14/Entities/fire.yml | 6 +++--- 3 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 Content.Server/_CP14/Temperature/CP14AutoIgniteComponent.cs diff --git a/Content.Server/_CP14/Temperature/CP14AutoIgniteComponent.cs b/Content.Server/_CP14/Temperature/CP14AutoIgniteComponent.cs deleted file mode 100644 index 2f23c840be..0000000000 --- a/Content.Server/_CP14/Temperature/CP14AutoIgniteComponent.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Content.Server._CP14.Temperature; - -[RegisterComponent, Access(typeof(CP14FireSpreadSystem))] -public sealed partial class CP14AutoIgniteComponent : Component -{ - [DataField] - public float StartStack = 1f; -} diff --git a/Content.Server/_CP14/Temperature/CP14FireSpreadSystem.cs b/Content.Server/_CP14/Temperature/CP14FireSpreadSystem.cs index a72d54890c..66238afd71 100644 --- a/Content.Server/_CP14/Temperature/CP14FireSpreadSystem.cs +++ b/Content.Server/_CP14/Temperature/CP14FireSpreadSystem.cs @@ -26,7 +26,6 @@ public sealed partial class CP14FireSpreadSystem : EntitySystem public override void Initialize() { SubscribeLocalEvent(OnCompInit); - SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(OnFireChanged); } @@ -36,14 +35,6 @@ public sealed partial class CP14FireSpreadSystem : EntitySystem QueueDel(ent); } - private void OnMapInit(Entity ent, ref MapInitEvent args) - { - if (!TryComp(ent, out var flammable)) - return; - _flammable.AdjustFireStacks(ent, ent.Comp.StartStack, flammable); - _flammable.Ignite(ent, ent, flammable); - } - private void OnCompInit(Entity ent, ref OnFireChangedEvent args) { if (!args.OnFire) diff --git a/Resources/Prototypes/_CP14/Entities/fire.yml b/Resources/Prototypes/_CP14/Entities/fire.yml index 1e65ccd65e..c926627dd2 100644 --- a/Resources/Prototypes/_CP14/Entities/fire.yml +++ b/Resources/Prototypes/_CP14/Entities/fire.yml @@ -66,8 +66,8 @@ Heat: 0 - type: CP14FlammableEntityHeater - type: CP14FlammableSolutionHeater - - type: CP14Fireplace - fuel: 15 - - type: CP14AutoIgnite + #- type: CP14Fireplace + # fuel: 15 + #- type: CP14AutoIgnite - type: CP14FireSpread - type: CP14DespawnOnExtinguish \ No newline at end of file