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

1
Content.Server/Power/Components/ApcComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System;
using Content.Server.Access.Components;
using Content.Server.Power.NodeGroups;

1
Content.Server/Power/Components/ApcPowerProviderComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System;
using System.Collections.Generic;
using Content.Server.Power.NodeGroups;

15
Content.Server/Power/Components/ApcPowerReceiverComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System;
using System.Diagnostics.CodeAnalysis;
using Content.Server.Power.NodeGroups;
@@ -175,6 +174,7 @@ namespace Content.Server.Power.Components
private void OnNewPowerState()
{
SendMessage(new PowerChangedMessage(Powered));
Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new PowerChangedEvent(Powered));
if (Owner.TryGetComponent<AppearanceComponent>(out var appearance))
{
@@ -217,4 +217,17 @@ namespace Content.Server.Power.Components
Powered = powered;
}
}
/// <summary>
/// Raised whenever an ApcPowerReceiver becomes powered / unpowered.
/// </summary>
public sealed class PowerChangedEvent : EntityEventArgs
{
public readonly bool Powered;
public PowerChangedEvent(bool powered)
{
Powered = powered;
}
}
}

1
Content.Server/Power/Components/BaseApcNetComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using Content.Server.Power.NodeGroups;
namespace Content.Server.Power.Components

1
Content.Server/Power/Components/BaseCharger.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System;
using System.Threading.Tasks;
using Content.Server.Hands.Components;

3
Content.Server/Power/Components/BaseNetConnectorComponent.cs
View File

@@ -1,5 +1,4 @@
#nullable enable
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Server.NodeContainer;
using Content.Server.NodeContainer.NodeGroups;

1
Content.Server/Power/Components/BasePowerNetComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using Content.Server.NodeContainer.NodeGroups;
using Content.Server.Power.NodeGroups;

1
Content.Server/Power/Components/BatteryComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;

1
Content.Server/Power/Components/CableComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System.Threading.Tasks;
using Content.Server.Stack;
using Content.Server.Tools.Components;

1
Content.Server/Power/Components/CablePlacerComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System.Threading.Tasks;
using Content.Server.Stack;
using Content.Shared.Interaction;

1
Content.Server/Power/Components/ExaminableBatteryComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using Content.Shared.Examine;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;

1
Content.Server/Power/Components/PowerConsumerComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using Content.Server.Power.NodeGroups;
using Content.Server.Power.Pow3r;
using Robust.Shared.GameObjects;

1
Content.Server/Power/Components/PowerSupplierComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using Content.Server.Power.NodeGroups;
using Content.Server.Power.Pow3r;
using Robust.Shared.GameObjects;