tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor comp message removal (#6733)

Browse Source
This commit is contained in:
mirrorcult
2022-02-15 20:04:33 -07:00
committed by GitHub
parent 9d422d0762
commit e427381be6
9 changed files with 19 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Climbing/ClimbSystem.cs
View File

@@ -5,6 +5,7 @@ using Content.Server.Climbing.Components;
using Content.Server.Popups;
using Content.Server.Stunnable;
using Content.Shared.ActionBlocker;
using Content.Shared.Buckle.Components;
using Content.Shared.Climbing;
using Content.Shared.Damage;
using Content.Shared.GameTicking;
@@ -33,6 +34,7 @@ namespace Content.Server.Climbing
SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
SubscribeLocalEvent<ClimbableComponent, GetVerbsEvent<AlternativeVerb>>(AddClimbVerb);
SubscribeLocalEvent<ClimbingComponent, BuckleChangeEvent>(OnBuckleChange);
SubscribeLocalEvent<GlassTableComponent, ClimbedOnEvent>(OnGlassClimbed);
}
@@ -62,6 +64,12 @@ namespace Content.Server.Climbing
args.Verbs.Add(verb);
}
private void OnBuckleChange(EntityUid uid, ClimbingComponent component, BuckleChangeEvent args)
{
if (args.Buckling)
component.IsClimbing = false;
}
private void OnGlassClimbed(EntityUid uid, GlassTableComponent component, ClimbedOnEvent args)
{
_damageableSystem.TryChangeDamage(args.Climber, component.ClimberDamage);