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

Merge branch 'master' into replace-sounds-with-sound-specifier

Browse Source 
# Conflicts:
#	Content.Server/Actions/Actions/DisarmAction.cs
#	Content.Server/Actions/Actions/ScreamAction.cs
#	Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
#	Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs
#	Content.Server/Explosion/Components/FlashExplosiveComponent.cs
#	Content.Server/Physics/Controllers/MoverController.cs
#	Content.Server/Portal/Components/PortalComponent.cs
#	Content.Server/Portal/Components/TeleporterComponent.cs
#	Content.Server/Projectiles/Components/ProjectileComponent.cs
#	Content.Server/Singularity/Components/EmitterComponent.cs
#	Content.Server/Sound/EmitSoundSystem.cs
#	Content.Server/Stunnable/Components/StunbatonComponent.cs
#	Content.Server/Tools/Components/MultitoolComponent.cs
#	Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
#	Content.Shared/Gravity/GravityComponent.cs
#	Content.Shared/Light/Component/SharedExpendableLightComponent.cs
#	Content.Shared/Maps/ContentTileDefinition.cs
#	Content.Shared/Slippery/SlipperyComponent.cs
#	Content.Shared/Standing/StandingStateComponent.cs
#	Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
This commit is contained in:
Galactic Chimp
2021-07-25 14:12:00 +02:00
parent f3ef50c1d9 10af8efc0e
commit f531c65a0b
4171 changed files with 15603 additions and 14404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/Flash/Components/FlashOnTriggerComponent.cs Normal file
View File

@@ -0,0 +1,19 @@
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Server.Flash.Components
{
/// <summary>
/// Upon being triggered will flash in an area around it.
/// </summary>
[RegisterComponent]
internal sealed class FlashOnTriggerComponent : Component
{
public override string Name => "FlashOnTrigger";
[DataField("range")] internal float Range = 1.0f;
[DataField("duration")] internal float Duration = 8.0f;
internal bool Flashed;
}
}

39
Content.Server/Flash/Components/FlashProjectileComponent.cs
View File

@@ -1,39 +0,0 @@
using Content.Server.Projectiles.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.Physics.Collision;
using Robust.Shared.Physics.Dynamics;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Server.Flash.Components
{
/// <summary>
/// Upon colliding with an object this will flash in an area around it
/// </summary>
[RegisterComponent]
public class FlashProjectileComponent : Component, IStartCollide
{
public override string Name => "FlashProjectile";
[DataField("range")]
private float _range = 1.0f;
[DataField("duration")]
private float _duration = 8.0f;
private bool _flashed;
protected override void Initialize()
{
base.Initialize();
// Shouldn't be using this without a ProjectileComponent because it will just immediately collide with thrower
Owner.EnsureComponent<ProjectileComponent>();
}
void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
{
if (_flashed) return;
FlashableComponent.FlashAreaHelper(Owner, _range, _duration);
_flashed = true;
}
}
}

3
Content.Server/Flash/FlashSystem.cs
View File

@@ -3,7 +3,6 @@ using Content.Server.Stunnable.Components;
using Content.Server.Weapon.Melee;
using Content.Shared.Examine;
using Content.Shared.Interaction;
using Content.Shared.Notification;
using Content.Shared.Notification.Managers;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
@@ -14,7 +13,7 @@ using Robust.Shared.Player;
namespace Content.Server.Flash
{
public class FlashSystem : EntitySystem
internal sealed class FlashSystem : EntitySystem
{
public override void Initialize()
{