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

3
Content.Server/Body/Behavior/BrainBehavior.cs
View File

@@ -1,5 +1,4 @@
#nullable enable
using Content.Server.Ghost;
using Content.Server.Ghost;
using Content.Server.Ghost.Components;
using Content.Server.Mind.Components;
using Content.Shared.Body.Components;

1
Content.Server/Body/Behavior/LiverBehavior.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System.Linq;
using Content.Server.Body.Circulatory;
using Content.Shared.Body.Networks;

5
Content.Server/Body/Behavior/LungBehavior.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System;
using Content.Server.Atmos;
using Content.Server.Atmos.Components;
@@ -149,7 +148,7 @@ namespace Content.Server.Body.Behavior
return;
}
if (!Owner.Transform.Coordinates.TryGetTileAir(out var tileAir))
if (EntitySystem.Get<AtmosphereSystem>().GetTileMixture(Owner.Transform.Coordinates, true) is not {} tileAir)
{
return;
}
@@ -167,7 +166,7 @@ namespace Content.Server.Body.Behavior
public void Exhale(float frameTime)
{
if (!Owner.Transform.Coordinates.TryGetTileAir(out var tileAir))
if (EntitySystem.Get<AtmosphereSystem>().GetTileMixture(Owner.Transform.Coordinates, true) is not {} tileAir)
{
return;
}

3
Content.Server/Body/Behavior/MechanismBehavior.cs
View File

@@ -1,5 +1,4 @@
#nullable enable
using Content.Shared.Body.Behavior;
using Content.Shared.Body.Behavior;
using Content.Shared.Body.Components;
using Content.Shared.Body.Mechanism;
using Content.Shared.Body.Part;

1
Content.Server/Body/Behavior/StomachBehavior.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System.Collections.Generic;
using System.Linq;
using Content.Server.Body.Circulatory;

1
Content.Server/Body/BodyComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using Content.Server.GameTicking;
using Content.Server.Ghost;
using Content.Server.Mind.Components;

1
Content.Server/Body/Circulatory/BloodstreamComponent.cs
View File

@@ -3,7 +3,6 @@ using System.Linq;
using Content.Server.Atmos;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Chemistry.Components;
using Content.Server.Interfaces;
using Content.Server.Metabolism;
using Content.Shared.Atmos;
using Content.Shared.Body.Networks;

1
Content.Server/Body/Commands/AddHandCommand.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using Content.Server.Administration;
using Content.Shared.Administration;
using Content.Shared.Body.Components;

1
Content.Server/Body/Commands/AttachBodyPartCommand.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using Content.Server.Administration;
using Content.Shared.Administration;
using Content.Shared.Body.Components;

1
Content.Server/Body/Commands/DestroyMechanismCommand.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using Content.Server.Administration;
using Content.Shared.Administration;
using Content.Shared.Body.Components;

1
Content.Server/Body/Commands/RemoveHandCommand.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System.Linq;
using Content.Server.Administration;
using Content.Shared.Administration;

1
Content.Server/Body/Mechanism/MechanismComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System.Collections.Generic;
using System.Threading.Tasks;
using Content.Server.UserInterface;

1
Content.Server/Body/Part/BodyPartComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System.Collections.Generic;
using System.Threading.Tasks;
using Content.Server.UserInterface;

3
Content.Server/Body/Respiratory/InternalsComponent.cs
View File

@@ -1,5 +1,4 @@
#nullable enable
using Content.Server.Atmos.Components;
using Content.Server.Atmos.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.ViewVariables;

3
Content.Server/Body/Scanner/BodyScannerComponent.cs
View File

@@ -1,5 +1,4 @@
#nullable enable
using Content.Server.UserInterface;
using Content.Server.UserInterface;
using Content.Shared.Body.Components;
using Content.Shared.Body.Scanner;
using Content.Shared.Interaction;

1
Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System.Collections.Generic;
using System.Linq;
using System.Text;

4
Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
@@ -10,8 +9,6 @@ using Content.Shared.Body.Mechanism;
using Content.Shared.Body.Part;
using Content.Shared.Body.Surgery;
using Content.Shared.Interaction;
using Content.Shared.NetIDs;
using Content.Shared.Notification;
using Content.Shared.Notification.Managers;
using Robust.Server.GameObjects;
using Robust.Server.Player;
@@ -31,7 +28,6 @@ namespace Content.Server.Body.Surgery.Components
public class SurgeryToolComponent : Component, ISurgeon, IAfterInteract
{
public override string Name => "SurgeryTool";
public override uint? NetID => ContentNetIDs.SURGERY;
private readonly Dictionary<int, object> _optionsCache = new();