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

Add buildable plastic flaps (#6583)

Browse Source 
Co-authored-by: fishfish458 <fishfish458>
This commit is contained in:
Fishfish458
2022-02-21 23:01:58 -06:00
committed by GitHub
parent 8d111c8959
commit df53d50721
19 changed files with 159 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Climbing/SharedClimbingComponent.cs
View File

@@ -23,7 +23,7 @@ namespace Content.Shared.Climbing
foreach (var entity in physicsComponent.GetBodiesIntersecting())
{
if ((entity.CollisionLayer & (int) CollisionGroup.SmallImpassable) != 0) return true;
if ((entity.CollisionLayer & (int) CollisionGroup.VaultImpassable) != 0) return true;
}
return false;
@@ -83,11 +83,11 @@ namespace Content.Shared.Climbing
{
if (value)
{
fixture.CollisionMask &= ~(int) CollisionGroup.SmallImpassable;
fixture.CollisionMask &= ~(int) CollisionGroup.VaultImpassable;
}
else
{
fixture.CollisionMask |= (int) CollisionGroup.SmallImpassable;
fixture.CollisionMask |= (int) CollisionGroup.VaultImpassable;
}
}
}

19
Content.Shared/Standing/StandingStateSystem.cs
View File

@@ -7,6 +7,8 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Player;
using Robust.Shared.Timing;
using Robust.Shared.Physics;
using Content.Shared.Physics;
namespace Content.Shared.Standing
{
@@ -62,6 +64,14 @@ namespace Content.Shared.Standing
// Seemed like the best place to put it
appearance?.SetData(RotationVisuals.RotationState, RotationState.Horizontal);
if (TryComp(uid, out FixturesComponent? fixtureComponent))
{
foreach (var fixture in fixtureComponent.Fixtures.Values)
{
fixture.CollisionMask &= ~(int) CollisionGroup.VaultImpassable;
}
}
// Currently shit is only downed by server but when it's predicted we can probably only play this on server / client
// > no longer true with door crushing. There just needs to be a better way to handle audio prediction.
if (playSound)
@@ -97,6 +107,15 @@ namespace Content.Shared.Standing
RaiseLocalEvent(uid, new StoodEvent(), false);
appearance?.SetData(RotationVisuals.RotationState, RotationState.Vertical);
if (TryComp(uid, out FixturesComponent? fixtureComponent))
{
foreach (var fixture in fixtureComponent.Fixtures.Values)
{
fixture.CollisionMask |= (int) CollisionGroup.VaultImpassable;
}
}
return true;
}
}