Skip to content
Open

Goobmod #1492

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Content.Client.Stylesheets;
using Content.Goobstation.Maths.FixedPoint;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Components;
using Content.Shared.Atmos.Monitor;
using Content.Shared.FixedPoint;
using Content.Shared.Temperature;
using Robust.Client.AutoGenerated;
using Robust.Client.Graphics;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using Content.Client.Stylesheets;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Components;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Temperature;
using Robust.Client.AutoGenerated;
using Robust.Client.Graphics;
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ private void OnVesselChange(NewVesselEnteredMessage ev)
if (_musicProto == null) //if we don't find any, we play the default track.
{
_musicProto = _protMan.Index<AmbientMusicPrototype>("default");
//_lastBiome = _proto.Index<SpaceBiomePrototype>("default");
//_lastBiome = _protMan.Index<SpaceBiomePrototype>("default");
}

SoundCollectionPrototype soundcol = _protMan.Index<SoundCollectionPrototype>(_musicProto.ID);
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
using Robust.Shared.Utility;
using System.Linq;
using System.Numerics;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Robust.Client.Graphics;
using static Robust.Client.UserInterface.Controls.BoxContainer;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
using Content.Client.Stylesheets;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Timing;
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/Chemistry/UI/HyposprayStatusControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
using Content.Client.Stylesheets;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Timing;
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/Chemistry/UI/InjectorStatusControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
using Content.Client.Stylesheets;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Timing;
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/Chemistry/UI/SolutionStatusControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
using Content.Client.Stylesheets;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Robust.Client.UserInterface.Controls;

namespace Content.Client.Chemistry.UI;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Content.Shared.Chemistry;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Client.UserInterface;
Expand Down
3 changes: 0 additions & 3 deletions Content.Client/Content.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
<ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Spawners\" />
</ItemGroup>
<ItemGroup>
<Compile Update="Lobby\UI\LobbyCharacterPanel.xaml.cs">
<DependentUpon>LobbyCharacterPanel.xaml</DependentUpon>
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/Damage/DamageVisualsComponent.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;


namespace Content.Client.Damage;

Expand Down
3 changes: 2 additions & 1 deletion Content.Client/Damage/DamageVisualsSystem.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using System.Linq;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Robust.Client.GameObjects;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/Fluids/PuddleOverlay.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Numerics;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Robust.Client.Graphics;
using Robust.Client.ResourceManagement;
using Robust.Shared.Enums;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Content.Client.UserInterface.ControlExtensions;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using JetBrains.Annotations;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/Guidebook/Controls/GuideFoodEmbed.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
using Content.Client.Message;
using Content.Client.Nutrition.EntitySystems;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using JetBrains.Annotations;
using Robust.Client.AutoGenerated;
using Robust.Client.Graphics;
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/Guidebook/Controls/GuideFoodSource.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
using Content.Client.Chemistry.EntitySystems;
using Content.Client.UserInterface.ControlExtensions;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Nutrition.Components;
using JetBrains.Annotations;
using Robust.Client.AutoGenerated;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Reaction;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Localizations;
using JetBrains.Annotations;
using Robust.Client.AutoGenerated;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
using Content.Shared._Shitmed.Targeting; // Shitmed
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Humanoid;
using Content.Shared.Humanoid.Prototypes;
using Content.Shared.IdentityManagement;
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/Overlays/EntityHealthBarOverlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
using Content.Client.StatusIcon;
using Content.Client.UserInterface.Systems;
using Content.Shared.Damage;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Mobs;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Linq;
using Content.Client.UserInterface.Controls;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Silicons.Laws;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.XAML;
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/Store/Ui/StoreMenu.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
using System.Text;
using Content.Client.Actions;
using Content.Client.Message;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Store;
using Content.Client.Stylesheets;
using Robust.Client.AutoGenerated;
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Store;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Prototypes;
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/Tools/UI/WelderStatusControl.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using Content.Client.Items.UI;
using Content.Client.Message;
using Content.Client.Stylesheets;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Tools.Components;
using Content.Shared.Tools.Systems;
using Robust.Client.UserInterface.Controls;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Content.Shared.Damage;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Mobs;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/WhiteDream/BloodCult/UI/BloodRitesUi.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using System.Numerics;
using Content.Client.Popups;
using Content.Client.UserInterface.Controls;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.WhiteDream.BloodCult.UI;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Reflection;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.Markdown.Mapping;
using Robust.Shared.Serialization.Markdown.Value;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Chemistry.Reaction;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Robust.Shared.GameObjects;

namespace Content.IntegrationTests.Tests.Chemistry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Robust.Shared.GameObjects;
using Robust.Shared.Prototypes;

Expand Down
3 changes: 2 additions & 1 deletion Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
using Content.Server.Administration.Systems;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
using Robust.Shared.GameObjects;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.Execution;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Ghost;
using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using Content.IntegrationTests.Tests.Interaction;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Robust.Shared.Prototypes;

namespace Content.IntegrationTests.Tests.Construction.Interaction;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Collections.Generic;
using Content.Shared.Damage;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;


namespace Content.IntegrationTests.Tests.Damageable;

Expand Down
3 changes: 2 additions & 1 deletion Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using System.Linq;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using Content.Server.Destructible.Thresholds.Triggers;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
using Content.Server.Destructible.Thresholds.Triggers;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.GameObjects;
Expand Down
3 changes: 2 additions & 1 deletion Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using Content.Server.Fluids.EntitySystems;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Fluids;
using Robust.Shared.GameObjects;
using Robust.Shared.Prototypes;
Expand Down
3 changes: 2 additions & 1 deletion Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
using Content.Server.Fluids.EntitySystems;
using Content.Server.Spreader;
using Content.Shared.Chemistry.Components;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Fluids.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
Expand Down
3 changes: 2 additions & 1 deletion Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using Content.Server.Fluids.EntitySystems;
using Content.Shared.Chemistry.Components;
using Content.Shared.Coordinates;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Fluids.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
Expand Down
3 changes: 2 additions & 1 deletion Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
using Content.Server.Station.Components;
using Content.Shared.CCVar;
using Content.Shared.Damage;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.GameTicking;
using Content.Shared.Hands.Components;
using Content.Shared.Inventory;
Expand Down
3 changes: 2 additions & 1 deletion Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
using Content.Shared.Construction.Components;
using Content.Shared.Construction.Prototypes;
using Content.Shared.Construction.Steps;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Lathe;
using Content.Shared.Materials;
using Content.Shared.Research.Prototypes;
Expand Down
3 changes: 2 additions & 1 deletion Content.IntegrationTests/Tests/Minds/MindTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
using Content.Server.Roles;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
using Content.Goobstation.Maths.FixedPoint;

using Content.Shared.Mind;
using Content.Shared.Mind.Components;
using Content.Shared.Players;
Expand Down
Loading
Loading