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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Light/EntitySystems/LightReplacerSystem.cs
View File

@@ -1,8 +1,8 @@
using System.Linq;
using Content.Server.Light.Components;
using Content.Server.Storage.Components;
using Content.Shared.ActionBlocker;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Events;
using Content.Shared.Light;
using Content.Shared.Popups;
using JetBrains.Annotations;
@@ -12,8 +12,6 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Player;
using System;
using System.Linq;
namespace Content.Server.Light.EntitySystems
{
@@ -71,7 +69,7 @@ namespace Content.Server.Light.EntitySystems
if (eventArgs.Used != null)
{
var usedUid = (EntityUid) eventArgs.Used;
var usedUid = eventArgs.Used;
// want to insert a new light bulb?
if (EntityManager.TryGetComponent(usedUid, out LightBulbComponent ? bulb))

2
Content.Server/Light/EntitySystems/MatchstickSystem.cs
View File

@@ -58,7 +58,7 @@ namespace Content.Server.Light.EntitySystems
args.IsHot = component.CurrentState == SmokableState.Lit;
}
public void Ignite(MatchstickComponent component, IEntity user)
public void Ignite(MatchstickComponent component, EntityUiduser)
{
// Play Sound
SoundSystem.Play(

30
Content.Server/Light/EntitySystems/PoweredLightSystem.cs
View File

@@ -1,30 +1,28 @@
using System;
using Content.Server.Administration.Logs;
using Content.Server.DeviceNetwork;
using Content.Server.DeviceNetwork.Systems;
using Content.Server.Ghost;
using Content.Server.Light.Components;
using Content.Server.MachineLinking.Events;
using Content.Server.Power.Components;
using Content.Server.Power.EntitySystems;
using Content.Shared.Light;
using Content.Server.Temperature.Components;
using Content.Shared.Audio;
using Content.Shared.Damage;
using Content.Shared.Database;
using Content.Shared.Hands.Components;
using Content.Shared.Interaction;
using Content.Shared.Light;
using Content.Shared.Popups;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Timing;
using Robust.Shared.Containers;
using Content.Shared.Interaction;
using Content.Shared.Hands.Components;
using Content.Server.Temperature.Components;
using Content.Shared.Popups;
using Robust.Shared.Localization;
using Robust.Shared.Audio;
using Robust.Shared.Player;
using Robust.Shared.Maths;
using Content.Shared.Audio;
using Content.Server.Administration.Logs;
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
using Robust.Shared.Player;
using Robust.Shared.Timing;
namespace Content.Server.Light.EntitySystems
{
@@ -102,7 +100,7 @@ namespace Content.Server.Light.EntitySystems
return;
// check if it's possible to apply burn damage to user
var userUid = (EntityUid) args.User;
var userUid = args.User;
if (EntityManager.TryGetComponent(userUid, out HeatResistanceComponent? heatResist) &&
EntityManager.TryGetComponent(bulbUid.Value, out LightBulbComponent? lightBulb))
{
@@ -179,7 +177,7 @@ namespace Content.Server.Light.EntitySystems
return null;
// try to remove bulb from container
var bulbEnt = EntityManager.GetEntity(bulbUid.Value);
var bulbbulbUid.Value
if (!light.LightBulbContainer.Remove(bulbEnt))
return null;