This commit is contained in:
metalgearsloth
2023-01-18 05:25:32 +11:00
committed by GitHub
parent 4456229836
commit 6c9ce79387
27 changed files with 405 additions and 22 deletions

View File

@@ -10,6 +10,7 @@ using Content.Shared.Body.Part;
using Content.Shared.Buckle.Components;
using Content.Shared.CCVar;
using Content.Shared.Climbing;
using Content.Shared.Climbing.Events;
using Content.Shared.Damage;
using Content.Shared.DragDrop;
using Content.Shared.GameTicking;
@@ -280,6 +281,8 @@ public sealed class ClimbSystem : SharedClimbSystem
climbing.IsClimbing = false;
climbing.OwnerIsTransitioning = false;
var ev = new EndClimbEvent();
RaiseLocalEvent(uid, ref ev);
Dirty(climbing);
}

View File

@@ -14,7 +14,7 @@ namespace Content.Server.Damage.Systems
SubscribeLocalEvent<DamageOnLandComponent, LandEvent>(DamageOnLand);
}
private void DamageOnLand(EntityUid uid, DamageOnLandComponent component, LandEvent args)
private void DamageOnLand(EntityUid uid, DamageOnLandComponent component, ref LandEvent args)
{
_damageableSystem.TryChangeDamage(uid, component.Damage, component.IgnoreResistances);
}

View File

@@ -40,7 +40,7 @@ namespace Content.Server.Dice
Roll(uid, component);
}
private void OnLand(EntityUid uid, DiceComponent component, LandEvent args)
private void OnLand(EntityUid uid, DiceComponent component, ref LandEvent args)
{
Roll(uid, component);
}

View File

@@ -95,7 +95,7 @@ public sealed class SpillableSystem : EntitySystem
: SpillAt(solution, transformComponent.Coordinates, prototype, sound: sound, combine: combine);
}
private void SpillOnLand(EntityUid uid, SpillableComponent component, LandEvent args)
private void SpillOnLand(EntityUid uid, SpillableComponent component, ref LandEvent args)
{
if (!_solutionContainerSystem.TryGetSolution(uid, component.SolutionName, out var solution)) return;

View File

@@ -25,7 +25,7 @@ namespace Content.Server.Light.EntitySystems
SetState(uid, bulb.State, bulb);
}
private void HandleLand(EntityUid uid, LightBulbComponent bulb, LandEvent args)
private void HandleLand(EntityUid uid, LightBulbComponent bulb, ref LandEvent args)
{
PlayBreakSound(uid, bulb);
SetState(uid, LightBulbState.Broken, bulb);

View File

@@ -154,7 +154,7 @@ namespace Content.Server.Nutrition.EntitySystems
args.Handled = TryDrink(args.User, args.User, component);
}
private void HandleLand(EntityUid uid, DrinkComponent component, LandEvent args)
private void HandleLand(EntityUid uid, DrinkComponent component, ref LandEvent args)
{
if (component.Pressurized &&
!component.Opened &&

View File

@@ -0,0 +1,23 @@
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
namespace Content.Server.Tiles;
/// <summary>
/// Applies flammable and damage while vaulting.
/// </summary>
[RegisterComponent, Access(typeof(LavaSystem))]
public sealed class LavaComponent : Component
{
/// <summary>
/// Sound played if something disintegrates in lava.
/// </summary>
[ViewVariables(VVAccess.ReadWrite), DataField("soundDisintegration")]
public SoundSpecifier DisintegrationSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg");
/// <summary>
/// How many fire stacks are applied per second.
/// </summary>
[ViewVariables(VVAccess.ReadWrite), DataField("fireStacks")]
public float FireStacks = 2f;
}

View File

@@ -0,0 +1,39 @@
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.StepTrigger.Systems;
namespace Content.Server.Tiles;
public sealed class LavaSystem : EntitySystem
{
[Dependency] private readonly FlammableSystem _flammable = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<LavaComponent, StepTriggeredEvent>(OnLavaStepTriggered);
SubscribeLocalEvent<LavaComponent, StepTriggerAttemptEvent>(OnLavaStepTriggerAttempt);
}
private void OnLavaStepTriggerAttempt(EntityUid uid, LavaComponent component, ref StepTriggerAttemptEvent args)
{
if (!HasComp<FlammableComponent>(args.Tripper))
return;
args.Continue = true;
}
private void OnLavaStepTriggered(EntityUid uid, LavaComponent component, ref StepTriggeredEvent args)
{
var otherUid = args.Tripper;
if (TryComp<FlammableComponent>(otherUid, out var flammable))
{
// Apply the fury of a thousand suns
var multiplier = flammable.FireStacks == 0f ? 5f : 1f;
_flammable.AdjustFireStacks(otherUid, component.FireStacks * multiplier, flammable);
_flammable.Ignite(otherUid, flammable);
}
}
}

View File

@@ -14,7 +14,7 @@ public sealed class ArtifactLandSystem : EntitySystem
SubscribeLocalEvent<ArtifactLandTriggerComponent, LandEvent>(OnLand);
}
private void OnLand(EntityUid uid, ArtifactLandTriggerComponent component, LandEvent args)
private void OnLand(EntityUid uid, ArtifactLandTriggerComponent component, ref LandEvent args)
{
_artifact.TryActivateArtifact(uid, args.User);
}