diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs index f5bdcbc676..565fc35b52 100644 --- a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs +++ b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs @@ -5,7 +5,7 @@ using static Robust.Client.UserInterface.Controls.BaseButton; // Corvax-Wega-Rec namespace Content.Client.StationRecords; -public sealed class GeneralStationRecordConsoleBoundUserInterface : BoundUserInterface +public sealed partial class GeneralStationRecordConsoleBoundUserInterface : BoundUserInterface { [ViewVariables] private GeneralStationRecordConsoleWindow? _window = default!; @@ -14,8 +14,8 @@ public sealed class GeneralStationRecordConsoleBoundUserInterface : BoundUserInt { } - [Dependency] private readonly IEntityManager _entityManager = default!; // Corvax-Wega-Record - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; // Corvax-Wega-Record + [Dependency] private IEntityManager _entityManager = default!; // Corvax-Wega-Record + [Dependency] private ISharedPlayerManager _playerManager = default!; // Corvax-Wega-Record protected override void Open() { diff --git a/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs b/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs index 24747c339f..a2009b84d2 100644 --- a/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs +++ b/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs @@ -16,8 +16,8 @@ namespace Content.Client.UserInterface.Systems.Ghost; public sealed partial class GhostUIController : UIController, IOnSystemChanged, IOnSystemChanged // Corvax-Wega-GhostRespawn { [Dependency] private IEntityNetworkManager _net = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; // Corvax-Wega-GhostRespawn - [Dependency] private readonly IConsoleHost _consoleHost = default!; // Corvax-Wega-GhostRespawn + [Dependency] private IConfigurationManager _cfg = default!; // Corvax-Wega-GhostRespawn + [Dependency] private IConsoleHost _consoleHost = default!; // Corvax-Wega-GhostRespawn [UISystemDependency] private readonly GhostSystem? _system = default; [UISystemDependency] private readonly GhostRespawnSystem? _respawn = default; // Corvax-Wega-GhostRespawn diff --git a/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs index bebe1d686f..07f0d8a1ed 100644 --- a/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs +++ b/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs @@ -10,7 +10,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Widgets; [GenerateTypedNameReferences] public sealed partial class GhostGui : UIWidget { - [Dependency] private readonly IGameTiming _gameTiming = default!; // Corvax-Wega-GhostRespawn + [Dependency] private IGameTiming _gameTiming = default!; // Corvax-Wega-GhostRespawn private TimeSpan? _timeOfDeath; // Corvax-Wega-GhostRespawn private float _minTimeToRespawn; // Corvax-Wega-GhostRespawn diff --git a/Content.Client/_Wega/Achievements/AchievementsSystem.cs b/Content.Client/_Wega/Achievements/AchievementsSystem.cs index 19542fb0eb..d936203b1d 100644 --- a/Content.Client/_Wega/Achievements/AchievementsSystem.cs +++ b/Content.Client/_Wega/Achievements/AchievementsSystem.cs @@ -14,7 +14,7 @@ using Robust.Shared.Timing; namespace Content.Client.Achievements; -public sealed class AchievementsSystem : SharedAchievementsSystem +public sealed partial class AchievementsSystem : SharedAchievementsSystem { [Dependency] private IPlayerManager _playerManager = default!; [Dependency] private IUserInterfaceManager _ui = default!; diff --git a/Content.Client/_Wega/Android/AndroidFrameSystem.cs b/Content.Client/_Wega/Android/AndroidFrameSystem.cs index a2b15a972b..2cc82b2c25 100644 --- a/Content.Client/_Wega/Android/AndroidFrameSystem.cs +++ b/Content.Client/_Wega/Android/AndroidFrameSystem.cs @@ -2,7 +2,7 @@ using Content.Shared._Wega.Android; namespace Content.Client._Wega.Android; -public sealed class AndroidFrameSystem : SharedAndroidFrameSystem +public sealed partial class AndroidFrameSystem : SharedAndroidFrameSystem { } diff --git a/Content.Client/_Wega/Android/AndroidSystem.cs b/Content.Client/_Wega/Android/AndroidSystem.cs index c4e62a130e..87b20e70ac 100644 --- a/Content.Client/_Wega/Android/AndroidSystem.cs +++ b/Content.Client/_Wega/Android/AndroidSystem.cs @@ -5,7 +5,7 @@ using Content.Shared.PowerCell; namespace Content.Client.Android; -public sealed class AndroidSystem : SharedAndroidSystem +public sealed partial class AndroidSystem : SharedAndroidSystem { [Dependency] private PowerCellSystem _powerCell = default!; [Dependency] private BatterySystem _battery = default!; diff --git a/Content.Client/_Wega/Android/Ui/AndroidConstructBoundUserInterface.cs b/Content.Client/_Wega/Android/Ui/AndroidConstructBoundUserInterface.cs index 8724101626..108ca4b805 100644 --- a/Content.Client/_Wega/Android/Ui/AndroidConstructBoundUserInterface.cs +++ b/Content.Client/_Wega/Android/Ui/AndroidConstructBoundUserInterface.cs @@ -9,7 +9,7 @@ using Robust.Shared.Prototypes; namespace Content.Client._Wega.Android.Ui; [UsedImplicitly] -public sealed class AndroidConstructBoundUserInterface : BoundUserInterface +public sealed partial class AndroidConstructBoundUserInterface : BoundUserInterface { [ViewVariables] private AndroidConstructMenu? _menu; diff --git a/Content.Client/_Wega/Barks/BarkSystem.cs b/Content.Client/_Wega/Barks/BarkSystem.cs index 17fc63c53f..8f7856a9f0 100644 --- a/Content.Client/_Wega/Barks/BarkSystem.cs +++ b/Content.Client/_Wega/Barks/BarkSystem.cs @@ -17,7 +17,7 @@ namespace Content.Client.Speech.Synthesis.System; /// /// Система отвечающая за прогрышь звука для каждого калиента /// -public sealed class BarkSystem : EntitySystem +public sealed partial class BarkSystem : EntitySystem { [Dependency] private AudioSystem _audio = default!; [Dependency] private IConfigurationManager _cfg = default!; diff --git a/Content.Client/_Wega/BloodCult/BloodCultSystem.cs b/Content.Client/_Wega/BloodCult/BloodCultSystem.cs index 8d9612221e..68df494148 100644 --- a/Content.Client/_Wega/BloodCult/BloodCultSystem.cs +++ b/Content.Client/_Wega/BloodCult/BloodCultSystem.cs @@ -9,7 +9,7 @@ using Robust.Shared.Random; namespace Content.Client.Blood.Cult { - public sealed class BloodCultSystem : SharedBloodCultSystem + public sealed partial class BloodCultSystem : SharedBloodCultSystem { [Dependency] private AppearanceSystem _appearance = default!; [Dependency] private IPrototypeManager _prototype = default!; diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodConstructBoundUserInterface.cs b/Content.Client/_Wega/BloodCult/Ui/BloodConstructBoundUserInterface.cs index e636f4fbfe..3b583736cf 100644 --- a/Content.Client/_Wega/BloodCult/Ui/BloodConstructBoundUserInterface.cs +++ b/Content.Client/_Wega/BloodCult/Ui/BloodConstructBoundUserInterface.cs @@ -5,7 +5,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.BloodCult.Ui; [UsedImplicitly] -public sealed class BloodConstructBoundUserInterface : BoundUserInterface +public sealed partial class BloodConstructBoundUserInterface : BoundUserInterface { [ViewVariables] private BloodConstructMenu? _menu; diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodMagicEui.cs b/Content.Client/_Wega/BloodCult/Ui/BloodMagicEui.cs index bb3f9ef162..8032b4cb3d 100644 --- a/Content.Client/_Wega/BloodCult/Ui/BloodMagicEui.cs +++ b/Content.Client/_Wega/BloodCult/Ui/BloodMagicEui.cs @@ -5,7 +5,7 @@ using JetBrains.Annotations; namespace Content.Client._Wega.BloodCult.Ui; [UsedImplicitly] -public sealed class BloodMagicEui : BaseEui +public sealed partial class BloodMagicEui : BaseEui { private readonly BloodMagicMenu _menu; diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodRitesBoundUserInterface.cs b/Content.Client/_Wega/BloodCult/Ui/BloodRitesBoundUserInterface.cs index a88c1ffc08..395485c325 100644 --- a/Content.Client/_Wega/BloodCult/Ui/BloodRitesBoundUserInterface.cs +++ b/Content.Client/_Wega/BloodCult/Ui/BloodRitesBoundUserInterface.cs @@ -3,7 +3,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.BloodCult.Ui; -public sealed class BloodRitesBoundUserInterface : BoundUserInterface +public sealed partial class BloodRitesBoundUserInterface : BoundUserInterface { [ViewVariables] private BloodRitesMenu? _menu; diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodStructureBoundUserInterface.cs b/Content.Client/_Wega/BloodCult/Ui/BloodStructureBoundUserInterface.cs index 596519b6f6..9557cf91e2 100644 --- a/Content.Client/_Wega/BloodCult/Ui/BloodStructureBoundUserInterface.cs +++ b/Content.Client/_Wega/BloodCult/Ui/BloodStructureBoundUserInterface.cs @@ -5,7 +5,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.BloodCult.Ui; [UsedImplicitly] -public sealed class BloodStructureBoundUserInterface : BoundUserInterface +public sealed partial class BloodStructureBoundUserInterface : BoundUserInterface { [ViewVariables] private BloodStructureMenu? _menu; diff --git a/Content.Client/_Wega/BloodCult/Ui/EmpoweringRuneBoundUserInterface.cs b/Content.Client/_Wega/BloodCult/Ui/EmpoweringRuneBoundUserInterface.cs index 3e9f5dfbe1..dcd710c6b9 100644 --- a/Content.Client/_Wega/BloodCult/Ui/EmpoweringRuneBoundUserInterface.cs +++ b/Content.Client/_Wega/BloodCult/Ui/EmpoweringRuneBoundUserInterface.cs @@ -3,7 +3,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.BloodCult.Ui; -public sealed class EmpoweringRuneBoundUserInterface : BoundUserInterface +public sealed partial class EmpoweringRuneBoundUserInterface : BoundUserInterface { [ViewVariables] private EmpoweringRuneMenu? _menu; diff --git a/Content.Client/_Wega/BloodCult/Ui/RunesMenuBoundUserInterface.cs b/Content.Client/_Wega/BloodCult/Ui/RunesMenuBoundUserInterface.cs index b81faf6bd3..5b6b813186 100644 --- a/Content.Client/_Wega/BloodCult/Ui/RunesMenuBoundUserInterface.cs +++ b/Content.Client/_Wega/BloodCult/Ui/RunesMenuBoundUserInterface.cs @@ -5,7 +5,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.BloodCult.Ui; [UsedImplicitly] -public sealed class RunesMenuBoundUserInterface : BoundUserInterface +public sealed partial class RunesMenuBoundUserInterface : BoundUserInterface { [ViewVariables] private RunesMenu? _menu; diff --git a/Content.Client/_Wega/BloodCult/Ui/SummoningRuneBoundUserInterface.cs b/Content.Client/_Wega/BloodCult/Ui/SummoningRuneBoundUserInterface.cs index d0fce7e8d3..ac8c9ec634 100644 --- a/Content.Client/_Wega/BloodCult/Ui/SummoningRuneBoundUserInterface.cs +++ b/Content.Client/_Wega/BloodCult/Ui/SummoningRuneBoundUserInterface.cs @@ -3,7 +3,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.BloodCult.Ui; -public sealed class SummoningRuneBoundUserInterface : BoundUserInterface +public sealed partial class SummoningRuneBoundUserInterface : BoundUserInterface { [ViewVariables] private SummoningRuneMenu? _menu; diff --git a/Content.Client/_Wega/Botany/PlantAnalyzerBoundUserInterface.cs b/Content.Client/_Wega/Botany/PlantAnalyzerBoundUserInterface.cs index 225db86bc6..780826509a 100644 --- a/Content.Client/_Wega/Botany/PlantAnalyzerBoundUserInterface.cs +++ b/Content.Client/_Wega/Botany/PlantAnalyzerBoundUserInterface.cs @@ -5,7 +5,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.Botany; [UsedImplicitly] -public sealed class PlantAnalyzerBoundUserInterface : BoundUserInterface +public sealed partial class PlantAnalyzerBoundUserInterface : BoundUserInterface { [ViewVariables] private PlantAnalyzerWindow? _window; diff --git a/Content.Client/_Wega/Botany/PlantAnalyzerSystem.cs b/Content.Client/_Wega/Botany/PlantAnalyzerSystem.cs index 4308445499..63994dbf21 100644 --- a/Content.Client/_Wega/Botany/PlantAnalyzerSystem.cs +++ b/Content.Client/_Wega/Botany/PlantAnalyzerSystem.cs @@ -2,6 +2,6 @@ using Content.Shared.Botany.Systems; namespace Content.Client.Botany.Systems; -public sealed class PlantAnalyzerSystem : SharedPlantAnalyzerSystem +public sealed partial class PlantAnalyzerSystem : SharedPlantAnalyzerSystem { } diff --git a/Content.Client/_Wega/CardTarot/CardTarotSystem.cs b/Content.Client/_Wega/CardTarot/CardTarotSystem.cs index 390c561ea2..cec434841e 100644 --- a/Content.Client/_Wega/CardTarot/CardTarotSystem.cs +++ b/Content.Client/_Wega/CardTarot/CardTarotSystem.cs @@ -4,7 +4,7 @@ using Robust.Client.GameObjects; namespace Content.Client.Card.Tarot; -public sealed class CardTarotSystem : EntitySystem +public sealed partial class CardTarotSystem : EntitySystem { [Dependency] private AppearanceSystem _appearance = default!; [Dependency] private SpriteSystem _sprite = default!; diff --git a/Content.Client/_Wega/Crayon/CrayonPreviewOverlay.cs b/Content.Client/_Wega/Crayon/CrayonPreviewOverlay.cs index 86996b2b9d..01418dcfab 100644 --- a/Content.Client/_Wega/Crayon/CrayonPreviewOverlay.cs +++ b/Content.Client/_Wega/Crayon/CrayonPreviewOverlay.cs @@ -11,7 +11,7 @@ using System.Numerics; namespace Content.Client.Crayon; -public sealed class CrayonPreviewOverlay : Overlay +public sealed partial class CrayonPreviewOverlay : Overlay { [Dependency] private IInputManager _input = default!; [Dependency] private IPlayerManager _player = default!; diff --git a/Content.Client/_Wega/DetailExaminable/DetailExaminableEui.cs b/Content.Client/_Wega/DetailExaminable/DetailExaminableEui.cs index 084382d0a7..5164569001 100644 --- a/Content.Client/_Wega/DetailExaminable/DetailExaminableEui.cs +++ b/Content.Client/_Wega/DetailExaminable/DetailExaminableEui.cs @@ -5,7 +5,7 @@ using Content.Shared.Eui; namespace Content.Client._Wega.DetailExaminable; -public sealed class DetailExaminableEui : BaseEui +public sealed partial class DetailExaminableEui : BaseEui { [Dependency] private IEntityManager _entManager = default!; diff --git a/Content.Client/_Wega/Dirt/DirtVisualsSystem.cs b/Content.Client/_Wega/Dirt/DirtVisualsSystem.cs index 04ca1fc211..732fd12bce 100644 --- a/Content.Client/_Wega/Dirt/DirtVisualsSystem.cs +++ b/Content.Client/_Wega/Dirt/DirtVisualsSystem.cs @@ -8,7 +8,7 @@ using Robust.Shared.Utility; namespace Content.Client.DirtVisuals; -public sealed class DirtVisualsSystem : EntitySystem +public sealed partial class DirtVisualsSystem : EntitySystem { [Dependency] private AppearanceSystem _appearance = default!; [Dependency] private SpriteSystem _sprite = default!; diff --git a/Content.Client/_Wega/Dirt/ShowerSystem.cs b/Content.Client/_Wega/Dirt/ShowerSystem.cs index 7523f7789f..1048bdebb6 100644 --- a/Content.Client/_Wega/Dirt/ShowerSystem.cs +++ b/Content.Client/_Wega/Dirt/ShowerSystem.cs @@ -4,7 +4,7 @@ using Robust.Client.GameObjects; namespace Content.Client.Shower { - public sealed class ShowerSystem : EntitySystem + public sealed partial class ShowerSystem : EntitySystem { [Dependency] private AppearanceSystem _appearance = default!; [Dependency] private SpriteSystem _sprite = default!; diff --git a/Content.Client/_Wega/Dirt/WashingMachineSystem.cs b/Content.Client/_Wega/Dirt/WashingMachineSystem.cs index a8e6e19b64..850ea4a7ab 100644 --- a/Content.Client/_Wega/Dirt/WashingMachineSystem.cs +++ b/Content.Client/_Wega/Dirt/WashingMachineSystem.cs @@ -4,7 +4,7 @@ using Robust.Client.GameObjects; namespace Content.Client.WashingMachine { - public sealed class WashingMachineSystem : EntitySystem + public sealed partial class WashingMachineSystem : EntitySystem { [Dependency] private AppearanceSystem _appearance = default!; [Dependency] private SpriteSystem _sprite = default!; diff --git a/Content.Client/_Wega/Disease/DiseaseMachineSystem.cs b/Content.Client/_Wega/Disease/DiseaseMachineSystem.cs index 0d4d635dc1..7fbb0dfa2a 100644 --- a/Content.Client/_Wega/Disease/DiseaseMachineSystem.cs +++ b/Content.Client/_Wega/Disease/DiseaseMachineSystem.cs @@ -7,7 +7,7 @@ namespace Content.Client.Disease /// Controls client-side visuals for the /// disease machines. /// - public sealed class DiseaseMachineSystem : VisualizerSystem + public sealed partial class DiseaseMachineSystem : VisualizerSystem { protected override void OnAppearanceChange(EntityUid uid, DiseaseMachineVisualsComponent component, ref AppearanceChangeEvent args) { diff --git a/Content.Client/_Wega/GPS/UI/GpsBoundUserInterface.cs b/Content.Client/_Wega/GPS/UI/GpsBoundUserInterface.cs index 0e5e953371..beaef53177 100644 --- a/Content.Client/_Wega/GPS/UI/GpsBoundUserInterface.cs +++ b/Content.Client/_Wega/GPS/UI/GpsBoundUserInterface.cs @@ -5,7 +5,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.GPS.UI; [UsedImplicitly] -public sealed class GpsBoundUserInterface : BoundUserInterface +public sealed partial class GpsBoundUserInterface : BoundUserInterface { private GpsWindow? _window; diff --git a/Content.Client/_Wega/GPS/UI/GpsNavMapControl.cs b/Content.Client/_Wega/GPS/UI/GpsNavMapControl.cs index 1674ca8ba6..a7b94f44eb 100644 --- a/Content.Client/_Wega/GPS/UI/GpsNavMapControl.cs +++ b/Content.Client/_Wega/GPS/UI/GpsNavMapControl.cs @@ -12,7 +12,7 @@ using Robust.Shared.Timing; namespace Content.Client._Wega.GPS.UI; -public sealed class GpsNavMapControl : Control +public sealed partial class GpsNavMapControl : Control { [Dependency] private IResourceCache _resourceCache = default!; [Dependency] private IEntityManager _entityManager = default!; diff --git a/Content.Client/_Wega/GPS/UI/GpsWindow.xaml.cs b/Content.Client/_Wega/GPS/UI/GpsWindow.xaml.cs index 59c94fe57b..3012ee8453 100644 --- a/Content.Client/_Wega/GPS/UI/GpsWindow.xaml.cs +++ b/Content.Client/_Wega/GPS/UI/GpsWindow.xaml.cs @@ -252,7 +252,7 @@ public sealed partial class GpsWindow : BaseWindow } } -public sealed class GpsDeviceControl : PanelContainer +public sealed partial class GpsDeviceControl : PanelContainer { public GpsDeviceControl(GpsDeviceInfo device) { @@ -335,7 +335,7 @@ public sealed class GpsDeviceControl : PanelContainer } } -public sealed class NavBeaconControl : PanelContainer +public sealed partial class NavBeaconControl : PanelContainer { public NavBeaconControl(NavBeaconInfo beacon) { diff --git a/Content.Client/_Wega/Genetics/Systems/Disease/DizzyOverlay.cs b/Content.Client/_Wega/Genetics/Systems/Disease/DizzyOverlay.cs index 892181b62d..843bd249c5 100644 --- a/Content.Client/_Wega/Genetics/Systems/Disease/DizzyOverlay.cs +++ b/Content.Client/_Wega/Genetics/Systems/Disease/DizzyOverlay.cs @@ -7,7 +7,7 @@ using Robust.Shared.Timing; namespace Content.Client.Genetics.System; -public sealed class DizzyOverlay : Overlay +public sealed partial class DizzyOverlay : Overlay { [Dependency] private IEntityManager _entityManager = default!; [Dependency] private IPlayerManager _playerManager = default!; diff --git a/Content.Client/_Wega/Genetics/Systems/Disease/DizzySystem.cs b/Content.Client/_Wega/Genetics/Systems/Disease/DizzySystem.cs index d95bf20fe6..5aea9c197e 100644 --- a/Content.Client/_Wega/Genetics/Systems/Disease/DizzySystem.cs +++ b/Content.Client/_Wega/Genetics/Systems/Disease/DizzySystem.cs @@ -5,7 +5,7 @@ using Robust.Shared.Player; namespace Content.Client.Genetics.System; -public sealed class DizzySystem : EntitySystem +public sealed partial class DizzySystem : EntitySystem { [Dependency] private IPlayerManager _player = default!; [Dependency] private IOverlayManager _overlayMan = default!; diff --git a/Content.Client/_Wega/Genetics/Ui/DnaModifierBoundUserInterface.cs b/Content.Client/_Wega/Genetics/Ui/DnaModifierBoundUserInterface.cs index bd87b57c60..9d20c7b972 100644 --- a/Content.Client/_Wega/Genetics/Ui/DnaModifierBoundUserInterface.cs +++ b/Content.Client/_Wega/Genetics/Ui/DnaModifierBoundUserInterface.cs @@ -7,7 +7,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.Genetics.Ui; [UsedImplicitly] -public sealed class DnaModifierBoundUserInterface : BoundUserInterface +public sealed partial class DnaModifierBoundUserInterface : BoundUserInterface { [ViewVariables] private DnaModifierWindow? _window; diff --git a/Content.Client/_Wega/Genetics/Ui/MindCommunicationUIController.cs b/Content.Client/_Wega/Genetics/Ui/MindCommunicationUIController.cs index 067edbfeb2..d1e4f4e40a 100644 --- a/Content.Client/_Wega/Genetics/Ui/MindCommunicationUIController.cs +++ b/Content.Client/_Wega/Genetics/Ui/MindCommunicationUIController.cs @@ -6,7 +6,7 @@ using Robust.Shared.Timing; namespace Content.Client._Wega.Genetics.Ui; -public sealed class MindCommunicationUIController : UIController +public sealed partial class MindCommunicationUIController : UIController { [Dependency] private IUserInterfaceManager _uiManager = default!; [Dependency] private IEntityManager _entityManager = default!; diff --git a/Content.Client/_Wega/Ghost/GhostRespawnSystem.cs b/Content.Client/_Wega/Ghost/GhostRespawnSystem.cs index 07cd403da4..72ba8946d4 100644 --- a/Content.Client/_Wega/Ghost/GhostRespawnSystem.cs +++ b/Content.Client/_Wega/Ghost/GhostRespawnSystem.cs @@ -2,7 +2,7 @@ using Content.Shared.Wega.Ghost.Respawn; namespace Content.Client.Wega.Ghost.Respawn; -public sealed class GhostRespawnSystem : EntitySystem +public sealed partial class GhostRespawnSystem : EntitySystem { public TimeSpan? GhostRespawnTime { get; private set; } public event Action? GhostRespawn; diff --git a/Content.Client/_Wega/Humanoid/HumanoidHeightSystem.cs b/Content.Client/_Wega/Humanoid/HumanoidHeightSystem.cs index 3dcf82da6a..4ef366374d 100644 --- a/Content.Client/_Wega/Humanoid/HumanoidHeightSystem.cs +++ b/Content.Client/_Wega/Humanoid/HumanoidHeightSystem.cs @@ -4,7 +4,7 @@ using Robust.Client.GameObjects; namespace Content.Client.Humanoid; -public sealed class HumanoidHeightSystem : EntitySystem +public sealed partial class HumanoidHeightSystem : EntitySystem { [Dependency] private SpriteSystem _sprite = default!; diff --git a/Content.Client/_Wega/ItemSelector/ItemSelectorBoundUserInterface.cs b/Content.Client/_Wega/ItemSelector/ItemSelectorBoundUserInterface.cs index 2f492a1c4b..ef572bddc6 100644 --- a/Content.Client/_Wega/ItemSelector/ItemSelectorBoundUserInterface.cs +++ b/Content.Client/_Wega/ItemSelector/ItemSelectorBoundUserInterface.cs @@ -6,7 +6,7 @@ using Robust.Shared.Player; namespace Content.Client._Wega.Item.Selector.UI; [UsedImplicitly] -public sealed class ItemSelectorBoundUserInterface : BoundUserInterface +public sealed partial class ItemSelectorBoundUserInterface : BoundUserInterface { [Dependency] private ISharedPlayerManager _playerManager = default!; diff --git a/Content.Client/_Wega/ItemSelector/ObjectSelectorBoundUserInterface.cs b/Content.Client/_Wega/ItemSelector/ObjectSelectorBoundUserInterface.cs index b6c053d9e0..adb414dd04 100644 --- a/Content.Client/_Wega/ItemSelector/ObjectSelectorBoundUserInterface.cs +++ b/Content.Client/_Wega/ItemSelector/ObjectSelectorBoundUserInterface.cs @@ -5,7 +5,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.Item.Selector.UI; [UsedImplicitly] -public sealed class ObjectSelectorBoundUserInterface : BoundUserInterface +public sealed partial class ObjectSelectorBoundUserInterface : BoundUserInterface { [ViewVariables] private ObjectSelectorWindow? _window; diff --git a/Content.Client/_Wega/Lavaland/LavalandConsoleBoundUserInterface.cs b/Content.Client/_Wega/Lavaland/LavalandConsoleBoundUserInterface.cs index 22987d984b..9c6b00dd3a 100644 --- a/Content.Client/_Wega/Lavaland/LavalandConsoleBoundUserInterface.cs +++ b/Content.Client/_Wega/Lavaland/LavalandConsoleBoundUserInterface.cs @@ -3,7 +3,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.Lavaland; -public sealed class LavalandConsoleBoundUserInterface : BoundUserInterface +public sealed partial class LavalandConsoleBoundUserInterface : BoundUserInterface { [ViewVariables] private LavalandConsoleWindow? _window; diff --git a/Content.Client/_Wega/Lavaland/LavalandPenalServitudeShuttleConsoleBoundUserInterface.cs b/Content.Client/_Wega/Lavaland/LavalandPenalServitudeShuttleConsoleBoundUserInterface.cs index db020955dc..cbe3f0212d 100644 --- a/Content.Client/_Wega/Lavaland/LavalandPenalServitudeShuttleConsoleBoundUserInterface.cs +++ b/Content.Client/_Wega/Lavaland/LavalandPenalServitudeShuttleConsoleBoundUserInterface.cs @@ -3,7 +3,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.Lavaland; -public sealed class LavalandPenalServitudeConsoleBoundUserInterface : BoundUserInterface +public sealed partial class LavalandPenalServitudeConsoleBoundUserInterface : BoundUserInterface { [ViewVariables] private LavalandPenalServitudeConsoleWindow? _window; diff --git a/Content.Client/_Wega/Lavaland/UtilityVendorBoundUserInterface.cs b/Content.Client/_Wega/Lavaland/UtilityVendorBoundUserInterface.cs index dfa495a55b..129f596954 100644 --- a/Content.Client/_Wega/Lavaland/UtilityVendorBoundUserInterface.cs +++ b/Content.Client/_Wega/Lavaland/UtilityVendorBoundUserInterface.cs @@ -3,7 +3,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.Lavaland; -public sealed class UtilityVendorBoundUserInterface : BoundUserInterface +public sealed partial class UtilityVendorBoundUserInterface : BoundUserInterface { [ViewVariables] private UtilityVendorMenu? _window; diff --git a/Content.Client/_Wega/Medical/InjectorFabticatorVisualsSystem.cs b/Content.Client/_Wega/Medical/InjectorFabticatorVisualsSystem.cs index e898ffdb39..9d1c9323b1 100644 --- a/Content.Client/_Wega/Medical/InjectorFabticatorVisualsSystem.cs +++ b/Content.Client/_Wega/Medical/InjectorFabticatorVisualsSystem.cs @@ -1,7 +1,7 @@ using Content.Shared.Injector.Fabticator; using Robust.Client.GameObjects; -public sealed class InjectorFabticatorSystem : EntitySystem +public sealed partial class InjectorFabticatorSystem : EntitySystem { [Dependency] private AppearanceSystem _appearance = default!; [Dependency] private SpriteSystem _sprite = default!; diff --git a/Content.Client/_Wega/Medical/Ui/InjectorFabticatorBoundUserInterface.cs b/Content.Client/_Wega/Medical/Ui/InjectorFabticatorBoundUserInterface.cs index e3f2bc993c..b2f11559bb 100644 --- a/Content.Client/_Wega/Medical/Ui/InjectorFabticatorBoundUserInterface.cs +++ b/Content.Client/_Wega/Medical/Ui/InjectorFabticatorBoundUserInterface.cs @@ -4,7 +4,7 @@ using JetBrains.Annotations; namespace Content.Client._Wega.Medical.Ui; [UsedImplicitly] -public sealed class InjectorFabticatorBoundUserInterface : BoundUserInterface +public sealed partial class InjectorFabticatorBoundUserInterface : BoundUserInterface { [ViewVariables] private InjectorFabticatorWindow? _window; diff --git a/Content.Client/_Wega/Mining/MiningConsoleBoundInterfaceState.cs b/Content.Client/_Wega/Mining/MiningConsoleBoundInterfaceState.cs index 6d116267f2..cc8eec9c4d 100644 --- a/Content.Client/_Wega/Mining/MiningConsoleBoundInterfaceState.cs +++ b/Content.Client/_Wega/Mining/MiningConsoleBoundInterfaceState.cs @@ -3,7 +3,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.Mining; -public sealed class MiningConsoleBoundInterface : BoundUserInterface +public sealed partial class MiningConsoleBoundInterface : BoundUserInterface { [ViewVariables] private MiningConsoleWindow? _window; diff --git a/Content.Client/_Wega/Mining/MiningServerVisualizerSystem.cs b/Content.Client/_Wega/Mining/MiningServerVisualizerSystem.cs index b1640107e2..ad0b2a5bc7 100644 --- a/Content.Client/_Wega/Mining/MiningServerVisualizerSystem.cs +++ b/Content.Client/_Wega/Mining/MiningServerVisualizerSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Mining.Components; namespace Content.Client.Mining.Visualizers { - public sealed class MiningServerVisualizerSystem : VisualizerSystem + public sealed partial class MiningServerVisualizerSystem : VisualizerSystem { protected override void OnAppearanceChange(EntityUid uid, MiningServerVisualsComponent component, ref AppearanceChangeEvent args) { diff --git a/Content.Client/_Wega/ModularSuit/ModularSuitAssemblyVisualizerSystem.cs b/Content.Client/_Wega/ModularSuit/ModularSuitAssemblyVisualizerSystem.cs index 3280096108..8447a4383d 100644 --- a/Content.Client/_Wega/ModularSuit/ModularSuitAssemblyVisualizerSystem.cs +++ b/Content.Client/_Wega/ModularSuit/ModularSuitAssemblyVisualizerSystem.cs @@ -7,7 +7,7 @@ namespace Content.Client.Modular.Suit; /// Handles the sprite state changes while /// constructing mech assemblies. /// -public sealed class ModularSuitAssemblyVisualizerSystem : VisualizerSystem +public sealed partial class ModularSuitAssemblyVisualizerSystem : VisualizerSystem { protected override void OnAppearanceChange(EntityUid uid, ModularSuitAssemblyVisualsComponent component, ref AppearanceChangeEvent args) diff --git a/Content.Client/_Wega/ModularSuit/ModularSuitHiddenClothingSystem.cs b/Content.Client/_Wega/ModularSuit/ModularSuitHiddenClothingSystem.cs index e512a4738f..343e2c246a 100644 --- a/Content.Client/_Wega/ModularSuit/ModularSuitHiddenClothingSystem.cs +++ b/Content.Client/_Wega/ModularSuit/ModularSuitHiddenClothingSystem.cs @@ -5,7 +5,7 @@ namespace Content.Client.Modular.Suit; /// /// idk. /// -public sealed class ModularSuitHiddenClothingSystem : SharedModularSuitHiddenClothingSystem +public sealed partial class ModularSuitHiddenClothingSystem : SharedModularSuitHiddenClothingSystem { } diff --git a/Content.Client/_Wega/ModularSuit/Ui/LightModuleBoundUserInterface.cs b/Content.Client/_Wega/ModularSuit/Ui/LightModuleBoundUserInterface.cs index bdefeb3b82..42090f89e8 100644 --- a/Content.Client/_Wega/ModularSuit/Ui/LightModuleBoundUserInterface.cs +++ b/Content.Client/_Wega/ModularSuit/Ui/LightModuleBoundUserInterface.cs @@ -3,7 +3,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.ModularSuit.Ui; -public sealed class LightModuleBoundUserInterface : BoundUserInterface +public sealed partial class LightModuleBoundUserInterface : BoundUserInterface { private LightModuleWindow? _window; diff --git a/Content.Client/_Wega/ModularSuit/Ui/ModularSuitBoundUserInterface.cs b/Content.Client/_Wega/ModularSuit/Ui/ModularSuitBoundUserInterface.cs index 3d1f543e9e..61430df910 100644 --- a/Content.Client/_Wega/ModularSuit/Ui/ModularSuitBoundUserInterface.cs +++ b/Content.Client/_Wega/ModularSuit/Ui/ModularSuitBoundUserInterface.cs @@ -3,7 +3,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.ModularSuit.Ui; -public sealed class ModularSuitBoundUserInterface : BoundUserInterface +public sealed partial class ModularSuitBoundUserInterface : BoundUserInterface { [ViewVariables] private ModularSuitWindow? _window; diff --git a/Content.Client/_Wega/ModularSuit/Ui/ModularSuitWindow.xaml.cs b/Content.Client/_Wega/ModularSuit/Ui/ModularSuitWindow.xaml.cs index 599c5eb906..270f167e14 100644 --- a/Content.Client/_Wega/ModularSuit/Ui/ModularSuitWindow.xaml.cs +++ b/Content.Client/_Wega/ModularSuit/Ui/ModularSuitWindow.xaml.cs @@ -238,7 +238,7 @@ public sealed partial class ModularSuitWindow : BaseWindow protected override DragMode GetDragModeFor(Vector2 relativeMousePos) => DragMode.Move; } -public sealed class ModuleControl : PanelContainer +public sealed partial class ModuleControl : PanelContainer { private readonly CheckBox? _toggleButton; public event Action? OnToggle; @@ -334,7 +334,7 @@ public sealed class ModuleControl : PanelContainer } } -public sealed class PartControl : PanelContainer +public sealed partial class PartControl : PanelContainer { public PartControl(SuitPartEntry part, IEntityManager entMan) { diff --git a/Content.Client/_Wega/NullRod/NullDamageOverlay.cs b/Content.Client/_Wega/NullRod/NullDamageOverlay.cs index 79dc5ce840..91dfa925e6 100644 --- a/Content.Client/_Wega/NullRod/NullDamageOverlay.cs +++ b/Content.Client/_Wega/NullRod/NullDamageOverlay.cs @@ -7,7 +7,7 @@ using Robust.Shared.Timing; namespace Content.Client.NullRod; -public sealed class NullDamageOverlay : Overlay +public sealed partial class NullDamageOverlay : Overlay { [Dependency] private IEntityManager _entityManager = default!; [Dependency] private IPlayerManager _playerManager = default!; diff --git a/Content.Client/_Wega/NullRod/NullDamageSystem.cs b/Content.Client/_Wega/NullRod/NullDamageSystem.cs index 923f11a7bb..b2485af40e 100644 --- a/Content.Client/_Wega/NullRod/NullDamageSystem.cs +++ b/Content.Client/_Wega/NullRod/NullDamageSystem.cs @@ -5,7 +5,7 @@ using Robust.Shared.Player; namespace Content.Client.NullRod; -public sealed class NullDamageSystem : EntitySystem +public sealed partial class NullDamageSystem : EntitySystem { [Dependency] private IPlayerManager _player = default!; [Dependency] private IOverlayManager _overlayMan = default!; diff --git a/Content.Client/_Wega/Offer/OfferItemIndicatorsOverlay.cs b/Content.Client/_Wega/Offer/OfferItemIndicatorsOverlay.cs index be41f0b642..986c6a3bec 100644 --- a/Content.Client/_Wega/Offer/OfferItemIndicatorsOverlay.cs +++ b/Content.Client/_Wega/Offer/OfferItemIndicatorsOverlay.cs @@ -7,7 +7,7 @@ using Robust.Shared.Enums; namespace Content.Client.Offer; -public sealed class OfferItemIndicatorsOverlay : Overlay +public sealed partial class OfferItemIndicatorsOverlay : Overlay { [Dependency] private IInputManager _inputManager = default!; [Dependency] private IPlayerManager _player = default!; diff --git a/Content.Client/_Wega/Offer/OfferItemSystem.cs b/Content.Client/_Wega/Offer/OfferItemSystem.cs index b54bc262bd..f5a6756d08 100644 --- a/Content.Client/_Wega/Offer/OfferItemSystem.cs +++ b/Content.Client/_Wega/Offer/OfferItemSystem.cs @@ -5,7 +5,7 @@ using Robust.Shared.Player; namespace Content.Client.Offer; -public sealed class OfferItemSystem : SharedOfferItemSystem +public sealed partial class OfferItemSystem : SharedOfferItemSystem { [Dependency] private IOverlayManager _overlay = default!; [Dependency] private IPlayerManager _player = default!; diff --git a/Content.Client/_Wega/Overlays/Abstract/ToggleableEquipmentHudSystem.cs b/Content.Client/_Wega/Overlays/Abstract/ToggleableEquipmentHudSystem.cs index daaa84dc8b..3994db128c 100644 --- a/Content.Client/_Wega/Overlays/Abstract/ToggleableEquipmentHudSystem.cs +++ b/Content.Client/_Wega/Overlays/Abstract/ToggleableEquipmentHudSystem.cs @@ -4,14 +4,14 @@ using Robust.Client.GameObjects; namespace Content.Client.Overlays; -public abstract class ToggleableEquipmentHudSystem : EquipmentHudSystem - where T : ToggleableHudComponent +public abstract partial class ToggleableEquipmentHudSystem : EquipmentHudSystem + where T : ToggleableHudComponent { public override void Initialize() { base.Initialize(); } - + protected override void OnRefreshComponentHud(Entity ent, ref RefreshEquipmentHudEvent args) { if (!ent.Comp.Enabled) @@ -19,4 +19,4 @@ public abstract class ToggleableEquipmentHudSystem : EquipmentHudSystem base.OnRefreshComponentHud(ent, ref args); } -} \ No newline at end of file +} diff --git a/Content.Client/_Wega/Overlays/ColourblindnessOverlay.cs b/Content.Client/_Wega/Overlays/ColourblindnessOverlay.cs index 4bbb20c0da..a337496c37 100644 --- a/Content.Client/_Wega/Overlays/ColourblindnessOverlay.cs +++ b/Content.Client/_Wega/Overlays/ColourblindnessOverlay.cs @@ -6,7 +6,7 @@ using Robust.Shared.Prototypes; namespace Content.Client.Shaders.Systems; -public sealed class ColourblindnessOverlay : Overlay +public sealed partial class ColourblindnessOverlay : Overlay { [Dependency] private IEntityManager _entityManager = default!; [Dependency] private IPlayerManager _playerManager = default!; diff --git a/Content.Client/_Wega/Overlays/ColourblindnessSystem.cs b/Content.Client/_Wega/Overlays/ColourblindnessSystem.cs index 222d2a79ef..a44aba5286 100644 --- a/Content.Client/_Wega/Overlays/ColourblindnessSystem.cs +++ b/Content.Client/_Wega/Overlays/ColourblindnessSystem.cs @@ -6,7 +6,7 @@ using Robust.Shared.Player; namespace Content.Client.Shaders.System; -public sealed class ColourblindnessSystem : EntitySystem +public sealed partial class ColourblindnessSystem : EntitySystem { [Dependency] private IPlayerManager _player = default!; [Dependency] private IOverlayManager _overlayMan = default!; diff --git a/Content.Client/_Wega/Overlays/ListenUpOverlay.cs b/Content.Client/_Wega/Overlays/ListenUpOverlay.cs index 2253a88e52..192fd53cb4 100644 --- a/Content.Client/_Wega/Overlays/ListenUpOverlay.cs +++ b/Content.Client/_Wega/Overlays/ListenUpOverlay.cs @@ -12,7 +12,7 @@ using Content.Shared.Mobs; namespace Content.Client._Wega.Overlays; -public sealed class ListenUpOverlay : Overlay +public sealed partial class ListenUpOverlay : Overlay { [Dependency] private IEntityManager _entity = default!; [Dependency] private IPlayerManager _players = default!; diff --git a/Content.Client/_Wega/Overlays/ListenUpSystem.cs b/Content.Client/_Wega/Overlays/ListenUpSystem.cs index 23a2cd9067..56653415b1 100644 --- a/Content.Client/_Wega/Overlays/ListenUpSystem.cs +++ b/Content.Client/_Wega/Overlays/ListenUpSystem.cs @@ -6,7 +6,7 @@ using Robust.Shared.Player; namespace Content.Client._Wega.Overlays; -public sealed class ListenUpSystem : SharedListenUpSkillSystem +public sealed partial class ListenUpSystem : SharedListenUpSkillSystem { [Dependency] private IPlayerManager _player = default!; [Dependency] private IOverlayManager _overlayMan = default!; diff --git a/Content.Client/_Wega/Shader/NaturalNightVisionOverlay.cs b/Content.Client/_Wega/Shader/NaturalNightVisionOverlay.cs index 8332f52abb..579b81d28b 100644 --- a/Content.Client/_Wega/Shader/NaturalNightVisionOverlay.cs +++ b/Content.Client/_Wega/Shader/NaturalNightVisionOverlay.cs @@ -6,7 +6,7 @@ using Robust.Shared.Prototypes; namespace Content.Client.Shaders.Systems; -public sealed class NaturalNightVisionOverlay : Overlay +public sealed partial class NaturalNightVisionOverlay : Overlay { [Dependency] private IEntityManager _entityManager = default!; [Dependency] private IPlayerManager _playerManager = default!; diff --git a/Content.Client/_Wega/Shader/NaturalNightVisionSystem.cs b/Content.Client/_Wega/Shader/NaturalNightVisionSystem.cs index 9b2245a9e8..1b3c4e0bef 100644 --- a/Content.Client/_Wega/Shader/NaturalNightVisionSystem.cs +++ b/Content.Client/_Wega/Shader/NaturalNightVisionSystem.cs @@ -7,7 +7,7 @@ using Robust.Shared.Player; namespace Content.Client.Shaders.Systems; -public sealed class NaturalNightVisionSystem : EntitySystem +public sealed partial class NaturalNightVisionSystem : EntitySystem { [Dependency] private IPlayerManager _playerManager = default!; [Dependency] private IOverlayManager _overlayManager = default!; diff --git a/Content.Client/_Wega/Shader/NightVisionOverlay.cs b/Content.Client/_Wega/Shader/NightVisionOverlay.cs index 261bcdc88e..858189dfcc 100644 --- a/Content.Client/_Wega/Shader/NightVisionOverlay.cs +++ b/Content.Client/_Wega/Shader/NightVisionOverlay.cs @@ -8,7 +8,7 @@ using Robust.Shared.Timing; namespace Content.Client.Shaders.Systems; -public sealed class NightVisionOverlay : Overlay +public sealed partial class NightVisionOverlay : Overlay { [Dependency] private IEntityManager _entityManager = default!; [Dependency] private IPlayerManager _playerManager = default!; diff --git a/Content.Client/_Wega/Shader/NightVisionSystem.cs b/Content.Client/_Wega/Shader/NightVisionSystem.cs index 0cb56f18f7..3acb8ff695 100644 --- a/Content.Client/_Wega/Shader/NightVisionSystem.cs +++ b/Content.Client/_Wega/Shader/NightVisionSystem.cs @@ -6,7 +6,7 @@ using Robust.Shared.GameStates; namespace Content.Client.Shaders.Systems; -public sealed class NightVisionSystem : ToggleableEquipmentHudSystem +public sealed partial class NightVisionSystem : ToggleableEquipmentHudSystem { [Dependency] private IOverlayManager _overlayMan = default!; [Dependency] private ILightManager _lightManager = default!; diff --git a/Content.Client/_Wega/Shader/NoirVisionOverlay.cs b/Content.Client/_Wega/Shader/NoirVisionOverlay.cs index dcdead36c3..909765a3b2 100644 --- a/Content.Client/_Wega/Shader/NoirVisionOverlay.cs +++ b/Content.Client/_Wega/Shader/NoirVisionOverlay.cs @@ -6,7 +6,7 @@ using Robust.Shared.Prototypes; namespace Content.Client.Shaders.Systems; -public sealed class NoirVisionOverlay : Overlay +public sealed partial class NoirVisionOverlay : Overlay { [Dependency] private IEntityManager _entityManager = default!; [Dependency] private IPlayerManager _playerManager = default!; diff --git a/Content.Client/_Wega/Shader/NoirVisionSystem.cs b/Content.Client/_Wega/Shader/NoirVisionSystem.cs index 667866a64c..5d74179bc6 100644 --- a/Content.Client/_Wega/Shader/NoirVisionSystem.cs +++ b/Content.Client/_Wega/Shader/NoirVisionSystem.cs @@ -7,7 +7,7 @@ using Robust.Shared.Player; namespace Content.Client.Shaders.System; -public sealed class NoirVisionSystem : EntitySystem +public sealed partial class NoirVisionSystem : EntitySystem { [Dependency] private IPlayerManager _player = default!; [Dependency] private IOverlayManager _overlayMan = default!; diff --git a/Content.Client/_Wega/Stylesheets/SecApartmentStyles.cs b/Content.Client/_Wega/Stylesheets/SecApartmentStyles.cs index 35208f7599..85abc8af16 100644 --- a/Content.Client/_Wega/Stylesheets/SecApartmentStyles.cs +++ b/Content.Client/_Wega/Stylesheets/SecApartmentStyles.cs @@ -6,7 +6,7 @@ using Robust.Client.UserInterface.Controls; namespace Content.Client._Wega.Stylesheets; -public sealed class SecApartmentStyles +public sealed partial class SecApartmentStyles { private readonly IResourceCache _resCache; diff --git a/Content.Client/_Wega/Surgery/Ui/BodyScannerBoundUserInterface.cs b/Content.Client/_Wega/Surgery/Ui/BodyScannerBoundUserInterface.cs index ae2d6fdaa3..4820922d82 100644 --- a/Content.Client/_Wega/Surgery/Ui/BodyScannerBoundUserInterface.cs +++ b/Content.Client/_Wega/Surgery/Ui/BodyScannerBoundUserInterface.cs @@ -5,7 +5,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.Surgery.Ui { [UsedImplicitly] - public sealed class BodyScannerBoundUserInterface : BoundUserInterface + public sealed partial class BodyScannerBoundUserInterface : BoundUserInterface { [ViewVariables] private BodyScannerWindow? _window; diff --git a/Content.Client/_Wega/Surgery/Ui/SurgeryBoundUserInterface.cs b/Content.Client/_Wega/Surgery/Ui/SurgeryBoundUserInterface.cs index e51ec4d455..7c0324f467 100644 --- a/Content.Client/_Wega/Surgery/Ui/SurgeryBoundUserInterface.cs +++ b/Content.Client/_Wega/Surgery/Ui/SurgeryBoundUserInterface.cs @@ -7,7 +7,7 @@ using Robust.Shared.Player; namespace Content.Client._Wega.Surgery.Ui; [UsedImplicitly] -public sealed class SurgeryBoundUserInterface : BoundUserInterface +public sealed partial class SurgeryBoundUserInterface : BoundUserInterface { [Dependency] private ISharedPlayerManager _playerManager = default!; diff --git a/Content.Client/_Wega/TapeRecorder/TapeRecorderSystem.cs b/Content.Client/_Wega/TapeRecorder/TapeRecorderSystem.cs index 7dbda04869..cc9ef6ce33 100644 --- a/Content.Client/_Wega/TapeRecorder/TapeRecorderSystem.cs +++ b/Content.Client/_Wega/TapeRecorder/TapeRecorderSystem.cs @@ -5,7 +5,7 @@ namespace Content.Client.TapeRecorder; /// /// Required for client side prediction stuff /// -public sealed class TapeRecorderSystem : SharedTapeRecorderSystem +public sealed partial class TapeRecorderSystem : SharedTapeRecorderSystem { private TimeSpan _lastTickTime = TimeSpan.Zero; diff --git a/Content.Client/_Wega/TapeRecorder/Ui/TapeRecorderBoundUserInterface.cs b/Content.Client/_Wega/TapeRecorder/Ui/TapeRecorderBoundUserInterface.cs index 1b3ca0f4e0..ef340b5780 100644 --- a/Content.Client/_Wega/TapeRecorder/Ui/TapeRecorderBoundUserInterface.cs +++ b/Content.Client/_Wega/TapeRecorder/Ui/TapeRecorderBoundUserInterface.cs @@ -4,7 +4,7 @@ using Robust.Shared.Timing; namespace Content.Client.TapeRecorder.Ui; -public sealed class TapeRecorderBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey) +public sealed partial class TapeRecorderBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey) { [Dependency] private IEntityManager _entMan = default!; diff --git a/Content.Client/_Wega/Vampire/Ui/DissectSelectionEui.cs b/Content.Client/_Wega/Vampire/Ui/DissectSelectionEui.cs index 7ee7e044c6..1b9dc00e08 100644 --- a/Content.Client/_Wega/Vampire/Ui/DissectSelectionEui.cs +++ b/Content.Client/_Wega/Vampire/Ui/DissectSelectionEui.cs @@ -6,7 +6,7 @@ using JetBrains.Annotations; namespace Content.Client._Wega.Vampire.Ui; [UsedImplicitly] -public sealed class DissectSelectionEui : BaseEui +public sealed partial class DissectSelectionEui : BaseEui { private DissectSelectionMenu _menu; diff --git a/Content.Client/_Wega/Vampire/Ui/TrophiesMenuEui.cs b/Content.Client/_Wega/Vampire/Ui/TrophiesMenuEui.cs index f5c5729486..84303f7297 100644 --- a/Content.Client/_Wega/Vampire/Ui/TrophiesMenuEui.cs +++ b/Content.Client/_Wega/Vampire/Ui/TrophiesMenuEui.cs @@ -6,7 +6,7 @@ using JetBrains.Annotations; namespace Content.Client._Wega.Vampire.Ui; [UsedImplicitly] -public sealed class TrophiesMenuEui : BaseEui +public sealed partial class TrophiesMenuEui : BaseEui { private TrophiesMenu _menu; diff --git a/Content.Client/_Wega/Vampire/Ui/VampireClassSelectionEui.cs b/Content.Client/_Wega/Vampire/Ui/VampireClassSelectionEui.cs index 56180c3f73..53c8216260 100644 --- a/Content.Client/_Wega/Vampire/Ui/VampireClassSelectionEui.cs +++ b/Content.Client/_Wega/Vampire/Ui/VampireClassSelectionEui.cs @@ -5,7 +5,7 @@ using JetBrains.Annotations; namespace Content.Client._Wega.Vampire.Ui; [UsedImplicitly] -public sealed class VampireClassSelectionEui : BaseEui +public sealed partial class VampireClassSelectionEui : BaseEui { private readonly VampireClassSelectionMenu _menu; diff --git a/Content.Client/_Wega/Vampire/VampireSystem.cs b/Content.Client/_Wega/Vampire/VampireSystem.cs index 1662259568..7d6cfc5d6f 100644 --- a/Content.Client/_Wega/Vampire/VampireSystem.cs +++ b/Content.Client/_Wega/Vampire/VampireSystem.cs @@ -12,9 +12,9 @@ using Robust.Shared.Prototypes; namespace Content.Client.Vampire; -public sealed class VampireSystem : SharedVampireSystem +public sealed partial class VampireSystem : SharedVampireSystem { - [Dependency] private GhostSystem? _ghost = default; + [Dependency] private GhostSystem _ghost = default!; [Dependency] private IClientAdminManager _admin = default!; [Dependency] private IPlayerManager _playerManager = default!; [Dependency] private IPrototypeManager _prototype = default!; diff --git a/Content.Client/_Wega/Vehicle/VehicleSystem.cs b/Content.Client/_Wega/Vehicle/VehicleSystem.cs index 265ebe7b19..74b08690d0 100644 --- a/Content.Client/_Wega/Vehicle/VehicleSystem.cs +++ b/Content.Client/_Wega/Vehicle/VehicleSystem.cs @@ -4,7 +4,7 @@ using Robust.Client.GameObjects; namespace Content.Client.Vehicle; -public sealed class VehicleSystem : SharedVehicleSystem +public sealed partial class VehicleSystem : SharedVehicleSystem { [Dependency] private SpriteSystem _sprite = default!; diff --git a/Content.Client/_Wega/VeilCult/UI/EnchantBoundUserInterface.cs b/Content.Client/_Wega/VeilCult/UI/EnchantBoundUserInterface.cs index d16680ada8..e70dee821a 100644 --- a/Content.Client/_Wega/VeilCult/UI/EnchantBoundUserInterface.cs +++ b/Content.Client/_Wega/VeilCult/UI/EnchantBoundUserInterface.cs @@ -6,7 +6,7 @@ using Robust.Shared.Prototypes; namespace Content.Client._Wega.VeilCult.UI; [UsedImplicitly] -public sealed class EnchantBoundUserInterface : BoundUserInterface +public sealed partial class EnchantBoundUserInterface : BoundUserInterface { [ViewVariables] private EnchantWindow? _window; diff --git a/Content.Client/_Wega/VeilCult/UI/TeleportEnchantBoundUserInterface.cs b/Content.Client/_Wega/VeilCult/UI/TeleportEnchantBoundUserInterface.cs index c6efd67d3c..aaf6185fc2 100644 --- a/Content.Client/_Wega/VeilCult/UI/TeleportEnchantBoundUserInterface.cs +++ b/Content.Client/_Wega/VeilCult/UI/TeleportEnchantBoundUserInterface.cs @@ -6,7 +6,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.VeilCult.UI; [UsedImplicitly] -public sealed class TeleportEnchantBoundUserInterface : BoundUserInterface +public sealed partial class TeleportEnchantBoundUserInterface : BoundUserInterface { // Copy of TeleportLocationsUI for Teleportation enchantment [ViewVariables] diff --git a/Content.Client/_Wega/VeilCult/UI/VeilAltarBoundUserInterface.cs b/Content.Client/_Wega/VeilCult/UI/VeilAltarBoundUserInterface.cs index 6265cfc8a2..d4ad167f18 100644 --- a/Content.Client/_Wega/VeilCult/UI/VeilAltarBoundUserInterface.cs +++ b/Content.Client/_Wega/VeilCult/UI/VeilAltarBoundUserInterface.cs @@ -3,7 +3,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.VeilCult.UI; -public sealed class VeilAltarBoundUserInterface : BoundUserInterface +public sealed partial class VeilAltarBoundUserInterface : BoundUserInterface { [ViewVariables] private VeilAltarMenu? _menu; diff --git a/Content.Client/_Wega/VeilCult/UI/VeilBeaconBoundUserInterface.cs b/Content.Client/_Wega/VeilCult/UI/VeilBeaconBoundUserInterface.cs index 77931e8811..c7c3d0a62d 100644 --- a/Content.Client/_Wega/VeilCult/UI/VeilBeaconBoundUserInterface.cs +++ b/Content.Client/_Wega/VeilCult/UI/VeilBeaconBoundUserInterface.cs @@ -3,7 +3,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.VeilCult.UI; -public sealed class VeilBeaconBoundUserInterface : BoundUserInterface +public sealed partial class VeilBeaconBoundUserInterface : BoundUserInterface { [ViewVariables] private VeilBeaconWindow? _window; diff --git a/Content.Client/_Wega/VeilCult/VeilCultSystem.cs b/Content.Client/_Wega/VeilCult/VeilCultSystem.cs index ecde6f4eb3..53b654ce88 100644 --- a/Content.Client/_Wega/VeilCult/VeilCultSystem.cs +++ b/Content.Client/_Wega/VeilCult/VeilCultSystem.cs @@ -7,7 +7,7 @@ using Robust.Shared.Prototypes; namespace Content.Client.Veil.Cult { - public sealed class VeilCultSystem : SharedVeilCultSystem + public sealed partial class VeilCultSystem : SharedVeilCultSystem { [Dependency] private IPrototypeManager _prototype = default!; [Dependency] private SpriteSystem _sprite = default!; diff --git a/Content.Client/_Wega/VentCraw/VentCrawVisionSystem.cs b/Content.Client/_Wega/VentCraw/VentCrawVisionSystem.cs index a1aae8f2fa..d9ed135706 100644 --- a/Content.Client/_Wega/VentCraw/VentCrawVisionSystem.cs +++ b/Content.Client/_Wega/VentCraw/VentCrawVisionSystem.cs @@ -5,7 +5,7 @@ using Robust.Shared.Timing; namespace Content.Client.VentCraw; -public sealed class VentCrawVisionSystem : EntitySystem +public sealed partial class VentCrawVisionSystem : EntitySystem { [Dependency] private IGameTiming _timing = default!; [Dependency] private IPlayerManager _player = default!; diff --git a/Content.Client/_Wega/Visuals/FadeSystem.cs b/Content.Client/_Wega/Visuals/FadeSystem.cs index 16b5e4184d..25ff2bc094 100644 --- a/Content.Client/_Wega/Visuals/FadeSystem.cs +++ b/Content.Client/_Wega/Visuals/FadeSystem.cs @@ -4,7 +4,7 @@ using Robust.Shared.Timing; namespace Content.Client.Visuals; -public sealed class FadeSystem : EntitySystem +public sealed partial class FadeSystem : EntitySystem { [Dependency] private IGameTiming _gameTiming = default!; [Dependency] private SpriteSystem _sprite = default!; diff --git a/Content.Client/_Wega/Visuals/VisualStateSystem.cs b/Content.Client/_Wega/Visuals/VisualStateSystem.cs index d192d7454b..5174979d4a 100644 --- a/Content.Client/_Wega/Visuals/VisualStateSystem.cs +++ b/Content.Client/_Wega/Visuals/VisualStateSystem.cs @@ -12,7 +12,7 @@ namespace Content.Client.Visuals; /// A visual system is necessary to optimize the process of creating and displaying a visual, without creating a of different visual systems. /// Only for integration via code. /// -public sealed class VisualStateSystem : VisualizerSystem +public sealed partial class VisualStateSystem : VisualizerSystem { [Dependency] private SharedItemSystem _item = default!; diff --git a/Content.Client/_Wega/Voucher/VoucherBoundUserInterface.cs b/Content.Client/_Wega/Voucher/VoucherBoundUserInterface.cs index 570079ac46..3b609e8f16 100644 --- a/Content.Client/_Wega/Voucher/VoucherBoundUserInterface.cs +++ b/Content.Client/_Wega/Voucher/VoucherBoundUserInterface.cs @@ -8,7 +8,7 @@ using Robust.Shared.Prototypes; namespace Content.Client._Wega.Voucher; [UsedImplicitly] -public sealed class VoucherBoundUserInterface : BoundUserInterface +public sealed partial class VoucherBoundUserInterface : BoundUserInterface { [Dependency] private IEntityManager _entMan = default!; [Dependency] private ISharedPlayerManager _playerManager = default!; diff --git a/Content.Client/_Wega/Xenobiology/CellSystem.cs b/Content.Client/_Wega/Xenobiology/CellSystem.cs index 75a6e07646..bf0aaa43f9 100644 --- a/Content.Client/_Wega/Xenobiology/CellSystem.cs +++ b/Content.Client/_Wega/Xenobiology/CellSystem.cs @@ -2,4 +2,4 @@ namespace Content.Client._Wega.Xenobiology; -public sealed class CellSystem : SharedCellSystem; +public sealed partial class CellSystem : SharedCellSystem; diff --git a/Content.Client/_Wega/Xenobiology/CellVisualsSystem.cs b/Content.Client/_Wega/Xenobiology/CellVisualsSystem.cs index 885b1e0531..b1721d4306 100644 --- a/Content.Client/_Wega/Xenobiology/CellVisualsSystem.cs +++ b/Content.Client/_Wega/Xenobiology/CellVisualsSystem.cs @@ -5,7 +5,7 @@ using Robust.Client.GameObjects; namespace Content.Client._Wega.Xenobiology; -public sealed class CellVisualsSystem : SharedCellVisualsSystem +public sealed partial class CellVisualsSystem : SharedCellVisualsSystem { [Dependency] private SpriteSystem _sprite = default!; diff --git a/Content.Client/_Wega/Xenobiology/SlimeVisualSystem.cs b/Content.Client/_Wega/Xenobiology/SlimeVisualSystem.cs index 437f31107a..47f3ebd84a 100644 --- a/Content.Client/_Wega/Xenobiology/SlimeVisualSystem.cs +++ b/Content.Client/_Wega/Xenobiology/SlimeVisualSystem.cs @@ -6,7 +6,7 @@ using Robust.Client.GameObjects; namespace Content.Client._Wega.Xenobiology; -public sealed class SlimeVisualSystem : SharedSlimeVisualSystem +public sealed partial class SlimeVisualSystem : SharedSlimeVisualSystem { [Dependency] private SharedAppearanceSystem _appearance = default!; [Dependency] private SpriteSystem _sprite = default!; diff --git a/Content.Client/_Wega/Xenobiology/UI/CellSequencerBoundUserInterface.cs b/Content.Client/_Wega/Xenobiology/UI/CellSequencerBoundUserInterface.cs index baa92d47cf..620c3bbb7f 100644 --- a/Content.Client/_Wega/Xenobiology/UI/CellSequencerBoundUserInterface.cs +++ b/Content.Client/_Wega/Xenobiology/UI/CellSequencerBoundUserInterface.cs @@ -5,7 +5,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.Xenobiology.UI; [UsedImplicitly] -public sealed class CellSequencerBoundUserInterface : BoundUserInterface +public sealed partial class CellSequencerBoundUserInterface : BoundUserInterface { [ViewVariables] private CellSequencerWindow? _window; diff --git a/Content.Client/_Wega/Xenobiology/UI/CellularFusionBoundUserInterface.cs b/Content.Client/_Wega/Xenobiology/UI/CellularFusionBoundUserInterface.cs index 5b37c91ccf..5b6ab94855 100644 --- a/Content.Client/_Wega/Xenobiology/UI/CellularFusionBoundUserInterface.cs +++ b/Content.Client/_Wega/Xenobiology/UI/CellularFusionBoundUserInterface.cs @@ -3,7 +3,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.Xenobiology.UI; -public sealed class CellularFusionBoundUserInterface : BoundUserInterface +public sealed partial class CellularFusionBoundUserInterface : BoundUserInterface { [ViewVariables] private CellularFusionWindow? _window; diff --git a/Content.Client/_Wega/Xenobiology/UI/SlimeAnalyzerBoundUserInterface.cs b/Content.Client/_Wega/Xenobiology/UI/SlimeAnalyzerBoundUserInterface.cs index d4147a6d8d..561d6c942f 100644 --- a/Content.Client/_Wega/Xenobiology/UI/SlimeAnalyzerBoundUserInterface.cs +++ b/Content.Client/_Wega/Xenobiology/UI/SlimeAnalyzerBoundUserInterface.cs @@ -5,7 +5,7 @@ using Robust.Client.UserInterface; namespace Content.Client._Wega.Xenobiology.UI; [UsedImplicitly] -public sealed class SlimeAnalyzerBoundUserInterface : BoundUserInterface +public sealed partial class SlimeAnalyzerBoundUserInterface : BoundUserInterface { [ViewVariables] private SlimeAnalyzerWindow? _window; diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs index a8288aa5c1..7bc961a7aa 100644 --- a/Content.Server/Dragon/DragonSystem.cs +++ b/Content.Server/Dragon/DragonSystem.cs @@ -41,12 +41,12 @@ public sealed partial class DragonSystem : EntitySystem [Dependency] private GibbingSystem _gibbing = default!; [Dependency] private SmokeSystem _smoke = default!; // Corvax-Wega-DragonPushSkill-start - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly TileSystem _tile = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private TileSystem _tile = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedStunSystem _stun = default!; // Corvax-Wega-DragonPushSkill-end [Dependency] private EntityQuery _carpRiftsConditionQuery = default!; diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs index 87034e41d0..5ee83ef0c0 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs @@ -28,7 +28,7 @@ namespace Content.Server.Explosion.EntitySystems; public sealed partial class ExplosionSystem { - [Dependency] private readonly SurgerySystem _surgery = default!; // Corvax-Wega-Surgery + [Dependency] private SurgerySystem _surgery = default!; // Corvax-Wega-Surgery /// /// Used to limit explosion processing time. See . diff --git a/Content.Server/StationRecords/Systems/GeneralStationRecordConsoleSystem.cs b/Content.Server/StationRecords/Systems/GeneralStationRecordConsoleSystem.cs index 19b9daf3bc..c7e5c8f234 100644 --- a/Content.Server/StationRecords/Systems/GeneralStationRecordConsoleSystem.cs +++ b/Content.Server/StationRecords/Systems/GeneralStationRecordConsoleSystem.cs @@ -8,6 +8,7 @@ using Content.Shared.Inventory; // Corvax-Wega-Record using Content.Shared.PDA; // Corvax-Wega-Record using Content.Shared.StationRecords; using Robust.Server.GameObjects; +using Robust.Shared.Audio.Systems; using Robust.Shared.Timing; // Corvax-Wega-Record namespace Content.Server.StationRecords.Systems; @@ -17,6 +18,7 @@ public sealed partial class GeneralStationRecordConsoleSystem : EntitySystem [Dependency] private UserInterfaceSystem _ui = default!; [Dependency] private StationSystem _station = default!; [Dependency] private StationRecordsSystem _stationRecords = default!; + [Dependency] private SharedAudioSystem _audio = default!; // Corvax-Wega-Record [Dependency] private StationJobsSystem _stationJobsSystem = default!; // Corvax-Wega-Record [Dependency] private PopupSystem _popup = default!; // Corvax-Wega-Record [Dependency] private InventorySystem _inventory = default!; // Corvax-Wega-Record diff --git a/Content.Server/_Wega/Administration/Commands/AchievementsCommands.cs b/Content.Server/_Wega/Administration/Commands/AchievementsCommands.cs index 9b61c627b4..00ef042d13 100644 --- a/Content.Server/_Wega/Administration/Commands/AchievementsCommands.cs +++ b/Content.Server/_Wega/Administration/Commands/AchievementsCommands.cs @@ -12,7 +12,7 @@ namespace Content.Server.Administration.Commands; /// What are you looking at here? [AdminCommand(AdminFlags.Permissions)] -public sealed class AchievementsGrantCommand : IConsoleCommand +public sealed partial class AchievementsGrantCommand : IConsoleCommand { [Dependency] private IPlayerManager _playerManager = default!; [Dependency] private IPrototypeManager _prototypeManager = default!; @@ -100,7 +100,7 @@ public sealed class AchievementsGrantCommand : IConsoleCommand } [AdminCommand(AdminFlags.Permissions)] -public sealed class AchievementsRevokeCommand : IConsoleCommand +public sealed partial class AchievementsRevokeCommand : IConsoleCommand { [Dependency] private IPlayerManager _playerManager = default!; [Dependency] private IPrototypeManager _prototypeManager = default!; @@ -193,7 +193,7 @@ public sealed class AchievementsRevokeCommand : IConsoleCommand } [AdminCommand(AdminFlags.Permissions)] -public sealed class AchievementsGrantAllCommand : IConsoleCommand +public sealed partial class AchievementsGrantAllCommand : IConsoleCommand { [Dependency] private IPlayerManager _playerManager = default!; [Dependency] private IPrototypeManager _prototypeManager = default!; @@ -248,7 +248,7 @@ public sealed class AchievementsGrantAllCommand : IConsoleCommand } [AdminCommand(AdminFlags.Permissions)] -public sealed class AchievementsClearCommand : IConsoleCommand +public sealed partial class AchievementsClearCommand : IConsoleCommand { [Dependency] private IPlayerManager _playerManager = default!; [Dependency] private IServerDbManager _db = default!; @@ -293,7 +293,7 @@ public sealed class AchievementsClearCommand : IConsoleCommand } [AdminCommand(AdminFlags.Admin)] -public sealed class AchievementsListCommand : IConsoleCommand +public sealed partial class AchievementsListCommand : IConsoleCommand { [Dependency] private IPlayerManager _playerManager = default!; [Dependency] private IPrototypeManager _prototypeManager = default!; diff --git a/Content.Server/_Wega/Administration/Commands/TimePackCommand.cs b/Content.Server/_Wega/Administration/Commands/TimePackCommand.cs index c734041d06..89269de1a1 100644 --- a/Content.Server/_Wega/Administration/Commands/TimePackCommand.cs +++ b/Content.Server/_Wega/Administration/Commands/TimePackCommand.cs @@ -8,7 +8,7 @@ using Content.Server.Database; namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Permissions)] -public sealed class TimePackCommand : IConsoleCommand +public sealed partial class TimePackCommand : IConsoleCommand { [Dependency] private IPlayerManager _playerManager = default!; [Dependency] private IServerDbManager _db = default!; diff --git a/Content.Server/_Wega/Aliens/Facehugger/FacehuggerSystem.cs b/Content.Server/_Wega/Aliens/Facehugger/FacehuggerSystem.cs index d2e7a10414..00dc93788c 100644 --- a/Content.Server/_Wega/Aliens/Facehugger/FacehuggerSystem.cs +++ b/Content.Server/_Wega/Aliens/Facehugger/FacehuggerSystem.cs @@ -13,7 +13,7 @@ using Robust.Shared.Timing; namespace Content.Server._Wega.Aliens.Facehugger; -public sealed class FacehuggerSystem : EntitySystem +public sealed partial class FacehuggerSystem : EntitySystem { [Dependency] private EntityLookupSystem _lookup = default!; [Dependency] private InventorySystem _inventory = default!; diff --git a/Content.Server/_Wega/Anomaly/Effects/CoreAnomChangeTempSystem.cs b/Content.Server/_Wega/Anomaly/Effects/CoreAnomChangeTempSystem.cs index 129ec59622..585d0cfa76 100644 --- a/Content.Server/_Wega/Anomaly/Effects/CoreAnomChangeTempSystem.cs +++ b/Content.Server/_Wega/Anomaly/Effects/CoreAnomChangeTempSystem.cs @@ -4,7 +4,7 @@ using Content.Server.CoreTempChange.Components; namespace Content.Server.CoreTempChange.Effects; -public sealed class CoreTempChangeSystem : EntitySystem +public sealed partial class CoreTempChangeSystem : EntitySystem { [Dependency] private AtmosphereSystem _atmosphere = default!; [Dependency] private TransformSystem _xform = default!; diff --git a/Content.Server/_Wega/Barks/BarkSystem.cs b/Content.Server/_Wega/Barks/BarkSystem.cs index d3735669af..509b6dfa43 100644 --- a/Content.Server/_Wega/Barks/BarkSystem.cs +++ b/Content.Server/_Wega/Barks/BarkSystem.cs @@ -12,7 +12,7 @@ namespace Content.Server.Speech.Synthesis.System; /// /// Обрабатывает барки для сущностей. /// -public sealed class BarkSystem : EntitySystem +public sealed partial class BarkSystem : EntitySystem { [Dependency] private AudioSystem _audio = default!; [Dependency] private IPrototypeManager _prototypeManager = default!; diff --git a/Content.Server/_Wega/BloodCult/BloodCultSystem.Abilities.cs b/Content.Server/_Wega/BloodCult/BloodCultSystem.Abilities.cs index ac33a725c5..da97104dba 100644 --- a/Content.Server/_Wega/BloodCult/BloodCultSystem.Abilities.cs +++ b/Content.Server/_Wega/BloodCult/BloodCultSystem.Abilities.cs @@ -100,7 +100,7 @@ public sealed partial class BloodCultSystem SubscribeLocalEvent(OnBloodRites); SubscribeLocalEvent(BloodRites); - SubscribeLocalEvent(OnExamine); + SubscribeLocalEvent(OnExamine); SubscribeLocalEvent(BloodRitesSelect); SubscribeLocalEvent(OnBloodOrb); SubscribeLocalEvent(OnBloodOrbAbsorbed); @@ -386,7 +386,7 @@ public sealed partial class BloodCultSystem } } - private void OnExamine(EntityUid uid, BloodSpellComponent spell, ExaminedEvent args) + private void OnExamine(EntityUid uid, BloodSpellComponent spell, ExaminedEvent args) { if (spell.SpellType != BloodCultSpell.BloodRites) return; @@ -959,7 +959,7 @@ public sealed partial class BloodCultSystem var absorbedBlood = 0; foreach (var containedEntity in container.ContainedEntities.ToList()) { - if (!_solution.TryGetSolution(containedEntity, null, out var solutionComp, out var solutionData)) + if (!_solution.TryGetSolution(containedEntity, "solution", out var solutionComp, out var solutionData)) continue; var bloodReagents = solutionData.Contents @@ -975,7 +975,7 @@ public sealed partial class BloodCultSystem if (bloodReagents.Count > 0) Spawn("BloodCultFloorGlowEffect", Transform(puddle).Coordinates); - if (_solution.TryGetSolution(containedEntity, null, out _, out var updatedSolution) && updatedSolution.Contents.Count == 0) + if (_solution.TryGetSolution(containedEntity, "solution", out _, out var updatedSolution) && updatedSolution.Contents.Count == 0) QueueDel(puddle); } @@ -1030,24 +1030,24 @@ public sealed partial class BloodCultSystem } } - private bool TrySpawnSpellInHand(EntityUid uid, EntProtoId proto) - { - if (!TryComp(uid, out var hands)) - return false; + private bool TrySpawnSpellInHand(EntityUid uid, EntProtoId proto) + { + if (!TryComp(uid, out var hands)) + return false; - var spell = Spawn(proto, Transform(uid).Coordinates); - var activeHand = _hands.GetActiveHand((uid, hands)); + var spell = Spawn(proto, Transform(uid).Coordinates); + var activeHand = _hands.GetActiveHand((uid, hands)); - if (_hands.TryPickupAnyHand(uid, spell)) - return true; + if (_hands.TryPickupAnyHand(uid, spell)) + return true; + else if (activeHand != null && _hands.TryForcePickup((uid, hands), spell, activeHand)) + return true; + else + { + QueueDel(spell); + return false; + } - else if (activeHand != null && _hands.TryForcePickup((uid, hands), spell, activeHand)) - return true; - - else - QueueDel(spell); - return false; - - } + } #endregion } diff --git a/Content.Server/_Wega/BloodCult/BloodMagicEui.cs b/Content.Server/_Wega/BloodCult/BloodMagicEui.cs index 8c8d9aac38..ab57581acb 100644 --- a/Content.Server/_Wega/BloodCult/BloodMagicEui.cs +++ b/Content.Server/_Wega/BloodCult/BloodMagicEui.cs @@ -7,7 +7,7 @@ namespace Content.Server.Blood.Cult.UI; /// /// Logic for the blood magic window /// -public sealed class BloodMagicEui(EntityUid cultist, BloodCultSystem bloodCult) : BaseEui +public sealed partial class BloodMagicEui(EntityUid cultist, BloodCultSystem bloodCult) : BaseEui { public override EuiStateBase GetNewState() => new BloodMagicState(); diff --git a/Content.Server/_Wega/Botany/PlantAnalyzerSystem.cs b/Content.Server/_Wega/Botany/PlantAnalyzerSystem.cs index 704e926de6..7ec08011ae 100644 --- a/Content.Server/_Wega/Botany/PlantAnalyzerSystem.cs +++ b/Content.Server/_Wega/Botany/PlantAnalyzerSystem.cs @@ -20,7 +20,7 @@ using Content.Shared.PowerCell; namespace Content.Server.Botany.Systems; -public sealed class PlantAnalyzerSystem : SharedPlantAnalyzerSystem +public sealed partial class PlantAnalyzerSystem : SharedPlantAnalyzerSystem { [Dependency] private BotanySystem _botany = default!; [Dependency] private UserInterfaceSystem _uiSystem = default!; diff --git a/Content.Server/_Wega/CardTarot/CardTarotSystem.cs b/Content.Server/_Wega/CardTarot/CardTarotSystem.cs index c3c06f28c5..2a9eaf4c5a 100644 --- a/Content.Server/_Wega/CardTarot/CardTarotSystem.cs +++ b/Content.Server/_Wega/CardTarot/CardTarotSystem.cs @@ -68,7 +68,7 @@ using Robust.Shared.Timing; namespace Content.Server.Card.Tarot; -public sealed class CardTarotSystem : EntitySystem +public sealed partial class CardTarotSystem : EntitySystem { [Dependency] private AppearanceSystem _appearance = default!; [Dependency] private BloodstreamSystem _blood = default!; diff --git a/Content.Server/_Wega/Carrying/CarryingSystem.cs b/Content.Server/_Wega/Carrying/CarryingSystem.cs index b4c0b6ae67..05aab586a6 100644 --- a/Content.Server/_Wega/Carrying/CarryingSystem.cs +++ b/Content.Server/_Wega/Carrying/CarryingSystem.cs @@ -32,7 +32,7 @@ using Content.Shared.Hands.EntitySystems; namespace Content.Server.Carrying { - public sealed class CarryingSystem : EntitySystem + public sealed partial class CarryingSystem : EntitySystem { [Dependency] private VirtualItemSystem _virtualItemSystem = default!; [Dependency] private CarryingSlowdownSystem _slowdown = default!; diff --git a/Content.Server/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs index bc2b636752..cb3e30dfd8 100644 --- a/Content.Server/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs +++ b/Content.Server/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs @@ -16,7 +16,7 @@ using Robust.Shared.Utility; namespace Content.Server.CartridgeLoader.Cartridges; -public sealed class NanoChatCartridgeSystem : SharedNanoChatCartridgeSystem +public sealed partial class NanoChatCartridgeSystem : SharedNanoChatCartridgeSystem { [Dependency] private IAdminLogManager _admin = default!; [Dependency] private SharedAudioSystem _audio = default!; diff --git a/Content.Server/_Wega/Chat/Commands/MindSayCommand.cs b/Content.Server/_Wega/Chat/Commands/MindSayCommand.cs index 4599df041c..4ad1532253 100644 --- a/Content.Server/_Wega/Chat/Commands/MindSayCommand.cs +++ b/Content.Server/_Wega/Chat/Commands/MindSayCommand.cs @@ -7,7 +7,7 @@ using Robust.Shared.Enums; namespace Content.Server.Chat.Commands { [AnyCommand] - internal sealed class MindSayCommand : LocalizedEntityCommands + internal sealed partial class MindSayCommand : LocalizedEntityCommands { [Dependency] private ChatSystem _chatSystem = default!; diff --git a/Content.Server/_Wega/Clothing/ForceLoadoutSystem.cs b/Content.Server/_Wega/Clothing/ForceLoadoutSystem.cs index 1f56870b1f..9d76a4f5fe 100644 --- a/Content.Server/_Wega/Clothing/ForceLoadoutSystem.cs +++ b/Content.Server/_Wega/Clothing/ForceLoadoutSystem.cs @@ -6,7 +6,7 @@ using Content.Server.Clothing.Systems; namespace Content.Shared.Clothing; -public sealed class ForceLoadoutSystem : EntitySystem +public sealed partial class ForceLoadoutSystem : EntitySystem { [Dependency] private IRobustRandom _random = default!; [Dependency] private OutfitSystem _outfitSystem = default!; diff --git a/Content.Server/_Wega/Commands/GhostRespawnCommand.cs b/Content.Server/_Wega/Commands/GhostRespawnCommand.cs index 1a4bcaf5a1..a4b1562fc7 100644 --- a/Content.Server/_Wega/Commands/GhostRespawnCommand.cs +++ b/Content.Server/_Wega/Commands/GhostRespawnCommand.cs @@ -10,7 +10,7 @@ using Robust.Shared.Timing; namespace Content.Server.Wega.Commands; [AnyCommand()] -public sealed class GhostRespawnCommand : IConsoleCommand +public sealed partial class GhostRespawnCommand : IConsoleCommand { [Dependency] private IGameTiming _gameTiming = default!; [Dependency] private IEntityManager _entityManager = default!; diff --git a/Content.Server/_Wega/Damage/DamageResistSystem.cs b/Content.Server/_Wega/Damage/DamageResistSystem.cs index 2ca76bad50..b5a7b774f2 100644 --- a/Content.Server/_Wega/Damage/DamageResistSystem.cs +++ b/Content.Server/_Wega/Damage/DamageResistSystem.cs @@ -7,7 +7,7 @@ using Robust.Shared.Timing; namespace Content.Server.Damage; -public sealed class DamageResistSystem : EntitySystem +public sealed partial class DamageResistSystem : EntitySystem { [Dependency] private DamageableSystem _damageable = default!; [Dependency] private IGameTiming _gameTiming = default!; diff --git a/Content.Server/_Wega/Damage/Systems/DamageInContainerSystem.cs b/Content.Server/_Wega/Damage/Systems/DamageInContainerSystem.cs index d9a92d29eb..e9468d55da 100644 --- a/Content.Server/_Wega/Damage/Systems/DamageInContainerSystem.cs +++ b/Content.Server/_Wega/Damage/Systems/DamageInContainerSystem.cs @@ -11,7 +11,7 @@ using Robust.Shared.Timing; namespace Content.Server.Damage.Systems; -public sealed class DamageInContainerSystem : EntitySystem +public sealed partial class DamageInContainerSystem : EntitySystem { [Dependency] private IGameTiming _gameTiming = default!; [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; diff --git a/Content.Server/_Wega/Damage/Systems/DamageOnActionSystems.cs b/Content.Server/_Wega/Damage/Systems/DamageOnActionSystems.cs index 8d51d98a8a..7df2e52db5 100644 --- a/Content.Server/_Wega/Damage/Systems/DamageOnActionSystems.cs +++ b/Content.Server/_Wega/Damage/Systems/DamageOnActionSystems.cs @@ -7,7 +7,7 @@ using Content.Server.Popups; namespace Content.Server.Damage.Systems; -public sealed class DamageOnActionSystem : EntitySystem +public sealed partial class DamageOnActionSystem : EntitySystem { [Dependency] private DamageableSystem _damageable = default!; [Dependency] private SharedActionsSystem _actions = default!; diff --git a/Content.Server/_Wega/DetailExaminable/DetailExaminableEui.cs b/Content.Server/_Wega/DetailExaminable/DetailExaminableEui.cs index 6e53d00e17..a1d98aa600 100644 --- a/Content.Server/_Wega/DetailExaminable/DetailExaminableEui.cs +++ b/Content.Server/_Wega/DetailExaminable/DetailExaminableEui.cs @@ -4,7 +4,7 @@ using Content.Shared.Eui; namespace Content.Server.DetailExaminable; -public sealed class DetailExaminableEui : BaseEui +public sealed partial class DetailExaminableEui : BaseEui { private readonly DetailExaminableEuiState _state; diff --git a/Content.Server/_Wega/Dice/DiceOfFateSystem.cs b/Content.Server/_Wega/Dice/DiceOfFateSystem.cs index 3e38e80f4e..046c4d3ed3 100644 --- a/Content.Server/_Wega/Dice/DiceOfFateSystem.cs +++ b/Content.Server/_Wega/Dice/DiceOfFateSystem.cs @@ -35,7 +35,7 @@ using Robust.Shared.Timing; namespace Content.Server.Dice; -public sealed class DiceOfFateSystem : EntitySystem +public sealed partial class DiceOfFateSystem : EntitySystem { [Dependency] private SharedAccessSystem _access = default!; [Dependency] private IAdminLogManager _admin = default!; diff --git a/Content.Server/_Wega/Dirt/ShowerSystem.cs b/Content.Server/_Wega/Dirt/ShowerSystem.cs index e22107c082..7cd01dd90b 100644 --- a/Content.Server/_Wega/Dirt/ShowerSystem.cs +++ b/Content.Server/_Wega/Dirt/ShowerSystem.cs @@ -10,7 +10,7 @@ using Robust.Shared.Audio.Systems; namespace Content.Server.Shower { - public sealed class ShowerSystem : EntitySystem + public sealed partial class ShowerSystem : EntitySystem { [Dependency] private SharedAmbientSoundSystem _ambient = default!; [Dependency] private SharedAppearanceSystem _appearance = default!; diff --git a/Content.Server/_Wega/Dirt/WashingMachineSystem.cs b/Content.Server/_Wega/Dirt/WashingMachineSystem.cs index 3c9c49232c..e31580a1fb 100644 --- a/Content.Server/_Wega/Dirt/WashingMachineSystem.cs +++ b/Content.Server/_Wega/Dirt/WashingMachineSystem.cs @@ -14,7 +14,7 @@ using Robust.Shared.Containers; namespace Content.Server.WashingMachine { - public sealed class WashingMachineSystem : EntitySystem + public sealed partial class WashingMachineSystem : EntitySystem { [Dependency] private SharedAmbientSoundSystem _ambient = default!; [Dependency] private SharedAppearanceSystem _appearance = default!; diff --git a/Content.Server/_Wega/Disease/DiseaseDiagnosisSystem.cs b/Content.Server/_Wega/Disease/DiseaseDiagnosisSystem.cs index 24b905940e..e3fba64294 100644 --- a/Content.Server/_Wega/Disease/DiseaseDiagnosisSystem.cs +++ b/Content.Server/_Wega/Disease/DiseaseDiagnosisSystem.cs @@ -26,7 +26,7 @@ namespace Content.Server.Disease /// /// Everything that's about disease diangosis and machines is in here /// - public sealed class DiseaseDiagnosisSystem : EntitySystem + public sealed partial class DiseaseDiagnosisSystem : EntitySystem { [Dependency] private SharedAudioSystem _audio = default!; [Dependency] private MetaDataSystem _metaData = default!; diff --git a/Content.Server/_Wega/Disease/DiseaseProtectionSystem.cs b/Content.Server/_Wega/Disease/DiseaseProtectionSystem.cs index 9a1a00ec48..d4f364ba23 100644 --- a/Content.Server/_Wega/Disease/DiseaseProtectionSystem.cs +++ b/Content.Server/_Wega/Disease/DiseaseProtectionSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Disease.Components; namespace Content.Server.Nutrition.EntitySystems; -public sealed class DiseaseProtectionSystem : EntitySystem +public sealed partial class DiseaseProtectionSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/Disease/DiseaseSystem.cs b/Content.Server/_Wega/Disease/DiseaseSystem.cs index dfd308f947..9256610172 100644 --- a/Content.Server/_Wega/Disease/DiseaseSystem.cs +++ b/Content.Server/_Wega/Disease/DiseaseSystem.cs @@ -26,7 +26,7 @@ namespace Content.Server.Disease /// /// Handles disease propagation & curing /// - public sealed class DiseaseSystem : SharedDiseaseSystem + public sealed partial class DiseaseSystem : SharedDiseaseSystem { [Dependency] private IPrototypeManager _prototypeManager = default!; [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Server/_Wega/Disease/Effects/DiseaseAdjustReagent.cs b/Content.Server/_Wega/Disease/Effects/DiseaseAdjustReagent.cs index d2d300d000..d0f0359809 100644 --- a/Content.Server/_Wega/Disease/Effects/DiseaseAdjustReagent.cs +++ b/Content.Server/_Wega/Disease/Effects/DiseaseAdjustReagent.cs @@ -25,11 +25,11 @@ namespace Content.Server.Disease.Effects public override void Effect(DiseaseEffectArgs args) { - if (!args.EntityManager.TryGetComponent(args.DiseasedEntity, out var bloodstream)) + if (!args.EntityManager.HasComponent(args.DiseasedEntity)) return; var solutionSys = args.EntityManager.EntitySysManager.GetEntitySystem(); - if (Reagent is null || !solutionSys.TryGetSolution(args.DiseasedEntity, null, out var solutionEntity, out var solution) || solutionEntity is null) + if (Reagent is null || !solutionSys.TryGetSolution(args.DiseasedEntity, BloodstreamComponent.DefaultBloodSolutionName, out var solutionEntity, out var solution) || solutionEntity is null) return; var reagentId = new ReagentId(Reagent, new List()); diff --git a/Content.Server/_Wega/ERP/SexToyUsageSystem.cs b/Content.Server/_Wega/ERP/SexToyUsageSystem.cs index 4e36da74be..e7f17114eb 100644 --- a/Content.Server/_Wega/ERP/SexToyUsageSystem.cs +++ b/Content.Server/_Wega/ERP/SexToyUsageSystem.cs @@ -10,7 +10,7 @@ using Robust.Shared.Player; namespace Content.Server.SexToy.System { - public sealed class SexToyUsageSystem : EntitySystem + public sealed partial class SexToyUsageSystem : EntitySystem { [Dependency] private IEntityManager _entManager = default!; [Dependency] private PopupSystem _popupSystem = default!; diff --git a/Content.Server/_Wega/ERP/VibratorSystem.cs b/Content.Server/_Wega/ERP/VibratorSystem.cs index 5abb1002a0..5f5d350589 100644 --- a/Content.Server/_Wega/ERP/VibratorSystem.cs +++ b/Content.Server/_Wega/ERP/VibratorSystem.cs @@ -10,7 +10,7 @@ using Robust.Shared.Player; namespace Content.Server.Vibrator.System { - public sealed class VibratorUsageSystem : EntitySystem + public sealed partial class VibratorUsageSystem : EntitySystem { [Dependency] private IEntityManager _entManager = default!; [Dependency] private PopupSystem _popupSystem = default!; diff --git a/Content.Server/_Wega/GameTicking/AutoVoteSystem.cs b/Content.Server/_Wega/GameTicking/AutoVoteSystem.cs index ce8c1f086b..271ff1ccb1 100644 --- a/Content.Server/_Wega/GameTicking/AutoVoteSystem.cs +++ b/Content.Server/_Wega/GameTicking/AutoVoteSystem.cs @@ -8,7 +8,7 @@ using Robust.Shared.Player; namespace Content.Server.GameTicking { - public sealed class AutoVoteSystem : EntitySystem + public sealed partial class AutoVoteSystem : EntitySystem { [Dependency] private IVoteManager _voteManager = default!; [Dependency] private IPlayerManager _playerManager = default!; diff --git a/Content.Server/_Wega/GameTicking/Rules/BloodBrotherRuleSystem.cs b/Content.Server/_Wega/GameTicking/Rules/BloodBrotherRuleSystem.cs index b0d97d4278..b4786777a3 100644 --- a/Content.Server/_Wega/GameTicking/Rules/BloodBrotherRuleSystem.cs +++ b/Content.Server/_Wega/GameTicking/Rules/BloodBrotherRuleSystem.cs @@ -18,7 +18,7 @@ using Content.Server.Objectives.Systems; namespace Content.Server.GameTicking.Rules; -public sealed class BloodBrotherRuleSystem : GameRuleSystem +public sealed partial class BloodBrotherRuleSystem : GameRuleSystem { [Dependency] private AntagSelectionSystem _antag = default!; [Dependency] private SharedJobSystem _jobs = default!; diff --git a/Content.Server/_Wega/GameTicking/Rules/BloodCultRuleSystem.cs b/Content.Server/_Wega/GameTicking/Rules/BloodCultRuleSystem.cs index 9f15aafa2f..49ab78da28 100644 --- a/Content.Server/_Wega/GameTicking/Rules/BloodCultRuleSystem.cs +++ b/Content.Server/_Wega/GameTicking/Rules/BloodCultRuleSystem.cs @@ -39,7 +39,7 @@ using Robust.Shared.Random; namespace Content.Server.GameTicking.Rules { - public sealed class BloodCultRuleSystem : GameRuleSystem + public sealed partial class BloodCultRuleSystem : GameRuleSystem { [Dependency] private SharedAchievementsSystem _achievement = default!; [Dependency] private ActionsSystem _action = default!; diff --git a/Content.Server/_Wega/GameTicking/Rules/VampireRuleSystem.cs b/Content.Server/_Wega/GameTicking/Rules/VampireRuleSystem.cs index 97ec936adb..e4a16a7aa5 100644 --- a/Content.Server/_Wega/GameTicking/Rules/VampireRuleSystem.cs +++ b/Content.Server/_Wega/GameTicking/Rules/VampireRuleSystem.cs @@ -12,7 +12,7 @@ using Content.Shared.Vampire.Components; namespace Content.Server.GameTicking.Rules { - public sealed class VampireRuleSystem : GameRuleSystem + public sealed partial class VampireRuleSystem : GameRuleSystem { [Dependency] private AntagSelectionSystem _antag = default!; [Dependency] private SharedMindSystem _mind = default!; diff --git a/Content.Server/_Wega/GameTicking/Rules/VeilCultRuleSystem.cs b/Content.Server/_Wega/GameTicking/Rules/VeilCultRuleSystem.cs index 5cf9ee965a..8e065f14d5 100644 --- a/Content.Server/_Wega/GameTicking/Rules/VeilCultRuleSystem.cs +++ b/Content.Server/_Wega/GameTicking/Rules/VeilCultRuleSystem.cs @@ -35,7 +35,7 @@ using Content.Shared.Veil.Cult; namespace Content.Server.GameTicking.Rules { - public sealed class VeilCultRuleSystem : GameRuleSystem + public sealed partial class VeilCultRuleSystem : GameRuleSystem { [Dependency] private SharedAchievementsSystem _achievement = default!; [Dependency] private ActionsSystem _action = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/Basic/EmpatheticThoughtGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Basic/EmpatheticThoughtGenSystem.cs index e6b78ca479..66e5c937be 100644 --- a/Content.Server/_Wega/Genetics/Systems/Basic/EmpatheticThoughtGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Basic/EmpatheticThoughtGenSystem.cs @@ -14,7 +14,7 @@ using Robust.Shared.Utility; namespace Content.Server.Genetics.System; -public sealed class EmpatheticThoughtGenSystem : EntitySystem +public sealed partial class EmpatheticThoughtGenSystem : EntitySystem { [Dependency] private EntityLookupSystem _entityLookup = default!; [Dependency] private SharedMindSystem _mindSystem = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/Basic/HulkGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Basic/HulkGenSystem.cs index ab7f43716c..300468ba69 100644 --- a/Content.Server/_Wega/Genetics/Systems/Basic/HulkGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Basic/HulkGenSystem.cs @@ -16,7 +16,7 @@ using Robust.Shared.Prototypes; namespace Content.Server.Genetics.System; -public sealed class HulkGenSystem : EntitySystem +public sealed partial class HulkGenSystem : EntitySystem { [Dependency] private SharedActionsSystem _action = default!; [Dependency] private SharedAudioSystem _audio = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/Basic/MatterEaterGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Basic/MatterEaterGenSystem.cs index 2ba4479d0e..17f1d7ef25 100644 --- a/Content.Server/_Wega/Genetics/Systems/Basic/MatterEaterGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Basic/MatterEaterGenSystem.cs @@ -22,7 +22,7 @@ using Robust.Shared.Utility; namespace Content.Server.Genetics.System; -public sealed class MatterEaterSystem : EntitySystem +public sealed partial class MatterEaterSystem : EntitySystem { [Dependency] private ISharedAdminLogManager _adminLogger = default!; [Dependency] private SharedAudioSystem _audio = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/Basic/NoBreathingGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Basic/NoBreathingGenSystem.cs index e91c67ed96..e59bf98a45 100644 --- a/Content.Server/_Wega/Genetics/Systems/Basic/NoBreathingGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Basic/NoBreathingGenSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Genetics; namespace Content.Server.Genetics.System; -public sealed class NoBreathingGenSystem : EntitySystem +public sealed partial class NoBreathingGenSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/Genetics/Systems/Basic/NoPrintsGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Basic/NoPrintsGenSystem.cs index c79540f898..c82587315e 100644 --- a/Content.Server/_Wega/Genetics/Systems/Basic/NoPrintsGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Basic/NoPrintsGenSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Genetics; namespace Content.Server.Genetics.System; -public sealed class NoPrintsGenSystem : EntitySystem +public sealed partial class NoPrintsGenSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/Genetics/Systems/Basic/TelekinesisGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Basic/TelekinesisGenSystem.cs index a01cc22dde..5515381113 100644 --- a/Content.Server/_Wega/Genetics/Systems/Basic/TelekinesisGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Basic/TelekinesisGenSystem.cs @@ -5,7 +5,7 @@ using Content.Shared.Interaction.Components; namespace Content.Server.Genetics.System; -public sealed class TelekinesisGenSystem : EntitySystem +public sealed partial class TelekinesisGenSystem : EntitySystem { [Dependency] private HandsSystem _hands = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/Disease/EpilepsyGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Disease/EpilepsyGenSystem.cs index 5e3bc70de8..0eff40c01e 100644 --- a/Content.Server/_Wega/Genetics/Systems/Disease/EpilepsyGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Disease/EpilepsyGenSystem.cs @@ -9,7 +9,7 @@ using Robust.Shared.Random; namespace Content.Server.Genetics.System; -public sealed class EpilepsySystem : EntitySystem +public sealed partial class EpilepsySystem : EntitySystem { [Dependency] private ChatSystem _chat = default!; [Dependency] private SharedPopupSystem _popup = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/Disease/IncendiaryMitochondriaGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Disease/IncendiaryMitochondriaGenSystem.cs index 88de07cee9..85879f1cbf 100644 --- a/Content.Server/_Wega/Genetics/Systems/Disease/IncendiaryMitochondriaGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Disease/IncendiaryMitochondriaGenSystem.cs @@ -5,7 +5,7 @@ using Robust.Shared.Random; namespace Content.Server.Genetics.System; -public sealed class IncendiaryMitochondriaSystem : EntitySystem +public sealed partial class IncendiaryMitochondriaSystem : EntitySystem { [Dependency] private FlammableSystem _flammable = default!; [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/Disease/TourettesSyndromeSystem.cs b/Content.Server/_Wega/Genetics/Systems/Disease/TourettesSyndromeSystem.cs index d05b616ead..a22bc66e41 100644 --- a/Content.Server/_Wega/Genetics/Systems/Disease/TourettesSyndromeSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Disease/TourettesSyndromeSystem.cs @@ -7,7 +7,7 @@ using Robust.Shared.Random; namespace Content.Server.Genetics.System; -public sealed class TourettesSyndromeSystem : EntitySystem +public sealed partial class TourettesSyndromeSystem : EntitySystem { [Dependency] private ChatSystem _chat = default!; [Dependency] private SharedJitteringSystem _jitteringSystem = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/DnaModifierConsoleSystem.cs b/Content.Server/_Wega/Genetics/Systems/DnaModifierConsoleSystem.cs index af8129a72d..9681e3d199 100644 --- a/Content.Server/_Wega/Genetics/Systems/DnaModifierConsoleSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/DnaModifierConsoleSystem.cs @@ -36,7 +36,7 @@ using Robust.Shared.Timing; namespace Content.Server.Genetics.System { [UsedImplicitly] - public sealed class DnaModifierConsoleSystem : EntitySystem + public sealed partial class DnaModifierConsoleSystem : EntitySystem { [Dependency] private SharedAudioSystem _audio = default!; [Dependency] private SharedContainerSystem _container = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/EnsureMarkingSystem.cs b/Content.Server/_Wega/Genetics/Systems/EnsureMarkingSystem.cs index 75e525012e..dbe302b0a8 100644 --- a/Content.Server/_Wega/Genetics/Systems/EnsureMarkingSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/EnsureMarkingSystem.cs @@ -8,7 +8,7 @@ using Robust.Shared.Prototypes; namespace Content.Server.Genetics.System; -public sealed class EnsureMarkingSystem : EntitySystem +public sealed partial class EnsureMarkingSystem : EntitySystem { [Dependency] private SharedVisualBodySystem _visualBody = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/Intermediate/ChameleonGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Intermediate/ChameleonGenSystem.cs index 9764cf290d..e71b9a029f 100644 --- a/Content.Server/_Wega/Genetics/Systems/Intermediate/ChameleonGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Intermediate/ChameleonGenSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Stealth.Components; namespace Content.Server.Genetics.System; -public sealed class ChameleonGenSystem : EntitySystem +public sealed partial class ChameleonGenSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/Genetics/Systems/Intermediate/CloakOfDarknessGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Intermediate/CloakOfDarknessGenSystem.cs index b1421c1437..e77a97e3aa 100644 --- a/Content.Server/_Wega/Genetics/Systems/Intermediate/CloakOfDarknessGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Intermediate/CloakOfDarknessGenSystem.cs @@ -5,7 +5,7 @@ using Content.Shared.Stealth.Components; namespace Content.Server.Genetics.System; -public sealed class CloakOfDarknessGenSystem : EntitySystem +public sealed partial class CloakOfDarknessGenSystem : EntitySystem { [Dependency] private SharedActionsSystem _action = default!; [Dependency] private SharedStealthSystem _stealth = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/Intermediate/ColdResistanceGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Intermediate/ColdResistanceGenSystem.cs index bcda752024..f329558299 100644 --- a/Content.Server/_Wega/Genetics/Systems/Intermediate/ColdResistanceGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Intermediate/ColdResistanceGenSystem.cs @@ -5,7 +5,7 @@ using Content.Shared.Temperature.Components; namespace Content.Server.Genetics.System; -public sealed class ColdResistanceGenSystem : EntitySystem +public sealed partial class ColdResistanceGenSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/Genetics/Systems/Intermediate/MindCommunicationGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Intermediate/MindCommunicationGenSystem.cs index 0f67e85183..460b10de33 100644 --- a/Content.Server/_Wega/Genetics/Systems/Intermediate/MindCommunicationGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Intermediate/MindCommunicationGenSystem.cs @@ -9,7 +9,7 @@ using Robust.Shared.Player; namespace Content.Server.MindCommunication; -public sealed class MindCommunicationGenSystem : EntitySystem +public sealed partial class MindCommunicationGenSystem : EntitySystem { [Dependency] private SharedActionsSystem _action = default!; [Dependency] private IAdminLogManager _admin = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/Intermediate/PolymorphismGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Intermediate/PolymorphismGenSystem.cs index e5567cf5ca..098e91d409 100644 --- a/Content.Server/_Wega/Genetics/Systems/Intermediate/PolymorphismGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Intermediate/PolymorphismGenSystem.cs @@ -5,7 +5,7 @@ using Content.Shared.Humanoid; namespace Content.Server.Genetics.System; -public sealed class PolymorphismGenSystem : EntitySystem +public sealed partial class PolymorphismGenSystem : EntitySystem { [Dependency] private SharedActionsSystem _action = default!; [Dependency] private DnaModifierSystem _dnaModifier = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/Intermediate/RegenerationGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Intermediate/RegenerationGenSystem.cs index 80404dc5f5..6abf1de6d6 100644 --- a/Content.Server/_Wega/Genetics/Systems/Intermediate/RegenerationGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Intermediate/RegenerationGenSystem.cs @@ -7,7 +7,7 @@ using Robust.Shared.Prototypes; namespace Content.Server.Genetics.System; -public sealed class RegenerationGenSystem : EntitySystem +public sealed partial class RegenerationGenSystem : EntitySystem { [Dependency] private DamageableSystem _damage = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/Intermediate/SpeedUpGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Intermediate/SpeedUpGenSystem.cs index b4d72aa928..18f4ee7d3b 100644 --- a/Content.Server/_Wega/Genetics/Systems/Intermediate/SpeedUpGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Intermediate/SpeedUpGenSystem.cs @@ -7,7 +7,7 @@ using Content.Shared.Vampire.Components; namespace Content.Server.Genetics.System; -public sealed class SpeedUpGenSystem : EntitySystem +public sealed partial class SpeedUpGenSystem : EntitySystem { [Dependency] private DamageableSystem _damageable = default!; [Dependency] private MovementSpeedModifierSystem _speed = default!; diff --git a/Content.Server/_Wega/Genetics/Systems/Minor/HeatResistanceGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Minor/HeatResistanceGenSystem.cs index d834c6fcc8..b0b58b408a 100644 --- a/Content.Server/_Wega/Genetics/Systems/Minor/HeatResistanceGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Minor/HeatResistanceGenSystem.cs @@ -4,7 +4,7 @@ using Content.Shared.Temperature.Components; namespace Content.Server.Genetics.System; -public sealed class HeatResistanceGenSystem : EntitySystem +public sealed partial class HeatResistanceGenSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/Ghost/GhostRespawnSystem.cs b/Content.Server/_Wega/Ghost/GhostRespawnSystem.cs index 265cfdf115..3b7df5de91 100644 --- a/Content.Server/_Wega/Ghost/GhostRespawnSystem.cs +++ b/Content.Server/_Wega/Ghost/GhostRespawnSystem.cs @@ -10,7 +10,7 @@ using Robust.Shared.Timing; namespace Content.Server.Wega.Ghost.Respawn; -public sealed class GhostRespawnSystem : EntitySystem +public sealed partial class GhostRespawnSystem : EntitySystem { [Dependency] private IPlayerManager _player = default!; [Dependency] private IGameTiming _timing = default!; diff --git a/Content.Server/_Wega/Implants/BatteryDrainerImplantSystem.cs b/Content.Server/_Wega/Implants/BatteryDrainerImplantSystem.cs index 19c59ec184..e763bd09a8 100644 --- a/Content.Server/_Wega/Implants/BatteryDrainerImplantSystem.cs +++ b/Content.Server/_Wega/Implants/BatteryDrainerImplantSystem.cs @@ -9,7 +9,7 @@ using Robust.Server.Audio; namespace Content.Server._Wega.Implants; -public sealed class BatteryDrainerImplantSystem : EntitySystem +public sealed partial class BatteryDrainerImplantSystem : EntitySystem { [Dependency] private HandsSystem _hands = default!; [Dependency] private BatterySystem _battery = default!; diff --git a/Content.Server/_Wega/Implants/BodyPartImplantSystem.cs b/Content.Server/_Wega/Implants/BodyPartImplantSystem.cs index 45bec7dbaa..abdf0b7a38 100644 --- a/Content.Server/_Wega/Implants/BodyPartImplantSystem.cs +++ b/Content.Server/_Wega/Implants/BodyPartImplantSystem.cs @@ -11,7 +11,7 @@ using System.Linq; namespace Content.Server.Implants { - public sealed class BodyPartImplantSystem : EntitySystem + public sealed partial class BodyPartImplantSystem : EntitySystem { [Dependency] private ToolSystem _tool = default!; [Dependency] private PopupSystem _popup = default!; diff --git a/Content.Server/_Wega/Implants/HandItemImplantSystem.cs b/Content.Server/_Wega/Implants/HandItemImplantSystem.cs index 224dd7f455..68d2f8cb1a 100644 --- a/Content.Server/_Wega/Implants/HandItemImplantSystem.cs +++ b/Content.Server/_Wega/Implants/HandItemImplantSystem.cs @@ -10,7 +10,7 @@ using Robust.Shared.Containers; namespace Content.Server.Implants; -public sealed class HandItemImplantSystem : EntitySystem +public sealed partial class HandItemImplantSystem : EntitySystem { [Dependency] private AudioSystem _audio = default!; [Dependency] private HandsSystem _hands = default!; diff --git a/Content.Server/_Wega/Implants/InternalStorageSystem.cs b/Content.Server/_Wega/Implants/InternalStorageSystem.cs index b08c5034ea..f1b24800c3 100644 --- a/Content.Server/_Wega/Implants/InternalStorageSystem.cs +++ b/Content.Server/_Wega/Implants/InternalStorageSystem.cs @@ -6,7 +6,7 @@ using Content.Shared.Mobs; namespace Content.Server.Implants; -public sealed class InternalStorageSystem : SharedInternalStorageSystem +public sealed partial class InternalStorageSystem : SharedInternalStorageSystem { [Dependency] private LegionSystem _legion = default!; diff --git a/Content.Server/_Wega/Implants/LoyaltyImplantSystem.cs b/Content.Server/_Wega/Implants/LoyaltyImplantSystem.cs index fa6e009e2b..d508958129 100644 --- a/Content.Server/_Wega/Implants/LoyaltyImplantSystem.cs +++ b/Content.Server/_Wega/Implants/LoyaltyImplantSystem.cs @@ -15,7 +15,7 @@ using Robust.Shared.Player; namespace Content.Server._Wega.Implants; -public sealed class MindControlSystem : EntitySystem +public sealed partial class MindControlSystem : EntitySystem { private const string FollowOrdersObjectiveId = "MindControlledFollowOrders"; diff --git a/Content.Server/_Wega/Interaction/DeleteOnDropSystem.cs b/Content.Server/_Wega/Interaction/DeleteOnDropSystem.cs index f71935fe07..1d0cc9921d 100644 --- a/Content.Server/_Wega/Interaction/DeleteOnDropSystem.cs +++ b/Content.Server/_Wega/Interaction/DeleteOnDropSystem.cs @@ -5,7 +5,7 @@ using Content.Shared.Inventory.Events; namespace Content.Server.Interaction; -public sealed class DeleteOnDropSystem : EntitySystem +public sealed partial class DeleteOnDropSystem : EntitySystem { [Dependency] private IEntityManager _entityManager = default!; diff --git a/Content.Server/_Wega/Interaction/SpawnOnDespawnSystem.cs b/Content.Server/_Wega/Interaction/SpawnOnDespawnSystem.cs index 0608fd60e2..7ef8f6d61f 100644 --- a/Content.Server/_Wega/Interaction/SpawnOnDespawnSystem.cs +++ b/Content.Server/_Wega/Interaction/SpawnOnDespawnSystem.cs @@ -2,7 +2,7 @@ using Content.Shared.Interaction.Components; namespace Content.Server.Interaction; -public sealed class SpawnOnDespawnSystem : EntitySystem +public sealed partial class SpawnOnDespawnSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/DragonBloodSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/DragonBloodSystem.cs index 876938cec9..f037c92106 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/DragonBloodSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/DragonBloodSystem.cs @@ -11,7 +11,7 @@ using Robust.Shared.Random; namespace Content.Server.Lavaland.Artefacts.Systems; -public sealed class DragonBloodSystem : EntitySystem +public sealed partial class DragonBloodSystem : EntitySystem { [Dependency] private SharedActionsSystem _action = default!; [Dependency] private SharedAudioSystem _audio = default!; diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/FireSelfActionSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/FireSelfActionSystem.cs index 018407c977..2cf26e335c 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/FireSelfActionSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/FireSelfActionSystem.cs @@ -4,7 +4,7 @@ using Content.Shared.Lavaland.Events; namespace Content.Server.Lavaland.Artefacts.Systems; -public sealed class FireSelfActionSystem : EntitySystem +public sealed partial class FireSelfActionSystem : EntitySystem { [Dependency] private FlammableSystem _flammable = default!; diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/LavaStaffSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/LavaStaffSystem.cs index 5dfa22e503..2c7777925d 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/LavaStaffSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/LavaStaffSystem.cs @@ -9,7 +9,7 @@ using Robust.Shared.Map; namespace Content.Server.Lavaland.Artefacts.Systems; -public sealed class LavaStaffSystem : EntitySystem +public sealed partial class LavaStaffSystem : EntitySystem { [Dependency] private IMapManager _mapManager = default!; [Dependency] private ITileDefinitionManager _tileDefManager = default!; diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/LinkedCubeSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/LinkedCubeSystem.cs index c0f3af584f..f8fa01abd3 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/LinkedCubeSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/LinkedCubeSystem.cs @@ -7,7 +7,7 @@ using Robust.Shared.Map; namespace Content.Server.Lavaland.Artefacts.Systems; -public sealed class LinkedCubeSystem : EntitySystem +public sealed partial class LinkedCubeSystem : EntitySystem { [Dependency] private SharedTransformSystem _transform = default!; [Dependency] private SharedPopupSystem _popup = default!; diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/RodOfAsclepiusSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/RodOfAsclepiusSystem.cs index adf93265d4..337db870d9 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/RodOfAsclepiusSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/RodOfAsclepiusSystem.cs @@ -20,7 +20,7 @@ using Robust.Shared.Timing; namespace Content.Server.Lavaland.Artefacts.Systems; -public sealed class RodOfAsclepiusSystem : EntitySystem +public sealed partial class RodOfAsclepiusSystem : EntitySystem { [Dependency] private AppearanceSystem _appearance = default!; [Dependency] private IGameTiming _timing = default!; diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/ShipInBottleSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/ShipInBottleSystem.cs index da9c293449..6fe3fca416 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/ShipInBottleSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/ShipInBottleSystem.cs @@ -9,7 +9,7 @@ using Robust.Shared.Prototypes; namespace Content.Server.Lavaland.Artefacts.Systems; -public sealed class ShipInBottleSystem : EntitySystem +public sealed partial class ShipInBottleSystem : EntitySystem { [Dependency] private AppearanceSystem _appearance = default!; [Dependency] private SharedTransformSystem _transform = default!; diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/SoulStorageSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/SoulStorageSystem.cs index 0132ba9e57..468e4fc4b2 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/SoulStorageSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/SoulStorageSystem.cs @@ -7,7 +7,7 @@ using Robust.Shared.Player; namespace Content.Server.Lavaland.Artefacts.Systems; -public sealed class SoulStorageSystem : EntitySystem +public sealed partial class SoulStorageSystem : EntitySystem { [Dependency] private SharedHandsSystem _hands = default!; diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/VoiceOfGodSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/VoiceOfGodSystem.cs index 9e9fa2c486..3cc985d53d 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/VoiceOfGodSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/VoiceOfGodSystem.cs @@ -35,7 +35,7 @@ using Robust.Shared.Timing; namespace Content.Server.Lavaland.Artefacts.Systems; -public sealed class VoiceOfGodSystem : EntitySystem +public sealed partial class VoiceOfGodSystem : EntitySystem { [Dependency] private IAdminLogManager _admin = default!; [Dependency] private IGameTiming _timing = default!; @@ -508,7 +508,7 @@ public sealed class VoiceOfGodSystem : EntitySystem #endregion } -public sealed class VoiceOfGodCommand +public sealed partial class VoiceOfGodCommand { public string Key { get; set; } public string Id { get; set; } diff --git a/Content.Server/_Wega/Lavaland/Systems/FloraSystem.cs b/Content.Server/_Wega/Lavaland/Systems/FloraSystem.cs index dd67c654cb..9b75db75bf 100644 --- a/Content.Server/_Wega/Lavaland/Systems/FloraSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/FloraSystem.cs @@ -9,7 +9,7 @@ using Robust.Shared.Timing; namespace Content.Server.Lavaland; -public sealed class FloraSystem : EntitySystem +public sealed partial class FloraSystem : EntitySystem { [Dependency] private SharedAudioSystem _audio = default!; [Dependency] private IGameTiming _gameTiming = default!; diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/AshDrake/AshDrakeSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/AshDrake/AshDrakeSystem.cs index 5ba641d65c..aa7f4a56df 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/AshDrake/AshDrakeSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/AshDrake/AshDrakeSystem.cs @@ -924,7 +924,7 @@ public sealed partial class AshDrakeSystem : EntitySystem => _audio.PlayPvs(ent.Comp.AttackSound, ent); } -public sealed class LavaArenaData +public sealed partial class LavaArenaData { public Vector2 ArenaCenter; public int ArenaSize; diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/Colossus/ColossusSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/Colossus/ColossusSystem.cs index 7748d45f0c..1b13d0ca41 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/Colossus/ColossusSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/Colossus/ColossusSystem.cs @@ -15,7 +15,7 @@ using Robust.Shared.Timing; namespace Content.Server.Lavaland; -public sealed class ColossusSystem : EntitySystem +public sealed partial class ColossusSystem : EntitySystem { [Dependency] private ChatSystem _chat = default!; [Dependency] private DamageableSystem _damage = default!; diff --git a/Content.Server/_Wega/Lavaland/Systems/NecropolisTendrilSystem.cs b/Content.Server/_Wega/Lavaland/Systems/NecropolisTendrilSystem.cs index f653de5dc4..9e7f39b1a7 100644 --- a/Content.Server/_Wega/Lavaland/Systems/NecropolisTendrilSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/NecropolisTendrilSystem.cs @@ -14,7 +14,7 @@ using Robust.Shared.Timing; namespace Content.Server.Lavaland.Systems; -public sealed class NecropolisTendrilSystem : EntitySystem +public sealed partial class NecropolisTendrilSystem : EntitySystem { [Dependency] private SharedAudioSystem _audio = default!; [Dependency] private IGameTiming _timing = default!; diff --git a/Content.Server/_Wega/Medical/InjectorFabticatorSystem.cs b/Content.Server/_Wega/Medical/InjectorFabticatorSystem.cs index 8211621eaa..e9ff81b556 100644 --- a/Content.Server/_Wega/Medical/InjectorFabticatorSystem.cs +++ b/Content.Server/_Wega/Medical/InjectorFabticatorSystem.cs @@ -13,7 +13,7 @@ using Robust.Shared.Containers; namespace Content.Server.Injector.Fabticator; -public sealed class InjectorFabticatorSystem : EntitySystem +public sealed partial class InjectorFabticatorSystem : EntitySystem { [Dependency] private SharedAmbientSoundSystem _ambient = default!; [Dependency] private SharedSolutionContainerSystem _solutionSystem = default!; @@ -81,7 +81,7 @@ public sealed class InjectorFabticatorSystem : EntitySystem private void OnMapInit(EntityUid uid, InjectorFabticatorComponent component, MapInitEvent args) { - _solutionSystem.EnsureSolution(uid, InjectorFabticatorComponent.BufferSolutionName, out _, component.BufferMaxVolume); + _solutionSystem.EnsureSolution(uid, InjectorFabticatorComponent.BufferSolutionName, out _); } private void OnContainerModified(EntityUid uid, InjectorFabticatorComponent component, ContainerModifiedMessage args) diff --git a/Content.Server/_Wega/Mining/MiningConsoleSystem.cs b/Content.Server/_Wega/Mining/MiningConsoleSystem.cs index f924c3c5d7..4d7e3b1a2a 100644 --- a/Content.Server/_Wega/Mining/MiningConsoleSystem.cs +++ b/Content.Server/_Wega/Mining/MiningConsoleSystem.cs @@ -11,7 +11,7 @@ using Robust.Shared.Prototypes; namespace Content.Server.Mining; -public sealed class MiningConsoleSystem : EntitySystem +public sealed partial class MiningConsoleSystem : EntitySystem { [Dependency] private SharedAmbientSoundSystem _ambient = default!; [Dependency] private SharedAppearanceSystem _appearance = default!; diff --git a/Content.Server/_Wega/Mining/MiningServerSystem.cs b/Content.Server/_Wega/Mining/MiningServerSystem.cs index 54c5c86575..bd68a4c147 100644 --- a/Content.Server/_Wega/Mining/MiningServerSystem.cs +++ b/Content.Server/_Wega/Mining/MiningServerSystem.cs @@ -9,7 +9,7 @@ using Content.Shared.Examine; namespace Content.Server.Mining; -public sealed class MiningServerSystem : EntitySystem +public sealed partial class MiningServerSystem : EntitySystem { [Dependency] private SharedAmbientSoundSystem _ambient = default!; [Dependency] private SharedAppearanceSystem _appearance = default!; diff --git a/Content.Server/_Wega/ModularSuit/ModularSuitHiddenClothingSystem.cs b/Content.Server/_Wega/ModularSuit/ModularSuitHiddenClothingSystem.cs index 46dd875ac6..36bc79cc86 100644 --- a/Content.Server/_Wega/ModularSuit/ModularSuitHiddenClothingSystem.cs +++ b/Content.Server/_Wega/ModularSuit/ModularSuitHiddenClothingSystem.cs @@ -8,7 +8,7 @@ namespace Content.Server.Modular.Suit; /// /// Use this if you need to transfer effects from clothing hidden under a suit. (Server-side) /// -public sealed class ModularSuitHiddenClothingSystem : SharedModularSuitHiddenClothingSystem +public sealed partial class ModularSuitHiddenClothingSystem : SharedModularSuitHiddenClothingSystem { public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/AtrocinatorModuleHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/AtrocinatorModuleHandler.cs index 97d2be5110..05ec454e30 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/AtrocinatorModuleHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/AtrocinatorModuleHandler.cs @@ -7,7 +7,7 @@ using Content.Shared.Stunnable; namespace Content.Server.Modular.Suit; -public sealed class AtrocinatorModuleHandler : ModuleActionHandler +public sealed partial class AtrocinatorModuleHandler : ModuleActionHandler { [Dependency] private EntityLookupSystem _lookup = default!; [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/DispenserModuleHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/DispenserModuleHandler.cs index 7aef56ef15..2ce1b74f9f 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/DispenserModuleHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/DispenserModuleHandler.cs @@ -4,7 +4,7 @@ using Robust.Shared.Random; namespace Content.Server.Modular.Suit; -public sealed class DispenserModuleHandler : ModuleActionHandler +public sealed partial class DispenserModuleHandler : ModuleActionHandler { [Dependency] private SharedHandsSystem _hands = default!; [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/EnergyShieldModuleHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/EnergyShieldModuleHandler.cs index 9b38a050e2..65b62e978f 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/EnergyShieldModuleHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/EnergyShieldModuleHandler.cs @@ -3,7 +3,7 @@ using Content.Shared.Modular.Suit; namespace Content.Server.Modular.Suit; -public sealed class EnergyShieldModuleHandler : ModuleActionHandler +public sealed partial class EnergyShieldModuleHandler : ModuleActionHandler { [Dependency] private SharedTransformSystem _transform = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/HolsterModuleHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/HolsterModuleHandler.cs index 78c38c13ed..6123228fb1 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/HolsterModuleHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/HolsterModuleHandler.cs @@ -10,7 +10,7 @@ using Content.Shared.Wieldable.Components; namespace Content.Server.Modular.Suit; -public sealed class HolsterModuleHandler : ModuleActionHandler +public sealed partial class HolsterModuleHandler : ModuleActionHandler { [Dependency] private SharedActionsSystem _actions = default!; [Dependency] private EntityWhitelistSystem _whitelist = default!; @@ -46,7 +46,7 @@ public sealed class HolsterModuleHandler : ModuleActionHandler if (_hands.TryPickup(user, item)) { if (TryComp(item, out var wieldable)) - _wieldable.TryWield(item, wieldable, user); + _wieldable.TryWield((item, wieldable), user); if (TryComp(item, out var chamber) && chamber.BoltClosed != null && !chamber.BoltClosed.Value) diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/LightModuleHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/LightModuleHandler.cs index 115926c583..a0ac2898da 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/LightModuleHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/LightModuleHandler.cs @@ -6,7 +6,7 @@ using Robust.Server.GameObjects; namespace Content.Server.Modular.Suit; -public sealed class LightModuleHandler : ModuleActionHandler +public sealed partial class LightModuleHandler : ModuleActionHandler { [Dependency] private SharedActionsSystem _actions = default!; [Dependency] private InventorySystem _inventory = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/ModuleActionHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/ModuleActionHandler.cs index 254e6802e9..5607101e6f 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/ModuleActionHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/ModuleActionHandler.cs @@ -9,10 +9,10 @@ namespace Content.Server.Modular.Suit; public abstract partial class ModuleActionHandler : EntitySystem { - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] protected readonly SharedContainerSystem Container = default!; - [Dependency] protected readonly ModularSuitSystem ModularSuit = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] protected SharedContainerSystem Container = default!; + [Dependency] protected ModularSuitSystem ModularSuit = default!; + [Dependency] protected SharedPopupSystem Popup = default!; public BaseContainer? GetModulesContainer(EntityUid suitUid) { diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TanningModuleHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TanningModuleHandler.cs index 287c7a675c..8e91760780 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TanningModuleHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TanningModuleHandler.cs @@ -4,7 +4,7 @@ using Content.Shared.Modular.Suit; namespace Content.Server.Modular.Suit; -public sealed class TanningModuleHandler : ModuleActionHandler +public sealed partial class TanningModuleHandler : ModuleActionHandler { [Dependency] private SharedVisualBodySystem _visualBody = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TeleporterModuleHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TeleporterModuleHandler.cs index 3699fd95e6..feb5a92557 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TeleporterModuleHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TeleporterModuleHandler.cs @@ -4,7 +4,7 @@ using Robust.Shared.Random; namespace Content.Server.Modular.Suit; -public sealed class TeleporterModuleHandler : ModuleActionHandler +public sealed partial class TeleporterModuleHandler : ModuleActionHandler { [Dependency] private EntityLookupSystem _lookup = default!; [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleArmorBoosterSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleArmorBoosterSystem.cs index df60f15e81..5ca4f3a7c8 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleArmorBoosterSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleArmorBoosterSystem.cs @@ -7,7 +7,7 @@ using Content.Shared.Modular.Suit; namespace Content.Server.Modular.Suit; -public sealed class AffectedModuleArmorBoosterSystem : EntitySystem +public sealed partial class AffectedModuleArmorBoosterSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleCarrySystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleCarrySystem.cs index fd7f30f71d..c6bf650c2b 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleCarrySystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleCarrySystem.cs @@ -5,7 +5,7 @@ using Content.Shared.Mobs.Systems; namespace Content.Server.Modular.Suit; -public sealed class AffectedModuleCarrySystem : EntitySystem +public sealed partial class AffectedModuleCarrySystem : EntitySystem { [Dependency] private MobStateSystem _mobState = default!; [Dependency] private MovementSpeedModifierSystem _speed = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleSpringlockSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleSpringlockSystem.cs index 25b64178ca..069bce31a8 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleSpringlockSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleSpringlockSystem.cs @@ -11,7 +11,7 @@ using Robust.Shared.Timing; namespace Content.Server.Modular.Suit; -public sealed class AffectedModuleSpringlockSystem : EntitySystem +public sealed partial class AffectedModuleSpringlockSystem : EntitySystem { [Dependency] private SharedAchievementsSystem _achievement = default!; [Dependency] private SharedAudioSystem _audio = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitGrabberModuleSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitGrabberModuleSystem.cs index 1c9a4aa303..0ccf55fa2d 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitGrabberModuleSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitGrabberModuleSystem.cs @@ -13,7 +13,7 @@ using Robust.Shared.Physics.Components; namespace Content.Server.Modular.Suit; -public sealed class ModularSuitGrabberModuleSystem : EntitySystem +public sealed partial class ModularSuitGrabberModuleSystem : EntitySystem { [Dependency] private SharedAudioSystem _audio = default!; [Dependency] private SharedContainerSystem _container = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitLightModuleSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitLightModuleSystem.cs index 77fb86a057..e1b7de3492 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitLightModuleSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitLightModuleSystem.cs @@ -9,7 +9,7 @@ using Robust.Shared.Containers; namespace Content.Server.Modular.Suit; -public sealed class ModularSuitLightModuleSystem : EntitySystem +public sealed partial class ModularSuitLightModuleSystem : EntitySystem { [Dependency] private SharedContainerSystem _container = default!; [Dependency] private InventorySystem _inventory = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitMicrowaveModuleSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitMicrowaveModuleSystem.cs index 0a19b5f3e7..d9c80622a0 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitMicrowaveModuleSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitMicrowaveModuleSystem.cs @@ -11,7 +11,7 @@ using Robust.Shared.Audio.Systems; namespace Content.Server.Modular.Suit; -public sealed class ModularSuitMicrowaveSystem : EntitySystem +public sealed partial class ModularSuitMicrowaveSystem : EntitySystem { [Dependency] private SharedAudioSystem _audio = default!; [Dependency] private SharedDoAfterSystem _doAfter = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitSpringlockModuleSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitSpringlockModuleSystem.cs index e2e6ae472d..f0ec13f222 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitSpringlockModuleSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitSpringlockModuleSystem.cs @@ -5,7 +5,7 @@ using Content.Shared.Popups; namespace Content.Server.Modular.Suit; -public sealed class ModularSuitSpringlockModuleSystem : EntitySystem +public sealed partial class ModularSuitSpringlockModuleSystem : EntitySystem { [Dependency] private SharedPopupSystem _popup = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitStorageModuleSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitStorageModuleSystem.cs index db8c65cb79..a37c428500 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitStorageModuleSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitStorageModuleSystem.cs @@ -5,7 +5,7 @@ using Robust.Shared.Containers; namespace Content.Server.Modular.Suit; -public sealed class ModularSuitStorageModuleSystem : EntitySystem +public sealed partial class ModularSuitStorageModuleSystem : EntitySystem { [Dependency] private SharedContainerSystem _container = default!; [Dependency] private SharedStorageSystem _storage = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitActionModuleSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitActionModuleSystem.cs index 47c5bca7bc..1695e697f8 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitActionModuleSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitActionModuleSystem.cs @@ -7,7 +7,7 @@ using Robust.Shared.Prototypes; namespace Content.Server.Modular.Suit; -public sealed class ModularSuitActionModuleSystem : EntitySystem +public sealed partial class ModularSuitActionModuleSystem : EntitySystem { [Dependency] private ActionContainerSystem _actionContainer = default!; [Dependency] private SharedActionsSystem _actions = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitItemModuleSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitItemModuleSystem.cs index ede45df2bf..d49b195601 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitItemModuleSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitItemModuleSystem.cs @@ -8,7 +8,7 @@ using Robust.Shared.Containers; namespace Content.Server.Modular.Suit; -public sealed class ModularSuitItemModuleSystem : EntitySystem +public sealed partial class ModularSuitItemModuleSystem : EntitySystem { [Dependency] private SharedContainerSystem _container = default!; [Dependency] private SharedHandsSystem _hands = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleContainerRequirementSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleContainerRequirementSystem.cs index 9de08c6e75..3f99d515e4 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleContainerRequirementSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleContainerRequirementSystem.cs @@ -4,7 +4,7 @@ using Robust.Shared.Containers; namespace Content.Server.Modular.Suit; -public sealed class ModularSuitModuleContainerRequirementSystem : EntitySystem +public sealed partial class ModularSuitModuleContainerRequirementSystem : EntitySystem { [Dependency] private SharedContainerSystem _container = default!; [Dependency] private SharedPopupSystem _popup = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleEffectSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleEffectSystem.cs index e99dc100a9..2c61fde7e4 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleEffectSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleEffectSystem.cs @@ -6,7 +6,7 @@ using Robust.Shared.Containers; namespace Content.Server.Modular.Suit; -public sealed class ModularSuitSuitEffectSystem : EntitySystem +public sealed partial class ModularSuitSuitEffectSystem : EntitySystem { [Dependency] private SharedContainerSystem _container = default!; [Dependency] private InventorySystem _inventory = default!; diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleWearerEffectSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleWearerEffectSystem.cs index 07995ec7a0..344dd9a853 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleWearerEffectSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleWearerEffectSystem.cs @@ -2,7 +2,7 @@ using Content.Shared.Modular.Suit; namespace Content.Server.Modular.Suit; -public sealed class ModularSuitWearerEffectSystem : EntitySystem +public sealed partial class ModularSuitWearerEffectSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitPermanentInstalledSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitPermanentInstalledSystem.cs index b6af73ce93..2dbd074b60 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitPermanentInstalledSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitPermanentInstalledSystem.cs @@ -2,7 +2,7 @@ using Content.Shared.Modular.Suit; namespace Content.Server.Modular.Suit; -public sealed class ModularSuitPermanentInstalledSystem : EntitySystem +public sealed partial class ModularSuitPermanentInstalledSystem : EntitySystem { [Dependency] private SharedModularSuitSystem _modularSuit = default!; diff --git a/Content.Server/_Wega/Movement/Systems/FlyAbilitySystem.cs b/Content.Server/_Wega/Movement/Systems/FlyAbilitySystem.cs index 5191514183..29e6e204c4 100644 --- a/Content.Server/_Wega/Movement/Systems/FlyAbilitySystem.cs +++ b/Content.Server/_Wega/Movement/Systems/FlyAbilitySystem.cs @@ -8,7 +8,7 @@ using Content.Server.Popups; namespace Content.Server.Movement.Systems; -public sealed class FlyAbilitySystem : SharedFlyAbilitySystem +public sealed partial class FlyAbilitySystem : SharedFlyAbilitySystem { [Dependency] private SharedActionsSystem _actions = default!; [Dependency] private StaminaSystem _stamina = default!; diff --git a/Content.Server/_Wega/NPC/Systems/NPCAggressionSystem.cs b/Content.Server/_Wega/NPC/Systems/NPCAggressionSystem.cs index d17776eb15..34c8bbdf6a 100644 --- a/Content.Server/_Wega/NPC/Systems/NPCAggressionSystem.cs +++ b/Content.Server/_Wega/NPC/Systems/NPCAggressionSystem.cs @@ -6,7 +6,7 @@ using Robust.Shared.Player; namespace Content.Server.NPC.Systems; -public sealed class NPCAggressionSystem : EntitySystem +public sealed partial class NPCAggressionSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/NPC/Systems/NPCHandSwitcherSystem.cs b/Content.Server/_Wega/NPC/Systems/NPCHandSwitcherSystem.cs index ac16637d85..56e243d6df 100644 --- a/Content.Server/_Wega/NPC/Systems/NPCHandSwitcherSystem.cs +++ b/Content.Server/_Wega/NPC/Systems/NPCHandSwitcherSystem.cs @@ -11,7 +11,7 @@ namespace Content.Server.NPC.Systems; /// /// It didn't work out properly, so we're using heavy artillery. /// -public sealed class NPCHandSwitcherSystem : EntitySystem +public sealed partial class NPCHandSwitcherSystem : EntitySystem { [Dependency] private SharedHandsSystem _hands = default!; [Dependency] private IGameTiming _timing = default!; diff --git a/Content.Server/_Wega/NPC/Systems/NPCOptimizationSystem.cs b/Content.Server/_Wega/NPC/Systems/NPCOptimizationSystem.cs index 4723627653..4e683caf0a 100644 --- a/Content.Server/_Wega/NPC/Systems/NPCOptimizationSystem.cs +++ b/Content.Server/_Wega/NPC/Systems/NPCOptimizationSystem.cs @@ -13,7 +13,7 @@ using Robust.Shared.Timing; namespace Content.Server.NPC.Systems; -public sealed class NPCOptimizationSystem : EntitySystem +public sealed partial class NPCOptimizationSystem : EntitySystem { [Dependency] private IConfigurationManager _configuration = default!; [Dependency] private EntityLookupSystem _lookup = default!; diff --git a/Content.Server/_Wega/NPC/Systems/NPCUseActionsOnTargetSystem.cs b/Content.Server/_Wega/NPC/Systems/NPCUseActionsOnTargetSystem.cs index 4978a01408..1456b6da1f 100644 --- a/Content.Server/_Wega/NPC/Systems/NPCUseActionsOnTargetSystem.cs +++ b/Content.Server/_Wega/NPC/Systems/NPCUseActionsOnTargetSystem.cs @@ -10,7 +10,7 @@ using Robust.Shared.Timing; namespace Content.Server.NPC.Systems; -public sealed class NPCUseActionsOnTargetSystem : EntitySystem +public sealed partial class NPCUseActionsOnTargetSystem : EntitySystem { [Dependency] private SharedActionsSystem _actions = default!; [Dependency] private IGameTiming _timing = default!; diff --git a/Content.Server/_Wega/NightLightning/NightLightningSystem.cs b/Content.Server/_Wega/NightLightning/NightLightningSystem.cs index 68edeffa6d..8a8842504d 100644 --- a/Content.Server/_Wega/NightLightning/NightLightningSystem.cs +++ b/Content.Server/_Wega/NightLightning/NightLightningSystem.cs @@ -9,7 +9,7 @@ using Robust.Shared.Timing; namespace Content.Server.Night.Lightning; -public sealed class NightLightningSystem : EntitySystem +public sealed partial class NightLightningSystem : EntitySystem { [Dependency] private IConfigurationManager _cfg = default!; [Dependency] private EntityLookupSystem _lookup = default!; diff --git a/Content.Server/_Wega/NullRod/NullDamageSystem.cs b/Content.Server/_Wega/NullRod/NullDamageSystem.cs index f79481eb15..b679e73e13 100644 --- a/Content.Server/_Wega/NullRod/NullDamageSystem.cs +++ b/Content.Server/_Wega/NullRod/NullDamageSystem.cs @@ -10,7 +10,7 @@ using Content.Shared.Rejuvenate; namespace Content.Server.NullRod; -public sealed class NullDamageSystem : EntitySystem +public sealed partial class NullDamageSystem : EntitySystem { [Dependency] private IAdminLogManager _admin = default!; [Dependency] private IGameTiming _timing = default!; diff --git a/Content.Server/_Wega/NullRod/NullRodSystem.cs b/Content.Server/_Wega/NullRod/NullRodSystem.cs index cdc573b62d..a35a20b19d 100644 --- a/Content.Server/_Wega/NullRod/NullRodSystem.cs +++ b/Content.Server/_Wega/NullRod/NullRodSystem.cs @@ -5,7 +5,7 @@ using Content.Shared.NullRod.Components; namespace Content.Server.NullRod; -public sealed class NullRodSystem : EntitySystem +public sealed partial class NullRodSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedConditionSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedConditionSystem.cs index 8e073045e4..0b4546dd60 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedConditionSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedConditionSystem.cs @@ -4,7 +4,7 @@ using Content.Shared.Mind; namespace Content.Server.Objectives.Systems; -public sealed class BloodBrotherSharedConditionSystem : EntitySystem +public sealed partial class BloodBrotherSharedConditionSystem : EntitySystem { [Dependency] private SharedMindSystem _mind = default!; diff --git a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedEscapeConditionSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedEscapeConditionSystem.cs index 10a7d07d8e..0f0d3f1e72 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedEscapeConditionSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedEscapeConditionSystem.cs @@ -6,7 +6,7 @@ using Content.Shared.Objectives.Components; namespace Content.Server.Objectives.Systems; -public sealed class BloodBrotherSharedEscapeConditionSystem : EntitySystem +public sealed partial class BloodBrotherSharedEscapeConditionSystem : EntitySystem { [Dependency] private EmergencyShuttleSystem _emergencyShuttle = default!; [Dependency] private SharedMindSystem _mind = default!; diff --git a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedHijackConditionSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedHijackConditionSystem.cs index a3867b7281..620fb23a67 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedHijackConditionSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedHijackConditionSystem.cs @@ -12,7 +12,7 @@ using Robust.Shared.Player; namespace Content.Server.Objectives.Systems; -public sealed class BloodBrotherSharedHijackConditionSystem : EntitySystem +public sealed partial class BloodBrotherSharedHijackConditionSystem : EntitySystem { [Dependency] private EmergencyShuttleSystem _emergencyShuttle = default!; [Dependency] private SharedMindSystem _mind = default!; diff --git a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKeepAliveConditionSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKeepAliveConditionSystem.cs index d49fae01d0..c339a6eec6 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKeepAliveConditionSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKeepAliveConditionSystem.cs @@ -4,7 +4,7 @@ using Content.Shared.Objectives.Components; namespace Content.Server.Objectives.Systems; -public sealed class BloodBrotherSharedKeepAliveConditionSystem : EntitySystem +public sealed partial class BloodBrotherSharedKeepAliveConditionSystem : EntitySystem { [Dependency] private SharedMindSystem _mind = default!; [Dependency] private TargetObjectiveSystem _target = default!; diff --git a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKillConditionSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKillConditionSystem.cs index 7a89f9bfd4..1a3d40e272 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKillConditionSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKillConditionSystem.cs @@ -7,7 +7,7 @@ using Robust.Shared.Configuration; namespace Content.Server.Objectives.Systems; -public sealed class BloodBrotherSharedKillConditionSystem : EntitySystem +public sealed partial class BloodBrotherSharedKillConditionSystem : EntitySystem { [Dependency] private EmergencyShuttleSystem _emergencyShuttle = default!; [Dependency] private IConfigurationManager _config = default!; diff --git a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedStealConditionSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedStealConditionSystem.cs index 846680f790..f1647213c0 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedStealConditionSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedStealConditionSystem.cs @@ -15,7 +15,7 @@ using Content.Shared.CartridgeLoader; namespace Content.Server.Objectives.Systems; -public sealed class BloodBrotherSharedStealConditionSystem : EntitySystem +public sealed partial class BloodBrotherSharedStealConditionSystem : EntitySystem { [Dependency] private IRobustRandom _random = default!; [Dependency] private IPrototypeManager _proto = default!; diff --git a/Content.Server/_Wega/Objectives/Systems/BloodCultRitualObjectiveSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodCultRitualObjectiveSystem.cs index 3e46e45a2c..a3f22c5601 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodCultRitualObjectiveSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodCultRitualObjectiveSystem.cs @@ -6,7 +6,7 @@ using Content.Shared.Objectives.Components; namespace Content.Server.Objectives.Systems; -public sealed class BloodCultRitualObjectiveSystem : EntitySystem +public sealed partial class BloodCultRitualObjectiveSystem : EntitySystem { [Dependency] private BloodCultRuleSystem _bloodCult = default!; diff --git a/Content.Server/_Wega/Objectives/Systems/BloodCultTargetObjectiveSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodCultTargetObjectiveSystem.cs index c5c66723b2..f029c90722 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodCultTargetObjectiveSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodCultTargetObjectiveSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Objectives.Components; namespace Content.Server.Objectives.Systems; -public sealed class BloodCultTargetObjectiveSystem : EntitySystem +public sealed partial class BloodCultTargetObjectiveSystem : EntitySystem { [Dependency] private TargetObjectiveSystem _target = default!; diff --git a/Content.Server/_Wega/Objectives/Systems/VeilCultBeaconObjectiveSystem.cs b/Content.Server/_Wega/Objectives/Systems/VeilCultBeaconObjectiveSystem.cs index d28c0979bc..bc807f4d27 100644 --- a/Content.Server/_Wega/Objectives/Systems/VeilCultBeaconObjectiveSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/VeilCultBeaconObjectiveSystem.cs @@ -4,7 +4,7 @@ using Content.Shared.Veil.Cult.Components; namespace Content.Server.Objectives.Systems; -public sealed class VeilCultBeaconObjectiveSystem : EntitySystem +public sealed partial class VeilCultBeaconObjectiveSystem : EntitySystem { [Dependency] private TargetObjectiveSystem _target = default!; [Dependency] private EntityLookupSystem _entityLookup = default!; diff --git a/Content.Server/_Wega/Objectives/Systems/VeilCultRitualObjectiveSystem.cs b/Content.Server/_Wega/Objectives/Systems/VeilCultRitualObjectiveSystem.cs index 6a721adde4..05b0b58bdd 100644 --- a/Content.Server/_Wega/Objectives/Systems/VeilCultRitualObjectiveSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/VeilCultRitualObjectiveSystem.cs @@ -6,7 +6,7 @@ using Content.Shared.Objectives.Components; namespace Content.Server.Objectives.Systems; -public sealed class VeilCultRitualObjectiveSystem : EntitySystem +public sealed partial class VeilCultRitualObjectiveSystem : EntitySystem { [Dependency] private VeilCultRuleSystem _veilCult = default!; diff --git a/Content.Server/_Wega/Offer/OfferItemSystem.cs b/Content.Server/_Wega/Offer/OfferItemSystem.cs index e20a1213a9..80c5f84b99 100644 --- a/Content.Server/_Wega/Offer/OfferItemSystem.cs +++ b/Content.Server/_Wega/Offer/OfferItemSystem.cs @@ -8,7 +8,7 @@ using Content.Shared.Popups; namespace Content.Server.Offer; -public sealed class OfferItemSystem : SharedOfferItemSystem +public sealed partial class OfferItemSystem : SharedOfferItemSystem { [Dependency] private AlertsSystem _alerts = default!; [Dependency] private SharedHandsSystem _hands = default!; diff --git a/Content.Server/_Wega/Pain/PainSystem.cs b/Content.Server/_Wega/Pain/PainSystem.cs index 4550816e5e..da69da39a9 100644 --- a/Content.Server/_Wega/Pain/PainSystem.cs +++ b/Content.Server/_Wega/Pain/PainSystem.cs @@ -13,7 +13,7 @@ using Robust.Shared.Prototypes; namespace Content.Server.Pain; -public sealed class PainSystem : EntitySystem +public sealed partial class PainSystem : EntitySystem { [Dependency] private ChatSystem _emoting = default!; [Dependency] private SharedJitteringSystem _jittering = default!; diff --git a/Content.Server/_Wega/Paper/ChameleonStampSystem.cs b/Content.Server/_Wega/Paper/ChameleonStampSystem.cs index 9ff452656b..511204af4c 100644 --- a/Content.Server/_Wega/Paper/ChameleonStampSystem.cs +++ b/Content.Server/_Wega/Paper/ChameleonStampSystem.cs @@ -7,7 +7,7 @@ using Content.Shared.Popups; namespace Content.Server.Paper; -public sealed class ChameleonStampSystem : EntitySystem +public sealed partial class ChameleonStampSystem : EntitySystem { [Dependency] private SharedPopupSystem _popup = default!; [Dependency] private QuickDialogSystem _quickDialog = default!; diff --git a/Content.Server/_Wega/Paper/TicketMachineSystem.cs b/Content.Server/_Wega/Paper/TicketMachineSystem.cs index 96afa7dca4..b25508c3f3 100644 --- a/Content.Server/_Wega/Paper/TicketMachineSystem.cs +++ b/Content.Server/_Wega/Paper/TicketMachineSystem.cs @@ -9,7 +9,7 @@ using Robust.Shared.Audio.Systems; namespace Content.Server.Paper; -public sealed class TicketMachineSystem : EntitySystem +public sealed partial class TicketMachineSystem : EntitySystem { [Dependency] private SharedAudioSystem _audio = default!; [Dependency] private PaperSystem _paperSystem = default!; diff --git a/Content.Server/_Wega/Projectiles/ProjectileAoESystem.cs b/Content.Server/_Wega/Projectiles/ProjectileAoESystem.cs index 2a9d7b2557..5260f4e1e5 100644 --- a/Content.Server/_Wega/Projectiles/ProjectileAoESystem.cs +++ b/Content.Server/_Wega/Projectiles/ProjectileAoESystem.cs @@ -5,7 +5,7 @@ using Content.Shared.Projectiles; namespace Content.Server.Projectiles; -public sealed class ProjectileAoESystem : EntitySystem +public sealed partial class ProjectileAoESystem : EntitySystem { [Dependency] private DamageableSystem _damage = default!; [Dependency] private EntityLookupSystem _lookup = default!; diff --git a/Content.Server/_Wega/Projectiles/ProjectileInfectSystem.cs b/Content.Server/_Wega/Projectiles/ProjectileInfectSystem.cs index f168fcee01..79ab058d9d 100644 --- a/Content.Server/_Wega/Projectiles/ProjectileInfectSystem.cs +++ b/Content.Server/_Wega/Projectiles/ProjectileInfectSystem.cs @@ -4,7 +4,7 @@ using Robust.Shared.Random; namespace Content.Server.Projectiles; -public sealed class ProjectileInfectSystem : EntitySystem +public sealed partial class ProjectileInfectSystem : EntitySystem { [Dependency] private DiseaseSystem _disease = default!; [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Server/_Wega/Projectiles/ProjectileLifestealSystem.cs b/Content.Server/_Wega/Projectiles/ProjectileLifestealSystem.cs index c9757f46a3..d2a9b78e54 100644 --- a/Content.Server/_Wega/Projectiles/ProjectileLifestealSystem.cs +++ b/Content.Server/_Wega/Projectiles/ProjectileLifestealSystem.cs @@ -9,7 +9,7 @@ using Content.Shared.Projectiles; namespace Content.Server.Projectiles; -public sealed class ProjectileLifestealSystem : EntitySystem +public sealed partial class ProjectileLifestealSystem : EntitySystem { [Dependency] private DamageableSystem _damage = default!; [Dependency] private MobStateSystem _mobState = default!; diff --git a/Content.Server/_Wega/Projectiles/ProjectilePressureSystem.cs b/Content.Server/_Wega/Projectiles/ProjectilePressureSystem.cs index 621201890a..cda9f185b5 100644 --- a/Content.Server/_Wega/Projectiles/ProjectilePressureSystem.cs +++ b/Content.Server/_Wega/Projectiles/ProjectilePressureSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Projectiles; namespace Content.Server.Projectiles; -public sealed class ProjectilePressureSystem : EntitySystem +public sealed partial class ProjectilePressureSystem : EntitySystem { [Dependency] private AtmosphereSystem _atmos = default!; diff --git a/Content.Server/_Wega/Projectiles/ProjectileTimerResetsSystem.cs b/Content.Server/_Wega/Projectiles/ProjectileTimerResetsSystem.cs index 4695d389ce..afbaaacb58 100644 --- a/Content.Server/_Wega/Projectiles/ProjectileTimerResetsSystem.cs +++ b/Content.Server/_Wega/Projectiles/ProjectileTimerResetsSystem.cs @@ -6,7 +6,7 @@ using Robust.Shared.Timing; namespace Content.Server.Projectiles; -public sealed class ProjectileTimerResetsSystem : EntitySystem +public sealed partial class ProjectileTimerResetsSystem : EntitySystem { [Dependency] private SharedActionsSystem _action = default!; [Dependency] private IGameTiming _gameTiming = default!; diff --git a/Content.Server/_Wega/Resomi/Abilities/AgillitySkillSystem.cs b/Content.Server/_Wega/Resomi/Abilities/AgillitySkillSystem.cs index f0fc31e5d9..68ad661682 100644 --- a/Content.Server/_Wega/Resomi/Abilities/AgillitySkillSystem.cs +++ b/Content.Server/_Wega/Resomi/Abilities/AgillitySkillSystem.cs @@ -10,7 +10,7 @@ using Content.Server.Popups; namespace Content.Server.Resomi.Abilities; -public sealed class AgillitySkillSystem : SharedAgillitySkillSystem +public sealed partial class AgillitySkillSystem : SharedAgillitySkillSystem { [Dependency] private SharedActionsSystem _actions = default!; [Dependency] private StaminaSystem _stamina = default!; diff --git a/Content.Server/_Wega/Resomi/Abilities/ListenUpSkillSystem.cs b/Content.Server/_Wega/Resomi/Abilities/ListenUpSkillSystem.cs index 958aae52ab..f9282ad230 100644 --- a/Content.Server/_Wega/Resomi/Abilities/ListenUpSkillSystem.cs +++ b/Content.Server/_Wega/Resomi/Abilities/ListenUpSkillSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Resomi.Abilities.Hearing; namespace Content.Server.Resomi.Abilities; -public sealed class ListenUpSkillSystem : SharedListenUpSkillSystem +public sealed partial class ListenUpSkillSystem : SharedListenUpSkillSystem { [Dependency] private ActionsSystem _actionsSystem = default!; diff --git a/Content.Server/_Wega/Resomi/Abilities/ListenUpSystem.cs b/Content.Server/_Wega/Resomi/Abilities/ListenUpSystem.cs index 8589816fb5..952b892e6d 100644 --- a/Content.Server/_Wega/Resomi/Abilities/ListenUpSystem.cs +++ b/Content.Server/_Wega/Resomi/Abilities/ListenUpSystem.cs @@ -4,7 +4,7 @@ using Content.Shared.IdentityManagement; namespace Content.Server.Resomi.Abilities; -public sealed class ListenUpSystem : EntitySystem +public sealed partial class ListenUpSystem : EntitySystem { [Dependency] private SharedPopupSystem _popup = default!; diff --git a/Content.Server/_Wega/Shader/NightVisionSystem.cs b/Content.Server/_Wega/Shader/NightVisionSystem.cs index 968a707f63..58a68a16de 100644 --- a/Content.Server/_Wega/Shader/NightVisionSystem.cs +++ b/Content.Server/_Wega/Shader/NightVisionSystem.cs @@ -3,4 +3,4 @@ using Content.Shared.Overlay; namespace Content.Server.Overlay; -public sealed class NightVisionSystem : SharedToggleableEquipmentHudSystem; \ No newline at end of file +public sealed partial class NightVisionSystem : SharedToggleableEquipmentHudSystem; diff --git a/Content.Server/_Wega/Shadow/PhotophobiaSystem.cs b/Content.Server/_Wega/Shadow/PhotophobiaSystem.cs index 87bf79025a..4e870decc7 100644 --- a/Content.Server/_Wega/Shadow/PhotophobiaSystem.cs +++ b/Content.Server/_Wega/Shadow/PhotophobiaSystem.cs @@ -20,7 +20,7 @@ using Content.Shared.Lavaland.Components; namespace Content.Server.Shadow; -public sealed class PhotophobiaSystem : EntitySystem +public sealed partial class PhotophobiaSystem : EntitySystem { [Dependency] private IGameTiming _gameTiming = default!; [Dependency] private DamageableSystem _damageable = default!; diff --git a/Content.Server/_Wega/Sharpening/Systems/SharpeningSystem.cs b/Content.Server/_Wega/Sharpening/Systems/SharpeningSystem.cs index 1bb1e8f16f..fcc841edd8 100644 --- a/Content.Server/_Wega/Sharpening/Systems/SharpeningSystem.cs +++ b/Content.Server/_Wega/Sharpening/Systems/SharpeningSystem.cs @@ -6,7 +6,7 @@ using Robust.Shared.Audio; namespace Content.Server.Sharpening.Systems; -public sealed class SharpeningSystem : SharedSharpeningSystem +public sealed partial class SharpeningSystem : SharedSharpeningSystem { [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() diff --git a/Content.Server/_Wega/Skrell/SkrellSystem.cs b/Content.Server/_Wega/Skrell/SkrellSystem.cs index 36a93222cd..6ac943e459 100644 --- a/Content.Server/_Wega/Skrell/SkrellSystem.cs +++ b/Content.Server/_Wega/Skrell/SkrellSystem.cs @@ -9,7 +9,7 @@ using System.Linq; namespace Content.Server.Skrell; -public sealed class SkrellSystem : EntitySystem +public sealed partial class SkrellSystem : EntitySystem { [Dependency] private InventorySystem _inventorySystem = default!; [Dependency] private SharedVisualBodySystem _visualBody = default!; diff --git a/Content.Server/_Wega/SlotMachine/SlotMachineSystem.cs b/Content.Server/_Wega/SlotMachine/SlotMachineSystem.cs index c9c043c3d8..e29aabaf8a 100644 --- a/Content.Server/_Wega/SlotMachine/SlotMachineSystem.cs +++ b/Content.Server/_Wega/SlotMachine/SlotMachineSystem.cs @@ -18,7 +18,7 @@ using Robust.Shared.Timing; namespace Content.Server.Economy.SlotMachine; -public sealed class SlotMachineSystem : EntitySystem +public sealed partial class SlotMachineSystem : EntitySystem { [Dependency] private SharedAppearanceSystem _appearance = default!; [Dependency] private SharedAudioSystem _audio = default!; diff --git a/Content.Server/_Wega/Speech/EntitySystems/AphasiaAccentSystem.cs b/Content.Server/_Wega/Speech/EntitySystems/AphasiaAccentSystem.cs index 4aa884c187..c665d6edf8 100644 --- a/Content.Server/_Wega/Speech/EntitySystems/AphasiaAccentSystem.cs +++ b/Content.Server/_Wega/Speech/EntitySystems/AphasiaAccentSystem.cs @@ -6,7 +6,7 @@ using System.Text.RegularExpressions; namespace Content.Server.Speech.EntitySystems { - public sealed class GibberishSpeechSystem : EntitySystem + public sealed partial class GibberishSpeechSystem : EntitySystem { [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Server/_Wega/Speech/EntitySystems/AuldImperialAccentSystem.cs b/Content.Server/_Wega/Speech/EntitySystems/AuldImperialAccentSystem.cs index a6ba3c30e6..40f2beb20d 100644 --- a/Content.Server/_Wega/Speech/EntitySystems/AuldImperialAccentSystem.cs +++ b/Content.Server/_Wega/Speech/EntitySystems/AuldImperialAccentSystem.cs @@ -6,7 +6,7 @@ using Content.Shared.Speech; namespace Content.Server.Speech.EntitySystems { - public sealed class AuldImperialAccentSystem : EntitySystem + public sealed partial class AuldImperialAccentSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/Speech/EntitySystems/ClownAccentSystem.cs b/Content.Server/_Wega/Speech/EntitySystems/ClownAccentSystem.cs index b17c37a442..071cd5fb4a 100644 --- a/Content.Server/_Wega/Speech/EntitySystems/ClownAccentSystem.cs +++ b/Content.Server/_Wega/Speech/EntitySystems/ClownAccentSystem.cs @@ -3,7 +3,7 @@ using Robust.Shared.Random; namespace Content.Server.Speech.EntitySystems { - public sealed class ClownAccentSystem : EntitySystem + public sealed partial class ClownAccentSystem : EntitySystem { [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Server/_Wega/Speech/EntitySystems/LispAccentSystem.cs b/Content.Server/_Wega/Speech/EntitySystems/LispAccentSystem.cs index ed12b14c14..d44c375207 100644 --- a/Content.Server/_Wega/Speech/EntitySystems/LispAccentSystem.cs +++ b/Content.Server/_Wega/Speech/EntitySystems/LispAccentSystem.cs @@ -5,7 +5,7 @@ using Content.Shared.Speech; namespace Content.Server.Speech.EntitySystems { - public sealed class HissingAccentSystem : EntitySystem + public sealed partial class HissingAccentSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/Speech/EntitySystems/LoudAccentSystem.cs b/Content.Server/_Wega/Speech/EntitySystems/LoudAccentSystem.cs index b4ef0e4f96..397be0c762 100644 --- a/Content.Server/_Wega/Speech/EntitySystems/LoudAccentSystem.cs +++ b/Content.Server/_Wega/Speech/EntitySystems/LoudAccentSystem.cs @@ -4,7 +4,7 @@ using Robust.Shared.Random; namespace Content.Server.Speech.EntitySystems { - public sealed class LoudAccentSystem : EntitySystem + public sealed partial class LoudAccentSystem : EntitySystem { [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Server/_Wega/Speech/EntitySystems/ResomiAccentSystem.cs b/Content.Server/_Wega/Speech/EntitySystems/ResomiAccentSystem.cs index 4546067f09..488342c2ab 100644 --- a/Content.Server/_Wega/Speech/EntitySystems/ResomiAccentSystem.cs +++ b/Content.Server/_Wega/Speech/EntitySystems/ResomiAccentSystem.cs @@ -5,7 +5,7 @@ using Robust.Shared.Random; namespace Content.Server._Wega.Speech.EntitySystems; -public sealed class ResomiAccentSystem : EntitySystem +public sealed partial class ResomiAccentSystem : EntitySystem { [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Server/_Wega/Speech/EntitySystems/UnintelligibleAccentSystem.cs b/Content.Server/_Wega/Speech/EntitySystems/UnintelligibleAccentSystem.cs index 14df9ab9b9..3b7b8703c0 100644 --- a/Content.Server/_Wega/Speech/EntitySystems/UnintelligibleAccentSystem.cs +++ b/Content.Server/_Wega/Speech/EntitySystems/UnintelligibleAccentSystem.cs @@ -7,7 +7,7 @@ using Robust.Shared.Random; namespace Content.Server.Speech.EntitySystems { - public sealed class UnintelligibleAccentSystem : EntitySystem + public sealed partial class UnintelligibleAccentSystem : EntitySystem { [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Server/_Wega/Speech/EntitySystems/WingdingsAccentSystem.cs b/Content.Server/_Wega/Speech/EntitySystems/WingdingsAccentSystem.cs index 623950f82a..f8ebc9a44e 100644 --- a/Content.Server/_Wega/Speech/EntitySystems/WingdingsAccentSystem.cs +++ b/Content.Server/_Wega/Speech/EntitySystems/WingdingsAccentSystem.cs @@ -4,7 +4,7 @@ using System.Text; namespace Content.Server.Speech.EntitySystems { - public sealed class WingdingsSpeechSystem : EntitySystem + public sealed partial class WingdingsSpeechSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/StationEvents/Events/DiseaseOutbreakRule.cs b/Content.Server/_Wega/StationEvents/Events/DiseaseOutbreakRule.cs index b15db885db..d0593ba7ca 100644 --- a/Content.Server/_Wega/StationEvents/Events/DiseaseOutbreakRule.cs +++ b/Content.Server/_Wega/StationEvents/Events/DiseaseOutbreakRule.cs @@ -12,7 +12,7 @@ namespace Content.Server.StationEvents.Events; /// Infects a couple people /// with a random disease that isn't super deadly /// -public sealed class DiseaseOutbreakRule : StationEventSystem +public sealed partial class DiseaseOutbreakRule : StationEventSystem { [Dependency] private DiseaseSystem _diseaseSystem = default!; [Dependency] private MobStateSystem _mobStateSystem = default!; diff --git a/Content.Server/_Wega/StationEvents/Events/RadiationOutburstRuleSystem.cs b/Content.Server/_Wega/StationEvents/Events/RadiationOutburstRuleSystem.cs index 1babc5693b..35b9e18d23 100644 --- a/Content.Server/_Wega/StationEvents/Events/RadiationOutburstRuleSystem.cs +++ b/Content.Server/_Wega/StationEvents/Events/RadiationOutburstRuleSystem.cs @@ -14,7 +14,7 @@ using Content.Shared.Ghost; namespace Content.Server.StationEvents.Events; -public sealed class RadiationOutburstRuleSystem : StationEventSystem //port only with codeowner permision @4_ydo +public sealed partial class RadiationOutburstRuleSystem : StationEventSystem //port only with codeowner permision @4_ydo { [Dependency] private IRobustRandom _random = default!; [Dependency] private SharedContainerSystem _containerSystem = default!; diff --git a/Content.Server/_Wega/Surgery/BodyScannerConsoleSystem.cs b/Content.Server/_Wega/Surgery/BodyScannerConsoleSystem.cs index a961ecfe3a..237573473a 100644 --- a/Content.Server/_Wega/Surgery/BodyScannerConsoleSystem.cs +++ b/Content.Server/_Wega/Surgery/BodyScannerConsoleSystem.cs @@ -13,7 +13,7 @@ using Robust.Shared.Timing; namespace Content.Server.Medical.Surgery { - public sealed class BodyScannerConsoleSystem : EntitySystem + public sealed partial class BodyScannerConsoleSystem : EntitySystem { [Dependency] private UserInterfaceSystem _uiSystem = default!; [Dependency] private IPrototypeManager _prototypeManager = default!; diff --git a/Content.Server/_Wega/TapeRecorder/TapeRecorderSystem.cs b/Content.Server/_Wega/TapeRecorder/TapeRecorderSystem.cs index 040e7d9757..0958d249a9 100644 --- a/Content.Server/_Wega/TapeRecorder/TapeRecorderSystem.cs +++ b/Content.Server/_Wega/TapeRecorder/TapeRecorderSystem.cs @@ -13,7 +13,7 @@ using System.Text; namespace Content.Server.TapeRecorder; -public sealed class TapeRecorderSystem : SharedTapeRecorderSystem +public sealed partial class TapeRecorderSystem : SharedTapeRecorderSystem { [Dependency] private ChatSystem _chat = default!; [Dependency] private HandsSystem _hands = default!; diff --git a/Content.Server/_Wega/Traits/Assorted/UncontrollableCoughSystem.cs b/Content.Server/_Wega/Traits/Assorted/UncontrollableCoughSystem.cs index 31ccb4dd43..c4da90cb4b 100644 --- a/Content.Server/_Wega/Traits/Assorted/UncontrollableCoughSystem.cs +++ b/Content.Server/_Wega/Traits/Assorted/UncontrollableCoughSystem.cs @@ -4,7 +4,7 @@ using Robust.Shared.Random; namespace Content.Server.Traits.Assorted; -public sealed class UncontrollableCoughSystem : EntitySystem +public sealed partial class UncontrollableCoughSystem : EntitySystem { [Dependency] private IRobustRandom _random = default!; [Dependency] private DiseaseSystem _diseaseSystem = default!; diff --git a/Content.Server/_Wega/Traits/Assorted/UncontrollableSnoughSystem.cs b/Content.Server/_Wega/Traits/Assorted/UncontrollableSnoughSystem.cs index f23dfd7b2e..e6eda86712 100644 --- a/Content.Server/_Wega/Traits/Assorted/UncontrollableSnoughSystem.cs +++ b/Content.Server/_Wega/Traits/Assorted/UncontrollableSnoughSystem.cs @@ -6,7 +6,7 @@ namespace Content.Server.Traits.Assorted; /// /// This handles making people randomly cough/sneeze without a disease. /// -public sealed class UncontrollableSnoughSystem : EntitySystem +public sealed partial class UncontrollableSnoughSystem : EntitySystem { [Dependency] private IRobustRandom _random = default!; [Dependency] private DiseaseSystem _diseaseSystem = default!; diff --git a/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Gargantua.cs b/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Gargantua.cs index 22dfef699e..10ee51800e 100644 --- a/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Gargantua.cs +++ b/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Gargantua.cs @@ -2,6 +2,7 @@ using System.Numerics; using Content.Shared.Body; using Content.Shared.CombatMode; using Content.Shared.Damage.Prototypes; +using Content.Shared.Ensnaring; using Content.Shared.Ensnaring.Components; using Content.Shared.FixedPoint; using Content.Shared.Movement.Components; @@ -22,6 +23,8 @@ namespace Content.Server.Vampire; public sealed partial class VampireSystem { + [Dependency] private SharedEnsnareableSystem _ensnareable = default!; + public static readonly ProtoId BloodSwell = "VampireBloodSwell"; private void InitializeGargantua() @@ -123,7 +126,7 @@ public sealed partial class VampireSystem private void OnSeismicStomp(Entity ent, ref VampireSeismicStompActionEvent args) { - if (TryComp(ent, out EnsnareableComponent? ensnareable) && ensnareable.IsEnsnared) + if (_ensnareable.IsEnsnared(ent.Owner)) { _popup.PopupEntity(Loc.GetString("vampire-legs-ensnared"), ent, ent, PopupType.Medium); return; @@ -181,7 +184,7 @@ public sealed partial class VampireSystem private void OnOverwhelmingForce(Entity ent, ref VampireOverwhelmingForceActionEvent args) { - if (TryComp(ent, out EnsnareableComponent? ensnareable) && ensnareable.IsEnsnared) + if (_ensnareable.IsEnsnared(ent.Owner)) { _popup.PopupEntity(Loc.GetString("vampire-legs-ensnared"), ent, ent, PopupType.Medium); return; @@ -259,7 +262,7 @@ public sealed partial class VampireSystem private void OnCharge(Entity ent, ref VampireChargeActionEvent args) { - if (TryComp(ent, out EnsnareableComponent? ensnareable) && ensnareable.IsEnsnared) + if (_ensnareable.IsEnsnared(ent.Owner)) { _popup.PopupEntity(Loc.GetString("vampire-legs-ensnared"), ent, ent, PopupType.Medium); return; diff --git a/Content.Server/_Wega/Vampire/BittenByVampireSystem.cs b/Content.Server/_Wega/Vampire/BittenByVampireSystem.cs index a68051c77c..4b32f8a49d 100644 --- a/Content.Server/_Wega/Vampire/BittenByVampireSystem.cs +++ b/Content.Server/_Wega/Vampire/BittenByVampireSystem.cs @@ -8,7 +8,7 @@ namespace Content.Server.Vampire; /// /// Medics can see bite on your neck. /// -public sealed class BittenByVampireSystem : EntitySystem +public sealed partial class BittenByVampireSystem : EntitySystem { [Dependency] private IGameTiming _timing = default!; diff --git a/Content.Server/_Wega/Vampire/HolyPointSystem.cs b/Content.Server/_Wega/Vampire/HolyPointSystem.cs index a20c11489a..72be18cd90 100644 --- a/Content.Server/_Wega/Vampire/HolyPointSystem.cs +++ b/Content.Server/_Wega/Vampire/HolyPointSystem.cs @@ -8,7 +8,7 @@ using Robust.Shared.Prototypes; namespace Content.Server.Vampire; -public sealed class HolyPointSystem : EntitySystem +public sealed partial class HolyPointSystem : EntitySystem { [Dependency] private ChatSystem _chat = default!; [Dependency] private EntityLookupSystem _entityLookup = default!; diff --git a/Content.Server/_Wega/Vampire/Ui/DissectSelectionEui.cs b/Content.Server/_Wega/Vampire/Ui/DissectSelectionEui.cs index f50cb2204f..d2334dc5ab 100644 --- a/Content.Server/_Wega/Vampire/Ui/DissectSelectionEui.cs +++ b/Content.Server/_Wega/Vampire/Ui/DissectSelectionEui.cs @@ -7,7 +7,7 @@ using Content.Shared.FixedPoint; namespace Content.Server.Vampire; [UsedImplicitly] -public sealed class DissectSelectionEui : BaseEui +public sealed partial class DissectSelectionEui : BaseEui { private readonly EntityUid _vampire; private readonly EntityUid _target; diff --git a/Content.Server/_Wega/Vampire/Ui/TrophiesMenuEui.cs b/Content.Server/_Wega/Vampire/Ui/TrophiesMenuEui.cs index cdc3afba0b..b4b8e42168 100644 --- a/Content.Server/_Wega/Vampire/Ui/TrophiesMenuEui.cs +++ b/Content.Server/_Wega/Vampire/Ui/TrophiesMenuEui.cs @@ -6,7 +6,7 @@ using JetBrains.Annotations; namespace Content.Server.Vampire; [UsedImplicitly] -public sealed class TrophiesMenuEui : BaseEui +public sealed partial class TrophiesMenuEui : BaseEui { private readonly TrophiesEuiState _state; diff --git a/Content.Server/_Wega/Vampire/Ui/VampireClassSelectionEui.cs b/Content.Server/_Wega/Vampire/Ui/VampireClassSelectionEui.cs index 5a30f27a92..6e6586db44 100644 --- a/Content.Server/_Wega/Vampire/Ui/VampireClassSelectionEui.cs +++ b/Content.Server/_Wega/Vampire/Ui/VampireClassSelectionEui.cs @@ -4,7 +4,7 @@ using Content.Shared.Eui; namespace Content.Server.Vampire; -public sealed class VampireClassSelectionEui : BaseEui +public sealed partial class VampireClassSelectionEui : BaseEui { private readonly EntityUid _vampire; private readonly VampireSystem _vampireSystem; diff --git a/Content.Server/_Wega/Vehicle/VehicleSystem.cs b/Content.Server/_Wega/Vehicle/VehicleSystem.cs index f0eea36ffb..6801589673 100644 --- a/Content.Server/_Wega/Vehicle/VehicleSystem.cs +++ b/Content.Server/_Wega/Vehicle/VehicleSystem.cs @@ -2,6 +2,6 @@ using Content.Shared.Vehicle; namespace Content.Server.Vehicle; -public sealed class VehicleSystem : SharedVehicleSystem +public sealed partial class VehicleSystem : SharedVehicleSystem { } diff --git a/Content.Server/_Wega/VentCraw/BeingVentCrawSystem.cs b/Content.Server/_Wega/VentCraw/BeingVentCrawSystem.cs index 7c53db91f7..3cd911d050 100644 --- a/Content.Server/_Wega/VentCraw/BeingVentCrawSystem.cs +++ b/Content.Server/_Wega/VentCraw/BeingVentCrawSystem.cs @@ -5,7 +5,7 @@ using Content.Shared.VentCraw.Components; namespace Content.Server.VentCraw; -public sealed class BeingVentCrawSystem : EntitySystem +public sealed partial class BeingVentCrawSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Server/_Wega/VentCraw/VentCrawTubeSystem.cs b/Content.Server/_Wega/VentCraw/VentCrawTubeSystem.cs index fd2e930033..a79d07cacb 100644 --- a/Content.Server/_Wega/VentCraw/VentCrawTubeSystem.cs +++ b/Content.Server/_Wega/VentCraw/VentCrawTubeSystem.cs @@ -21,7 +21,7 @@ using Robust.Shared.Utility; namespace Content.Server.VentCraw; -public sealed class VentCrawTubeSystem : EntitySystem +public sealed partial class VentCrawTubeSystem : EntitySystem { [Dependency] private IGameTiming _gameTiming = default!; [Dependency] private MapSystem _mapSystem = default!; diff --git a/Content.Server/_Wega/VentCraw/VentCrawableSystem.cs b/Content.Server/_Wega/VentCraw/VentCrawableSystem.cs index ede6ba1417..4dff474713 100644 --- a/Content.Server/_Wega/VentCraw/VentCrawableSystem.cs +++ b/Content.Server/_Wega/VentCraw/VentCrawableSystem.cs @@ -17,7 +17,7 @@ using Robust.Shared.Timing; namespace Content.Server.VentCraw; -public sealed class VentCrawableSystem : EntitySystem +public sealed partial class VentCrawableSystem : EntitySystem { [Dependency] private IGameTiming _gameTiming = default!; [Dependency] private SharedAudioSystem _audioSystem = default!; diff --git a/Content.Server/_Wega/Weapons/Marker/DamageMarkerSystem.cs b/Content.Server/_Wega/Weapons/Marker/DamageMarkerSystem.cs index 7546476e1f..dfd9fa059e 100644 --- a/Content.Server/_Wega/Weapons/Marker/DamageMarkerSystem.cs +++ b/Content.Server/_Wega/Weapons/Marker/DamageMarkerSystem.cs @@ -7,7 +7,7 @@ using Robust.Shared.Audio.Systems; namespace Content.Server.Weapons.Marker; -public sealed class DamageMarkerSystem : EntitySystem +public sealed partial class DamageMarkerSystem : EntitySystem { [Dependency] private SharedAudioSystem _audio = default!; [Dependency] private AtmosphereSystem _atmos = default!; diff --git a/Content.Server/_Wega/Weapons/Systems/LeechMeleeWeaponSystem.cs b/Content.Server/_Wega/Weapons/Systems/LeechMeleeWeaponSystem.cs index cf6203ff45..10e9f35d91 100644 --- a/Content.Server/_Wega/Weapons/Systems/LeechMeleeWeaponSystem.cs +++ b/Content.Server/_Wega/Weapons/Systems/LeechMeleeWeaponSystem.cs @@ -7,7 +7,7 @@ using Content.Shared.Whitelist; namespace Content.Server.Weapons.Marker; -public sealed class LeechMeleeWeaponSystem : EntitySystem +public sealed partial class LeechMeleeWeaponSystem : EntitySystem { [Dependency] private EntityWhitelistSystem _entityWhitelist = default!; [Dependency] private DamageableSystem _damageable = default!; diff --git a/Content.Server/_Wega/Xenobiology/CellSystem.cs b/Content.Server/_Wega/Xenobiology/CellSystem.cs index be601ff09c..b003664e53 100644 --- a/Content.Server/_Wega/Xenobiology/CellSystem.cs +++ b/Content.Server/_Wega/Xenobiology/CellSystem.cs @@ -14,7 +14,7 @@ using Robust.Server.GameObjects; namespace Content.Server.Xenobiology; -public sealed class CellSystem : SharedCellSystem +public sealed partial class CellSystem : SharedCellSystem { [Dependency] private AppearanceSystem _appearance = default!; [Dependency] private DamageableSystem _damageable = default!; diff --git a/Content.Server/_Wega/Xenobiology/CellVisualsSystem.cs b/Content.Server/_Wega/Xenobiology/CellVisualsSystem.cs index 9f07b70bfb..634de0dc10 100644 --- a/Content.Server/_Wega/Xenobiology/CellVisualsSystem.cs +++ b/Content.Server/_Wega/Xenobiology/CellVisualsSystem.cs @@ -2,4 +2,4 @@ namespace Content.Server.Xenobiology; -public sealed class CellVisualsSystem : SharedCellVisualsSystem; +public sealed partial class CellVisualsSystem : SharedCellVisualsSystem; diff --git a/Content.Server/_Wega/Xenobiology/Machines/SlimeExtractorSystem.cs b/Content.Server/_Wega/Xenobiology/Machines/SlimeExtractorSystem.cs index 8bc7281ce2..b7a2256db5 100644 --- a/Content.Server/_Wega/Xenobiology/Machines/SlimeExtractorSystem.cs +++ b/Content.Server/_Wega/Xenobiology/Machines/SlimeExtractorSystem.cs @@ -23,7 +23,7 @@ using Robust.Shared.Audio; namespace Content.Server.Xenobiology { - public sealed class SlimeExtractorSystem : EntitySystem + public sealed partial class SlimeExtractorSystem : EntitySystem { [Dependency] private IEntityManager _entManager = default!; [Dependency] private MobStateSystem _mobState = default!; diff --git a/Content.Server/_Wega/Xenobiology/Mobs/SlimeGrowthSystem.cs b/Content.Server/_Wega/Xenobiology/Mobs/SlimeGrowthSystem.cs index b18955b8d4..c946d24b7e 100644 --- a/Content.Server/_Wega/Xenobiology/Mobs/SlimeGrowthSystem.cs +++ b/Content.Server/_Wega/Xenobiology/Mobs/SlimeGrowthSystem.cs @@ -8,7 +8,7 @@ using Robust.Shared.Random; namespace Content.Server.Xenobiology; -public sealed class SlimeGrowthSystem : SharedSlimeGrowthSystem +public sealed partial class SlimeGrowthSystem : SharedSlimeGrowthSystem { [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Server/_Wega/Xenobiology/Mobs/SlimeHungerSystem.cs b/Content.Server/_Wega/Xenobiology/Mobs/SlimeHungerSystem.cs index 8f002e052c..0747d15d5e 100644 --- a/Content.Server/_Wega/Xenobiology/Mobs/SlimeHungerSystem.cs +++ b/Content.Server/_Wega/Xenobiology/Mobs/SlimeHungerSystem.cs @@ -14,7 +14,7 @@ using Robust.Shared.Timing; namespace Content.Server.Xenobiology; -public sealed class SlimeHungerSystem : EntitySystem +public sealed partial class SlimeHungerSystem : EntitySystem { [Dependency] private ChatSystem _chat = default!; [Dependency] private SharedDoAfterSystem _doAfter = default!; diff --git a/Content.Server/_Wega/Xenobiology/Mobs/SlimeRebellionSystem.cs b/Content.Server/_Wega/Xenobiology/Mobs/SlimeRebellionSystem.cs index c92641dc48..b22b5d5f39 100644 --- a/Content.Server/_Wega/Xenobiology/Mobs/SlimeRebellionSystem.cs +++ b/Content.Server/_Wega/Xenobiology/Mobs/SlimeRebellionSystem.cs @@ -4,7 +4,7 @@ using Robust.Shared.Timing; namespace Content.Server.Xenobiology; -public sealed class SlimeRebellionSystem : EntitySystem +public sealed partial class SlimeRebellionSystem : EntitySystem { [Dependency] private IGameTiming _gameTiming = default!; [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Server/_Wega/Xenobiology/Mobs/SlimeSocialSystem.cs b/Content.Server/_Wega/Xenobiology/Mobs/SlimeSocialSystem.cs index c25e9c9c02..e6d2392d17 100644 --- a/Content.Server/_Wega/Xenobiology/Mobs/SlimeSocialSystem.cs +++ b/Content.Server/_Wega/Xenobiology/Mobs/SlimeSocialSystem.cs @@ -16,7 +16,7 @@ using Robust.Shared.Timing; namespace Content.Server.Xenobiology; -public sealed class SlimeSocialSystem : EntitySystem +public sealed partial class SlimeSocialSystem : EntitySystem { [Dependency] private ChatSystem _chat = default!; [Dependency] private IGameTiming _gameTiming = default!; diff --git a/Content.Server/_Wega/Xenobiology/Mobs/SlimeVisualSystem.cs b/Content.Server/_Wega/Xenobiology/Mobs/SlimeVisualSystem.cs index 5f11f28699..5f571b8a94 100644 --- a/Content.Server/_Wega/Xenobiology/Mobs/SlimeVisualSystem.cs +++ b/Content.Server/_Wega/Xenobiology/Mobs/SlimeVisualSystem.cs @@ -2,6 +2,6 @@ using Content.Shared.Xenobiology; namespace Content.Server.Xenobiology; -public sealed class SlimeVisualSystem : SharedSlimeVisualSystem +public sealed partial class SlimeVisualSystem : SharedSlimeVisualSystem { } diff --git a/Content.Server/_Wega/Xenobiology/SlimeAnalyzerSystem.cs b/Content.Server/_Wega/Xenobiology/SlimeAnalyzerSystem.cs index 8c85be22a9..adae6d1b04 100644 --- a/Content.Server/_Wega/Xenobiology/SlimeAnalyzerSystem.cs +++ b/Content.Server/_Wega/Xenobiology/SlimeAnalyzerSystem.cs @@ -18,7 +18,7 @@ using Content.Shared.PowerCell; namespace Content.Server.Medical; -public sealed class SlimeAnalyzerSystem : EntitySystem +public sealed partial class SlimeAnalyzerSystem : EntitySystem { [Dependency] private SharedAudioSystem _audio = default!; [Dependency] private IGameTiming _gameTiming = default!; diff --git a/Content.Shared/Crayon/SharedCrayonSystem.cs b/Content.Shared/Crayon/SharedCrayonSystem.cs index 75671c6df1..eda0f0fd60 100644 --- a/Content.Shared/Crayon/SharedCrayonSystem.cs +++ b/Content.Shared/Crayon/SharedCrayonSystem.cs @@ -5,9 +5,9 @@ using Robust.Shared.Input.Binding; namespace Content.Shared.Crayon; -public abstract class SharedCrayonSystem : EntitySystem +public abstract partial class SharedCrayonSystem : EntitySystem { - [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private SharedHandsSystem _hands = default!; private readonly Angle _rotationIncrement = Angle.FromDegrees(2.5); diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs index 198f33dd3d..ac8f5085ab 100644 --- a/Content.Shared/Flash/SharedFlashSystem.cs +++ b/Content.Shared/Flash/SharedFlashSystem.cs @@ -286,7 +286,6 @@ public abstract partial class SharedFlashSystem : EntitySystem args.Cancelled = true; } -<<<<<<< HEAD // Corvax-Wega-Wielder-start private void OnMaskToggled(EntityUid uid, FlashImmunityComponent component, ItemMaskToggledEvent args) { @@ -311,13 +310,6 @@ public abstract partial class SharedFlashSystem : EntitySystem } // Corvax-Wega-Arsenal-end - private void OnTemporaryBlindnessFlashAttempt(Entity ent, ref FlashAttemptEvent args) - { - args.Cancelled = true; - } - -======= ->>>>>>> upstream/master private void OnFlashImmunityFlashAttempt(Entity ent, ref FlashAttemptEvent args) { if (TryComp(ent, out var mask) && mask.IsToggled) diff --git a/Content.Shared/Humanoid/SkinColorationPrototype.cs b/Content.Shared/Humanoid/SkinColorationPrototype.cs index 168d597200..65d18e6aaf 100644 --- a/Content.Shared/Humanoid/SkinColorationPrototype.cs +++ b/Content.Shared/Humanoid/SkinColorationPrototype.cs @@ -585,18 +585,28 @@ public sealed partial class MonochromaticSkinColoration : ISkinColorationStrateg public SkinColorationStrategyInput InputType => SkinColorationStrategyInput.Unary; - public bool VerifySkinColor(Color color) + public bool VerifySkinColor(Color color, [NotNullWhen(false)] out string? reason) { + reason = null; var hsv = Color.ToHsv(color); - if (hsv.X < MinHue || hsv.X > MaxHue) + if (hsv.X < MinHue - SkinColorationUtils.Epsilon || hsv.X > MaxHue + SkinColorationUtils.Epsilon) + { + reason = $"Hue {hsv.X} is outside of range min {MinHue} max {MaxHue}"; return false; + } - if (hsv.Y < MinSaturation || hsv.Y > MaxSaturation) + if (hsv.Y < MinSaturation - SkinColorationUtils.Epsilon || hsv.Y > MaxSaturation + SkinColorationUtils.Epsilon) + { + reason = $"Saturation {hsv.Y} is outside of range min {MinSaturation} max {MaxSaturation}"; return false; + } - if (hsv.Z < MinValue || hsv.Z > MaxValue) + if (hsv.Z < MinValue - SkinColorationUtils.Epsilon || hsv.Z > MaxValue + SkinColorationUtils.Epsilon) + { + reason = $"Value {hsv.Z} is outside of range min {MinValue} max {MaxValue}"; return false; + } return true; } diff --git a/Content.Shared/Mindshield/FakeMindShield/SharedFakeMindShieldImplantSystem.cs b/Content.Shared/Mindshield/FakeMindShield/SharedFakeMindShieldImplantSystem.cs index d05b89cc20..dee5d5f59b 100644 --- a/Content.Shared/Mindshield/FakeMindShield/SharedFakeMindShieldImplantSystem.cs +++ b/Content.Shared/Mindshield/FakeMindShield/SharedFakeMindShieldImplantSystem.cs @@ -6,9 +6,9 @@ using Robust.Shared.Containers; namespace Content.Shared.Mindshield.FakeMindShield; -public sealed class SharedFakeMindShieldImplantSystem : EntitySystem +public sealed partial class SharedFakeMindShieldImplantSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs b/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs index 0de4656bfc..12b6334660 100644 --- a/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs +++ b/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs @@ -8,7 +8,7 @@ namespace Content.Shared.Mobs.Systems; public partial class MobStateSystem { - [Dependency] private readonly SharedStutteringSystem _stutteringSystem = default!; // Corvax-Wega-PreCritical + [Dependency] private SharedStutteringSystem _stutteringSystem = default!; // Corvax-Wega-PreCritical #region Public API diff --git a/Content.Shared/Wieldable/SharedWieldableSystem.cs b/Content.Shared/Wieldable/SharedWieldableSystem.cs index f14f523531..b4508df0ff 100644 --- a/Content.Shared/Wieldable/SharedWieldableSystem.cs +++ b/Content.Shared/Wieldable/SharedWieldableSystem.cs @@ -342,7 +342,7 @@ public abstract partial class SharedWieldableSystem : EntitySystem var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", Identity.Entity(user, EntityManager)), ("item", wieldable.Owner)); _popup.PopupPredicted(selfMessage, othersMessage, user, user); - component.User = user; //Corvax-Wega-Resomi + wieldable.Comp.User = user; //Corvax-Wega-Resomi var ev = new ItemWieldedEvent(user); RaiseLocalEvent(wieldable.Owner, ref ev); diff --git a/Content.Shared/_Wega/Achievements/AchievementEvents.cs b/Content.Shared/_Wega/Achievements/AchievementEvents.cs index 3802a201c6..11e4e6adcf 100644 --- a/Content.Shared/_Wega/Achievements/AchievementEvents.cs +++ b/Content.Shared/_Wega/Achievements/AchievementEvents.cs @@ -5,7 +5,7 @@ using Robust.Shared.Serialization; namespace Content.Shared.Achievements; [Serializable, NetSerializable] -public sealed class AchievementUnlockedEvent : EntityEventArgs +public sealed partial class AchievementUnlockedEvent : EntityEventArgs { public NetEntity User { get; } public AchievementsEnum Achievement { get; } @@ -18,12 +18,12 @@ public sealed class AchievementUnlockedEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class RequestAchievementsEvent : EntityEventArgs +public sealed partial class RequestAchievementsEvent : EntityEventArgs { } [Serializable, NetSerializable] -public sealed class ResponseAchievementsEvent : EntityEventArgs +public sealed partial class ResponseAchievementsEvent : EntityEventArgs { public List Achievements { get; } @@ -34,7 +34,7 @@ public sealed class ResponseAchievementsEvent : EntityEventArgs } // Server -public sealed class GetAchievementStateRequestEvent : EntityEventArgs +public sealed partial class GetAchievementStateRequestEvent : EntityEventArgs { public NetUserId UserId { get; } public byte AchievementKey { get; } @@ -48,7 +48,7 @@ public sealed class GetAchievementStateRequestEvent : EntityEventArgs } } -public sealed class GetAchievementsRequestEvent : EntityEventArgs +public sealed partial class GetAchievementsRequestEvent : EntityEventArgs { public NetUserId UserId { get; } public TaskCompletionSource> CompletionSource { get; } @@ -60,7 +60,7 @@ public sealed class GetAchievementsRequestEvent : EntityEventArgs } } -public sealed class AddAchievementRequestEvent : EntityEventArgs +public sealed partial class AddAchievementRequestEvent : EntityEventArgs { public NetUserId UserId { get; } public byte AchievementKey { get; } diff --git a/Content.Shared/_Wega/Android/AndroidFrameComponent.cs b/Content.Shared/_Wega/Android/AndroidFrameComponent.cs index e2d13514c2..45a5417647 100644 --- a/Content.Shared/_Wega/Android/AndroidFrameComponent.cs +++ b/Content.Shared/_Wega/Android/AndroidFrameComponent.cs @@ -32,7 +32,7 @@ public enum AndroidConstructUiKey : byte } [Serializable, NetSerializable] -public sealed class AndroidConstructUiState : BoundUserInterfaceState +public sealed partial class AndroidConstructUiState : BoundUserInterfaceState { public AndroidConstructUiState(ProtoId species, HumanoidCharacterProfile profile, bool hasBattery, bool hasBrain) { @@ -50,7 +50,7 @@ public sealed class AndroidConstructUiState : BoundUserInterfaceState } [Serializable, NetSerializable] -public sealed class AndroidConstructEditMessage : BoundUserInterfaceMessage +public sealed partial class AndroidConstructEditMessage : BoundUserInterfaceMessage { public AndroidConstructEditMessage(HumanoidCharacterProfile newProfile) { @@ -61,7 +61,7 @@ public sealed class AndroidConstructEditMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class AndroidConstructAssembleMessage : BoundUserInterfaceMessage +public sealed partial class AndroidConstructAssembleMessage : BoundUserInterfaceMessage { public AndroidConstructAssembleMessage() { diff --git a/Content.Shared/_Wega/Barks/RequestBarkEvents.cs b/Content.Shared/_Wega/Barks/RequestBarkEvents.cs index 8512dc748d..63632e87c7 100644 --- a/Content.Shared/_Wega/Barks/RequestBarkEvents.cs +++ b/Content.Shared/_Wega/Barks/RequestBarkEvents.cs @@ -3,13 +3,13 @@ using Robust.Shared.Serialization; namespace Content.Shared.Speech.Synthesis; [Serializable, NetSerializable] -public sealed class RequestPreviewBarkEvent(string barkVoiceId) : EntityEventArgs +public sealed partial class RequestPreviewBarkEvent(string barkVoiceId) : EntityEventArgs { public string BarkVoiceId { get; } = barkVoiceId; } [Serializable, NetSerializable] -public sealed class PlayBarkEvent : EntityEventArgs +public sealed partial class PlayBarkEvent : EntityEventArgs { public string SoundPath { get; } public NetEntity SourceUid { get; } diff --git a/Content.Shared/_Wega/BloodCult/BloodCultEnums.cs b/Content.Shared/_Wega/BloodCult/BloodCultEnums.cs index 6acdf7e167..7b913f458a 100644 --- a/Content.Shared/_Wega/BloodCult/BloodCultEnums.cs +++ b/Content.Shared/_Wega/BloodCult/BloodCultEnums.cs @@ -64,7 +64,7 @@ public enum VeilShifterVisuals : byte } [Serializable, NetSerializable] -public sealed class BloodMagicState : EuiStateBase +public sealed partial class BloodMagicState : EuiStateBase { } @@ -87,7 +87,7 @@ public enum BloodStructureUiKey : byte } [Serializable, NetSerializable] -public sealed class BloodStructureBoundUserInterfaceState : BoundUserInterfaceState +public sealed partial class BloodStructureBoundUserInterfaceState : BoundUserInterfaceState { public readonly List Items; public BloodStructureBoundUserInterfaceState(List items) @@ -103,7 +103,7 @@ public enum BloodRunesUiKey : byte } [Serializable, NetSerializable] -public sealed class BloodRitualBoundUserInterfaceState : BoundUserInterfaceState +public sealed partial class BloodRitualBoundUserInterfaceState : BoundUserInterfaceState { } diff --git a/Content.Shared/_Wega/BloodCult/BloodCultEvents.cs b/Content.Shared/_Wega/BloodCult/BloodCultEvents.cs index 7704d46266..e2f3ada64d 100644 --- a/Content.Shared/_Wega/BloodCult/BloodCultEvents.cs +++ b/Content.Shared/_Wega/BloodCult/BloodCultEvents.cs @@ -7,22 +7,22 @@ using Robust.Shared.Serialization; namespace Content.Shared.Blood.Cult; // Events -public sealed class BloodGodCalledEvent : EntityEventArgs +public sealed partial class BloodGodCalledEvent : EntityEventArgs { } -public sealed class BloodRitualConductedEvent : EntityEventArgs +public sealed partial class BloodRitualConductedEvent : EntityEventArgs { } [Serializable, NetSerializable] -public sealed class BloodMagicSelectSpellMessage(EntProtoId spell) : EuiMessageBase +public sealed partial class BloodMagicSelectSpellMessage(EntProtoId spell) : EuiMessageBase { public readonly EntProtoId Spell = spell; } [Serializable, NetSerializable] -public sealed class BloodRitesSelectRitesMessage : BoundUserInterfaceMessage +public sealed partial class BloodRitesSelectRitesMessage : BoundUserInterfaceMessage { public EntProtoId Rites { get; } @@ -33,7 +33,7 @@ public sealed class BloodRitesSelectRitesMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class BloodConstructSelectMessage : BoundUserInterfaceMessage +public sealed partial class BloodConstructSelectMessage : BoundUserInterfaceMessage { public EntProtoId Construct { get; } @@ -44,7 +44,7 @@ public sealed class BloodConstructSelectMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class BloodStructureSelectMessage : BoundUserInterfaceMessage +public sealed partial class BloodStructureSelectMessage : BoundUserInterfaceMessage { public EntProtoId Item { get; } @@ -55,7 +55,7 @@ public sealed class BloodStructureSelectMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class SelectBloodRuneMessage : BoundUserInterfaceMessage +public sealed partial class SelectBloodRuneMessage : BoundUserInterfaceMessage { public EntProtoId RuneProtoId { get; } @@ -66,7 +66,7 @@ public sealed class SelectBloodRuneMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class EmpoweringRuneSelectSpellMessage : BoundUserInterfaceMessage +public sealed partial class EmpoweringRuneSelectSpellMessage : BoundUserInterfaceMessage { public EntProtoId Spell { get; } @@ -77,7 +77,7 @@ public sealed class EmpoweringRuneSelectSpellMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class SummoningRuneSelectCultistMessage : BoundUserInterfaceMessage +public sealed partial class SummoningRuneSelectCultistMessage : BoundUserInterfaceMessage { public NetEntity CultistUid { get; } diff --git a/Content.Shared/_Wega/BloodCult/SharedBloodCultSystem.cs b/Content.Shared/_Wega/BloodCult/SharedBloodCultSystem.cs index 5f6aac7f6c..4c1d7df741 100644 --- a/Content.Shared/_Wega/BloodCult/SharedBloodCultSystem.cs +++ b/Content.Shared/_Wega/BloodCult/SharedBloodCultSystem.cs @@ -9,7 +9,7 @@ using Content.Shared.Stunnable; namespace Content.Shared.Blood.Cult; -public abstract class SharedBloodCultSystem : EntitySystem +public abstract partial class SharedBloodCultSystem : EntitySystem { [Dependency] private SharedActionsSystem _action = default!; [Dependency] private SharedPopupSystem _popup = default!; diff --git a/Content.Shared/_Wega/Botany/PlantAnalyzerMessages.cs b/Content.Shared/_Wega/Botany/PlantAnalyzerMessages.cs index 2c63d59aad..972b7623f8 100644 --- a/Content.Shared/_Wega/Botany/PlantAnalyzerMessages.cs +++ b/Content.Shared/_Wega/Botany/PlantAnalyzerMessages.cs @@ -11,7 +11,7 @@ public enum PlantAnalyzerUiKey : byte } [Serializable, NetSerializable] -public sealed class PlantAnalyzerScannedUserMessage(NetEntity? targetEntity, bool? scanMode, PlantAnalyzerPlantData? plantData, PlantAnalyzerTrayData? trayData, PlantAnalyzerTolerancesData? tolerancesData, PlantAnalyzerProduceData? produceData, TimeSpan? printReadyAt) : BoundUserInterfaceMessage +public sealed partial class PlantAnalyzerScannedUserMessage(NetEntity? targetEntity, bool? scanMode, PlantAnalyzerPlantData? plantData, PlantAnalyzerTrayData? trayData, PlantAnalyzerTolerancesData? tolerancesData, PlantAnalyzerProduceData? produceData, TimeSpan? printReadyAt) : BoundUserInterfaceMessage { public readonly NetEntity? TargetEntity = targetEntity; public bool? ScanMode = scanMode; @@ -26,7 +26,7 @@ public sealed class PlantAnalyzerScannedUserMessage(NetEntity? targetEntity, boo /// Everything that is kept independent of a given plant/seed. /// [Serializable, NetSerializable] -public sealed class PlantAnalyzerTrayData(float waterLevel, float nutritionLevel, float toxins, float pestLevel, float weedLevel, List? chemicals) +public sealed partial class PlantAnalyzerTrayData(float waterLevel, float nutritionLevel, float toxins, float pestLevel, float weedLevel, List? chemicals) { public float WaterLevel = waterLevel; public float NutritionLevel = nutritionLevel; @@ -41,7 +41,7 @@ public sealed class PlantAnalyzerTrayData(float waterLevel, float nutritionLevel /// Which is most of the "Tolerances" region plus the gases it may need. /// [Serializable, NetSerializable] -public sealed class PlantAnalyzerTolerancesData(float waterConsumption, float nutrientConsumption, float toxinsTolerance, float pestTolerance, float weedTolerance, float lowPressureTolerance, float highPressureTolerance, float idealHeat, float heatTolerance, float idealLight, float lightTolerance, List consumeGasses) +public sealed partial class PlantAnalyzerTolerancesData(float waterConsumption, float nutrientConsumption, float toxinsTolerance, float pestTolerance, float weedTolerance, float lowPressureTolerance, float highPressureTolerance, float idealHeat, float heatTolerance, float idealLight, float lightTolerance, List consumeGasses) { public float WaterConsumption = waterConsumption; public float NutrientConsumption = nutrientConsumption; @@ -61,7 +61,7 @@ public sealed class PlantAnalyzerTolerancesData(float waterConsumption, float nu /// Information about the plant inside the tray. /// [Serializable, NetSerializable] -public sealed class PlantAnalyzerPlantData(string seedDisplayName, float health, float endurance, float age, float lifespan, float maturation, bool dead, bool viable, bool mutating, bool kudzu) +public sealed partial class PlantAnalyzerPlantData(string seedDisplayName, float health, float endurance, float age, float lifespan, float maturation, bool dead, bool viable, bool mutating, bool kudzu) { public string SeedDisplayName = seedDisplayName; public float Health = health; @@ -79,7 +79,7 @@ public sealed class PlantAnalyzerPlantData(string seedDisplayName, float health, /// Information about the output of a plant (produce and gas). /// [Serializable, NetSerializable] -public sealed class PlantAnalyzerProduceData(int yield, float potency, List chemicals, List produce, List exudeGasses, bool seedless) +public sealed partial class PlantAnalyzerProduceData(int yield, float potency, List chemicals, List produce, List exudeGasses, bool seedless) { public int Yield = yield; public string Potency = ObscurePotency(potency); @@ -109,6 +109,6 @@ public sealed class PlantAnalyzerProduceData(int yield, float potency, List -public sealed class CureDiseaseAttemptEvent : EntityEventArgs +public sealed partial class CureDiseaseAttemptEvent : EntityEventArgs { public float CureChance { get; } public CureDiseaseAttemptEvent(float cureChance) { CureChance = cureChance; } -} \ No newline at end of file +} diff --git a/Content.Shared/_Wega/Disease/SharedDiseaseSystem.cs b/Content.Shared/_Wega/Disease/SharedDiseaseSystem.cs index 02281824ce..a470d87202 100644 --- a/Content.Shared/_Wega/Disease/SharedDiseaseSystem.cs +++ b/Content.Shared/_Wega/Disease/SharedDiseaseSystem.cs @@ -4,7 +4,7 @@ using Robust.Shared.Serialization.Manager; namespace Content.Shared.Disease; -public abstract class SharedDiseaseSystem : EntitySystem +public abstract partial class SharedDiseaseSystem : EntitySystem { [Dependency] private IPrototypeManager _prototypeManager = default!; [Dependency] private ISerializationManager _serializationManager = default!; diff --git a/Content.Shared/_Wega/GPS/UI/GpsUI.cs b/Content.Shared/_Wega/GPS/UI/GpsUI.cs index 0704cbb896..de0abab61f 100644 --- a/Content.Shared/_Wega/GPS/UI/GpsUI.cs +++ b/Content.Shared/_Wega/GPS/UI/GpsUI.cs @@ -9,7 +9,7 @@ public enum GpsUiKey : byte } [Serializable, NetSerializable] -public sealed class GpsUpdateState : BoundUserInterfaceState +public sealed partial class GpsUpdateState : BoundUserInterfaceState { public NetEntity? MapUid { get; } public string CurrentGpsName { get; } @@ -42,7 +42,7 @@ public sealed class GpsUpdateState : BoundUserInterfaceState } [Serializable, NetSerializable] -public sealed class UpdateGpsNameMessage : BoundUserInterfaceMessage +public sealed partial class UpdateGpsNameMessage : BoundUserInterfaceMessage { public string NewName { get; } @@ -53,7 +53,7 @@ public sealed class UpdateGpsNameMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class UpdateGpsDescriptionMessage : BoundUserInterfaceMessage +public sealed partial class UpdateGpsDescriptionMessage : BoundUserInterfaceMessage { public string NewDescription { get; } @@ -64,7 +64,7 @@ public sealed class UpdateGpsDescriptionMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class ToggleGpsBroadcastMessage : BoundUserInterfaceMessage +public sealed partial class ToggleGpsBroadcastMessage : BoundUserInterfaceMessage { public bool Enabled { get; } @@ -75,7 +75,7 @@ public sealed class ToggleGpsBroadcastMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class GpsDeviceInfo +public sealed partial class GpsDeviceInfo { public NetEntity EntityUid { get; } public string Name { get; } @@ -99,7 +99,7 @@ public sealed class GpsDeviceInfo } [Serializable, NetSerializable] -public sealed class NavBeaconInfo +public sealed partial class NavBeaconInfo { public string Name { get; } public string Desc { get; } @@ -126,7 +126,7 @@ public sealed class NavBeaconInfo } [Serializable, NetSerializable] -public sealed class LavaTileInfo +public sealed partial class LavaTileInfo { public (int X, int Y) Coordinates { get; } public Color Color { get; } diff --git a/Content.Shared/_Wega/GameTicking/EndVoteEvent.cs b/Content.Shared/_Wega/GameTicking/EndVoteEvent.cs index f5cdd9d032..d3084b332e 100644 --- a/Content.Shared/_Wega/GameTicking/EndVoteEvent.cs +++ b/Content.Shared/_Wega/GameTicking/EndVoteEvent.cs @@ -1,5 +1,5 @@ namespace Content.Shared.GameTicking; -public sealed class VoteRoundEndEvent : EntityEventArgs +public sealed partial class VoteRoundEndEvent : EntityEventArgs { } diff --git a/Content.Shared/_Wega/Genetics/Enzymes.cs b/Content.Shared/_Wega/Genetics/Enzymes.cs index 151cc0fd59..520e0aaff0 100644 --- a/Content.Shared/_Wega/Genetics/Enzymes.cs +++ b/Content.Shared/_Wega/Genetics/Enzymes.cs @@ -4,7 +4,7 @@ using Robust.Shared.Serialization; namespace Content.Shared.Genetics; [Serializable, NetSerializable] -public sealed class EnzymeInfo +public sealed partial class EnzymeInfo { public string SampleName { get; set; } = string.Empty; public UniqueIdentifiersData? Identifier { get; set; } @@ -22,7 +22,7 @@ public sealed class EnzymeInfo } [Serializable, NetSerializable] -public sealed class EnzymesPrototypeInfo +public sealed partial class EnzymesPrototypeInfo { public string EnzymesPrototypeId { get; set; } = string.Empty; public string[] HexCode { get; set; } = new[] { "0", "0", "0" }; diff --git a/Content.Shared/_Wega/Genetics/Events/DnaModifierConsoleEvents.cs b/Content.Shared/_Wega/Genetics/Events/DnaModifierConsoleEvents.cs index 0e00bc7b7c..7e64f6b28d 100644 --- a/Content.Shared/_Wega/Genetics/Events/DnaModifierConsoleEvents.cs +++ b/Content.Shared/_Wega/Genetics/Events/DnaModifierConsoleEvents.cs @@ -5,7 +5,7 @@ using Robust.Shared.Serialization; namespace Content.Shared.Genetics; [Serializable, NetSerializable] -public sealed class DnaModifierUpdateEvent : EntityEventArgs +public sealed partial class DnaModifierUpdateEvent : EntityEventArgs { public NetEntity Uid { get; } @@ -16,7 +16,7 @@ public sealed class DnaModifierUpdateEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class DnaModifierConsoleEjectEvent : EntityEventArgs +public sealed partial class DnaModifierConsoleEjectEvent : EntityEventArgs { public NetEntity Uid { get; } @@ -27,7 +27,7 @@ public sealed class DnaModifierConsoleEjectEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class DnaModifierConsoleEjectRejuveEvent : EntityEventArgs +public sealed partial class DnaModifierConsoleEjectRejuveEvent : EntityEventArgs { public NetEntity Uid { get; } @@ -38,7 +38,7 @@ public sealed class DnaModifierConsoleEjectRejuveEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class DnaModifierConsoleReagentButtonEvent : EntityEventArgs +public sealed partial class DnaModifierConsoleReagentButtonEvent : EntityEventArgs { public NetEntity Uid { get; } public DnaModifierReagentAmount Amount { get; } @@ -53,7 +53,7 @@ public sealed class DnaModifierConsoleReagentButtonEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class DnaModifierConsoleSaveServerEvent : EntityEventArgs +public sealed partial class DnaModifierConsoleSaveServerEvent : EntityEventArgs { public NetEntity Uid { get; } public int CurrentSection { get; } @@ -68,7 +68,7 @@ public sealed class DnaModifierConsoleSaveServerEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class DnaModifierConsoleInjectorEvent : EntityEventArgs +public sealed partial class DnaModifierConsoleInjectorEvent : EntityEventArgs { public NetEntity Uid { get; } public int Index { get; } @@ -81,7 +81,7 @@ public sealed class DnaModifierConsoleInjectorEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class DnaModifierInjectBlockEvent : EntityEventArgs +public sealed partial class DnaModifierInjectBlockEvent : EntityEventArgs { public NetEntity Uid { get; } public int Index { get; } @@ -96,7 +96,7 @@ public sealed class DnaModifierInjectBlockEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class DnaModifierConsoleSubjectInjectEvent : EntityEventArgs +public sealed partial class DnaModifierConsoleSubjectInjectEvent : EntityEventArgs { public NetEntity Uid { get; } public int Index { get; } @@ -109,7 +109,7 @@ public sealed class DnaModifierConsoleSubjectInjectEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class DnaModifierConsoleClearBufferEvent : EntityEventArgs +public sealed partial class DnaModifierConsoleClearBufferEvent : EntityEventArgs { public NetEntity Uid { get; } public int Index { get; } @@ -122,7 +122,7 @@ public sealed class DnaModifierConsoleClearBufferEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class DnaModifierConsoleRenameBufferEvent : EntityEventArgs +public sealed partial class DnaModifierConsoleRenameBufferEvent : EntityEventArgs { public NetEntity Console { get; } public NetEntity User { get; } @@ -137,7 +137,7 @@ public sealed class DnaModifierConsoleRenameBufferEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class DnaModifierConsoleExportOnDiskEvent : EntityEventArgs +public sealed partial class DnaModifierConsoleExportOnDiskEvent : EntityEventArgs { public NetEntity Uid { get; } public int Index { get; } @@ -150,7 +150,7 @@ public sealed class DnaModifierConsoleExportOnDiskEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class DnaModifierConsoleExportFromDiskEvent : EntityEventArgs +public sealed partial class DnaModifierConsoleExportFromDiskEvent : EntityEventArgs { public NetEntity Uid { get; } public int Index { get; } @@ -163,7 +163,7 @@ public sealed class DnaModifierConsoleExportFromDiskEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class DnaModifierConsoleClearDiskEvent : EntityEventArgs +public sealed partial class DnaModifierConsoleClearDiskEvent : EntityEventArgs { public NetEntity Uid { get; } @@ -174,7 +174,7 @@ public sealed class DnaModifierConsoleClearDiskEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class DnaModifierConsoleReleverationEvent : EntityEventArgs +public sealed partial class DnaModifierConsoleReleverationEvent : EntityEventArgs { public NetEntity Uid { get; } public int CurrentTab { get; } @@ -193,7 +193,7 @@ public sealed class DnaModifierConsoleReleverationEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class DnaModifierConsoleReleverationsEvent : EntityEventArgs +public sealed partial class DnaModifierConsoleReleverationsEvent : EntityEventArgs { public NetEntity Uid { get; } public int CurrentTab { get; } @@ -209,7 +209,7 @@ public sealed class DnaModifierConsoleReleverationsEvent : EntityEventArgs } } -public sealed class CureDnaDiseaseAttemptEvent : EntityEventArgs +public sealed partial class CureDnaDiseaseAttemptEvent : EntityEventArgs { public float CureChance { get; } @@ -219,7 +219,7 @@ public sealed class CureDnaDiseaseAttemptEvent : EntityEventArgs } } -public sealed class MutateDnaAttemptEvent : EntityEventArgs +public sealed partial class MutateDnaAttemptEvent : EntityEventArgs { public MutateDnaAttemptEvent() { diff --git a/Content.Shared/_Wega/Genetics/Events/Gen/MindCommunicationEvents.cs b/Content.Shared/_Wega/Genetics/Events/Gen/MindCommunicationEvents.cs index a7c70bf216..4bcf064f89 100644 --- a/Content.Shared/_Wega/Genetics/Events/Gen/MindCommunicationEvents.cs +++ b/Content.Shared/_Wega/Genetics/Events/Gen/MindCommunicationEvents.cs @@ -8,7 +8,7 @@ public sealed partial class MindCommunicationActionEvent : InstantActionEvent } [Serializable, NetSerializable] -public sealed class MindCommunicationMenuOpenedEvent : EntityEventArgs +public sealed partial class MindCommunicationMenuOpenedEvent : EntityEventArgs { public NetEntity Uid { get; } @@ -19,7 +19,7 @@ public sealed class MindCommunicationMenuOpenedEvent : EntityEventArgs } [Serializable, NetSerializable] -public sealed class MindCommunicationTargetSelectedEvent : EntityEventArgs +public sealed partial class MindCommunicationTargetSelectedEvent : EntityEventArgs { public NetEntity Sender { get; } public NetEntity Target { get; } diff --git a/Content.Shared/_Wega/Genetics/Systems/Connection/DnaClientSystem.cs b/Content.Shared/_Wega/Genetics/Systems/Connection/DnaClientSystem.cs index b5d010f023..ef7f93bd8d 100644 --- a/Content.Shared/_Wega/Genetics/Systems/Connection/DnaClientSystem.cs +++ b/Content.Shared/_Wega/Genetics/Systems/Connection/DnaClientSystem.cs @@ -3,7 +3,7 @@ using Robust.Shared.Serialization; namespace Content.Shared.Genetics.Systems; -public sealed class DnaClientSystem : EntitySystem +public sealed partial class DnaClientSystem : EntitySystem { [Dependency] private DnaServerSystem _dnaServer = default!; diff --git a/Content.Shared/_Wega/Genetics/Systems/Connection/DnaServerSystem.cs b/Content.Shared/_Wega/Genetics/Systems/Connection/DnaServerSystem.cs index ea58099570..b1f7338df1 100644 --- a/Content.Shared/_Wega/Genetics/Systems/Connection/DnaServerSystem.cs +++ b/Content.Shared/_Wega/Genetics/Systems/Connection/DnaServerSystem.cs @@ -4,7 +4,7 @@ using Robust.Shared.Random; namespace Content.Shared.Genetics.Systems; -public sealed class DnaServerSystem : EntitySystem +public sealed partial class DnaServerSystem : EntitySystem { [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Shared/_Wega/Genetics/Systems/Disease/DizzyGenSystem.cs b/Content.Shared/_Wega/Genetics/Systems/Disease/DizzyGenSystem.cs index f610721442..d3e8f3ed06 100644 --- a/Content.Shared/_Wega/Genetics/Systems/Disease/DizzyGenSystem.cs +++ b/Content.Shared/_Wega/Genetics/Systems/Disease/DizzyGenSystem.cs @@ -5,7 +5,7 @@ using Robust.Shared.Timing; namespace Content.Shared.Genetics.Systems; // TODO: ref this -public sealed class DizzySystem : EntitySystem +public sealed partial class DizzySystem : EntitySystem { [Dependency] private StatusEffectsSystem _statusEffectsSystem = default!; [Dependency] private IGameTiming _gameTiming = default!; diff --git a/Content.Shared/_Wega/Genetics/Systems/Disease/WeaknessGenSystem.cs b/Content.Shared/_Wega/Genetics/Systems/Disease/WeaknessGenSystem.cs index 6fd8610271..61bea3c14f 100644 --- a/Content.Shared/_Wega/Genetics/Systems/Disease/WeaknessGenSystem.cs +++ b/Content.Shared/_Wega/Genetics/Systems/Disease/WeaknessGenSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Weapons.Melee; namespace Content.Shared.Genetics.Systems; -public sealed class WeaknessSystem : EntitySystem +public sealed partial class WeaknessSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Shared/_Wega/Genetics/Systems/MarkingIndexer.cs b/Content.Shared/_Wega/Genetics/Systems/MarkingIndexer.cs index 2241e7dab1..5fa0f2a934 100644 --- a/Content.Shared/_Wega/Genetics/Systems/MarkingIndexer.cs +++ b/Content.Shared/_Wega/Genetics/Systems/MarkingIndexer.cs @@ -6,7 +6,7 @@ using Robust.Shared.Random; namespace Content.Shared.Genetics.Systems { - public sealed class MarkingPrototypesIndexerSystem : EntitySystem + public sealed partial class MarkingPrototypesIndexerSystem : EntitySystem { [Dependency] private IPrototypeManager _prototypeManager = default!; [Dependency] private IRobustRandom _random = default!; @@ -121,7 +121,7 @@ namespace Content.Shared.Genetics.Systems } } - public sealed class MarkingPrototypeInfo + public sealed partial class MarkingPrototypeInfo { public string MarkingPrototypeId { get; set; } = string.Empty; public string[] HexValue { get; set; } = default!; diff --git a/Content.Shared/_Wega/Genetics/Systems/Minor/StrongnessSystem.cs b/Content.Shared/_Wega/Genetics/Systems/Minor/StrongnessSystem.cs index 287389a861..15d4ed579d 100644 --- a/Content.Shared/_Wega/Genetics/Systems/Minor/StrongnessSystem.cs +++ b/Content.Shared/_Wega/Genetics/Systems/Minor/StrongnessSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Weapons.Melee; namespace Content.Shared.Genetics.Systems; -public sealed class StrongnessSystem : EntitySystem +public sealed partial class StrongnessSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Shared/_Wega/Genetics/Systems/StructuralEnzymesIndexer.cs b/Content.Shared/_Wega/Genetics/Systems/StructuralEnzymesIndexer.cs index a5a7dc06b8..3c8a154658 100644 --- a/Content.Shared/_Wega/Genetics/Systems/StructuralEnzymesIndexer.cs +++ b/Content.Shared/_Wega/Genetics/Systems/StructuralEnzymesIndexer.cs @@ -5,7 +5,7 @@ using Robust.Shared.Random; namespace Content.Shared.Genetics.Systems { - public sealed class StructuralEnzymesIndexerSystem : EntitySystem + public sealed partial class StructuralEnzymesIndexerSystem : EntitySystem { [Dependency] private IPrototypeManager _prototypeManager = default!; [Dependency] private IRobustRandom _random = default!; diff --git a/Content.Shared/_Wega/Genetics/Ui/DnaModifier.cs b/Content.Shared/_Wega/Genetics/Ui/DnaModifier.cs index 515ef23948..16fa07f1d1 100644 --- a/Content.Shared/_Wega/Genetics/Ui/DnaModifier.cs +++ b/Content.Shared/_Wega/Genetics/Ui/DnaModifier.cs @@ -3,7 +3,7 @@ using Robust.Shared.Serialization; namespace Content.Shared.Genetics.UI; -public sealed class SharedDnaModifier +public sealed partial class SharedDnaModifier { public const string OccupantSlotName = "scanner-bodyContainer"; public const string DiskSlotName = "diskSlot"; @@ -12,7 +12,7 @@ public sealed class SharedDnaModifier } [Serializable, NetSerializable] -public sealed class DnaModifierBoundUserInterfaceState : BoundUserInterfaceState +public sealed partial class DnaModifierBoundUserInterfaceState : BoundUserInterfaceState { public readonly NetEntity Console; public readonly UniqueIdentifiersData? Unique; diff --git a/Content.Shared/_Wega/Genetics/UniqueIdentifiersData.cs b/Content.Shared/_Wega/Genetics/UniqueIdentifiersData.cs index 71e3fc22d0..73dd4db54f 100644 --- a/Content.Shared/_Wega/Genetics/UniqueIdentifiersData.cs +++ b/Content.Shared/_Wega/Genetics/UniqueIdentifiersData.cs @@ -5,7 +5,7 @@ namespace Content.Shared.Genetics; [Serializable, NetSerializable] [Access(typeof(SharedDnaModifierSystem), typeof(EnzymeInfo))] -public sealed class UniqueIdentifiersData +public sealed partial class UniqueIdentifiersData { public string ID { get; set; } = string.Empty; public string[] HairColorR { get; set; } = Array.Empty(); diff --git a/Content.Shared/_Wega/Ghost/GhostRespawnEvent.cs b/Content.Shared/_Wega/Ghost/GhostRespawnEvent.cs index 84b2fd6608..bebf75385f 100644 --- a/Content.Shared/_Wega/Ghost/GhostRespawnEvent.cs +++ b/Content.Shared/_Wega/Ghost/GhostRespawnEvent.cs @@ -3,7 +3,7 @@ using Robust.Shared.Serialization; namespace Content.Shared.Wega.Ghost.Respawn; [Serializable, NetSerializable] -public sealed class GhostRespawnEvent(TimeSpan? time) : EntityEventArgs +public sealed partial class GhostRespawnEvent(TimeSpan? time) : EntityEventArgs { public readonly TimeSpan? Time = time; } diff --git a/Content.Shared/_Wega/Height/HeightSystem.cs b/Content.Shared/_Wega/Height/HeightSystem.cs index ae4549a76c..d1977c7397 100644 --- a/Content.Shared/_Wega/Height/HeightSystem.cs +++ b/Content.Shared/_Wega/Height/HeightSystem.cs @@ -2,7 +2,7 @@ using Content.Shared.Humanoid; namespace Content.Shared.Height; -public sealed class HeightSystem : EntitySystem +public sealed partial class HeightSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Shared/_Wega/Implants/MagbootsImplantSystem.cs b/Content.Shared/_Wega/Implants/MagbootsImplantSystem.cs index 23feb7c150..dde17d4019 100644 --- a/Content.Shared/_Wega/Implants/MagbootsImplantSystem.cs +++ b/Content.Shared/_Wega/Implants/MagbootsImplantSystem.cs @@ -7,7 +7,7 @@ using Content.Shared.Toggleable; namespace Content.Shared._Wega.Implants; -public sealed class SharedMagbootsImplantSystem : EntitySystem +public sealed partial class SharedMagbootsImplantSystem : EntitySystem { [Dependency] private SharedActionsSystem _actions = default!; [Dependency] private AlertsSystem _alerts = default!; diff --git a/Content.Shared/_Wega/Implants/SharedInternalStorageSystem.cs b/Content.Shared/_Wega/Implants/SharedInternalStorageSystem.cs index c6ac78b083..7972b146b1 100644 --- a/Content.Shared/_Wega/Implants/SharedInternalStorageSystem.cs +++ b/Content.Shared/_Wega/Implants/SharedInternalStorageSystem.cs @@ -12,7 +12,7 @@ using Robust.Shared.Prototypes; namespace Content.Shared.Implants; -public abstract class SharedInternalStorageSystem : EntitySystem +public abstract partial class SharedInternalStorageSystem : EntitySystem { [Dependency] private SharedActionsSystem _action = default!; [Dependency] private SharedAudioSystem _audio = default!; diff --git a/Content.Shared/_Wega/Interaction/InteractionActionSystem.cs b/Content.Shared/_Wega/Interaction/InteractionActionSystem.cs index c20a858fda..e888b02d4e 100644 --- a/Content.Shared/_Wega/Interaction/InteractionActionSystem.cs +++ b/Content.Shared/_Wega/Interaction/InteractionActionSystem.cs @@ -13,7 +13,7 @@ using Robust.Shared.Timing; namespace Content.Shared.Interaction; -public sealed class InteractionActionSystem : EntitySystem +public sealed partial class InteractionActionSystem : EntitySystem { [Dependency] private IGameTiming _timing = default!; [Dependency] private INetManager _net = default!; diff --git a/Content.Shared/_Wega/ItemSelector/ItemSelectorUi.cs b/Content.Shared/_Wega/ItemSelector/ItemSelectorUi.cs index f979c3e8d6..7a1ab54315 100644 --- a/Content.Shared/_Wega/ItemSelector/ItemSelectorUi.cs +++ b/Content.Shared/_Wega/ItemSelector/ItemSelectorUi.cs @@ -10,7 +10,7 @@ public enum ItemSelectorUiKey : byte } [Serializable, NetSerializable] -public sealed class ItemSelectorUserMessage : BoundUserInterfaceMessage +public sealed partial class ItemSelectorUserMessage : BoundUserInterfaceMessage { public List Items; @@ -21,7 +21,7 @@ public sealed class ItemSelectorUserMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class ItemSelectorSelectionMessage : BoundUserInterfaceMessage +public sealed partial class ItemSelectorSelectionMessage : BoundUserInterfaceMessage { public NetEntity User; public EntProtoId SelectedId; diff --git a/Content.Shared/_Wega/ItemSelector/ObjectSelectorUi.cs b/Content.Shared/_Wega/ItemSelector/ObjectSelectorUi.cs index 4d52f9cde7..27a5f3edba 100644 --- a/Content.Shared/_Wega/ItemSelector/ObjectSelectorUi.cs +++ b/Content.Shared/_Wega/ItemSelector/ObjectSelectorUi.cs @@ -10,7 +10,7 @@ public enum ObjectSelectorUiKey : byte } [Serializable, NetSerializable] -public sealed class ObjectSelectorUserMessage : BoundUserInterfaceMessage +public sealed partial class ObjectSelectorUserMessage : BoundUserInterfaceMessage { public List Objects; @@ -21,7 +21,7 @@ public sealed class ObjectSelectorUserMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class ObjectSelectorSelectionMessage : BoundUserInterfaceMessage +public sealed partial class ObjectSelectorSelectionMessage : BoundUserInterfaceMessage { public EntProtoId SelectedId; diff --git a/Content.Shared/_Wega/Lavaland/LavalandConsoleUi.cs b/Content.Shared/_Wega/Lavaland/LavalandConsoleUi.cs index 615b7f321d..d7f44b61da 100644 --- a/Content.Shared/_Wega/Lavaland/LavalandConsoleUi.cs +++ b/Content.Shared/_Wega/Lavaland/LavalandConsoleUi.cs @@ -15,7 +15,7 @@ public enum PenalServitudeLavalandShuttleConsoleUiKey } [Serializable, NetSerializable] -public sealed class LavalandShuttleConsoleState : BoundUserInterfaceState +public sealed partial class LavalandShuttleConsoleState : BoundUserInterfaceState { public ShuttleStatus Status; public DockLocation Location; @@ -32,7 +32,7 @@ public sealed class LavalandShuttleConsoleState : BoundUserInterfaceState } [Serializable, NetSerializable] -public sealed class PenalServitudeLavalandShuttleConsoleState : BoundUserInterfaceState +public sealed partial class PenalServitudeLavalandShuttleConsoleState : BoundUserInterfaceState { public PenalServitudeLavalandShuttleStatus Status; public PenalServitudeLavalandDockLocation Location; @@ -49,7 +49,7 @@ public sealed class PenalServitudeLavalandShuttleConsoleState : BoundUserInterfa } [Serializable, NetSerializable] -public sealed class LavalandShuttleCallMessage : BoundUserInterfaceMessage +public sealed partial class LavalandShuttleCallMessage : BoundUserInterfaceMessage { public bool ReturnCall; @@ -60,7 +60,7 @@ public sealed class LavalandShuttleCallMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class PenalServitudeLavalandShuttleCallMessage : BoundUserInterfaceMessage +public sealed partial class PenalServitudeLavalandShuttleCallMessage : BoundUserInterfaceMessage { public bool ReturnCall; diff --git a/Content.Shared/_Wega/Lavaland/Systems/SharedLavalandSystem.cs b/Content.Shared/_Wega/Lavaland/Systems/SharedLavalandSystem.cs index f4a044cf25..2f021159c9 100644 --- a/Content.Shared/_Wega/Lavaland/Systems/SharedLavalandSystem.cs +++ b/Content.Shared/_Wega/Lavaland/Systems/SharedLavalandSystem.cs @@ -1,6 +1,6 @@ namespace Content.Shared.Lavaland; -public abstract class SharedLavalandSystem : EntitySystem +public abstract partial class SharedLavalandSystem : EntitySystem { // Empty } diff --git a/Content.Shared/_Wega/Lavaland/UtilityVendorBoundUserInterface.cs b/Content.Shared/_Wega/Lavaland/UtilityVendorBoundUserInterface.cs index 6d16c47e0b..116bbdba3b 100644 --- a/Content.Shared/_Wega/Lavaland/UtilityVendorBoundUserInterface.cs +++ b/Content.Shared/_Wega/Lavaland/UtilityVendorBoundUserInterface.cs @@ -11,7 +11,7 @@ public enum UtilityVendorUiKey : byte } [Serializable, NetSerializable] -public sealed class CategoryData +public sealed partial class CategoryData { public string Id { get; set; } public string Name { get; set; } @@ -28,7 +28,7 @@ public sealed class CategoryData } [Serializable, NetSerializable] -public sealed class UtilityVendorBoundUserInterfaceState : BoundUserInterfaceState +public sealed partial class UtilityVendorBoundUserInterfaceState : BoundUserInterfaceState { public readonly FixedPoint2 Points; public readonly List Categories; @@ -41,7 +41,7 @@ public sealed class UtilityVendorBoundUserInterfaceState : BoundUserInterfaceSta } [Serializable, NetSerializable] -public sealed class UtilityVendorPurchaseMessage : BoundUserInterfaceMessage +public sealed partial class UtilityVendorPurchaseMessage : BoundUserInterfaceMessage { public readonly string ItemId; diff --git a/Content.Shared/_Wega/MartialArts/SharedMartialArtsSystem.cs b/Content.Shared/_Wega/MartialArts/SharedMartialArtsSystem.cs index f94b69ed48..d9a51764f7 100644 --- a/Content.Shared/_Wega/MartialArts/SharedMartialArtsSystem.cs +++ b/Content.Shared/_Wega/MartialArts/SharedMartialArtsSystem.cs @@ -7,11 +7,10 @@ using Content.Shared.Martial.Arts.Components; using Content.Shared.Martial.Arts.Prototypes; using Content.Shared.Popups; using Robust.Shared.Prototypes; -using Robust.Shared.Utility; namespace Content.Shared.Martial.Arts; -public abstract class SharedMartialArtsSystem : EntitySystem +public abstract partial class SharedMartialArtsSystem : EntitySystem { [Dependency] private SharedActionsSystem _action = default!; [Dependency] private IPrototypeManager _prototype = default!; diff --git a/Content.Shared/_Wega/Medical/Ui/InjectorFabricator.cs b/Content.Shared/_Wega/Medical/Ui/InjectorFabricator.cs index 9f7ccfe4a6..00fe3a113a 100644 --- a/Content.Shared/_Wega/Medical/Ui/InjectorFabricator.cs +++ b/Content.Shared/_Wega/Medical/Ui/InjectorFabricator.cs @@ -13,7 +13,7 @@ public enum InjectorFabticatorUiKey : byte } [Serializable, NetSerializable] -public sealed class InjectorFabticatorBoundUserInterfaceState : BoundUserInterfaceState +public sealed partial class InjectorFabticatorBoundUserInterfaceState : BoundUserInterfaceState { public readonly bool IsProducing; public readonly bool CanProduce; @@ -56,7 +56,7 @@ public sealed class InjectorFabticatorBoundUserInterfaceState : BoundUserInterfa } [Serializable, NetSerializable] -public sealed class InjectorFabticatorTransferBufferToBeakerMessage : BoundUserInterfaceMessage +public sealed partial class InjectorFabticatorTransferBufferToBeakerMessage : BoundUserInterfaceMessage { public readonly ReagentId ReagentId; public readonly FixedPoint2 Amount; @@ -69,7 +69,7 @@ public sealed class InjectorFabticatorTransferBufferToBeakerMessage : BoundUserI } [Serializable, NetSerializable] -public sealed class InjectorFabticatorTransferBeakerToBufferMessage : BoundUserInterfaceMessage +public sealed partial class InjectorFabticatorTransferBeakerToBufferMessage : BoundUserInterfaceMessage { public readonly ReagentId ReagentId; public readonly FixedPoint2 Amount; @@ -82,7 +82,7 @@ public sealed class InjectorFabticatorTransferBeakerToBufferMessage : BoundUserI } [Serializable, NetSerializable] -public sealed class InjectorFabticatorSetReagentMessage : BoundUserInterfaceMessage +public sealed partial class InjectorFabticatorSetReagentMessage : BoundUserInterfaceMessage { public readonly ReagentId ReagentId; public readonly FixedPoint2 Amount; @@ -95,7 +95,7 @@ public sealed class InjectorFabticatorSetReagentMessage : BoundUserInterfaceMess } [Serializable, NetSerializable] -public sealed class InjectorFabticatorRemoveReagentMessage : BoundUserInterfaceMessage +public sealed partial class InjectorFabticatorRemoveReagentMessage : BoundUserInterfaceMessage { public readonly ReagentId ReagentId; @@ -106,7 +106,7 @@ public sealed class InjectorFabticatorRemoveReagentMessage : BoundUserInterfaceM } [Serializable, NetSerializable] -public sealed class InjectorFabticatorProduceMessage : BoundUserInterfaceMessage +public sealed partial class InjectorFabticatorProduceMessage : BoundUserInterfaceMessage { public readonly int Amount; public readonly string? CustomName; @@ -119,10 +119,10 @@ public sealed class InjectorFabticatorProduceMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class InjectorFabticatorEjectMessage : BoundUserInterfaceMessage { } +public sealed partial class InjectorFabticatorEjectMessage : BoundUserInterfaceMessage { } [Serializable, NetSerializable] -public sealed class InjectorFabticatorSyncRecipeMessage : BoundUserInterfaceMessage +public sealed partial class InjectorFabticatorSyncRecipeMessage : BoundUserInterfaceMessage { public readonly Dictionary? Recipe; diff --git a/Content.Shared/_Wega/Mining/MiningConsoleUi.cs b/Content.Shared/_Wega/Mining/MiningConsoleUi.cs index 2226741cd0..56e99d6f6a 100644 --- a/Content.Shared/_Wega/Mining/MiningConsoleUi.cs +++ b/Content.Shared/_Wega/Mining/MiningConsoleUi.cs @@ -10,7 +10,7 @@ public enum MiningConsoleUiKey } [Serializable, NetSerializable] -public sealed class MiningConsoleBoundInterfaceState : BoundUserInterfaceState +public sealed partial class MiningConsoleBoundInterfaceState : BoundUserInterfaceState { public float Credits; public float ResearchPoints; @@ -34,17 +34,17 @@ public sealed class MiningConsoleBoundInterfaceState : BoundUserInterfaceState } [Serializable, NetSerializable] -public sealed class MiningConsoleToggleModeMessage : BoundUserInterfaceMessage +public sealed partial class MiningConsoleToggleModeMessage : BoundUserInterfaceMessage { } [Serializable, NetSerializable] -public sealed class MiningConsoleToggleActivationMessage : BoundUserInterfaceMessage +public sealed partial class MiningConsoleToggleActivationMessage : BoundUserInterfaceMessage { } [Serializable, NetSerializable] -public sealed class MiningConsoleToggleServerActivationMessage : BoundUserInterfaceMessage +public sealed partial class MiningConsoleToggleServerActivationMessage : BoundUserInterfaceMessage { public NetEntity ServerUid; @@ -55,7 +55,7 @@ public sealed class MiningConsoleToggleServerActivationMessage : BoundUserInterf } [Serializable, NetSerializable] -public sealed class MiningConsoleChangeServerStageMessage : BoundUserInterfaceMessage +public sealed partial class MiningConsoleChangeServerStageMessage : BoundUserInterfaceMessage { public NetEntity ServerUid; public int Delta; @@ -68,12 +68,12 @@ public sealed class MiningConsoleChangeServerStageMessage : BoundUserInterfaceMe } [Serializable, NetSerializable] -public sealed class MiningConsoleToggleUpdateMessage : BoundUserInterfaceMessage +public sealed partial class MiningConsoleToggleUpdateMessage : BoundUserInterfaceMessage { } [Serializable, NetSerializable] -public sealed class MiningConsoleWithdrawMessage : BoundUserInterfaceMessage +public sealed partial class MiningConsoleWithdrawMessage : BoundUserInterfaceMessage { } diff --git a/Content.Shared/_Wega/Mobs/MobAngerSystem.cs b/Content.Shared/_Wega/Mobs/MobAngerSystem.cs index 4ac8bdc27a..ad3c53e6dc 100644 --- a/Content.Shared/_Wega/Mobs/MobAngerSystem.cs +++ b/Content.Shared/_Wega/Mobs/MobAngerSystem.cs @@ -8,7 +8,7 @@ using Content.Shared.Weapons.Melee.Events; namespace Content.Shared.Mobs.Anger; -public sealed class MobAngerSystem : EntitySystem +public sealed partial class MobAngerSystem : EntitySystem { [Dependency] private DamageableSystem _damageable = default!; [Dependency] private MovementSpeedModifierSystem _speed = default!; diff --git a/Content.Shared/_Wega/ModularSuit/Events/ModularSuitEvents.cs b/Content.Shared/_Wega/ModularSuit/Events/ModularSuitEvents.cs index 157a981a4a..b6b994aa45 100644 --- a/Content.Shared/_Wega/ModularSuit/Events/ModularSuitEvents.cs +++ b/Content.Shared/_Wega/ModularSuit/Events/ModularSuitEvents.cs @@ -1,7 +1,7 @@ namespace Content.Shared.Modular.Suit; [ByRefEvent] -public sealed class ModularSuitDeployAttemptEvent : CancellableEntityEventArgs; +public sealed partial class ModularSuitDeployAttemptEvent : CancellableEntityEventArgs; [ByRefEvent] public readonly record struct ModularSuitRefreshPowerEvent(); @@ -22,7 +22,7 @@ public readonly record struct ModularSuitRemovedEvent(EntityUid Suit, EntityUid? public readonly record struct ModularSuitModuleItemCreatedEvent(EntityUid Module); [ByRefEvent] -public sealed class ModularSuitModuleAttemptEvent : CancellableEntityEventArgs +public sealed partial class ModularSuitModuleAttemptEvent : CancellableEntityEventArgs { public readonly EntityUid Suit; diff --git a/Content.Shared/_Wega/ModularSuit/SharedModularSuitSystem.cs b/Content.Shared/_Wega/ModularSuit/SharedModularSuitSystem.cs index 25ab10b007..d007024c93 100644 --- a/Content.Shared/_Wega/ModularSuit/SharedModularSuitSystem.cs +++ b/Content.Shared/_Wega/ModularSuit/SharedModularSuitSystem.cs @@ -15,11 +15,11 @@ namespace Content.Shared.Modular.Suit; public abstract partial class SharedModularSuitSystem : EntitySystem { - [Dependency] protected readonly IGameTiming GameTiming = default!; - [Dependency] protected readonly InventorySystem Inventory = default!; - [Dependency] protected readonly ItemToggleSystem Toggle = default!; - [Dependency] protected readonly SharedContainerSystem Container = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; + [Dependency] protected IGameTiming GameTiming = default!; + [Dependency] protected InventorySystem Inventory = default!; + [Dependency] protected ItemToggleSystem Toggle = default!; + [Dependency] protected SharedContainerSystem Container = default!; + [Dependency] protected SharedPopupSystem Popup = default!; [Dependency] private ActionContainerSystem _actionContainer = default!; [Dependency] private SharedActionsSystem _actions = default!; [Dependency] private SharedAudioSystem _audioSystem = default!; diff --git a/Content.Shared/_Wega/ModularSuit/Ui/LightModuleUi.cs b/Content.Shared/_Wega/ModularSuit/Ui/LightModuleUi.cs index e21519eed1..a83a5fb5c0 100644 --- a/Content.Shared/_Wega/ModularSuit/Ui/LightModuleUi.cs +++ b/Content.Shared/_Wega/ModularSuit/Ui/LightModuleUi.cs @@ -9,7 +9,7 @@ public enum LightModuleUiKey : byte } [Serializable, NetSerializable] -public sealed class LightModuleBoundUserInterfaceState : BoundUserInterfaceState +public sealed partial class LightModuleBoundUserInterfaceState : BoundUserInterfaceState { public Color LightColor { get; } public bool Multicoloured { get; } @@ -22,7 +22,7 @@ public sealed class LightModuleBoundUserInterfaceState : BoundUserInterfaceState } [Serializable, NetSerializable] -public sealed class UpdateLightModuleMessage : BoundUserInterfaceMessage +public sealed partial class UpdateLightModuleMessage : BoundUserInterfaceMessage { public Color LightColor { get; } public bool Multicoloured { get; } diff --git a/Content.Shared/_Wega/ModularSuit/Ui/ModularSuitUi.cs b/Content.Shared/_Wega/ModularSuit/Ui/ModularSuitUi.cs index 4a79f8edb9..eea3c047a6 100644 --- a/Content.Shared/_Wega/ModularSuit/Ui/ModularSuitUi.cs +++ b/Content.Shared/_Wega/ModularSuit/Ui/ModularSuitUi.cs @@ -9,7 +9,7 @@ public enum ModularSuitUiKey : byte } [Serializable, NetSerializable] -public sealed class ModularSuitBoundUserInterfaceState : BoundUserInterfaceState +public sealed partial class ModularSuitBoundUserInterfaceState : BoundUserInterfaceState { public bool Active { get; } public float CoreCharge { get; } @@ -54,7 +54,7 @@ public sealed class ModularSuitBoundUserInterfaceState : BoundUserInterfaceState } [Serializable, NetSerializable] -public sealed class SuitModuleEntry +public sealed partial class SuitModuleEntry { public NetEntity ModuleUid { get; } public string Name { get; } @@ -90,7 +90,7 @@ public sealed class SuitModuleEntry } [Serializable, NetSerializable] -public sealed class SuitPartEntry +public sealed partial class SuitPartEntry { public NetEntity PartUid { get; } public string Name { get; } @@ -105,7 +105,7 @@ public sealed class SuitPartEntry } [Serializable, NetSerializable] -public sealed class ToggleSuitActiveMessage : BoundUserInterfaceMessage +public sealed partial class ToggleSuitActiveMessage : BoundUserInterfaceMessage { public bool Active { get; } @@ -116,7 +116,7 @@ public sealed class ToggleSuitActiveMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class ToggleModuleMessage : BoundUserInterfaceMessage +public sealed partial class ToggleModuleMessage : BoundUserInterfaceMessage { public NetEntity ModuleUid { get; } public bool Active { get; } diff --git a/Content.Shared/_Wega/Movement/Systems/FlyAbilitySystem.cs b/Content.Shared/_Wega/Movement/Systems/FlyAbilitySystem.cs index 5a68876545..31d2b25d21 100644 --- a/Content.Shared/_Wega/Movement/Systems/FlyAbilitySystem.cs +++ b/Content.Shared/_Wega/Movement/Systems/FlyAbilitySystem.cs @@ -10,9 +10,9 @@ using Robust.Shared.Audio.Systems; namespace Content.Shared.Movement.Systems; -public abstract class SharedFlyAbilitySystem : EntitySystem +public abstract partial class SharedFlyAbilitySystem : EntitySystem { - [Dependency] protected readonly IGameTiming Timing = default!; + [Dependency] protected IGameTiming Timing = default!; [Dependency] private SharedAmbientSoundSystem _ambient = default!; [Dependency] private SharedActionsSystem _actions = default!; [Dependency] private SharedPhysicsSystem _physics = default!; diff --git a/Content.Shared/_Wega/Objectives/Systems/BloodCondition.cs b/Content.Shared/_Wega/Objectives/Systems/BloodCondition.cs index 59b492d381..313dcb2375 100644 --- a/Content.Shared/_Wega/Objectives/Systems/BloodCondition.cs +++ b/Content.Shared/_Wega/Objectives/Systems/BloodCondition.cs @@ -5,7 +5,7 @@ using Robust.Shared.Random; namespace Content.Server.Objectives.Systems; -public sealed class BloodConditionSystem : EntitySystem +public sealed partial class BloodConditionSystem : EntitySystem { [Dependency] private IRobustRandom _random = default!; [Dependency] private MetaDataSystem _metaData = default!; diff --git a/Content.Shared/_Wega/Offer/SharedOfferItemSystem.cs b/Content.Shared/_Wega/Offer/SharedOfferItemSystem.cs index 9a102a1a45..329641544c 100644 --- a/Content.Shared/_Wega/Offer/SharedOfferItemSystem.cs +++ b/Content.Shared/_Wega/Offer/SharedOfferItemSystem.cs @@ -132,7 +132,7 @@ public abstract partial class SharedOfferItemSystem : EntitySystem } [Serializable, NetSerializable] -public sealed class RequestToggleOfferEvent : EntityEventArgs +public sealed partial class RequestToggleOfferEvent : EntityEventArgs { public NetEntity Player { get; } diff --git a/Content.Shared/_Wega/Overlays/Abstract/SharedToggleableEquipmentHudSystem.cs b/Content.Shared/_Wega/Overlays/Abstract/SharedToggleableEquipmentHudSystem.cs index 24bee545ae..91f4aee1a4 100644 --- a/Content.Shared/_Wega/Overlays/Abstract/SharedToggleableEquipmentHudSystem.cs +++ b/Content.Shared/_Wega/Overlays/Abstract/SharedToggleableEquipmentHudSystem.cs @@ -9,7 +9,7 @@ using Robust.Shared.Timing; namespace Content.Shared.Overlay; -public abstract class SharedToggleableEquipmentHudSystem : EntitySystem where T : ToggleableHudComponent +public abstract partial class SharedToggleableEquipmentHudSystem : EntitySystem where T : ToggleableHudComponent { [Dependency] private SharedActionsSystem _actions = default!; [Dependency] private SharedAudioSystem _audio = default!; diff --git a/Content.Shared/_Wega/Resomi/Abilities/Hearing/SharedListenUpSkillSystem.cs b/Content.Shared/_Wega/Resomi/Abilities/Hearing/SharedListenUpSkillSystem.cs index 152ff66119..ae7c114bf3 100644 --- a/Content.Shared/_Wega/Resomi/Abilities/Hearing/SharedListenUpSkillSystem.cs +++ b/Content.Shared/_Wega/Resomi/Abilities/Hearing/SharedListenUpSkillSystem.cs @@ -4,7 +4,7 @@ using Content.Shared.Movement.Events; namespace Content.Shared.Resomi.Abilities.Hearing; -public abstract class SharedListenUpSkillSystem : EntitySystem +public abstract partial class SharedListenUpSkillSystem : EntitySystem { [Dependency] private SharedActionsSystem _actionsSystem = default!; [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; diff --git a/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillSystem.cs b/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillSystem.cs index 91e848bfcb..99a1596afb 100644 --- a/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillSystem.cs +++ b/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillSystem.cs @@ -7,9 +7,9 @@ using Content.Shared.Actions; namespace Content.Shared.Resomi.Abilities; -public abstract class SharedAgillitySkillSystem : EntitySystem +public abstract partial class SharedAgillitySkillSystem : EntitySystem { - [Dependency] protected readonly IGameTiming Timing = default!; + [Dependency] protected IGameTiming Timing = default!; [Dependency] private ClimbSystem _climb = default!; [Dependency] private SharedStaminaSystem _stamina = default!; [Dependency] private SharedActionsSystem _actions = default!; diff --git a/Content.Shared/_Wega/Shader/SharedNaturalNightVisionSystem.cs b/Content.Shared/_Wega/Shader/SharedNaturalNightVisionSystem.cs index 6f16ce5dc5..7b40682827 100644 --- a/Content.Shared/_Wega/Shader/SharedNaturalNightVisionSystem.cs +++ b/Content.Shared/_Wega/Shader/SharedNaturalNightVisionSystem.cs @@ -2,7 +2,7 @@ using Content.Shared.Actions; namespace Content.Shared.Shaders; -public sealed class SharedNaturalNightVisionSystem : EntitySystem +public sealed partial class SharedNaturalNightVisionSystem : EntitySystem { [Dependency] private SharedActionsSystem _action = default!; diff --git a/Content.Shared/_Wega/Sharpening/Events/SharpeningEvents.cs b/Content.Shared/_Wega/Sharpening/Events/SharpeningEvents.cs index 6cd86a22ff..e2cad10f25 100644 --- a/Content.Shared/_Wega/Sharpening/Events/SharpeningEvents.cs +++ b/Content.Shared/_Wega/Sharpening/Events/SharpeningEvents.cs @@ -4,7 +4,7 @@ using Robust.Shared.Serialization; namespace Content.Shared.Sharpening.Events; [Serializable, NetSerializable] -public sealed class SharpeningFinishedEvent : EntityEventArgs +public sealed partial class SharpeningFinishedEvent : EntityEventArgs { public NetEntity Sharpener; public NetEntity Sharpening; diff --git a/Content.Shared/_Wega/Sharpening/Systems/SharedSharpeningSystem.cs b/Content.Shared/_Wega/Sharpening/Systems/SharedSharpeningSystem.cs index ce9eae2728..2e0d1aa76d 100644 --- a/Content.Shared/_Wega/Sharpening/Systems/SharedSharpeningSystem.cs +++ b/Content.Shared/_Wega/Sharpening/Systems/SharedSharpeningSystem.cs @@ -8,7 +8,7 @@ using Content.Shared.Sharpening.Events; namespace Content.Shared.Sharpening.Systems; -public abstract class SharedSharpeningSystem : EntitySystem +public abstract partial class SharedSharpeningSystem : EntitySystem { [Dependency] private SharedAudioSystem _audio = default!; diff --git a/Content.Shared/_Wega/SoundInsulation/SoundInsulationSystem.cs b/Content.Shared/_Wega/SoundInsulation/SoundInsulationSystem.cs index 1e455ff9bf..aeb2eb7ff8 100644 --- a/Content.Shared/_Wega/SoundInsulation/SoundInsulationSystem.cs +++ b/Content.Shared/_Wega/SoundInsulation/SoundInsulationSystem.cs @@ -10,7 +10,7 @@ using Robust.Shared.Random; namespace Content.Shared.SoundInsolation; -public sealed class SoundInsulationSystem : EntitySystem +public sealed partial class SoundInsulationSystem : EntitySystem { [Dependency] private IConfigurationManager _cfg = default!; [Dependency] private SharedPhysicsSystem _physics = default!; diff --git a/Content.Shared/_Wega/Strangulation/SharedStrangulationSystem.cs b/Content.Shared/_Wega/Strangulation/SharedStrangulationSystem.cs index 6778755512..9abbb2b226 100644 --- a/Content.Shared/_Wega/Strangulation/SharedStrangulationSystem.cs +++ b/Content.Shared/_Wega/Strangulation/SharedStrangulationSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Movement.Events; namespace Content.Shared.Strangulation { - public abstract class SharedStrangulationSystem : EntitySystem + public abstract partial class SharedStrangulationSystem : EntitySystem { [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; diff --git a/Content.Shared/_Wega/Surgery/Ui/BodyScanner.cs b/Content.Shared/_Wega/Surgery/Ui/BodyScanner.cs index 07e92987c5..030dd55c0a 100644 --- a/Content.Shared/_Wega/Surgery/Ui/BodyScanner.cs +++ b/Content.Shared/_Wega/Surgery/Ui/BodyScanner.cs @@ -9,7 +9,7 @@ namespace Content.Shared.Surgery } [Serializable, NetSerializable] - public sealed class BodyScannerBoundUserInterfaceState : BoundUserInterfaceState + public sealed partial class BodyScannerBoundUserInterfaceState : BoundUserInterfaceState { public readonly string? PatientName; public readonly string? PatientStatus; @@ -30,7 +30,7 @@ namespace Content.Shared.Surgery } [Serializable, NetSerializable] - public sealed class BodyScannerDamageInfo + public sealed partial class BodyScannerDamageInfo { public readonly string DamageName; public readonly List AffectedParts; diff --git a/Content.Shared/_Wega/Surgery/Ui/SurgeryMenu.cs b/Content.Shared/_Wega/Surgery/Ui/SurgeryMenu.cs index e72b7bb7b7..b47cd21cee 100644 --- a/Content.Shared/_Wega/Surgery/Ui/SurgeryMenu.cs +++ b/Content.Shared/_Wega/Surgery/Ui/SurgeryMenu.cs @@ -10,7 +10,7 @@ public enum SurgeryUiKey } [Serializable, NetSerializable] -public sealed class SurgeryProcedureDto : BoundUserInterfaceMessage +public sealed partial class SurgeryProcedureDto : BoundUserInterfaceMessage { public List Groups; public NetEntity PatientId; @@ -23,7 +23,7 @@ public sealed class SurgeryProcedureDto : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class SurgeryGroupDto +public sealed partial class SurgeryGroupDto { public string GroupName; public string Description; @@ -40,7 +40,7 @@ public sealed class SurgeryGroupDto } [Serializable, NetSerializable] -public sealed class SurgeryStepDto +public sealed partial class SurgeryStepDto { public string Name; public bool IsCompleted; @@ -70,7 +70,7 @@ public sealed class SurgeryStepDto } [Serializable, NetSerializable] -public sealed class SurgeryStartMessage : BoundUserInterfaceMessage +public sealed partial class SurgeryStartMessage : BoundUserInterfaceMessage { public NetEntity User; public ProtoId TargetNode; diff --git a/Content.Shared/_Wega/TapeRecorder/Events/TapeRecorderEvents.cs b/Content.Shared/_Wega/TapeRecorder/Events/TapeRecorderEvents.cs index dfd5edcaf3..e35909650d 100644 --- a/Content.Shared/_Wega/TapeRecorder/Events/TapeRecorderEvents.cs +++ b/Content.Shared/_Wega/TapeRecorder/Events/TapeRecorderEvents.cs @@ -8,7 +8,7 @@ namespace Content.Shared.TapeRecorder.Events; public sealed partial class TapeCassetteRepairDoAfterEvent : SimpleDoAfterEvent; [Serializable, NetSerializable] -public sealed class ChangeModeTapeRecorderMessage : BoundUserInterfaceMessage +public sealed partial class ChangeModeTapeRecorderMessage : BoundUserInterfaceMessage { public TapeRecorderMode Mode; @@ -19,10 +19,10 @@ public sealed class ChangeModeTapeRecorderMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class PrintTapeRecorderMessage : BoundUserInterfaceMessage; +public sealed partial class PrintTapeRecorderMessage : BoundUserInterfaceMessage; [Serializable, NetSerializable] -public sealed class TapeRecorderState : BoundUserInterfaceState +public sealed partial class TapeRecorderState : BoundUserInterfaceState { // TODO: check the itemslot on client instead of putting easy casette stuff in the state public bool HasCasette; diff --git a/Content.Shared/_Wega/TapeRecorder/SharedTapeRecorderSystem.cs b/Content.Shared/_Wega/TapeRecorder/SharedTapeRecorderSystem.cs index 4485fe0030..6e08160569 100644 --- a/Content.Shared/_Wega/TapeRecorder/SharedTapeRecorderSystem.cs +++ b/Content.Shared/_Wega/TapeRecorder/SharedTapeRecorderSystem.cs @@ -18,13 +18,13 @@ using System.Text; namespace Content.Shared.TapeRecorder; -public abstract class SharedTapeRecorderSystem : EntitySystem +public abstract partial class SharedTapeRecorderSystem : EntitySystem { [Dependency] private EntityWhitelistSystem _whitelist = default!; - [Dependency] protected readonly IGameTiming Timing = default!; + [Dependency] protected IGameTiming Timing = default!; [Dependency] private IRobustRandom _random = default!; [Dependency] private SharedAppearanceSystem _appearance = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; + [Dependency] protected SharedAudioSystem Audio = default!; [Dependency] private SharedDoAfterSystem _doAfter = default!; [Dependency] private ItemSlotsSystem _slots = default!; [Dependency] private SharedUserInterfaceSystem _ui = default!; diff --git a/Content.Shared/_Wega/Vampire/SharedVampireSystem.cs b/Content.Shared/_Wega/Vampire/SharedVampireSystem.cs index 085f8eea21..8bf6b6c0c8 100644 --- a/Content.Shared/_Wega/Vampire/SharedVampireSystem.cs +++ b/Content.Shared/_Wega/Vampire/SharedVampireSystem.cs @@ -1,6 +1,5 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; -using System.Numerics; using Content.Shared.Body; using Content.Shared.Damage; using Content.Shared.FixedPoint; @@ -10,7 +9,7 @@ using Robust.Shared.Prototypes; namespace Content.Shared.Vampire; -public abstract class SharedVampireSystem : EntitySystem +public abstract partial class SharedVampireSystem : EntitySystem { [Dependency] private MobStateSystem _mobState = default!; [Dependency] private SharedVisualBodySystem _visualBody = default!; diff --git a/Content.Shared/_Wega/Vampire/Ui/BestiaEuiState.cs b/Content.Shared/_Wega/Vampire/Ui/BestiaEuiState.cs index 8e62153114..feebe67bc1 100644 --- a/Content.Shared/_Wega/Vampire/Ui/BestiaEuiState.cs +++ b/Content.Shared/_Wega/Vampire/Ui/BestiaEuiState.cs @@ -5,7 +5,7 @@ using Robust.Shared.Serialization; namespace Content.Shared.Vampire; [Serializable, NetSerializable] -public sealed class TrophiesEuiState : EuiStateBase +public sealed partial class TrophiesEuiState : EuiStateBase { public List Organs { get; } public List PassiveBonuses { get; } @@ -23,7 +23,7 @@ public sealed class TrophiesEuiState : EuiStateBase } [Serializable, NetSerializable] -public sealed class OrganDisplayInfo +public sealed partial class OrganDisplayInfo { public BestiaOrganType Type { get; set; } public int Count { get; set; } @@ -33,7 +33,7 @@ public sealed class OrganDisplayInfo } [Serializable, NetSerializable] -public sealed class PassiveBonusInfo +public sealed partial class PassiveBonusInfo { public string Name { get; set; } = ""; public string Value { get; set; } = ""; @@ -42,7 +42,7 @@ public sealed class PassiveBonusInfo } [Serializable, NetSerializable] -public sealed class AbilityDisplayInfo +public sealed partial class AbilityDisplayInfo { public NetEntity Action { get; set; } public string Name { get; set; } = ""; @@ -50,7 +50,7 @@ public sealed class AbilityDisplayInfo } [Serializable, NetSerializable] -public sealed class OrganBonusDetail +public sealed partial class OrganBonusDetail { public string OrganType { get; set; } = ""; public string Description { get; set; } = ""; @@ -58,7 +58,7 @@ public sealed class OrganBonusDetail } [Serializable, NetSerializable] -public sealed class DissectSelectionEuiState : EuiStateBase +public sealed partial class DissectSelectionEuiState : EuiStateBase { public List AvailableOrgans { get; } @@ -69,7 +69,7 @@ public sealed class DissectSelectionEuiState : EuiStateBase } [Serializable, NetSerializable] -public sealed class DissectOrganSelectedMessage : EuiMessageBase +public sealed partial class DissectOrganSelectedMessage : EuiMessageBase { public NetEntity Target { get; } diff --git a/Content.Shared/_Wega/Vampire/Ui/VampireEuiState.cs b/Content.Shared/_Wega/Vampire/Ui/VampireEuiState.cs index cb0c18f79f..2457e68663 100644 --- a/Content.Shared/_Wega/Vampire/Ui/VampireEuiState.cs +++ b/Content.Shared/_Wega/Vampire/Ui/VampireEuiState.cs @@ -4,12 +4,12 @@ using Robust.Shared.Serialization; namespace Content.Shared.Vampire; [Serializable, NetSerializable] -public sealed class VampireClassSelectionState : EuiStateBase +public sealed partial class VampireClassSelectionState : EuiStateBase { } [Serializable, NetSerializable] -public sealed class VampireClassSelectedMessage : EuiMessageBase +public sealed partial class VampireClassSelectedMessage : EuiMessageBase { public VampireClassEnum SelectedClass { get; } public VampireClassSelectedMessage(VampireClassEnum selectedClass) => SelectedClass = selectedClass; diff --git a/Content.Shared/_Wega/Vehicle/Components/RiderComponent.cs b/Content.Shared/_Wega/Vehicle/Components/RiderComponent.cs index d268672906..be8f50a3df 100644 --- a/Content.Shared/_Wega/Vehicle/Components/RiderComponent.cs +++ b/Content.Shared/_Wega/Vehicle/Components/RiderComponent.cs @@ -20,7 +20,7 @@ public sealed partial class RiderComponent : Component } [Serializable, NetSerializable] -public sealed class RiderComponentState : ComponentState +public sealed partial class RiderComponentState : ComponentState { public NetEntity? Entity; } diff --git a/Content.Shared/_Wega/Vehicle/SharedVehicleSystem.cs b/Content.Shared/_Wega/Vehicle/SharedVehicleSystem.cs index bd8a6dd7b7..ef94fa7463 100644 --- a/Content.Shared/_Wega/Vehicle/SharedVehicleSystem.cs +++ b/Content.Shared/_Wega/Vehicle/SharedVehicleSystem.cs @@ -30,7 +30,7 @@ namespace Content.Shared.Vehicle; public abstract partial class SharedVehicleSystem : EntitySystem { [Dependency] private INetManager _netManager = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; [Dependency] private SharedAudioSystem _audioSystem = default!; [Dependency] private MovementSpeedModifierSystem _modifier = default!; [Dependency] private SharedAmbientSoundSystem _ambientSound = default!; diff --git a/Content.Shared/_Wega/VeilCult/SharedVeilBeaconSystem.cs b/Content.Shared/_Wega/VeilCult/SharedVeilBeaconSystem.cs index 6bb85df8cf..a8de2dce17 100644 --- a/Content.Shared/_Wega/VeilCult/SharedVeilBeaconSystem.cs +++ b/Content.Shared/_Wega/VeilCult/SharedVeilBeaconSystem.cs @@ -4,7 +4,7 @@ using Robust.Shared.GameStates; namespace Content.Shared.Veil.Cult; -public sealed class VeilBeaconSystem : EntitySystem +public sealed partial class VeilBeaconSystem : EntitySystem { [Dependency] private SharedUserInterfaceSystem _ui = default!; diff --git a/Content.Shared/_Wega/VeilCult/SharedVeilCultSystem.cs b/Content.Shared/_Wega/VeilCult/SharedVeilCultSystem.cs index fc8550fa6c..fb150cf60c 100644 --- a/Content.Shared/_Wega/VeilCult/SharedVeilCultSystem.cs +++ b/Content.Shared/_Wega/VeilCult/SharedVeilCultSystem.cs @@ -16,7 +16,7 @@ using Robust.Shared.Spawners; namespace Content.Shared.Veil.Cult; -public abstract class SharedVeilCultSystem : EntitySystem +public abstract partial class SharedVeilCultSystem : EntitySystem { [Dependency] private SharedActionsSystem _action = default!; [Dependency] private SharedPopupSystem _popup = default!; diff --git a/Content.Shared/_Wega/VeilCult/UI/EnchantBoundUserInterface.cs b/Content.Shared/_Wega/VeilCult/UI/EnchantBoundUserInterface.cs index 498ea70da6..ee1119433c 100644 --- a/Content.Shared/_Wega/VeilCult/UI/EnchantBoundUserInterface.cs +++ b/Content.Shared/_Wega/VeilCult/UI/EnchantBoundUserInterface.cs @@ -4,7 +4,7 @@ using Robust.Shared.Serialization; namespace Content.Shared.Veil.Cult.UI; [Serializable, NetSerializable] -public sealed class EnchantSelectionState : BoundUserInterfaceState +public sealed partial class EnchantSelectionState : BoundUserInterfaceState { public readonly List AvailableEnchants = new(); @@ -15,7 +15,7 @@ public sealed class EnchantSelectionState : BoundUserInterfaceState } [Serializable, NetSerializable] -public sealed class EnchantSelectedMessage : BoundUserInterfaceMessage +public sealed partial class EnchantSelectedMessage : BoundUserInterfaceMessage { public readonly EntProtoId EnchantId; diff --git a/Content.Shared/_Wega/VeilCult/UI/VeilAltarBoundInterface.cs b/Content.Shared/_Wega/VeilCult/UI/VeilAltarBoundInterface.cs index 6518dc8c66..5228d9a6b2 100644 --- a/Content.Shared/_Wega/VeilCult/UI/VeilAltarBoundInterface.cs +++ b/Content.Shared/_Wega/VeilCult/UI/VeilAltarBoundInterface.cs @@ -10,11 +10,11 @@ public enum VeilAltarUiKey : byte // Events [Serializable, NetSerializable] -public sealed class VeilAltarSelectEnergyMessage : BoundUserInterfaceMessage +public sealed partial class VeilAltarSelectEnergyMessage : BoundUserInterfaceMessage { } [Serializable, NetSerializable] -public sealed class VeilAltarSelectOfferMessage : BoundUserInterfaceMessage +public sealed partial class VeilAltarSelectOfferMessage : BoundUserInterfaceMessage { } diff --git a/Content.Shared/_Wega/VeilCult/VeilCultEvents.cs b/Content.Shared/_Wega/VeilCult/VeilCultEvents.cs index b805c0ff59..d206f4895c 100644 --- a/Content.Shared/_Wega/VeilCult/VeilCultEvents.cs +++ b/Content.Shared/_Wega/VeilCult/VeilCultEvents.cs @@ -7,11 +7,11 @@ using Robust.Shared.Serialization; namespace Content.Shared.Veil.Cult; // Events -public sealed class VeilGodCalledEvent : EntityEventArgs +public sealed partial class VeilGodCalledEvent : EntityEventArgs { } -public sealed class VeilRitualConductedEvent : EntityEventArgs +public sealed partial class VeilRitualConductedEvent : EntityEventArgs { } @@ -125,7 +125,7 @@ public enum VeilBeaconUiKey : byte // STATES AND MESSAGES [Serializable, NetSerializable] -public sealed class VeilBeaconNameBoundUserInterfaceState : BoundUserInterfaceState +public sealed partial class VeilBeaconNameBoundUserInterfaceState : BoundUserInterfaceState { public string Name; public int MaxChars; @@ -138,26 +138,26 @@ public sealed class VeilBeaconNameBoundUserInterfaceState : BoundUserInterfaceSt } [Serializable, NetSerializable] -public sealed class VeilBeaconNameChangedMessage(string name) : BoundUserInterfaceMessage +public sealed partial class VeilBeaconNameChangedMessage(string name) : BoundUserInterfaceMessage { public string Name { get; } = name; } [Serializable, NetSerializable] -public sealed class TeleportEnchantDestinationMessage(NetEntity netEnt) : BoundUserInterfaceMessage +public sealed partial class TeleportEnchantDestinationMessage(NetEntity netEnt) : BoundUserInterfaceMessage { public NetEntity NetEnt = netEnt; } [Serializable, NetSerializable] -public sealed class VeilCultBeaconComponentState(string assignedName, int maxNameChars) : IComponentState // <-- Эт не ui тип, а к компонентам ближе +public sealed partial class VeilCultBeaconComponentState(string assignedName, int maxNameChars) : IComponentState // <-- Эт не ui тип, а к компонентам ближе { public string AssignedName = assignedName; public int MaxNameChars = maxNameChars; } [Serializable, NetSerializable] -public sealed class TeleportationEnchantBoundUserInterfaceState : BoundUserInterfaceState +public sealed partial class TeleportationEnchantBoundUserInterfaceState : BoundUserInterfaceState { public HashSet Warps; diff --git a/Content.Shared/_Wega/Voucher/VoucherBoundUserInterface.cs b/Content.Shared/_Wega/Voucher/VoucherBoundUserInterface.cs index b0ac626c77..7e1c28b0ee 100644 --- a/Content.Shared/_Wega/Voucher/VoucherBoundUserInterface.cs +++ b/Content.Shared/_Wega/Voucher/VoucherBoundUserInterface.cs @@ -11,7 +11,7 @@ public enum VoucherUiKey : byte } [Serializable, NetSerializable] -public sealed class VoucherKitSelectionState : BoundUserInterfaceState +public sealed partial class VoucherKitSelectionState : BoundUserInterfaceState { public readonly List> AvailableKits; @@ -22,7 +22,7 @@ public sealed class VoucherKitSelectionState : BoundUserInterfaceState } [Serializable, NetSerializable] -public sealed class VoucherKitSelectedMessage : BoundUserInterfaceMessage +public sealed partial class VoucherKitSelectedMessage : BoundUserInterfaceMessage { public readonly NetEntity User; public readonly ProtoId KitId; diff --git a/Content.Shared/_Wega/Weapons/Hitscan/System/HitscanIEMPSystem.cs b/Content.Shared/_Wega/Weapons/Hitscan/System/HitscanIEMPSystem.cs index fd6a0dcff7..5aae263b04 100644 --- a/Content.Shared/_Wega/Weapons/Hitscan/System/HitscanIEMPSystem.cs +++ b/Content.Shared/_Wega/Weapons/Hitscan/System/HitscanIEMPSystem.cs @@ -5,7 +5,7 @@ using Content.Shared.Mobs.Components; namespace Content.Shared.Weapons.Hitscan.Systems; -public sealed class HitscanEMPSystem : EntitySystem +public sealed partial class HitscanEMPSystem : EntitySystem { [Dependency] private SharedEmpSystem _emp = default!; diff --git a/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeEffectsSystem.cs b/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeEffectsSystem.cs index 1af7654cf6..038dae4bc2 100644 --- a/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeEffectsSystem.cs +++ b/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeEffectsSystem.cs @@ -23,7 +23,7 @@ using Robust.Shared.Timing; namespace Content.Shared.Weapons.Misc.Upgrades; -public sealed class CrusherUpgradeEffectsSystem : EntitySystem +public sealed partial class CrusherUpgradeEffectsSystem : EntitySystem { [Dependency] private DamageableSystem _damage = default!; [Dependency] private EntityLookupSystem _lookup = default!; diff --git a/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeSystem.cs b/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeSystem.cs index 784c72824d..3a76f0f3e2 100644 --- a/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeSystem.cs +++ b/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeSystem.cs @@ -19,7 +19,7 @@ using Robust.Shared.Prototypes; namespace Content.Shared.Weapons.Misc.Upgrades; -public sealed class CrusherUpgradeSystem : EntitySystem +public sealed partial class CrusherUpgradeSystem : EntitySystem { [Dependency] private ISharedAdminLogManager _adminLog = default!; [Dependency] private SharedAudioSystem _audio = default!; diff --git a/Content.Shared/_Wega/Xenobiology/Cell.cs b/Content.Shared/_Wega/Xenobiology/Cell.cs index f6e73dff33..5e6de27730 100644 --- a/Content.Shared/_Wega/Xenobiology/Cell.cs +++ b/Content.Shared/_Wega/Xenobiology/Cell.cs @@ -25,7 +25,7 @@ namespace Content.Shared.Xenobiology; /// /// [Serializable, NetSerializable] -public sealed class Cell : IEquatable +public sealed partial class Cell : IEquatable { /// /// Reflects the prototype on which the cell is based, diff --git a/Content.Shared/_Wega/Xenobiology/Events/CellAdded.cs b/Content.Shared/_Wega/Xenobiology/Events/CellAdded.cs index 048adcf6a2..218e0998ca 100644 --- a/Content.Shared/_Wega/Xenobiology/Events/CellAdded.cs +++ b/Content.Shared/_Wega/Xenobiology/Events/CellAdded.cs @@ -1,6 +1,6 @@ namespace Content.Shared.Xenobiology.Events; -public sealed class CellAdded : EntityEventArgs +public sealed partial class CellAdded : EntityEventArgs { public readonly NetEntity Entity; public readonly Cell Cell; diff --git a/Content.Shared/_Wega/Xenobiology/Events/CellRemoved.cs b/Content.Shared/_Wega/Xenobiology/Events/CellRemoved.cs index b8d9853b88..9cedfd02b2 100644 --- a/Content.Shared/_Wega/Xenobiology/Events/CellRemoved.cs +++ b/Content.Shared/_Wega/Xenobiology/Events/CellRemoved.cs @@ -1,6 +1,6 @@ namespace Content.Shared.Xenobiology.Events; -public sealed class CellRemoved : EntityEventArgs +public sealed partial class CellRemoved : EntityEventArgs { public readonly NetEntity Entity; public readonly Cell Cell; diff --git a/Content.Shared/_Wega/Xenobiology/Events/CellServerDatabaseChangedEvent.cs b/Content.Shared/_Wega/Xenobiology/Events/CellServerDatabaseChangedEvent.cs index a90558cb4c..2ef2ccf2ae 100644 --- a/Content.Shared/_Wega/Xenobiology/Events/CellServerDatabaseChangedEvent.cs +++ b/Content.Shared/_Wega/Xenobiology/Events/CellServerDatabaseChangedEvent.cs @@ -2,7 +2,7 @@ namespace Content.Shared.Xenobiology.Events; -public sealed class CellServerDatabaseChangedEvent : EntityEventArgs +public sealed partial class CellServerDatabaseChangedEvent : EntityEventArgs { public readonly Entity Server; public readonly Entity Client; diff --git a/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellInjectorSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellInjectorSystem.cs index 11ed90ddf5..a007899555 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellInjectorSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellInjectorSystem.cs @@ -13,7 +13,7 @@ using Robust.Shared.Timing; namespace Content.Shared.Xenobiology.Systems.Machines; -public sealed class CellMutagenicInjectorSystem : EntitySystem +public sealed partial class CellMutagenicInjectorSystem : EntitySystem { [Dependency] private SharedAudioSystem _audio = default!; [Dependency] private SharedCellSystem _cell = default!; diff --git a/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellSequencerSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellSequencerSystem.cs index 8bab1d79ab..4bd46c9d63 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellSequencerSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellSequencerSystem.cs @@ -9,7 +9,7 @@ using Robust.Shared.Containers; namespace Content.Shared.Xenobiology.Systems.Machines; -public sealed class CellSequencerSystem : EntitySystem +public sealed partial class CellSequencerSystem : EntitySystem { [Dependency] private CellClientSystem _cellClient = default!; [Dependency] private CellServerSystem _cellServer = default!; diff --git a/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellularFusionSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellularFusionSystem.cs index b0a10a4356..772588b287 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellularFusionSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellularFusionSystem.cs @@ -7,7 +7,7 @@ using Content.Shared.Xenobiology.UI; namespace Content.Shared.Xenobiology.Systems.Machines; -public sealed class CellularFusionSystem : EntitySystem +public sealed partial class CellularFusionSystem : EntitySystem { [Dependency] private CellClientSystem _cellClient = default!; [Dependency] private CellServerSystem _cellServer = default!; diff --git a/Content.Shared/_Wega/Xenobiology/Systems/Machines/Connection/CellClientSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/Machines/Connection/CellClientSystem.cs index bd3a0f89a7..a7bd08811b 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/Machines/Connection/CellClientSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/Machines/Connection/CellClientSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Xenobiology.Components.Server; namespace Content.Shared.Xenobiology.Systems.Machines.Connection; -public sealed class CellClientSystem : EntitySystem +public sealed partial class CellClientSystem : EntitySystem { [Dependency] private CellServerSystem _cellServer = default!; diff --git a/Content.Shared/_Wega/Xenobiology/Systems/Machines/Connection/CellServerSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/Machines/Connection/CellServerSystem.cs index 1d4793b4d0..7b05ef5b7a 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/Machines/Connection/CellServerSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/Machines/Connection/CellServerSystem.cs @@ -4,7 +4,7 @@ using Content.Shared.Xenobiology.Events; namespace Content.Shared.Xenobiology.Systems.Machines.Connection; -public sealed class CellServerSystem : EntitySystem +public sealed partial class CellServerSystem : EntitySystem { public override void Initialize() { diff --git a/Content.Shared/_Wega/Xenobiology/Systems/SharedCellVisualsSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/SharedCellVisualsSystem.cs index 1e33a37bc9..4c2b3236e5 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/SharedCellVisualsSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/SharedCellVisualsSystem.cs @@ -4,7 +4,7 @@ using Content.Shared.Xenobiology.Visuals; namespace Content.Shared.Xenobiology.Systems; -public abstract class SharedCellVisualsSystem : EntitySystem +public abstract partial class SharedCellVisualsSystem : EntitySystem { [Dependency] private SharedAppearanceSystem _appearance = default!; diff --git a/Content.Shared/_Wega/Xenobiology/Systems/SharedSlimeVisualSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/SharedSlimeVisualSystem.cs index b9dea1db8b..8522697084 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/SharedSlimeVisualSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/SharedSlimeVisualSystem.cs @@ -3,7 +3,7 @@ using Robust.Shared.Prototypes; namespace Content.Shared.Xenobiology; -public abstract class SharedSlimeVisualSystem : EntitySystem +public abstract partial class SharedSlimeVisualSystem : EntitySystem { [Dependency] private IPrototypeManager _proto = default!; [Dependency] private MetaDataSystem _metaData = default!; diff --git a/Content.Shared/_Wega/Xenobiology/UI/CellSequencer.cs b/Content.Shared/_Wega/Xenobiology/UI/CellSequencer.cs index 0b1dca7c7f..c50e8efb55 100644 --- a/Content.Shared/_Wega/Xenobiology/UI/CellSequencer.cs +++ b/Content.Shared/_Wega/Xenobiology/UI/CellSequencer.cs @@ -9,7 +9,7 @@ public enum CellSequencerUiKey } [Serializable, NetSerializable] -public sealed class CellSequencerUiState : BoundUserInterfaceState +public sealed partial class CellSequencerUiState : BoundUserInterfaceState { public readonly IReadOnlyList InsideCells; public readonly IReadOnlyList RemoteCells; @@ -26,10 +26,10 @@ public sealed class CellSequencerUiState : BoundUserInterfaceState } [Serializable, NetSerializable] -public sealed class CellSequencerUiSyncMessage : BoundUserInterfaceMessage; +public sealed partial class CellSequencerUiSyncMessage : BoundUserInterfaceMessage; [Serializable, NetSerializable] -public sealed class CellSequencerUiAddMessage : BoundUserInterfaceMessage +public sealed partial class CellSequencerUiAddMessage : BoundUserInterfaceMessage { public readonly Cell? Cell; @@ -40,7 +40,7 @@ public sealed class CellSequencerUiAddMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class CellSequencerUiRemoveMessage : BoundUserInterfaceMessage +public sealed partial class CellSequencerUiRemoveMessage : BoundUserInterfaceMessage { public readonly Cell? Cell; public readonly bool Remote; @@ -53,7 +53,7 @@ public sealed class CellSequencerUiRemoveMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class CellSequencerUiReplaceMessage : BoundUserInterfaceMessage +public sealed partial class CellSequencerUiReplaceMessage : BoundUserInterfaceMessage { public readonly Cell? Cell; diff --git a/Content.Shared/_Wega/Xenobiology/UI/CellularFusion.cs b/Content.Shared/_Wega/Xenobiology/UI/CellularFusion.cs index b283bd56e8..24c9d19fce 100644 --- a/Content.Shared/_Wega/Xenobiology/UI/CellularFusion.cs +++ b/Content.Shared/_Wega/Xenobiology/UI/CellularFusion.cs @@ -9,11 +9,11 @@ public enum CellularFusionUiKey } [Serializable, NetSerializable] -public sealed class CellularFusionUiSyncMessage : BoundUserInterfaceMessage; +public sealed partial class CellularFusionUiSyncMessage : BoundUserInterfaceMessage; [Serializable, NetSerializable] -public sealed class CellularFusionUiSpliceMessage : BoundUserInterfaceMessage +public sealed partial class CellularFusionUiSpliceMessage : BoundUserInterfaceMessage { public readonly Cell CellA; public readonly Cell CellB; @@ -26,7 +26,7 @@ public sealed class CellularFusionUiSpliceMessage : BoundUserInterfaceMessage } [Serializable, NetSerializable] -public sealed class CellularFusionUiState : BoundUserInterfaceState +public sealed partial class CellularFusionUiState : BoundUserInterfaceState { public readonly IReadOnlyList RemoteCells; public readonly int Material; diff --git a/Content.Shared/_Wega/Xenobiology/UI/SlimeAnalyzer.cs b/Content.Shared/_Wega/Xenobiology/UI/SlimeAnalyzer.cs index b4c5a45186..a49f5ef242 100644 --- a/Content.Shared/_Wega/Xenobiology/UI/SlimeAnalyzer.cs +++ b/Content.Shared/_Wega/Xenobiology/UI/SlimeAnalyzer.cs @@ -10,7 +10,7 @@ public enum SlimeAnalyzerUiKey : byte } [Serializable, NetSerializable] -public sealed class SlimeAnalyzerScannedUserMessage : BoundUserInterfaceMessage +public sealed partial class SlimeAnalyzerScannedUserMessage : BoundUserInterfaceMessage { public NetEntity TargetEntity; public float Hunger; diff --git a/Resources/Maps/_Wega/Lavaland/necropolis.yml b/Resources/Maps/_Wega/Lavaland/necropolis.yml index 10939c2018..460420e892 100644 --- a/Resources/Maps/_Wega/Lavaland/necropolis.yml +++ b/Resources/Maps/_Wega/Lavaland/necropolis.yml @@ -25025,9 +25025,6 @@ entities: - type: Transform pos: -2.5,-8.5 parent: 1 - - type: Damageable - damageModifierSet: null - damageContainer: null - type: Destructible thresholds: [] - uid: 1773 @@ -25035,9 +25032,6 @@ entities: - type: Transform pos: 35.5,-4.5 parent: 1 - - type: Damageable - damageModifierSet: null - damageContainer: null - type: Destructible thresholds: [] - uid: 1807 @@ -25045,9 +25039,6 @@ entities: - type: Transform pos: 25.5,2.5 parent: 1 - - type: Damageable - damageModifierSet: null - damageContainer: null - type: Destructible thresholds: [] - proto: StatueAshDrakeFalling @@ -25057,9 +25048,6 @@ entities: - type: Transform pos: 41.5,1.5 parent: 1 - - type: Damageable - damageModifierSet: null - damageContainer: null - type: Destructible thresholds: [] - uid: 217 @@ -25067,9 +25055,6 @@ entities: - type: Transform pos: 3.5,-8.5 parent: 1 - - type: Damageable - damageModifierSet: null - damageContainer: null - type: Destructible thresholds: [] - uid: 588 @@ -25077,9 +25062,6 @@ entities: - type: Transform pos: 35.5,1.5 parent: 1 - - type: Damageable - damageModifierSet: null - damageContainer: null - type: Destructible thresholds: [] - uid: 1823 @@ -25087,9 +25069,6 @@ entities: - type: Transform pos: 41.5,-4.5 parent: 1 - - type: Damageable - damageModifierSet: null - damageContainer: null - type: Destructible thresholds: [] - proto: TableBrass diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index 2b36f4d2ce..606995549c 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -35,7 +35,7 @@ - type: entity abstract: true - parent: [ ClothingHandsBase, ClothingHandsDamageableBase ] # Corvax-Wega-Edit + parent: ClothingHandsBase id: ClothingHandsButcherable components: - type: Butcherable diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index 4a9db9ccd8..300f086e3b 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -25,7 +25,7 @@ - type: entity abstract: true - parent: [ ClothingHeadBase, ClothingHeadDamageableBase ] # Corvax-Wega-Edit + parent: ClothingHeadBase id: ClothingHeadBaseButcherable components: - type: Butcherable diff --git a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml index 85e7940456..1db3e10e4a 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml @@ -38,7 +38,7 @@ - type: entity abstract: true - parent: [SolutionFood, SolutionToolSmall, ClothingMaskBase, ClothingMaskBaseButcherable] # Corvax-Wega-Edit + parent: [SolutionFood, SolutionToolSmall, ClothingMaskBase] id: ClothingMaskBaseButcherable components: - type: Butcherable diff --git a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml index f0c71bf872..c80fd341cc 100644 --- a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml +++ b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [UnsensoredClothingUniformBase, ClothingHeadBase, ClothingBeltBase, ClothingTowelDamageableBase] # Corvax-Wega-Edit + parent: [UnsensoredClothingUniformBase, ClothingHeadBase, ClothingBeltBase] id: BaseTowel name: base towel description: If you want to survive out here, you gotta know where your towel is. diff --git a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml index 9e568ea29b..c4e0bb6e02 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [SolutionFood, SolutionToolSmall, Clothing, ClothingNeckDamageableBase] # Corvax-Wega-Edit + parent: [SolutionFood, SolutionToolSmall, Clothing] id: ClothingNeckBase components: - type: Item diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 4558846d1a..f275dc2da4 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -66,7 +66,7 @@ - type: entity abstract: true - parent: [SolutionFood, SolutionNormal, ClothingOuterStorageBase, ClothingOuterDamageableBase] # Corvax-Wega-Clothing + parent: [SolutionFood, SolutionNormal, ClothingOuterStorageBase] id: ClothingOuterStorageEdible components: - type: Edible diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index d696c9be66..325682c6a4 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ ClothingOuterStorageBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterStorageBase ] id: ClothingOuterCoatBomber name: bomber jacket description: A thick, well-worn WW2 leather bomber jacket. @@ -10,7 +10,7 @@ sprite: Clothing/OuterClothing/Coats/bomber.rsi - type: entity - parent: [ ClothingOuterArmorBase, ClothingOuterStorageBase, AllowSuitStorageClothing, BaseSecurityContraband, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterArmorBase, ClothingOuterStorageBase, AllowSuitStorageClothing, BaseSecurityContraband ] id: ClothingOuterCoatDetective name: detective's armored trenchcoat description: An 20th-century trenchcoat with an armored underlay. Someone who wears this means serious business. @@ -50,7 +50,7 @@ - id: FlippoLighter #Not the steal objective, only difference from normal detective trenchcoat - type: entity - parent: [ ClothingOuterStorageBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterStorageBase ] id: ClothingOuterCoatGentle name: gentle coat description: A gentle coat for a gentle man, or woman. @@ -89,7 +89,7 @@ Caustic: 0.9 - type: entity - parent: [BaseSecurityCommandContraband, ClothingOuterArmorHoS, ClothingOuterDamageableBase] # Corvax-Wega-Clothing + parent: [BaseSecurityCommandContraband, ClothingOuterArmorHoS] id: ClothingOuterCoatHoSTrench name: head of security's armored trenchcoat description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence. @@ -113,7 +113,7 @@ clothingPrototype: ClothingHeadHatHoodChaplainHood - type: entity - parent: [ ClothingOuterCoatJensen, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterCoatJensen ] id: ClothingOuterCoatJensenSyndie suffix: Syndie components: @@ -307,7 +307,7 @@ name: research director lab coat - type: entity - parent: [ ClothingOuterStorageBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterStorageBase ] id: ClothingOuterCoatPirate name: pirate garb description: Yarr. @@ -318,7 +318,7 @@ sprite: Clothing/OuterClothing/Coats/pirate.rsi - type: entity - parent: [ClothingOuterArmorWarden, BaseSecurityContraband, ClothingOuterDamageableBase] # Corvax-Wega-Clothing + parent: [ClothingOuterArmorWarden, BaseSecurityContraband] id: ClothingOuterCoatWarden name: warden's armored jacket description: A sturdy, utilitarian jacket designed to protect a warden from any brig-bound threats. @@ -329,7 +329,7 @@ sprite: Clothing/OuterClothing/Coats/warden.rsi - type: entity - parent: [ ClothingOuterStorageBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterStorageBase ] id: ClothingOuterDameDane name: yakuza coat description: Friday... @@ -340,7 +340,7 @@ sprite: Clothing/OuterClothing/Coats/damedanecoat.rsi - type: entity - parent: [ ClothingOuterStorageBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterStorageBase ] id: ClothingOuterClownPriest name: honkmother coat description: Meant for a clown of the cloth. @@ -351,7 +351,7 @@ sprite: Clothing/OuterClothing/Coats/clownpriest.rsi - type: entity - parent: [ClothingOuterStorageBase, BaseMajorContraband, ClothingOuterDamageableBase] # Corvax-Wega-Clothing + parent: [ClothingOuterStorageBase, BaseMajorContraband] id: ClothingOuterDogi name: samurai dogi description: Dogi is a type of traditional Japanese clothing. The dogi is made of heavy, durable fabric, it is practical in combat and stylish in appearance. It is decorated with intricate patterns and embroidery on the back. @@ -368,7 +368,7 @@ Piercing: 0.85 - type: entity - parent: [ ClothingOuterStorageBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterStorageBase ] id: ClothingOuterCoatParamedicWB name: paramedic windbreaker description: A paramedic's trusty windbreaker, for all the space wind. @@ -379,7 +379,7 @@ sprite: Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi - type: entity - parent: [ ClothingOuterStorageBase, BaseSyndicateContraband, ClothingOuterDamageableBase] # Corvax-Wega-Clothing + parent: [ ClothingOuterStorageBase, BaseSyndicateContraband] id: ClothingOuterCoatSyndieCap name: syndicate's coat description: The syndicate's coat is made of durable fabric, with gilded patterns. @@ -401,7 +401,7 @@ sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi - type: entity - parent: [ ClothingOuterStorageBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterStorageBase ] id: ClothingOuterCoatAMG name: armored medical gown description: The version of the medical gown, with elements of a bulletproof vest, looks strange, but your heart is protected. @@ -463,7 +463,7 @@ name: senior physician lab coat - type: entity - parent: [ ClothingOuterStorageBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterStorageBase ] id: ClothingOuterCoatSpaceAsshole name: the coat of space asshole description: And there he was... diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 12fda6f17c..dedc5ffaba 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ ClothingOuterStorageBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterStorageBase ] id: ClothingOuterApron name: apron description: A fancy apron for a stylish person. @@ -14,7 +14,7 @@ - WhitelistChameleon - type: entity - parent: [ ClothingOuterStorageBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterStorageBase ] id: ClothingOuterApronBar suffix: Bartender name: apron @@ -30,7 +30,7 @@ - WhitelistChameleon - type: entity - parent: [ ClothingOuterStorageBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterStorageBase ] id: ClothingOuterApronBotanist name: apron suffix: Botanical @@ -46,7 +46,7 @@ - WhitelistChameleon - type: entity - parent: [ ClothingOuterStorageBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterStorageBase ] id: ClothingOuterApronChef name: apron suffix: Chef @@ -62,7 +62,7 @@ - WhitelistChameleon - type: entity - parent: [ ClothingOuterStorageBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterStorageBase ] id: ClothingOuterJacketChef name: chef jacket description: An apron-jacket used by a high class chef. @@ -73,7 +73,7 @@ sprite: Clothing/OuterClothing/Misc/chef.rsi - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterHoodieBlack name: black hoodie description: Oh my God, it's a black hoodie! @@ -84,7 +84,7 @@ sprite: Clothing/OuterClothing/Misc/black_hoodie.rsi - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterHoodieGrey name: grey hoodie description: A grey hoodie. @@ -95,7 +95,7 @@ sprite: Clothing/OuterClothing/Misc/grey_hoodie.rsi - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterCardborg name: cardborg costume description: An ordinary cardboard box with holes cut in the sides. @@ -111,7 +111,7 @@ - WhitelistChameleon - type: entity - parent: [ ClothingOuterBaseToggleable, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBaseToggleable ] id: ClothingOuterHoodieChaplain name: chaplain's hoodie description: Black and strict chaplain hoodie. @@ -124,7 +124,7 @@ clothingPrototype: ClothingHeadHatHoodChaplainHood - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterPonchoClassic name: classic poncho description: A warm and comfy classic poncho. @@ -137,7 +137,7 @@ accent: SpanishAccent - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterRobesCult name: cult robes description: There's no cult without classic red/crimson cult robes. @@ -148,7 +148,7 @@ sprite: Clothing/OuterClothing/Misc/cultrobes.rsi - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterRobesJudge name: judge robes description: This robe commands authority. @@ -159,7 +159,7 @@ sprite: Clothing/OuterClothing/Misc/judge.rsi - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterPoncho name: poncho description: A warm and comfy poncho. @@ -172,7 +172,7 @@ accent: SpanishAccent - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterSanta name: santa suit description: Ho ho ho! @@ -184,7 +184,7 @@ - type: entity abstract: true - parent: [ ClothingOuterBase, AllowSuitStorageClothingGasTanks, BaseMagicalContraband, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase, AllowSuitStorageClothingGasTanks, BaseMagicalContraband ] id: ClothingOuterWizardBase components: - type: WizardClothes @@ -234,7 +234,7 @@ - WhitelistChameleon - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterWizardFake name: fake wizard robes description: Covered in glittery stars and mystery stains. Instantly boosts your arcane fashion sense. @@ -256,7 +256,7 @@ sprite: Clothing/OuterClothing/Misc/skubbody.rsi - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterPlagueSuit name: plague doctor suit description: A bad omen. @@ -267,7 +267,7 @@ sprite: Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterNunRobe name: nun robe description: Maximum piety in this star system. @@ -278,7 +278,7 @@ sprite: Clothing/OuterClothing/Misc/nunrobe.rsi - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterGhostSheet name: ghost sheet description: Spooky!!! @@ -293,7 +293,7 @@ - type: IdentityBlocker - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterHospitalGown name: hospital gown description: Made from the wool of slaughtered baby lambs. The cruelty makes it softer. @@ -304,7 +304,7 @@ sprite: Clothing/OuterClothing/Misc/hospitalgown.rsi - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterFlannelRed name: red flannel jacket description: An old fashioned red flannel jacket for space autumn. @@ -340,7 +340,7 @@ coolingCoefficient: 0.3 - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterFlannelBlue name: blue flannel jacket description: An old fashioned blue flannel jacket for space autumn. @@ -376,7 +376,7 @@ coolingCoefficient: 0.3 - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterFlannelGreen name: green flannel jacket description: An old fashioned green flannel jacket for space autumn. @@ -412,7 +412,7 @@ coolingCoefficient: 0.3 - type: entity - parent: [ ClothingOuterBase, ClothingOuterDamageableBase ] # Corvax-Wega-Clothing + parent: [ ClothingOuterBase ] id: ClothingOuterRedRacoon name: red racoon suit description: Fluffy suit of red racoon! diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml index 5c62585fa8..7fa0edb9ff 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml @@ -31,7 +31,7 @@ - type: entity abstract: true - parent: [ ClothingShoesBase, ClothingShoesDamageableBase ] # Corvax-Wega-Edit + parent: ClothingShoesBase id: ClothingShoesBaseButcherable components: - type: Butcherable diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index f60db95682..c7414e3b72 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [SolutionFood, SolutionToolNormal, Clothing, ClothingUniformDamageableBase, BaseUpgradableClothingUniform] # Corvax-Wega-Edit + parent: [SolutionFood, SolutionToolNormal, Clothing, BaseUpgradableClothingUniform] # Corvax-Wega-Edit id: UnsensoredClothingUniformBase components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index 6e760eb029..9d23f09eb8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -36,10 +36,6 @@ - type: PhysicalComposition materialComposition: Steel: 75 -# Corvax-Wega-start - - type: Item - size: Normal -# Corvax-Wega-end - type: entity parent: [DrinkBaseMaterialPorcelain, SolutionNormal, DrinkBase] diff --git a/Resources/Prototypes/Guidebook/antagonist.yml b/Resources/Prototypes/Guidebook/antagonist.yml index 581ffe4e6b..53301dc057 100644 --- a/Resources/Prototypes/Guidebook/antagonist.yml +++ b/Resources/Prototypes/Guidebook/antagonist.yml @@ -4,6 +4,7 @@ text: "/ServerInfo/Guidebook/Antagonist/Antagonists.xml" children: - Traitors + - VeilCult # Corvax-Wega-VeilCult - Thieves - Vampires # Corvax-Wega-Vampire - BloodCult # Corvax-Wega-Blood-Cult diff --git a/Resources/Prototypes/Roles/Antags/base.yml b/Resources/Prototypes/Roles/Antags/base.yml index 4a0b1b6b99..61ae661c57 100644 --- a/Resources/Prototypes/Roles/Antags/base.yml +++ b/Resources/Prototypes/Roles/Antags/base.yml @@ -11,6 +11,7 @@ - ERTMedical - ERTJanitor - CBURN + - CBURNLeader # Corvax-Wega-Add blacklist: components: - AntagImmune @@ -30,6 +31,7 @@ - Quartermaster - IAA # Corvax-Role - Magistrate # Corvax-Role + - BlueShieldOfficer # Corvax-Wega-Add # Borgs - type: antagSpecifier @@ -66,6 +68,7 @@ - Brigmedic # Corvax-Role - Pilot # Corvax-Role - SeniorOfficer # Corvax-Role + - WardenHelper # Corvax-Wega-Add - type: antagSpecifier abstract: true diff --git a/Resources/Prototypes/_Wega/Body/Species/android.yml b/Resources/Prototypes/_Wega/Body/Species/android.yml index f64d6b3443..b2a2fd690d 100644 --- a/Resources/Prototypes/_Wega/Body/Species/android.yml +++ b/Resources/Prototypes/_Wega/Body/Species/android.yml @@ -172,6 +172,7 @@ Female: FemaleAndroid Unsexed: MaleAndroid - type: Damageable + - type: Injurable damageContainer: Android - type: DamageVisuals damageOverlayGroups: diff --git a/Resources/Prototypes/_Wega/Body/Species/ariral.yml b/Resources/Prototypes/_Wega/Body/Species/ariral.yml index 984840724b..292e1a4f86 100644 --- a/Resources/Prototypes/_Wega/Body/Species/ariral.yml +++ b/Resources/Prototypes/_Wega/Body/Species/ariral.yml @@ -140,8 +140,9 @@ types: Piercing: 6 - type: Damageable - damageContainer: Biological damageModifierSet: Ariral + - type: Injurable + damageContainer: Biological - type: Bloodstream bloodReferenceSolution: reagents: diff --git a/Resources/Prototypes/_Wega/Body/Species/demon.yml b/Resources/Prototypes/_Wega/Body/Species/demon.yml index e5a9253169..914db854cf 100644 --- a/Resources/Prototypes/_Wega/Body/Species/demon.yml +++ b/Resources/Prototypes/_Wega/Body/Species/demon.yml @@ -82,8 +82,9 @@ speechSounds: Lizard - type: Wagging - type: Damageable - damageContainer: Biological damageModifierSet: Demon + - type: Injurable + damageContainer: Biological - type: MeleeWeapon soundHit: path: /Audio/Weapons/pierce.ogg diff --git a/Resources/Prototypes/_Wega/Body/Species/phantom.yml b/Resources/Prototypes/_Wega/Body/Species/phantom.yml index 70a761c94d..4586d3600b 100644 --- a/Resources/Prototypes/_Wega/Body/Species/phantom.yml +++ b/Resources/Prototypes/_Wega/Body/Species/phantom.yml @@ -88,8 +88,9 @@ speedModifier: 0.70 interval: 0.5 - type: Damageable - damageContainer: Biological damageModifierSet: Phantom + - type: Injurable + damageContainer: Biological - type: ThermalRegulator metabolismHeat: 800 radiatedHeat: 100 diff --git a/Resources/Prototypes/_Wega/Body/Species/resomi.yml b/Resources/Prototypes/_Wega/Body/Species/resomi.yml index 27eb60bad8..21fb1067b0 100644 --- a/Resources/Prototypes/_Wega/Body/Species/resomi.yml +++ b/Resources/Prototypes/_Wega/Body/Species/resomi.yml @@ -206,8 +206,9 @@ - type: Puller needsHands: false - type: Damageable - damageContainer: Biological damageModifierSet: Resomi + - type: Injurable + damageContainer: Biological - type: Bloodstream bloodReferenceSolution: reagents: diff --git a/Resources/Prototypes/_Wega/Body/Species/skrell.yml b/Resources/Prototypes/_Wega/Body/Species/skrell.yml index f28d7d80ac..18d70718e8 100644 --- a/Resources/Prototypes/_Wega/Body/Species/skrell.yml +++ b/Resources/Prototypes/_Wega/Body/Species/skrell.yml @@ -76,8 +76,9 @@ baseDecayRate: 0.15 - type: SolutionScanner - type: Damageable - damageContainer: Biological damageModifierSet: Skrell + - type: Injurable + damageContainer: Biological - type: Reactive groups: Flammable: [ Touch ] diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Hands/base_clothinghands.yml index f82032f1bc..539922e0ef 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Hands/base_clothinghands.yml @@ -1,26 +1,27 @@ -- type: entity - abstract: true - id: ClothingHandsDamageableBase - components: - - type: TearableClothing - - type: Damageable - damageContainer: Clothing - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 17 # 1 saber strikes - behaviors: - - !type:PlaySoundBehavior - sound: - collection: TearClothing - - !type:EmptyContainersBehaviour - containers: - - storagebase - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:SpawnEntitiesBehavior - spawn: - MaterialCloth1: - min: 1 - max: 1 +# - type: entity +# abstract: true +# id: ClothingHandsDamageableBase +# components: +# - type: TearableClothing +# - type: Damageable +# - type: Injurable +# damageContainer: Clothing +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 17 # 1 saber strikes +# behaviors: +# - !type:PlaySoundBehavior +# sound: +# collection: TearClothing +# - !type:EmptyContainersBehaviour +# containers: +# - storagebase +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - !type:SpawnEntitiesBehavior +# spawn: +# MaterialCloth1: +# min: 1 +# max: 1 diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Head/base_clothinghead.yml index fbc04178f6..167a62f1e1 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Head/base_clothinghead.yml @@ -1,29 +1,30 @@ -- type: entity - abstract: true - id: ClothingHeadDamageableBase - components: - - type: TearableClothing - - type: Damageable - damageContainer: Clothing - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 17 # 1 saber strikes - behaviors: - - !type:PlaySoundBehavior - sound: - collection: TearClothing - - !type:EmptyContainersBehaviour - containers: - - storagebase - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:SpawnEntitiesBehavior - spawn: - MaterialCloth1: - min: 1 - max: 1 +# - type: entity +# abstract: true +# id: ClothingHeadDamageableBase +# components: +# - type: TearableClothing +# - type: Damageable +# - type: Injurable +# damageContainer: Clothing +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 17 # 1 saber strikes +# behaviors: +# - !type:PlaySoundBehavior +# sound: +# collection: TearClothing +# - !type:EmptyContainersBehaviour +# containers: +# - storagebase +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - !type:SpawnEntitiesBehavior +# spawn: +# MaterialCloth1: +# min: 1 +# max: 1 - type: entity abstract: true diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Masks/base_clothingmask.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Masks/base_clothingmask.yml index e18da8d146..23679558f5 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Masks/base_clothingmask.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Masks/base_clothingmask.yml @@ -1,26 +1,27 @@ -- type: entity - abstract: true - id: ClothingMasksDamageableBase - components: - - type: TearableClothing - - type: Damageable - damageContainer: Clothing - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 17 # 1 saber strikes - behaviors: - - !type:PlaySoundBehavior - sound: - collection: TearClothing - - !type:EmptyContainersBehaviour - containers: - - storagebase - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:SpawnEntitiesBehavior - spawn: - MaterialCloth1: - min: 1 - max: 1 +# - type: entity +# abstract: true +# id: ClothingMasksDamageableBase +# components: +# - type: TearableClothing +# - type: Damageable +# - type: Injurable +# damageContainer: Clothing +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 17 # 1 saber strikes +# behaviors: +# - !type:PlaySoundBehavior +# sound: +# collection: TearClothing +# - !type:EmptyContainersBehaviour +# containers: +# - storagebase +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - !type:SpawnEntitiesBehavior +# spawn: +# MaterialCloth1: +# min: 1 +# max: 1 diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Modular/basemodular.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Modular/basemodular.yml index aeeaae576a..471439ee1a 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Modular/basemodular.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Modular/basemodular.yml @@ -101,8 +101,6 @@ slots: cell_slot: name: power-cell-slot-component-slot-name-default - - type: Damageable - damageContainer: Clothing - type: Reactive reactions: - reagents: [Water, SpaceCleaner] diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Multiple/towel.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Multiple/towel.yml index 6f3a10e66e..4ca4397cd1 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Multiple/towel.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Multiple/towel.yml @@ -1,25 +1,26 @@ -- type: entity - abstract: true - id: ClothingTowelDamageableBase - components: - - type: Damageable - damageContainer: Clothing - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 34 # 2 saber strikes - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/poster_broken.ogg - - !type:EmptyContainersBehaviour - containers: - - storagebase - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:SpawnEntitiesBehavior - spawn: - MaterialCloth1: - min: 3 - max: 3 +# - type: entity +# abstract: true +# id: ClothingTowelDamageableBase +# components: +# - type: Damageable +# - type: Injurable +# damageContainer: Clothing +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 34 # 2 saber strikes +# behaviors: +# - !type:PlaySoundBehavior +# sound: +# path: /Audio/Effects/poster_broken.ogg +# - !type:EmptyContainersBehaviour +# containers: +# - storagebase +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - !type:SpawnEntitiesBehavior +# spawn: +# MaterialCloth1: +# min: 3 +# max: 3 diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Neck/base_clothingneck.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Neck/base_clothingneck.yml index f1851a975c..a3aca7f845 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Neck/base_clothingneck.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Neck/base_clothingneck.yml @@ -1,26 +1,27 @@ -- type: entity - abstract: true - id: ClothingNeckDamageableBase - components: - - type: TearableClothing - - type: Damageable - damageContainer: Clothing - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 34 # 2 saber strikes - behaviors: - - !type:PlaySoundBehavior - sound: - collection: TearClothing - - !type:EmptyContainersBehaviour - containers: - - storagebase - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:SpawnEntitiesBehavior - spawn: - MaterialCloth1: - min: 2 - max: 2 +# - type: entity +# abstract: true +# id: ClothingNeckDamageableBase +# components: +# - type: TearableClothing +# - type: Damageable +# - type: Injurable +# damageContainer: Clothing +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 34 # 2 saber strikes +# behaviors: +# - !type:PlaySoundBehavior +# sound: +# collection: TearClothing +# - !type:EmptyContainersBehaviour +# containers: +# - storagebase +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - !type:SpawnEntitiesBehavior +# spawn: +# MaterialCloth1: +# min: 2 +# max: 2 diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/base_clothingouter.yml index bd95e3aa00..b7542a77e8 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -1,29 +1,30 @@ -- type: entity - abstract: true - id: ClothingOuterDamageableBase - components: - - type: TearableClothing - - type: Damageable - damageContainer: Clothing - - type: Reactive - groups: - Special: [ Touch ] - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 34 # 2 saber strikes - behaviors: - - !type:PlaySoundBehavior - sound: - collection: TearClothing - - !type:EmptyContainersBehaviour - containers: - - storagebase - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:SpawnEntitiesBehavior - spawn: - MaterialCloth1: - min: 3 - max: 3 +# - type: entity +# abstract: true +# id: ClothingOuterDamageableBase +# components: +# - type: TearableClothing +# - type: Damageable +# - type: Injurable +# damageContainer: Clothing +# - type: Reactive +# groups: +# Special: [ Touch ] +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 34 # 2 saber strikes +# behaviors: +# - !type:PlaySoundBehavior +# sound: +# collection: TearClothing +# - !type:EmptyContainersBehaviour +# containers: +# - storagebase +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - !type:SpawnEntitiesBehavior +# spawn: +# MaterialCloth1: +# min: 3 +# max: 3 diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Shoes/base_clothingshoes.yml index db3727f0c1..4d0864b689 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Shoes/base_clothingshoes.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Shoes/base_clothingshoes.yml @@ -1,25 +1,26 @@ -- type: entity - abstract: true - id: ClothingShoesDamageableBase - components: - - type: Damageable - damageContainer: Clothing - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 17 # 1 saber strikes - behaviors: - - !type:PlaySoundBehavior - sound: - collection: TearClothing - - !type:EmptyContainersBehaviour - containers: - - storagebase - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:SpawnEntitiesBehavior - spawn: - MaterialCloth1: - min: 1 - max: 1 +# - type: entity +# abstract: true +# id: ClothingShoesDamageableBase +# components: +# - type: Damageable +# - type: Injurable +# damageContainer: Clothing +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 17 # 1 saber strikes +# behaviors: +# - !type:PlaySoundBehavior +# sound: +# collection: TearClothing +# - !type:EmptyContainersBehaviour +# containers: +# - storagebase +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - !type:SpawnEntitiesBehavior +# spawn: +# MaterialCloth1: +# min: 1 +# max: 1 diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Under/baseunderclothing.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Under/baseunderclothing.yml index 4375241d90..dceaddc6ad 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Under/baseunderclothing.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Under/baseunderclothing.yml @@ -1,26 +1,27 @@ -- type: entity - abstract: true - id: ClothingUnderDamageableBase - components: - - type: TearableClothing - - type: Damageable - damageContainer: Clothing - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 17 # 1 saber strikes - behaviors: - - !type:PlaySoundBehavior - sound: - collection: TearClothing - - !type:EmptyContainersBehaviour - containers: - - storagebase - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:SpawnEntitiesBehavior - spawn: - MaterialCloth1: - min: 2 - max: 2 \ No newline at end of file +# - type: entity +# abstract: true +# id: ClothingUnderDamageableBase +# components: +# - type: TearableClothing +# - type: Damageable +# - type: Injurable +# damageContainer: Clothing +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 17 # 1 saber strikes +# behaviors: +# - !type:PlaySoundBehavior +# sound: +# collection: TearClothing +# - !type:EmptyContainersBehaviour +# containers: +# - storagebase +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - !type:SpawnEntitiesBehavior +# spawn: +# MaterialCloth1: +# min: 2 +# max: 2 diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Under/bottom.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Under/bottom.yml index bdb4a532db..59d689fc07 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Under/bottom.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Under/bottom.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ Clothing, ClothingUnderDamageableBase ] + parent: Clothing id: ClothingUnderBottomBase abstract: true components: @@ -702,4 +702,4 @@ - type: Sprite sprite: _Wega/Clothing/Under/Bottom/swim_red.rsi - type: Clothing - sprite: _Wega/Clothing/Under/Bottom/swim_red.rsi \ No newline at end of file + sprite: _Wega/Clothing/Under/Bottom/swim_red.rsi diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Under/socks.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Under/socks.yml index 20117bc583..979a37e983 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Under/socks.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Under/socks.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ Clothing, ClothingUnderDamageableBase ] + parent: Clothing id: ClothingUnderSocksBase abstract: true components: diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Under/top.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Under/top.yml index 6a0d37f627..c04e63ab14 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Under/top.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Under/top.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ Clothing, ClothingUnderDamageableBase ] + parent: Clothing id: ClothingUnderTopBase abstract: true components: diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/base_clothinguniforms.yml index 6ce7c4c61e..55aa74a153 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -1,29 +1,30 @@ -- type: entity - abstract: true - id: ClothingUniformDamageableBase - components: - - type: TearableClothing - - type: Damageable - damageContainer: Clothing - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 51 # 3 saber strikes - behaviors: - - !type:PlaySoundBehavior - sound: - collection: TearClothing - - !type:EmptyContainersBehaviour - containers: - - storagebase - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:SpawnEntitiesBehavior - spawn: - MaterialCloth1: - min: 3 - max: 3 +# - type: entity +# abstract: true +# id: ClothingUniformDamageableBase +# components: +# - type: TearableClothing +# - type: Damageable +# - type: Injurable +# damageContainer: Clothing +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 51 # 3 saber strikes +# behaviors: +# - !type:PlaySoundBehavior +# sound: +# collection: TearClothing +# - !type:EmptyContainersBehaviour +# containers: +# - storagebase +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - !type:SpawnEntitiesBehavior +# spawn: +# MaterialCloth1: +# min: 3 +# max: 3 - type: entity abstract: true diff --git a/Resources/Prototypes/_Wega/Entities/Effects/vampire.yml b/Resources/Prototypes/_Wega/Entities/Effects/vampire.yml index c6e656f452..72af2a54b5 100644 --- a/Resources/Prototypes/_Wega/Entities/Effects/vampire.yml +++ b/Resources/Prototypes/_Wega/Entities/Effects/vampire.yml @@ -92,7 +92,7 @@ layer: - WallLayer - type: Airtight - - type: Damageable + - type: Injurable damageContainer: Biological - type: Destructible thresholds: @@ -197,7 +197,7 @@ - type: Sprite sprite: _Wega/Effects/shadowboxing.rsi state: shadow - - type: Damageable + - type: Injurable damageContainer: Inorganic - type: Destructible thresholds: diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/animals.yml index e3e699879b..ff676abe0c 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/animals.yml @@ -101,8 +101,9 @@ Heat: -0.25 Blunt: -0.25 - type: Damageable - damageContainer: Biological damageModifierSet: Skrell + - type: Injurable + damageContainer: Biological - type: SolutionScanner - type: entity diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/facehugger.yml b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/facehugger.yml index de7cf53d16..81f102e337 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/facehugger.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/facehugger.yml @@ -22,6 +22,7 @@ - type: VentCrawler enterDelay: 1 - type: Damageable + - type: Injurable damageContainer: Biological - type: MobThresholds thresholds: diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/lavaland_megafauna.yml b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/lavaland_megafauna.yml index 5294cd4ca4..ece969a090 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/lavaland_megafauna.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/lavaland_megafauna.yml @@ -28,6 +28,7 @@ - type: MobState - type: CombatMode - type: Damageable + - type: Injurable damageContainer: Biological - type: Megafauna - type: NPCAggression @@ -182,8 +183,9 @@ layer: - FlyingMobLayer - type: Damageable - damageContainer: Inorganic damageModifierSet: Hierophant + - type: Injurable + damageContainer: Inorganic - type: Sprite sprite: _Wega/Mobs/Lavaland/hierophant.rsi state: hierophant diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Player/bloodcult.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Player/bloodcult.yml index 22f951f833..2861459372 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Player/bloodcult.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Player/bloodcult.yml @@ -45,8 +45,9 @@ settings: default - type: GhostTakeoverAvailable - type: Damageable - damageContainer: ManifestedSpirit damageModifierSet: ManifestedSpirit + - type: Injurable + damageContainer: ManifestedSpirit - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Player/veilcult.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Player/veilcult.yml index 1650830950..734d375168 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Player/veilcult.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Player/veilcult.yml @@ -35,16 +35,16 @@ - type: NoSlip - type: IgnoreSpiderWeb - type: AntiGravityClothing - - type: CombatMode + - type: CombatMode - type: VeilCultConstruct - type: MindContainer - type: PressureImmunity - type: ActiveRadio channels: - Binary - + # Cogscarab - + - type: entity name: cogscarab parent: SimpleMobBase @@ -105,8 +105,9 @@ baseWalkSpeed : 2.5 baseSprintSpeed : 5 - type: Damageable - damageContainer: Inorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: Inorganic - type: Destructible thresholds: - trigger: @@ -144,12 +145,12 @@ - type: ActiveRadio channels: - Binary - + - type: startingGear id: MobCogscarabGear inhand: - OmnitoolUnremovable - + - type: entity name: omnitool diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Xenobiology/base.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Xenobiology/base.yml index 445773b9ee..8969fda322 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Xenobiology/base.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Xenobiology/base.yml @@ -52,8 +52,9 @@ Asphyxiation: -1.0 maxSaturation: 15 - type: Damageable - damageContainer: Biological damageModifierSet: Slime + - type: Injurable + damageContainer: Biological - type: Bloodstream bloodReagent: Slime bloodlossDamage: diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Drink/trash_drinks.yml b/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Drink/trash_drinks.yml index 682e17aed9..57c6246315 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Drink/trash_drinks.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Drink/trash_drinks.yml @@ -1,6 +1,6 @@ - type: entity name: aperol bottle - parent: DrinkBottleBaseEmpty + parent: DrinkBottleGlassBase id: DrinkAperolBottle components: - type: Sprite @@ -8,7 +8,7 @@ - type: entity name: aperol bottle - parent: DrinkBottleBaseEmpty + parent: DrinkBottleGlassBase id: DrinkJagermeisterBottle components: - type: Sprite @@ -16,7 +16,7 @@ - type: entity name: aperol bottle - parent: DrinkBottleBaseEmpty + parent: DrinkBottleGlassBase id: DrinkSchnapsBottle components: - type: Sprite @@ -24,7 +24,7 @@ - type: entity name: aperol bottle - parent: DrinkBottleBaseEmpty + parent: DrinkBottleGlassBase id: DrinkSambukaBottle components: - type: Sprite @@ -32,7 +32,7 @@ - type: entity name: aperol bottle - parent: DrinkBottleBaseEmpty + parent: DrinkBottleGlassBase id: DrinkBitterBottle components: - type: Sprite @@ -40,7 +40,7 @@ - type: entity name: aperol bottle - parent: DrinkBottleBaseEmpty + parent: DrinkBottleGlassBase id: DrinkSheridanBottle components: - type: Sprite @@ -48,8 +48,8 @@ - type: entity name: aperol bottle - parent: DrinkBottleBaseEmpty + parent: DrinkBottleGlassBase id: DrinkwWhitewineBottle components: - type: Sprite - sprite: _Wega/Objects/Consumable/Drinks/whitewine_botle.rsi \ No newline at end of file + sprite: _Wega/Objects/Consumable/Drinks/whitewine_botle.rsi diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Food/produce.yml index c73e983e1d..8da663482a 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Food/produce.yml @@ -153,6 +153,7 @@ - ReagentId: DemonsBlood Quantity: 20 - type: Damageable + - type: Injurable damageContainer: Biological - type: DamageOnHighSpeedImpact minimumSpeed: 0.1 @@ -883,6 +884,7 @@ - ReagentId: MelonJuice Quantity: 15 - type: Damageable + - type: Injurable damageContainer: Biological - type: DamageOnHighSpeedImpact minimumSpeed: 0.1 @@ -976,6 +978,7 @@ - ReagentId: CatMelonJuice Quantity: 15 - type: Damageable + - type: Injurable damageContainer: Biological - type: DamageOnHighSpeedImpact minimumSpeed: 0.1 diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/_Wega/Entities/Objects/Devices/station_beacon.yml index 07f2b093ae..60a00e678b 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Devices/station_beacon.yml @@ -47,8 +47,9 @@ - type: Item size: Tiny - type: Damageable - damageContainer: Inorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: Inorganic - type: Destructible thresholds: - trigger: # for nukes diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Lavaland/throphies.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Lavaland/throphies.yml index 8e93d09aa5..2524c1de14 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Lavaland/throphies.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Lavaland/throphies.yml @@ -209,6 +209,7 @@ - type: Item size: Small - type: Damageable + - type: Injurable damageContainer: Clothing - type: Reactive groups: diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/clearitem.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/clearitem.yml index ebf3471444..1a986f756d 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/clearitem.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/clearitem.yml @@ -73,13 +73,11 @@ - type: Absorbent pickupAmount: 100 - type: SolutionRegeneration - solution: absorbed generated: reagents: - ReagentId: Water Quantity: 5 - type: SolutionPurge - solution: absorbed preserve: - Water quantity: 10 diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/generalitem.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/generalitem.yml index b95a68244d..ea02a1875b 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/generalitem.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/generalitem.yml @@ -253,7 +253,6 @@ - type: FitsInDispenser solution: drink - type: SolutionRegeneration - solution: drink generated: reagents: - ReagentId: Water diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/meditem.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/meditem.yml index df3326d1c6..988c867de5 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/meditem.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/meditem.yml @@ -143,7 +143,6 @@ - ReagentId: Tricordrazine Quantity: 0 - type: SolutionRegeneration - solution: hypospray generated: reagents: - ReagentId: Tricordrazine @@ -402,7 +401,7 @@ - type: Tag tags: - Itemborg - + - type: entity parent: BorgHypo suffix: epinephrine @@ -449,4 +448,3 @@ - type: Tag tags: - Itemborg - \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/serviceitem.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/serviceitem.yml index 2c54ee91a3..3028f1676a 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/serviceitem.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/serviceitem.yml @@ -288,7 +288,6 @@ - type: FitsInDispenser solution: drink - type: SolutionRegeneration - solution: drink generated: reagents: - ReagentId: Water @@ -338,7 +337,6 @@ - type: FitsInDispenser solution: drink - type: SolutionRegeneration - solution: drink generated: reagents: - ReagentId: Beer @@ -388,7 +386,6 @@ - type: FitsInDispenser solution: drink - type: SolutionRegeneration - solution: drink generated: reagents: - ReagentId: Wine @@ -438,7 +435,6 @@ - type: FitsInDispenser solution: drink - type: SolutionRegeneration - solution: drink generated: reagents: - ReagentId: Coffee @@ -488,7 +484,6 @@ - type: FitsInDispenser solution: drink - type: SolutionRegeneration - solution: drink generated: reagents: - ReagentId: Cola @@ -538,7 +533,6 @@ - type: FitsInDispenser solution: drink - type: SolutionRegeneration - solution: drink generated: reagents: - ReagentId: Milk diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Vehicles/buckleable.yml b/Resources/Prototypes/_Wega/Entities/Objects/Vehicles/buckleable.yml index d1a8565efa..15f0e49211 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Vehicles/buckleable.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Vehicles/buckleable.yml @@ -19,8 +19,9 @@ fuelCost: 20 doAfterDelay: 20 - type: Damageable - damageContainer: Inorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: Inorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/ert_weapon_nullrod.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/ert_weapon_nullrod.yml index 563594bcb2..dd6a3ad9bc 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/ert_weapon_nullrod.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/ert_weapon_nullrod.yml @@ -73,7 +73,7 @@ sprite: _Wega/Objects/Weapons/Melee/chainsword.rsi - type: MeleeWeapon soundHit: - path: /Audio/Weapons/chainsaw.ogg + path: /Audio/Weapons/chainsaw_rev.ogg params: volume: -3 - type: Item diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/magic.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/magic.yml index 7c8bac02b9..c4f3f33096 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/magic.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/magic.yml @@ -103,6 +103,7 @@ - type: MultiHandedItem - type: DeleteOnDrop - type: Damageable + - type: Injurable damageContainer: Inorganic - type: Destructible thresholds: @@ -358,8 +359,9 @@ size: Normal - type: Wieldable - type: Damageable - damageContainer: Inorganic damageModifierSet: Glass + - type: Injurable + damageContainer: Inorganic - type: Destructible thresholds: - trigger: @@ -606,7 +608,7 @@ enchants: - WeaponClockworkSwordSwordsmen - WeaponClockworkSwordBloodshed - + - type: entity id: WeaponClockworkSwordBorg parent: BaseEnchantable @@ -632,7 +634,7 @@ soundHit: path: /Audio/Weapons/bladeslice.ogg - type: DisarmMalus - + - type: entity id: WeaponClockHammer parent: BaseEnchantable @@ -681,7 +683,7 @@ enchants: - WeaponClockHammerKnockback - WeaponClockHammerCrusher - + - type: entity parent: BaseEnchantable id: WeaponRatvarianSpear @@ -742,7 +744,7 @@ enchants: - WeaponRatvarianSpearElectricalTouch - WeaponRatvarianSpearConfusion - + - type: entity parent: BaseItem id: VeilCultMidasTouch @@ -764,4 +766,4 @@ - state: inhand-right color: "#ffec94" size: Ginormous - - type: MidasHand \ No newline at end of file + - type: MidasHand diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sword.yml index 9d632c8d9d..1229a5b634 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sword.yml @@ -8,7 +8,7 @@ sprite: _Wega/Objects/Weapons/Melee/chainsword.rsi - type: MeleeWeapon soundHit: - path: /Audio/Weapons/chainsaw.ogg + path: /Audio/Weapons/chainsaw_rev.ogg params: volume: -3 - type: Item diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Throwable/bola.yml index 7e08a04f22..d6333cff48 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Throwable/bola.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Throwable/bola.yml @@ -115,6 +115,7 @@ - type: EmitSoundOnLand sound: /Audio/Effects/snap.ogg - type: Damageable + - type: Injurable damageContainer: Inorganic - type: Destructible thresholds: @@ -135,4 +136,4 @@ acts: [ "Destruction" ] - type: Tag tags: - - Bola \ No newline at end of file + - Bola diff --git a/Resources/Prototypes/_Wega/Entities/Structures/Decoration/statues.yml b/Resources/Prototypes/_Wega/Entities/Structures/Decoration/statues.yml index 5ac26bd25e..8a90e205f4 100644 --- a/Resources/Prototypes/_Wega/Entities/Structures/Decoration/statues.yml +++ b/Resources/Prototypes/_Wega/Entities/Structures/Decoration/statues.yml @@ -11,8 +11,9 @@ drawdepth: Mobs offset: "0.0,0.5" - type: Damageable - damageContainer: StructuralInorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: @@ -45,8 +46,9 @@ drawdepth: Mobs offset: "0.0,0.5" - type: Damageable - damageContainer: StructuralInorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_Wega/Entities/Structures/Furniture/bench.yml b/Resources/Prototypes/_Wega/Entities/Structures/Furniture/bench.yml index a2cfeb1e18..de2af017df 100644 --- a/Resources/Prototypes/_Wega/Entities/Structures/Furniture/bench.yml +++ b/Resources/Prototypes/_Wega/Entities/Structures/Furniture/bench.yml @@ -236,8 +236,9 @@ - type: InteractionOutline - type: Pullable - type: Damageable - damageContainer: Inorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: Inorganic - type: Destructible thresholds: - trigger: @@ -304,8 +305,9 @@ - type: InteractionOutline - type: Pullable - type: Damageable - damageContainer: Inorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: Inorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_Wega/Entities/Structures/Furniture/shower.yml b/Resources/Prototypes/_Wega/Entities/Structures/Furniture/shower.yml index 3d4a60e847..24970c17e0 100644 --- a/Resources/Prototypes/_Wega/Entities/Structures/Furniture/shower.yml +++ b/Resources/Prototypes/_Wega/Entities/Structures/Furniture/shower.yml @@ -24,8 +24,9 @@ sound: collection: Shower - type: Damageable - damageContainer: Inorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: Inorganic - type: Destructible thresholds: - trigger: @@ -51,7 +52,6 @@ - ReagentId: Water Quantity: 9999999 - type: SolutionRegeneration - solution: shower generated: reagents: - ReagentId: Water diff --git a/Resources/Prototypes/_Wega/Entities/Structures/Machines/miningserver.yml b/Resources/Prototypes/_Wega/Entities/Structures/Machines/miningserver.yml index f42114fb5f..b35fe2d5d0 100644 --- a/Resources/Prototypes/_Wega/Entities/Structures/Machines/miningserver.yml +++ b/Resources/Prototypes/_Wega/Entities/Structures/Machines/miningserver.yml @@ -43,8 +43,9 @@ !type:CableDeviceNode nodeGroupID: MVPower - type: Damageable - damageContainer: StructuralInorganic damageModifierSet: StructuralMetallicStrong + - type: Injurable + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_Wega/Entities/Structures/Machines/slot_machine.yml b/Resources/Prototypes/_Wega/Entities/Structures/Machines/slot_machine.yml index 9d958c014b..9f0a3aa5e9 100644 --- a/Resources/Prototypes/_Wega/Entities/Structures/Machines/slot_machine.yml +++ b/Resources/Prototypes/_Wega/Entities/Structures/Machines/slot_machine.yml @@ -35,8 +35,9 @@ False: { state: light } - type: Pullable - type: Damageable - damageContainer: StructuralInorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: @@ -86,8 +87,9 @@ - type: Anchorable - type: Pullable - type: Damageable - damageContainer: StructuralInorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_Wega/Entities/Structures/Specific/Lavaland/tendril.yml b/Resources/Prototypes/_Wega/Entities/Structures/Specific/Lavaland/tendril.yml index 74b7ec065f..74e534ce05 100644 --- a/Resources/Prototypes/_Wega/Entities/Structures/Specific/Lavaland/tendril.yml +++ b/Resources/Prototypes/_Wega/Entities/Structures/Specific/Lavaland/tendril.yml @@ -30,8 +30,9 @@ enabled: true radius: 2 - type: Damageable - damageContainer: StructuralInorganic damageModifierSet: Rock + - type: Injurable + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_Wega/Entities/Structures/Specific/bloodcult.yml b/Resources/Prototypes/_Wega/Entities/Structures/Specific/bloodcult.yml index 6749fe568e..6b106a876a 100644 --- a/Resources/Prototypes/_Wega/Entities/Structures/Specific/bloodcult.yml +++ b/Resources/Prototypes/_Wega/Entities/Structures/Specific/bloodcult.yml @@ -93,8 +93,9 @@ - WallLayer hard: false - type: Damageable - damageContainer: StructuralInorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: @@ -177,8 +178,9 @@ bodyType: Dynamic - type: Construct - type: Damageable - damageContainer: StructuralInorganic damageModifierSet: StructuralMetallic + - type: Injurable + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: @@ -256,8 +258,9 @@ - MachineLayer - type: Appearance - type: Damageable - damageContainer: Inorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: Inorganic - type: Destructible thresholds: - trigger: @@ -307,8 +310,9 @@ layer: - MachineLayer - type: Damageable - damageContainer: Inorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: Inorganic - type: Destructible thresholds: - trigger: @@ -362,8 +366,9 @@ - MachineLayer - type: Appearance - type: Damageable - damageContainer: Inorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: Inorganic - type: Destructible thresholds: - trigger: @@ -408,8 +413,9 @@ - type: BloodStructure fixture: fix1 - type: Damageable - damageContainer: Inorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: Inorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_Wega/Entities/Structures/Specific/veilcult.yml b/Resources/Prototypes/_Wega/Entities/Structures/Specific/veilcult.yml index 4fe4e5d680..2d0f0e1677 100644 --- a/Resources/Prototypes/_Wega/Entities/Structures/Specific/veilcult.yml +++ b/Resources/Prototypes/_Wega/Entities/Structures/Specific/veilcult.yml @@ -24,8 +24,9 @@ bodyType: Dynamic - type: VeilCultBeacon - type: Damageable - damageContainer: Inorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: Inorganic - type: Destructible thresholds: - trigger: @@ -39,7 +40,7 @@ spawn: SheetBrass: min: 0 - max: 3 + max: 3 - !type:DoActsBehavior acts: [ "Destruction" ] - type: Construction @@ -62,8 +63,9 @@ state: altar noRot: true - type: Damageable - damageContainer: Inorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: Inorganic - type: Destructible thresholds: - trigger: @@ -100,7 +102,7 @@ - type: Construction graph: VeilCultStructureAltarGraph node: VeilCultStructureAltar - + - type: entity id: VeilCultClockworkLathe parent: BaseVeilCultStructure @@ -160,7 +162,7 @@ - type: Construction graph: VeilCultStructureLatheGraph node: VeilCultClockworkLathe - + - type: entity parent: BaseStructure id: VeilCultPortal @@ -188,8 +190,9 @@ color: "#E39612" - type: NightLightBlocked # Corvax-Wega-NightLight - type: Damageable - damageContainer: StructuralInorganic damageModifierSet: StructuralMetallic + - type: Injurable + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: @@ -203,4 +206,4 @@ range: 10 sound: path: /Audio/Ambience/Objects/anomaly_generator.ogg - - type: VeilCultPortal \ No newline at end of file + - type: VeilCultPortal diff --git a/Resources/Prototypes/_Wega/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_Wega/Entities/Structures/Storage/Crates/crates.yml index bad87a5ce7..f0e31148fc 100644 --- a/Resources/Prototypes/_Wega/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_Wega/Entities/Structures/Storage/Crates/crates.yml @@ -68,8 +68,9 @@ - type: PlaceableSurface isPlaceable: false # defaults to closed. - type: Damageable - damageContainer: StructuralInorganic damageModifierSet: Metallic + - type: Injurable + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_Wega/GameRules/roundstart.yml b/Resources/Prototypes/_Wega/GameRules/roundstart.yml index 643ac2f973..f8c99f415f 100644 --- a/Resources/Prototypes/_Wega/GameRules/roundstart.yml +++ b/Resources/Prototypes/_Wega/GameRules/roundstart.yml @@ -25,62 +25,34 @@ maxDifficulty: 5 - type: AntagSelection agentName: vampire-round-end-name - definitions: - - prefRoles: [ Vampire ] - max: 4 - playerRatio: 20 - blacklist: - components: - - AntagImmune - - BibleUser - - Android - - Ipc - lateJoinAdditional: true - components: - - type: Vampire - - type: NpcFactionMember - factions: - - Vampire - mindRoles: - - MindRoleVampire - briefing: - sound: "/Audio/_Wega/Ambience/Antag/vampare_start.ogg" + lateJoinAdditional: true + antags: + - !type:LinearAntagCount + proto: Vampire + playerRatio: 20 + range: + min: 1 + max: 6 - type: entity parent: BaseGameRule id: BloodCult components: - type: GameRule - minPlayers: 30 + minPlayers: 0 - type: BloodCultRule - type: AntagObjectives objectives: - BloodCultRitualObjective - type: AntagSelection - definitions: - - prefRoles: [ BloodCultist ] + lateJoinAdditional: true + antags: + - !type:LinearAntagCount + proto: BloodCultist + playerRatio: 10 + range: + min: 1 max: 4 - playerRatio: 10 - blacklist: - components: - - AntagImmune - - BibleUser - - Android - - Ipc - lateJoinAdditional: true - components: - - type: BloodCultist - - type: MindLink - channels: ["MindBloodCult"] - - type: NpcFactionMember - factions: - - BloodCult - - type: FriendlyFaction - faction: BloodCult - mindRoles: - - MindRoleBloodCultist - briefing: - sound: "/Audio/_Wega/Ambience/Antag/bloodcult_start.ogg" - type: entity parent: BaseGameRule @@ -96,15 +68,14 @@ maxPicks: 3 - type: AntagSelection agentName: blood-brother-round-end-name - definitions: - - prefRoles: [ BloodBrother ] + lateJoinAdditional: true + antags: + - !type:LinearAntagCount + proto: BloodBrother + playerRatio: 1 + range: min: 2 max: 8 - playerRatio: 1 - blacklist: - components: - - AntagImmune - - Pacified # Diona ha-ha-ha - type: entity parent: BaseGameRule @@ -117,29 +88,14 @@ objectives: - VeilCultRitualObjective - type: AntagSelection - definitions: - - prefRoles: [ VeilCultist ] + lateJoinAdditional: true + antags: + - !type:LinearAntagCount + proto: VeilCultist + playerRatio: 10 + range: + min: 1 max: 4 - playerRatio: 10 - blacklist: - components: - - AntagImmune - - BibleUser - lateJoinAdditional: true - components: - - type: VeilCultist - - type: MindLink - channels: ["MindVeilCult"] - - type: NpcFactionMember - factions: - - VeilCult - - type: FriendlyFaction - faction: VeilCult - mindRoles: - - MindRoleVeilCultist - briefing: - sound: "/Audio/_Wega/Ambience/Antag/veilcult_start.ogg" - startingGear: HeadVeilCultistGear # event schedulers diff --git a/Resources/Prototypes/_Wega/GameRules/subgamemodes.yml b/Resources/Prototypes/_Wega/GameRules/subgamemodes.yml index 139d534dbf..0f53887f51 100644 --- a/Resources/Prototypes/_Wega/GameRules/subgamemodes.yml +++ b/Resources/Prototypes/_Wega/GameRules/subgamemodes.yml @@ -6,26 +6,14 @@ minPlayers: 15 - type: AntagSelection agentName: vampire-round-end-name - definitions: - - prefRoles: [ Vampire ] + lateJoinAdditional: true + antags: + - !type:LinearAntagCount + proto: Vampire + playerRatio: 15 + range: + min: 1 max: 4 - playerRatio: 15 - blacklist: - components: - - AntagImmune - - BibleUser - - Android - - Ipc - lateJoinAdditional: true - components: - - type: Vampire - - type: NpcFactionMember - factions: - - Vampire - mindRoles: - - MindRoleVampire - briefing: - sound: "/Audio/_Wega/Ambience/Antag/vampare_start.ogg" - type: entity parent: BloodBrothers @@ -33,16 +21,14 @@ components: - type: AntagSelection agentName: blood-brother-round-end-name - definitions: - - prefRoles: [ BloodBrother ] + lateJoinAdditional: true + antags: + - !type:LinearAntagCount + proto: BloodBrother + playerRatio: 1 + range: min: 2 max: 2 - playerRatio: 1 - blacklist: - components: - - AntagImmune - - Pacified # Diona ha-ha-ha - lateJoinAdditional: true # Extended testing - type: entity @@ -63,22 +49,13 @@ maxDifficulty: 2.5 - type: AntagSelection agentName: thief-round-end-agent-name - selectionTime: IntraPlayerSpawn - definitions: - - prefRoles: [ Thief ] - max: 4 + lateJoinAdditional: true + antags: + - !type:LinearAntagCount + proto: Thief playerRatio: 15 - lateJoinAdditional: true - allowNonHumans: true - multiAntagSetting: NotExclusive - startingGear: ThiefGear - components: - - type: Thieving - stripTimeReduction: 2 - stealthy: true - mindRoles: - - MindRoleThief - briefing: - sound: "/Audio/Misc/thief_greeting.ogg" + range: + min: 0 + max: 4 - type: DynamicRuleCost cost: 75 diff --git a/Resources/Prototypes/_Wega/Roles/Antags/bloodbrother.yml b/Resources/Prototypes/_Wega/Roles/Antags/bloodbrother.yml index dee930520f..58a3d9a138 100644 --- a/Resources/Prototypes/_Wega/Roles/Antags/bloodbrother.yml +++ b/Resources/Prototypes/_Wega/Roles/Antags/bloodbrother.yml @@ -11,3 +11,19 @@ - !type:DepartmentTimeRequirement department: Security time: 25h + +- type: antagSpecifier + parent: RestrictedAntag + id: BloodBrother + prefRoles: + - BloodBrother + allowNonHumans: true + multiAntagSetting: None + blacklist: + components: + - AntagImmune + - Pacified # Diona ha-ha-ha + mindRoles: + - MindRoleBloodBrother + briefing: + sound: "/Audio/Misc/thief_greeting.ogg" diff --git a/Resources/Prototypes/_Wega/Roles/Antags/bloodcultist.yml b/Resources/Prototypes/_Wega/Roles/Antags/bloodcultist.yml index 79713cba6b..94f535ef77 100644 --- a/Resources/Prototypes/_Wega/Roles/Antags/bloodcultist.yml +++ b/Resources/Prototypes/_Wega/Roles/Antags/bloodcultist.yml @@ -12,6 +12,33 @@ department: Security time: 25h +- type: antagSpecifier + parent: RestrictedAntag + id: BloodCultist + prefRoles: + - BloodCultist + allowNonHumans: true + multiAntagSetting: None + blacklist: + components: + - AntagImmune + - BibleUser + - Android + - Ipc + components: + - type: BloodCultist + - type: MindLink + channels: ["MindBloodCult"] + - type: NpcFactionMember + factions: + - BloodCult + - type: FriendlyFaction + faction: BloodCult + mindRoles: + - MindRoleBloodCultist + briefing: + sound: "/Audio/_Wega/Ambience/Antag/bloodcult_start.ogg" + # Ability gears - type: startingGear id: BloodCultWeaponBloodGear diff --git a/Resources/Prototypes/_Wega/Roles/Antags/vampire.yml b/Resources/Prototypes/_Wega/Roles/Antags/vampire.yml index 64e2c6fbc5..2af79b7b10 100644 --- a/Resources/Prototypes/_Wega/Roles/Antags/vampire.yml +++ b/Resources/Prototypes/_Wega/Roles/Antags/vampire.yml @@ -12,6 +12,29 @@ department: Security time: 25h +- type: antagSpecifier + parent: RestrictedAntag + id: Vampire + prefRoles: + - Vampire + allowNonHumans: true + multiAntagSetting: None + blacklist: + components: + - AntagImmune + - BibleUser + - Android + - Ipc + components: + - type: Vampire + - type: NpcFactionMember + factions: + - Vampire + mindRoles: + - MindRoleVampire + briefing: + sound: "/Audio/_Wega/Ambience/Antag/vampare_start.ogg" + # Ability gear - type: startingGear id: VampireClawsGear diff --git a/Resources/Prototypes/_Wega/Roles/Antags/veilcultist.yml b/Resources/Prototypes/_Wega/Roles/Antags/veilcultist.yml index eff9db56c1..21d924195f 100644 --- a/Resources/Prototypes/_Wega/Roles/Antags/veilcultist.yml +++ b/Resources/Prototypes/_Wega/Roles/Antags/veilcultist.yml @@ -11,17 +11,43 @@ - !type:DepartmentTimeRequirement department: Security time: 25h - + +- type: antagSpecifier + parent: RestrictedAntag + id: VeilCultist + prefRoles: + - VeilCultist + allowNonHumans: true + multiAntagSetting: None + startingGear: HeadVeilCultistGear + blacklist: + components: + - AntagImmune + - BibleUser + components: + - type: VeilCultist + - type: MindLink + channels: ["MindVeilCult"] + - type: NpcFactionMember + factions: + - VeilCult + - type: FriendlyFaction + faction: VeilCult + mindRoles: + - MindRoleVeilCultist + briefing: + sound: "/Audio/_Wega/Ambience/Antag/veilcult_start.ogg" + - type: startingGear id: HeadVeilCultistGear storage: back: - SheetBrass10 - - VeilCultClockworkSlab - + - VeilCultClockworkSlab + # Ability gears - type: startingGear id: VeilCultMidasTouchGear inhand: - VeilCultMidasTouch - + diff --git a/Resources/Prototypes/_Wega/Roles/Jobs/CentComm/cburn.yml b/Resources/Prototypes/_Wega/Roles/Jobs/CentComm/cburn.yml index 61e28c279e..5b5e197b7d 100644 --- a/Resources/Prototypes/_Wega/Roles/Jobs/CentComm/cburn.yml +++ b/Resources/Prototypes/_Wega/Roles/Jobs/CentComm/cburn.yml @@ -7,7 +7,6 @@ startingGear: CBURNLeaderGear icon: "JobIconNanotrasen" supervisors: job-supervisors-centcom - canBeAntag: false accessGroups: - AllAccess access: diff --git a/Resources/Prototypes/_Wega/Roles/Jobs/Command/blueshield.yml b/Resources/Prototypes/_Wega/Roles/Jobs/Command/blueshield.yml index 85f46d1368..de5aa07f77 100644 --- a/Resources/Prototypes/_Wega/Roles/Jobs/Command/blueshield.yml +++ b/Resources/Prototypes/_Wega/Roles/Jobs/Command/blueshield.yml @@ -20,7 +20,6 @@ startingGear: BlueShieldOfficerGear icon: "JobIconBlueShield" supervisors: job-supervisors-centcom - canBeAntag: false accessGroups: - ExtendedAccess access: @@ -45,4 +44,4 @@ back: - MagazinePistol - WeaponPistolMk58 - - BlueSheildSheild \ No newline at end of file + - BlueSheildSheild diff --git a/Resources/Prototypes/_Wega/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_Wega/Roles/Jobs/Security/brigmedic.yml index 14583ebb0d..f0d2a90525 100644 --- a/Resources/Prototypes/_Wega/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/_Wega/Roles/Jobs/Security/brigmedic.yml @@ -18,7 +18,6 @@ startingGear: BrigmedicGear icon: "JobIconBrigmedic" supervisors: job-supervisors-hos - canBeAntag: false access: - Brig - Detective diff --git a/Resources/Prototypes/_Wega/Roles/Jobs/Security/wardenHelper.yml b/Resources/Prototypes/_Wega/Roles/Jobs/Security/wardenHelper.yml index 7f333acc97..e05c2554d8 100644 --- a/Resources/Prototypes/_Wega/Roles/Jobs/Security/wardenHelper.yml +++ b/Resources/Prototypes/_Wega/Roles/Jobs/Security/wardenHelper.yml @@ -16,7 +16,6 @@ startingGear: WardenHelperGear icon: "JobIconWardenHelper" supervisors: job-supervisors-hos - canBeAntag: false access: - Security - Brig @@ -57,4 +56,4 @@ neck: Dinkystar belt: ClothingBeltSecurity gloves: ClothingHandsGlovesCombat - shoes: ClothingShoesBootsJack \ No newline at end of file + shoes: ClothingShoesBootsJack diff --git a/Resources/Prototypes/_Wega/SoundCollections/harpy.yml b/Resources/Prototypes/_Wega/SoundCollections/harpy.yml index 8021a53a44..409962c401 100644 --- a/Resources/Prototypes/_Wega/SoundCollections/harpy.yml +++ b/Resources/Prototypes/_Wega/SoundCollections/harpy.yml @@ -191,7 +191,7 @@ - type: soundCollection id: HarpyRevs files: - - /Audio/Weapons/chainsawwield.ogg + - /Audio/Weapons/chainsaw_rev.ogg - /Audio/Machines/blender.ogg - /Audio/Machines/juicer.ogg - /Audio/Machines/reclaimer_startup.ogg @@ -214,7 +214,7 @@ - type: soundCollection id: HarpyChitter - files: + files: - /Audio/Voice/Moth/moth_chitter.ogg - /Audio/Machines/circuitprinter.ogg - /Audio/Machines/diagnoser_printing.ogg @@ -223,6 +223,6 @@ - type: soundCollection id: HarpySqueak - files: + files: - /Audio/Voice/Moth/moth_squeak.ogg - /Audio/Animals/mouse_squeak.ogg diff --git a/Resources/Prototypes/_Wega/Sponsors/sponsor-tiers.yml b/Resources/Prototypes/_Wega/Sponsors/sponsor-tiers.yml index f0d66ba9e0..b811326bbc 100644 --- a/Resources/Prototypes/_Wega/Sponsors/sponsor-tiers.yml +++ b/Resources/Prototypes/_Wega/Sponsors/sponsor-tiers.yml @@ -1,40 +1,40 @@ -### Do not touch it without the knowledge of the owners ### -- type: sponsorTier - id: SpaceTraveler - name: Космический путник - oocColor: "#A0D2EB" +# ### Do not touch it without the knowledge of the owners ### +# - type: sponsorTier +# id: SpaceTraveler +# name: Космический путник +# oocColor: "#A0D2EB" -- type: sponsorTier - id: Spark - name: Искра в вакууме - priorityJoin: true - extraCharSlots: 5 - oocColor: "#FCD53F" +# - type: sponsorTier +# id: Spark +# name: Искра в вакууме +# priorityJoin: true +# extraCharSlots: 5 +# oocColor: "#FCD53F" -- type: sponsorTier - id: GravitationalAnomaly - name: Гравитационная аномалия - priorityJoin: true - extraCharSlots: 5 - oocColor: "#0074BA" +# - type: sponsorTier +# id: GravitationalAnomaly +# name: Гравитационная аномалия +# priorityJoin: true +# extraCharSlots: 5 +# oocColor: "#0074BA" -- type: sponsorTier - id: FragmentStation - name: Осколок станции - priorityJoin: true - extraCharSlots: 5 - oocColor: "#B0C4DE" +# - type: sponsorTier +# id: FragmentStation +# name: Осколок станции +# priorityJoin: true +# extraCharSlots: 5 +# oocColor: "#B0C4DE" -- type: sponsorTier - id: BlackHole - name: Чёрная дыра - priorityJoin: true - extraCharSlots: 5 - oocColor: "#1A1A2E" +# - type: sponsorTier +# id: BlackHole +# name: Чёрная дыра +# priorityJoin: true +# extraCharSlots: 5 +# oocColor: "#1A1A2E" -- type: sponsorTier - id: Singularity - name: Сингулярность - priorityJoin: true - extraCharSlots: 5 - oocColor: "#FFF01F" +# - type: sponsorTier +# id: Singularity +# name: Сингулярность +# priorityJoin: true +# extraCharSlots: 5 +# oocColor: "#FFF01F" diff --git a/Resources/Prototypes/_Wega/Sponsors/sponsorghosts.yml b/Resources/Prototypes/_Wega/Sponsors/sponsorghosts.yml index dc66e3470b..5eefd84bdd 100644 --- a/Resources/Prototypes/_Wega/Sponsors/sponsorghosts.yml +++ b/Resources/Prototypes/_Wega/Sponsors/sponsorghosts.yml @@ -1,20 +1,20 @@ -- type: ghostTheme - id: SanabiGhost - name: Санаби - icon: - sprite: _Wega/Mobs/Ghosts/ghost_human.rsi - state: sanabi +# - type: ghostTheme +# id: SanabiGhost +# name: Санаби +# icon: +# sprite: _Wega/Mobs/Ghosts/ghost_human.rsi +# state: sanabi -- type: ghostTheme - id: FoxGhost - name: Лисица - icon: - sprite: _Wega/Mobs/Ghosts/ghost_human.rsi - state: fox_a +# - type: ghostTheme +# id: FoxGhost +# name: Лисица +# icon: +# sprite: _Wega/Mobs/Ghosts/ghost_human.rsi +# state: fox_a -- type: ghostTheme - id: GirlGhost - name: Красотка - icon: - sprite: _Wega/Mobs/Ghosts/ghost_human.rsi - state: girl_a +# - type: ghostTheme +# id: GirlGhost +# name: Красотка +# icon: +# sprite: _Wega/Mobs/Ghosts/ghost_human.rsi +# state: girl_a diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml index c09e4b9706..015baa8b72 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -193,7 +193,6 @@ - ReagentId: SpaceCleaner Quantity: 100 - type: SolutionRegeneration - solution: tank generated: reagents: - ReagentId: SpaceCleaner