From b7dc3c81aec77bba01240a5ba944ea405d5fe0ec Mon Sep 17 00:00:00 2001 From: Visne <39844191+Visne@users.noreply.github.com> Date: Sat, 17 Jul 2021 02:37:09 +0200 Subject: [PATCH 01/99] Remove redundant #nullable enable (#4275) --- Content.Client/Administration/UI/AdminMenuWindow.xaml.cs | 1 - .../Administration/UI/CustomControls/CommandButton.cs | 3 +-- .../Administration/UI/CustomControls/PlayerListControl.xaml.cs | 3 +-- .../Administration/UI/CustomControls/UICommandButton.cs | 3 +-- .../Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs | 3 +-- .../Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs | 3 +-- .../Administration/UI/Tabs/AdminTab/KickWindow.xaml.cs | 3 +-- .../Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs | 3 +-- .../Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs | 3 +-- .../UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs | 1 - .../Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs | 3 +-- .../Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs | 3 +-- .../Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs | 3 +-- .../Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs | 3 +-- .../UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs | 3 +-- Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs | 3 +-- Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs | 3 +-- Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs | 3 +-- Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs | 1 - Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs | 1 - Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs | 1 - Content.Client/Audio/BackgroundAudioSystem.cs | 1 - Content.Client/Buckle/BuckleComponent.cs | 3 +-- Content.Client/Cargo/UI/CargoConsoleMenu.cs | 1 - Content.Client/Changelog/ChangelogManager.cs | 1 - .../Chemistry/Visualizers/SolutionContainerVisualizer.cs | 1 - Content.Client/Clothing/ClothingComponent.cs | 1 - Content.Client/CombatMode/ColoredScreenBorderOverlay.cs | 1 - Content.Client/Commands/GroupingContextMenuCommand.cs | 3 +-- Content.Client/Construction/ConstructionSystem.cs | 1 - Content.Client/Construction/UI/ConstructionMenu.xaml.cs | 1 - Content.Client/Construction/UI/ConstructionMenuPresenter.cs | 1 - Content.Client/ContextMenu/UI/ContextMenuElement.cs | 3 +-- Content.Client/ContextMenu/UI/ContextMenuPresenter.cs | 3 +-- Content.Client/ContextMenu/UI/ContextMenuView.cs | 3 +-- Content.Client/ContextMenu/UI/ContextMenuViewGrouping.cs | 3 +-- Content.Client/Flash/FlashableComponent.cs | 1 - Content.Client/Ghost/GhostGui.cs | 1 - Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs | 3 +-- Content.Client/Gravity/GravityGeneratorVisualizer.cs | 3 +-- Content.Client/HealthOverlay/HealthOverlaySystem.cs | 3 +-- Content.Client/HealthOverlay/UI/HealthOverlayGui.cs | 1 - Content.Client/Info/InfoWindow.cs | 1 - Content.Client/Items/Components/ItemComponent.cs | 1 - Content.Client/Kitchen/KitchenSpikeComponent.cs | 1 - Content.Client/Light/Visualizers/PoweredLightVisualizer.cs | 1 - Content.Client/MobState/DamageStateVisualizer.cs | 1 - Content.Client/Morgue/Visualizers/MorgueVisualizer.cs | 3 +-- Content.Client/Physics/Controllers/MoverController.cs | 1 - Content.Client/Rotatable/RotatableComponent.cs | 1 - Content.Client/Singularity/SingularityOverlay.cs | 1 - Content.Client/Spawners/ClientEntitySpawnerComponent.cs | 1 - Content.Client/Stack/StackVisualizer.cs | 1 - Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs | 3 +-- Content.Client/Stylesheets/StyleNano.cs | 1 - Content.Client/Suspicion/SuspicionRoleComponent.cs | 1 - Content.Client/Voting/UI/VoteCallMenu.xaml.cs | 1 - Content.Client/Voting/VoteManager.cs | 1 - Content.Server/AI/Commands/AddAiCommand.cs | 3 +-- Content.Server/AI/Components/AiControllerComponent.cs | 3 +-- Content.Server/AI/Components/AiFactionPrototype.cs | 1 - Content.Server/AI/Components/AiFactionTagComponent.cs | 1 - Content.Server/AI/EntitySystems/AiFactionTagSystem.cs | 1 - Content.Server/AI/EntitySystems/AiSystem.cs | 1 - Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs | 3 +-- Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs | 1 - .../AI/Operators/Inventory/UseItemInInventoryOperator.cs | 1 - .../AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs | 1 - .../AI/Operators/Nutrition/UseFoodInInventoryOperator.cs | 1 - Content.Server/AI/Pathfinding/Accessible/ReachableArgs.cs | 3 +-- Content.Server/AI/Utility/BehaviorSetPrototype.cs | 1 - Content.Server/AI/Utility/NpcBehaviorManager.cs | 1 - Content.Server/AME/AMENodeGroup.cs | 1 - Content.Server/AME/Components/AMEControllerComponent.cs | 1 - Content.Server/AME/Components/AMEFuelContainerComponent.cs | 1 - Content.Server/AME/Components/AMEPartComponent.cs | 1 - Content.Server/AME/Components/AMEShieldComponent.cs | 3 +-- Content.Server/Access/Components/AccessComponent.cs | 1 - Content.Server/Access/Components/AccessReaderComponent.cs | 1 - Content.Server/Access/Components/IAccess.cs | 1 - Content.Server/Access/Components/IdCardConsoleComponent.cs | 1 - Content.Server/Access/Components/PresetIdCardComponent.cs | 1 - Content.Server/Actions/Actions/CombatMode.cs | 1 - Content.Server/Actions/Actions/DisarmAction.cs | 1 - Content.Server/Actions/Actions/GhostBoo.cs | 1 - Content.Server/Actions/Actions/ScreamAction.cs | 1 - Content.Server/Actions/Commands/CooldownAction.cs | 1 - Content.Server/Actions/Commands/GrantAction.cs | 1 - Content.Server/Actions/Commands/RevokeAction.cs | 1 - Content.Server/Actions/ServerActionsComponent.cs | 1 - Content.Server/Administration/AdminRank.cs | 1 - Content.Server/Administration/Commands/BanCommand.cs | 1 - Content.Server/Administration/Commands/DeAdminCommand.cs | 1 - Content.Server/Administration/Commands/DeleteComponent.cs | 3 +-- Content.Server/Administration/Commands/DeleteEntitiesWithId.cs | 1 - Content.Server/Administration/Commands/ExplosionCommand.cs | 1 - .../Administration/Commands/FindEntitiesWithComponents.cs | 1 - .../Administration/Commands/OpenPermissionsCommand.cs | 1 - Content.Server/Administration/Commands/PardonCommand.cs | 1 - Content.Server/Administration/Commands/PromoteHostCommand.cs | 3 +-- Content.Server/Administration/Commands/ReAdminCommand.cs | 1 - Content.Server/Administration/Commands/ReadyAll.cs | 3 +-- .../Administration/Commands/RemoveExtraComponents.cs | 3 +-- Content.Server/Administration/Commands/SetAdminOOC.cs | 1 - Content.Server/Administration/Commands/SetMindCommand.cs | 1 - Content.Server/Administration/Commands/SetOutfitCommand.cs | 1 - Content.Server/Administration/Managers/AdminManager.cs | 1 - Content.Server/Administration/Managers/IAdminManager.cs | 1 - Content.Server/Administration/UI/PermissionsEui.cs | 1 - Content.Server/Administration/Verbs/AdminAddReagentVerb.cs | 1 - Content.Server/Administration/Verbs/DeleteVerb.cs | 1 - Content.Server/Alert/Click/RemoveCuffs.cs | 1 - Content.Server/Alert/Commands/ClearAlert.cs | 1 - Content.Server/Alert/Commands/ShowAlert.cs | 1 - Content.Server/Arcade/Components/BlockGameArcadeComponent.cs | 1 - .../Arcade/Components/SpaceVillainArcadeComponent.cs | 1 - Content.Server/Atmos/AtmosHelpers.cs | 3 +-- Content.Server/Atmos/Components/AirtightComponent.cs | 1 - Content.Server/Atmos/Components/AtmosExposedComponent.cs | 3 +-- Content.Server/Atmos/Components/BreathToolComponent.cs | 3 +-- Content.Server/Atmos/Components/FirelockComponent.cs | 1 - Content.Server/Atmos/Components/GasAnalyzerComponent.cs | 1 - Content.Server/Atmos/Components/GasTankComponent.cs | 1 - Content.Server/Atmos/Components/GridAtmosphereComponent.cs | 1 - Content.Server/Atmos/Components/IGridAtmosphereComponent.cs | 3 +-- Content.Server/Atmos/Components/MovedByPressureComponent.cs | 3 +-- .../Atmos/Components/SpaceGridAtmosphereComponent.cs | 3 +-- .../Atmos/Components/UnsimulatedGridAtmosphereComponent.cs | 3 +-- Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs | 3 +-- Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs | 3 +-- Content.Server/Atmos/GasMixture.cs | 3 +-- Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs | 1 - .../Atmos/Piping/Trinary/Components/GasFilterComponent.cs | 1 - Content.Server/Atmos/Reactions/GasReactionPrototype.cs | 3 +-- Content.Server/Atmos/Reactions/PlasmaFireReaction.cs | 1 - Content.Server/Atmos/Reactions/TritiumFireReaction.cs | 1 - Content.Server/Atmos/Reactions/WaterVaporReaction.cs | 1 - Content.Server/BarSign/BarSignComponent.cs | 1 - Content.Server/BarSign/BarSignPrototype.cs | 1 - Content.Server/Body/Behavior/BrainBehavior.cs | 3 +-- Content.Server/Body/Behavior/LiverBehavior.cs | 1 - Content.Server/Body/Behavior/LungBehavior.cs | 1 - Content.Server/Body/Behavior/MechanismBehavior.cs | 3 +-- Content.Server/Body/Behavior/StomachBehavior.cs | 1 - Content.Server/Body/BodyComponent.cs | 1 - Content.Server/Body/Commands/AddHandCommand.cs | 1 - Content.Server/Body/Commands/AttachBodyPartCommand.cs | 1 - Content.Server/Body/Commands/DestroyMechanismCommand.cs | 1 - Content.Server/Body/Commands/RemoveHandCommand.cs | 1 - Content.Server/Body/Mechanism/MechanismComponent.cs | 1 - Content.Server/Body/Part/BodyPartComponent.cs | 1 - Content.Server/Body/Respiratory/InternalsComponent.cs | 3 +-- Content.Server/Body/Scanner/BodyScannerComponent.cs | 3 +-- Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs | 1 - Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs | 1 - Content.Server/Botany/Components/PlantHolderComponent.cs | 1 - Content.Server/Botany/Components/ProduceComponent.cs | 1 - Content.Server/Botany/Components/SeedComponent.cs | 1 - Content.Server/Botany/Components/SeedExtractorComponent.cs | 1 - Content.Server/Botany/Seed.cs | 1 - Content.Server/Buckle/BuckleSystem.cs | 1 - Content.Server/Buckle/Components/BuckleComponent.cs | 1 - Content.Server/Buckle/Components/StrapComponent.cs | 1 - Content.Server/Cargo/Components/CargoConsoleComponent.cs | 1 - Content.Server/Cargo/Components/CargoTelepadComponent.cs | 1 - .../CharacterAppearance/Components/MagicMirrorComponent.cs | 1 - Content.Server/CharacterInfo/CharacterInfoComponent.cs | 3 +-- Content.Server/Chat/Commands/AdminChatCommand.cs | 1 - Content.Server/Chat/Commands/MeCommand.cs | 1 - Content.Server/Chat/Commands/OOCCommand.cs | 1 - Content.Server/Chat/Commands/SayCommand.cs | 1 - Content.Server/Chat/Commands/SuicideCommand.cs | 1 - Content.Server/Chemistry/Components/ChemMasterComponent.cs | 1 - .../Chemistry/Components/FoamSolutionAreaEffectComponent.cs | 3 +-- Content.Server/Chemistry/Components/InjectorComponent.cs | 1 - .../Chemistry/Components/ReagentDispenserComponent.cs | 1 - Content.Server/Chemistry/Components/ReagentTankComponent.cs | 1 - Content.Server/Chemistry/Components/RehydratableComponent.cs | 1 - .../Chemistry/Components/SmokeSolutionAreaEffectComponent.cs | 3 +-- .../Chemistry/Components/SolutionAreaEffectComponent.cs | 1 - .../Components/SolutionAreaEffectInceptionComponent.cs | 3 +-- .../Chemistry/Components/SolutionContainerComponent.cs | 3 +-- .../Chemistry/Components/SolutionTransferComponent.cs | 1 - .../Chemistry/Components/TransformableContainerComponent.cs | 1 - .../Chemistry/EntitySystems/ChemicalReactionSystem.cs | 1 - .../Chemistry/EntitySystems/SolutionAreaEffectSystem.cs | 1 - Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs | 3 +-- Content.Server/Chemistry/PlantMetabolism/AdjustHealth.cs | 3 +-- .../Chemistry/PlantMetabolism/AdjustMutationLevel.cs | 3 +-- Content.Server/Chemistry/PlantMetabolism/AdjustMutationMod.cs | 3 +-- Content.Server/Chemistry/PlantMetabolism/AdjustNutrition.cs | 3 +-- Content.Server/Chemistry/PlantMetabolism/AdjustPests.cs | 3 +-- Content.Server/Chemistry/PlantMetabolism/AdjustToxins.cs | 3 +-- Content.Server/Chemistry/PlantMetabolism/AdjustWater.cs | 3 +-- Content.Server/Chemistry/PlantMetabolism/AdjustWeeds.cs | 3 +-- Content.Server/Chemistry/PlantMetabolism/AffectGrowth.cs | 3 +-- Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs | 3 +-- Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs | 3 +-- Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs | 3 +-- Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs | 1 - .../Chemistry/ReactionEffects/FoamAreaReactionEffect.cs | 3 +-- .../Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs | 3 +-- Content.Server/Climbing/Components/ClimbingComponent.cs | 3 +-- Content.Server/Cloning/CloningSystem.cs | 1 - Content.Server/Clothing/Components/MagbootsComponent.cs | 1 - Content.Server/Commands/Atmos/AddAtmosCommand.cs | 3 +-- Content.Server/Commands/Atmos/AddGasCommand.cs | 3 +-- Content.Server/Commands/Atmos/AddUnsimulatedAtmosCommand.cs | 3 +-- Content.Server/Commands/Atmos/DeleteGasCommand.cs | 1 - Content.Server/Commands/Atmos/FillGasCommand.cs | 3 +-- Content.Server/Commands/Atmos/FixGridAtmos.cs | 1 - Content.Server/Commands/Atmos/ListGasesCommand.cs | 3 +-- Content.Server/Commands/Atmos/RemoveGasCommand.cs | 3 +-- Content.Server/Commands/Atmos/SetAtmosTemperatureCommand.cs | 3 +-- Content.Server/Commands/Atmos/SetTemperatureCommand.cs | 3 +-- Content.Server/Commands/Atmos/ShowAtmosCommand.cs | 1 - Content.Server/Commands/CommandUtils.cs | 3 +-- .../Communications/CommunicationsConsoleComponent.cs | 1 - Content.Server/Connection/ConnectionManager.cs | 1 - Content.Server/Construction/Completions/AddContainer.cs | 3 +-- Content.Server/Construction/Completions/BuildComputer.cs | 1 - Content.Server/Construction/Completions/BuildMachine.cs | 1 - Content.Server/Construction/Completions/ConditionalAction.cs | 1 - .../Construction/Completions/DeleteEntitiesInContainer.cs | 1 - Content.Server/Construction/Completions/DeleteEntity.cs | 3 +-- Content.Server/Construction/Completions/DestroyEntity.cs | 1 - Content.Server/Construction/Completions/EmptyAllContainers.cs | 3 +-- Content.Server/Construction/Completions/EmptyContainer.cs | 3 +-- .../Construction/Completions/MachineFrameRegenerateProgress.cs | 3 +-- Content.Server/Construction/Completions/MoveContainer.cs | 1 - Content.Server/Construction/Completions/PlaySound.cs | 1 - Content.Server/Construction/Completions/PopupEveryone.cs | 1 - Content.Server/Construction/Completions/PopupUser.cs | 3 +-- Content.Server/Construction/Completions/SetAnchor.cs | 3 +-- Content.Server/Construction/Completions/SetStackCount.cs | 3 +-- Content.Server/Construction/Completions/SnapToGrid.cs | 1 - Content.Server/Construction/Completions/SpawnPrototype.cs | 3 +-- .../Construction/Completions/SpawnPrototypeAtContainer.cs | 1 - Content.Server/Construction/Completions/SpriteChange.cs | 3 +-- Content.Server/Construction/Completions/SpriteStateChange.cs | 3 +-- Content.Server/Construction/Completions/VisualizerDataInt.cs | 3 +-- Content.Server/Construction/Components/AnchorableComponent.cs | 1 - .../Construction/Components/ConstructionComponent.cs | 1 - .../Construction/Components/WelderRefinableComponent.cs | 1 - Content.Server/Construction/Conditions/AirlockBolted.cs | 1 - Content.Server/Construction/Conditions/ContainerEmpty.cs | 3 +-- Content.Server/Construction/Conditions/ContainerNotEmpty.cs | 1 - Content.Server/Construction/Conditions/DoorWelded.cs | 1 - Content.Server/Construction/Conditions/ToiletLidClosed.cs | 1 - Content.Server/Construction/ConstructionSystem.cs | 1 - .../Containers/Commands/HideContainedContextCommand.cs | 1 - .../Containers/Commands/ShowContainedContextCommand.cs | 1 - Content.Server/Conveyor/ConveyorComponent.cs | 1 - Content.Server/Coordinates/Helpers/GridTileLookupHelpers.cs | 1 - Content.Server/Crayon/CrayonComponent.cs | 1 - Content.Server/Cuffs/Components/CuffableComponent.cs | 1 - Content.Server/Cuffs/Components/HandcuffComponent.cs | 1 - Content.Server/Cuffs/CuffableSystem.cs | 1 - Content.Server/Damage/Commands/GodModeCommand.cs | 1 - Content.Server/Damage/Commands/HurtCommand.cs | 1 - Content.Server/Damage/GodmodeSystem.cs | 3 +-- Content.Server/Database/ServerBanDef.cs | 1 - Content.Server/Database/ServerDbBase.cs | 1 - Content.Server/Database/ServerDbManager.cs | 1 - Content.Server/Database/ServerDbPostgres.cs | 1 - Content.Server/Database/ServerDbSqlite.cs | 1 - Content.Server/Destructible/DestructibleComponent.cs | 3 +-- .../Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs | 3 +-- .../Thresholds/Behaviors/EmptyAllContainersBehaviour.cs | 1 - .../Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs | 1 - .../Destructible/Thresholds/Behaviors/SpillBehavior.cs | 1 - Content.Server/Destructible/Thresholds/Threshold.cs | 3 +-- Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs | 3 +-- .../Destructible/Thresholds/Triggers/DamageClassTrigger.cs | 3 +-- .../Destructible/Thresholds/Triggers/DamageTrigger.cs | 3 +-- .../Destructible/Thresholds/Triggers/DamageTypeTrigger.cs | 3 +-- .../Destructible/Thresholds/Triggers/IThresholdTrigger.cs | 3 +-- Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs | 3 +-- .../Disposal/Mailing/DisposalMailingUnitComponent.cs | 1 - .../Disposal/Tube/Components/DisposalRouterComponent.cs | 1 - .../Disposal/Tube/Components/DisposalTaggerComponent.cs | 1 - .../Disposal/Tube/Components/DisposalTubeComponent.cs | 1 - .../Disposal/Tube/Components/IDisposalTubeComponent.cs | 1 - Content.Server/Disposal/TubeConnectionsCommand.cs | 1 - .../Disposal/Unit/Components/DisposalHolderComponent.cs | 1 - .../Disposal/Unit/Components/DisposalUnitComponent.cs | 1 - Content.Server/DoAfter/DoAfter.cs | 3 +-- Content.Server/DoAfter/DoAfterComponent.cs | 3 +-- Content.Server/DoAfter/DoAfterEventArgs.cs | 3 +-- Content.Server/DoAfter/DoAfterSystem.cs | 1 - Content.Server/Doors/Components/AirlockComponent.cs | 1 - Content.Server/Doors/Components/ServerDoorComponent.cs | 1 - Content.Server/Doors/DoorSystem.cs | 1 - Content.Server/Doors/IDoorCheck.cs | 1 - Content.Server/EUI/BaseEui.cs | 1 - Content.Server/EUI/EuiManager.cs | 1 - .../Engineering/Components/DisassembleOnActivateComponent.cs | 1 - .../Engineering/Components/SpawnAfterInteractComponent.cs | 1 - .../Engineering/EntitySystems/SpawnAfterInteractSystem.cs | 1 - Content.Server/Explosion/Components/ClusterFlashComponent.cs | 1 - .../Explosion/Components/OnUseTimerTriggerComponent.cs | 3 +-- Content.Server/Explosion/ExplosionHelper.cs | 1 - Content.Server/Extinguisher/FireExtinguisherComponent.cs | 1 - Content.Server/Fluids/Components/BucketComponent.cs | 1 - Content.Server/Fluids/Components/MopComponent.cs | 1 - Content.Server/Fluids/Components/SpillExtensions.cs | 1 - Content.Server/GameTicking/Commands/GoLobbyCommand.cs | 3 +-- Content.Server/GameTicking/Rules/RuleInactivityTimeRestart.cs | 1 - Content.Server/Ghost/Components/GhostComponent.cs | 1 - Content.Server/Ghost/Components/GhostOnMoveComponent.cs | 1 - Content.Server/Ghost/Ghost.cs | 1 - Content.Server/Ghost/IGhostBooAffected.cs | 1 - Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs | 3 +-- Content.Server/Ghost/Roles/MakeGhostRoleVerb.cs | 1 - Content.Server/Gravity/GravityGeneratorComponent.cs | 3 +-- Content.Server/Hands/Components/HandsComponent.cs | 1 - Content.Server/Hands/Components/IHandsComponent.cs | 1 - Content.Server/Holiday/HolidayPrototype.cs | 1 - Content.Server/Instruments/InstrumentComponent.cs | 1 - Content.Server/Interaction/Components/ClumsyComponent.cs | 1 - Content.Server/Interaction/TilePryCommand.cs | 1 - Content.Server/Interfaces/IGasReactionEffect.cs | 1 - Content.Server/Items/ItemComponent.cs | 1 - Content.Server/Jobs/JanitorSpecial.cs | 1 - Content.Server/Kitchen/Components/KitchenSpikeComponent.cs | 1 - Content.Server/Kitchen/Components/MicrowaveComponent.cs | 1 - Content.Server/Kitchen/Components/ReagentGrinderComponent.cs | 1 - Content.Server/Lathe/Components/LatheComponent.cs | 1 - Content.Server/Light/Components/EmergencyLightComponent.cs | 1 - Content.Server/Light/Components/HandheldLightComponent.cs | 1 - Content.Server/Light/Components/LightBulbComponent.cs | 1 - Content.Server/Light/Components/LightReplacerComponent.cs | 1 - Content.Server/Light/Components/MatchstickComponent.cs | 1 - Content.Server/Light/Components/PoweredLightComponent.cs | 1 - Content.Server/Light/EntitySystems/LightReplacerSystem.cs | 1 - .../MachineLinking/Components/SignalTwoWayLeverComponent.cs | 1 - Content.Server/Medical/Components/MedicalScannerComponent.cs | 1 - Content.Server/Metabolism/MetabolismComponent.cs | 1 - Content.Server/Mind/Commands/MakeSentientCommand.cs | 1 - Content.Server/Mind/Components/MindComponent.cs | 1 - Content.Server/Mind/Components/VisitingMindComponent.cs | 1 - Content.Server/MobState/States/NormalMobState.cs | 3 +-- .../Morgue/Components/BodyBagEntityStorageComponent.cs | 1 - .../Morgue/Components/CrematoriumEntityStorageComponent.cs | 1 - .../Morgue/Components/MorgueEntityStorageComponent.cs | 1 - Content.Server/NodeContainer/NodeContainerComponent.cs | 1 - Content.Server/NodeContainer/NodeGroups/BaseNodeGroup.cs | 1 - Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs | 1 - Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs | 1 - Content.Server/NodeContainer/NodeGroups/PipeNet.cs | 1 - Content.Server/NodeContainer/Nodes/AdjacentNode.cs | 1 - Content.Server/NodeContainer/Nodes/Node.cs | 1 - Content.Server/NodeContainer/Nodes/PipeNode.cs | 1 - Content.Server/Nutrition/Components/DrinkComponent.cs | 1 - Content.Server/Nutrition/Components/FoodComponent.cs | 1 - Content.Server/Nutrition/Components/SmokingComponent.cs | 1 - Content.Server/Nutrition/Components/UtensilComponent.cs | 1 - Content.Server/Nutrition/Hungry.cs | 1 - Content.Server/Objectives/Commands/AddObjectiveCommand.cs | 3 +-- Content.Server/Objectives/Commands/ListObjectivesCommand.cs | 1 - Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs | 3 +-- Content.Server/Objectives/Conditions/DieCondition.cs | 1 - Content.Server/Objectives/Conditions/KillPersonCondition.cs | 1 - Content.Server/Objectives/Conditions/StayAliveCondition.cs | 1 - Content.Server/Objectives/Conditions/StealCondition.cs | 1 - Content.Server/Objectives/Interfaces/IObjectiveCondition.cs | 3 +-- Content.Server/Objectives/ObjectivePrototype.cs | 3 +-- Content.Server/Objectives/ObjectivesManager.cs | 3 +-- Content.Server/PDA/Managers/IPDAUplinkManager.cs | 1 - Content.Server/PDA/Managers/PDAUplinkManager.cs | 1 - Content.Server/PDA/PDAComponent.cs | 1 - Content.Server/PDA/PDAExtensions.cs | 3 +-- Content.Server/Paper/PaperComponent.cs | 1 - .../Components/ParticleAcceleratorControlBoxComponent.cs | 1 - .../Components/ParticleAcceleratorPartComponent.cs | 1 - .../Components/ParticleAcceleratorPowerBoxComponent.cs | 3 +-- .../EntitySystems/ParticleAcceleratorPartSystem.cs | 3 +-- Content.Server/Physics/Controllers/ConveyorController.cs | 1 - Content.Server/Physics/Controllers/MoverController.cs | 1 - Content.Server/Physics/Controllers/PullController.cs | 3 +-- Content.Server/Physics/Controllers/SingularityController.cs | 1 - Content.Server/Physics/TestbedCommand.cs | 1 - Content.Server/Players/PlayerData.cs | 1 - Content.Server/Pointing/Components/PointingArrowComponent.cs | 3 +-- .../Pointing/Components/RoguePointingArrowComponent.cs | 1 - Content.Server/Pointing/EntitySystems/PointingSystem.cs | 1 - Content.Server/Portal/Components/PortalComponent.cs | 1 - Content.Server/Portal/Components/TeleporterComponent.cs | 1 - Content.Server/Power/Components/ApcComponent.cs | 1 - Content.Server/Power/Components/ApcPowerProviderComponent.cs | 1 - Content.Server/Power/Components/ApcPowerReceiverComponent.cs | 1 - Content.Server/Power/Components/BaseApcNetComponent.cs | 1 - Content.Server/Power/Components/BaseCharger.cs | 1 - Content.Server/Power/Components/BaseNetConnectorComponent.cs | 3 +-- Content.Server/Power/Components/BasePowerNetComponent.cs | 1 - Content.Server/Power/Components/BatteryComponent.cs | 1 - Content.Server/Power/Components/CableComponent.cs | 1 - Content.Server/Power/Components/CablePlacerComponent.cs | 1 - Content.Server/Power/Components/ExaminableBatteryComponent.cs | 1 - Content.Server/Power/Components/PowerConsumerComponent.cs | 1 - Content.Server/Power/Components/PowerSupplierComponent.cs | 1 - Content.Server/Power/DrainAllBatteriesCommand.cs | 1 - Content.Server/Power/EntitySystems/BaseChargerSystem.cs | 1 - Content.Server/Power/EntitySystems/BatterySystem.cs | 1 - Content.Server/Power/EntitySystems/PowerApcSystem.cs | 1 - Content.Server/Power/EntitySystems/PowerNetSystem.cs | 1 - Content.Server/Power/NodeGroups/ApcNet.cs | 1 - Content.Server/Power/NodeGroups/BaseNetConnectorNodeGroup.cs | 1 - Content.Server/Power/NodeGroups/PowerNet.cs | 1 - Content.Server/Power/SMES/PowerSmesSystem.cs | 1 - Content.Server/Power/SMES/SmesComponent.cs | 3 +-- .../PowerCell/Components/PowerCellChargerComponent.cs | 1 - Content.Server/PowerCell/Components/PowerCellComponent.cs | 1 - Content.Server/PowerCell/Components/PowerCellSlotComponent.cs | 1 - .../Preferences/Managers/ServerPreferencesManager.cs | 1 - Content.Server/Pulling/PullableComponent.cs | 1 - Content.Server/Recycling/Components/RecyclableComponent.cs | 1 - Content.Server/Recycling/Components/RecyclerComponent.cs | 1 - Content.Server/Repairable/RepairableComponent.cs | 1 - Content.Server/Research/Components/ResearchClientComponent.cs | 3 +-- Content.Server/Research/Components/ResearchConsoleComponent.cs | 1 - Content.Server/Rotation/Components/FlippableComponent.cs | 1 - Content.Server/Rotation/Components/RotatableComponent.cs | 1 - Content.Server/Shuttle/ShuttleControllerComponent.cs | 3 +-- .../Singularity/Components/ContainmentFieldComponent.cs | 1 - .../Components/ContainmentFieldGeneratorComponent.cs | 1 - Content.Server/Singularity/Components/EmitterComponent.cs | 2 -- .../Singularity/Components/RadiationCollectorComponent.cs | 1 - .../Singularity/Components/ServerSingularityComponent.cs | 1 - Content.Server/Singularity/StartSingularityEngineCommand.cs | 1 - .../Solar/Components/SolarControlConsoleComponent.cs | 1 - Content.Server/Solar/Components/SolarPanelComponent.cs | 1 - .../Solar/EntitySystems/PowerSolarControlConsoleSystem.cs | 1 - Content.Server/Solar/EntitySystems/PowerSolarSystem.cs | 1 - Content.Server/Speech/AddAccent.cs | 1 - Content.Server/Speech/Components/IAccentComponent.cs | 3 +-- Content.Server/StationEvents/Events/FalseAlarm.cs | 3 +-- Content.Server/StationEvents/Events/GasLeak.cs | 1 - Content.Server/StationEvents/Events/PowerGridCheck.cs | 1 - Content.Server/StationEvents/Events/RadiationStorm.cs | 1 - Content.Server/StationEvents/Events/StationEvent.cs | 1 - Content.Server/StationEvents/StationEventCommand.cs | 1 - Content.Server/StationEvents/StationEventSystem.cs | 1 - Content.Server/Storage/Components/EntityStorageComponent.cs | 1 - Content.Server/Storage/Components/SecretStashComponent.cs | 1 - Content.Server/Storage/Components/ServerStorageComponent.cs | 1 - Content.Server/Storage/Components/StorageCounterComponent.cs | 1 - Content.Server/Storage/Components/StorageFillComponent.cs | 1 - Content.Server/Strip/StrippableComponent.cs | 1 - Content.Server/Stunnable/Components/StunbatonComponent.cs | 1 - Content.Server/Stunnable/Components/StunnableComponent.cs | 1 - .../Suspicion/EntitySystems/SuspicionEndTimerSystem.cs | 1 - Content.Server/Suspicion/SuspicionRoleComponent.cs | 1 - Content.Server/Throwing/ThrowHelper.cs | 1 - Content.Server/Toilet/ToiletComponent.cs | 1 - Content.Server/Tools/Components/WelderComponent.cs | 1 - .../Components/TraitorDeathMatchRedemptionComponent.cs | 1 - .../Components/TraitorDeathMatchReliableOwnerTagComponent.cs | 3 +-- Content.Server/UserInterface/UserInterfaceHelpers.cs | 3 +-- Content.Server/VendingMachines/VendingMachineComponent.cs | 1 - Content.Server/Verbs/VerbSystem.cs | 3 +-- Content.Server/Voting/Managers/IVoteManager.cs | 1 - Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs | 3 +-- Content.Server/Voting/Managers/VoteManager.cs | 1 - Content.Server/Voting/VoteCommands.cs | 1 - Content.Server/Voting/VoteFinishedEventArgs.cs | 1 - Content.Server/Voting/VoteFinishedEventHandler.cs | 3 +-- Content.Server/Voting/VoteOptions.cs | 1 - Content.Server/Weapon/WeaponCapacitorChargerComponent.cs | 3 +-- Content.Server/Window/WindowComponent.cs | 1 - Content.Server/WireHacking/WiresComponent.cs | 1 - Content.Shared/AI/SharedAiDebug.cs | 1 - Content.Shared/AME/SharedAMEControllerComponent.cs | 3 +-- Content.Shared/AME/SharedAMEShieldComponent.cs | 3 +-- Content.Shared/APC/SharedApc.cs | 3 +-- Content.Shared/Access/AccessLevelPrototype.cs | 1 - Content.Shared/Access/SharedIdCardConsoleComponent.cs | 1 - Content.Shared/ActionBlocker/ActionBlockerSystem.cs | 3 +-- Content.Shared/ActionBlocker/IActionBlocker.cs | 3 +-- Content.Shared/Actions/ActionManager.cs | 3 +-- Content.Shared/Actions/ActionType.cs | 1 - Content.Shared/Actions/Behaviors/IActionBehavior.cs | 3 +-- Content.Shared/Actions/Behaviors/IInstantAction.cs | 3 +-- Content.Shared/Actions/Behaviors/ITargetEntityAction.cs | 3 +-- Content.Shared/Actions/Behaviors/ITargetEntityItemAction.cs | 3 +-- Content.Shared/Actions/Behaviors/ITargetPointAction.cs | 3 +-- Content.Shared/Actions/Behaviors/ITargetPointItemAction.cs | 3 +-- Content.Shared/Actions/Behaviors/IToggleAction.cs | 3 +-- Content.Shared/Actions/Behaviors/Item/IInstantItemAction.cs | 3 +-- Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs | 3 +-- Content.Shared/Actions/Behaviors/Item/IToggleItemAction.cs | 3 +-- Content.Shared/Actions/Components/ItemActionsComponent.cs | 1 - Content.Shared/Actions/Components/SharedActionsComponent.cs | 1 - Content.Shared/Actions/IActionAttempt.cs | 3 +-- Content.Shared/Actions/Prototypes/ActionPrototype.cs | 3 +-- Content.Shared/Actions/Prototypes/BaseActionPrototype.cs | 3 +-- Content.Shared/Actions/Prototypes/ItemActionPrototype.cs | 3 +-- Content.Shared/Actions/SharedActionSystem.cs | 3 +-- Content.Shared/Acts/ActSystem.cs | 3 +-- Content.Shared/Administration/AdminAddReagentEuiState.cs | 3 +-- Content.Shared/Administration/AdminData.cs | 3 +-- Content.Shared/Administration/AdminFlags.cs | 3 +-- Content.Shared/Administration/AdminFlagsHelper.cs | 3 +-- .../Administration/Menu/AdminMenuPlayerListMessage.cs | 3 +-- .../Administration/Menu/AdminMenuPlayerListRequest.cs | 3 +-- Content.Shared/Administration/MsgUpdateAdminStatus.cs | 3 +-- Content.Shared/Administration/PermissionsEuiState.cs | 3 +-- Content.Shared/Administration/SetOutfitEuiState.cs | 1 - Content.Shared/Alert/AlertManager.cs | 3 +-- Content.Shared/Alert/AlertOrderPrototype.cs | 3 +-- Content.Shared/Alert/AlertPrototype.cs | 3 +-- Content.Shared/Alert/AlertType.cs | 3 +-- Content.Shared/Alert/IAlertClick.cs | 3 +-- Content.Shared/Alert/SharedAlertsComponent.cs | 1 - Content.Shared/Arcade/BlockGameBlock.cs | 3 +-- Content.Shared/Arcade/BlockGameMessages.cs | 3 +-- Content.Shared/Arcade/BlockGamePlayerAction.cs | 3 +-- Content.Shared/Arcade/BlockGameUiKey.cs | 3 +-- Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs | 1 - Content.Shared/Atmos/AtmosCommandUtils.cs | 3 +-- Content.Shared/Atmos/AtmosDirection.cs | 3 +-- Content.Shared/Atmos/Atmospherics.cs | 1 - Content.Shared/Atmos/Components/SharedFlammableComponent.cs | 3 +-- Content.Shared/Atmos/Components/SharedGasTankComponent.cs | 3 +-- .../Atmos/EntitySystems/SharedAtmosDebugOverlaySystem.cs | 3 +-- Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs | 3 +-- .../Atmos/EntitySystems/SharedGasTileOverlaySystem.cs | 3 +-- Content.Shared/Atmos/GasOverlayChunk.cs | 1 - Content.Shared/Atmos/PipeDirection.cs | 1 - .../Piping/Binary/Components/SharedGasCanisterComponent.cs | 3 +-- Content.Shared/Atmos/Prototypes/GasPrototype.cs | 3 +-- Content.Shared/Audio/AudioHelpers.cs | 1 - Content.Shared/Audio/SoundCollectionPrototype.cs | 1 - Content.Shared/Body/Behavior/SharedMechanismBehavior.cs | 3 +-- Content.Shared/Body/Components/SharedBodyComponent.cs | 1 - Content.Shared/Body/Mechanism/MechanismSystem.cs | 3 +-- Content.Shared/Body/Mechanism/SharedMechanismComponent.cs | 3 +-- Content.Shared/Body/Networks/SharedBloodstreamComponent.cs | 3 +-- Content.Shared/Body/Part/BodyPartCompatibility.cs | 3 +-- Content.Shared/Body/Part/BodyPartSymmetry.cs | 3 +-- Content.Shared/Body/Part/BodyPartType.cs | 3 +-- Content.Shared/Body/Part/IBodyPartAdded.cs | 3 +-- Content.Shared/Body/Part/IBodyPartContainer.cs | 3 +-- Content.Shared/Body/Part/IBodyPartRemoved.cs | 3 +-- Content.Shared/Body/Part/Property/BodyPartPropertyComponent.cs | 1 - Content.Shared/Body/Part/Property/ExtensionComponent.cs | 1 - Content.Shared/Body/Part/Property/GraspComponent.cs | 3 +-- Content.Shared/Body/Part/Property/IBodyPartProperty.cs | 3 +-- Content.Shared/Body/Part/Property/LegComponent.cs | 1 - Content.Shared/Body/Part/SharedBodyPartComponent.cs | 1 - Content.Shared/Body/Preset/BodyPresetPrototype.cs | 3 +-- Content.Shared/Body/Scanner/SharedBodyScannerComponent.cs | 3 +-- Content.Shared/Body/Surgery/SurgeryDataComponent.cs | 3 +-- Content.Shared/Body/Surgery/SurgeryType.cs | 3 +-- Content.Shared/Body/Surgery/SurgeryUIKey.cs | 3 +-- Content.Shared/Body/Surgery/SurgeryUIMessages.cs | 3 +-- Content.Shared/Body/Template/BodyTemplatePrototype.cs | 3 +-- Content.Shared/Botany/IPlantMetabolizable.cs | 1 - Content.Shared/Botany/PlantHolderVisuals.cs | 3 +-- Content.Shared/Buckle/Components/SharedBuckleComponent.cs | 1 - Content.Shared/Buckle/Components/SharedStrapComponent.cs | 1 - Content.Shared/CCVar/CCVars.cs | 1 - Content.Shared/Cabinet/ItemCabinetVisuals.cs | 3 +-- Content.Shared/Camera/SharedCameraRecoilComponent.cs | 1 - Content.Shared/Cargo/CargoOrderData.cs | 3 +-- Content.Shared/Cargo/CargoProductPrototype.cs | 3 +-- Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs | 3 +-- .../Cargo/Components/SharedCargoOrderDatabaseComponent.cs | 1 - .../Cargo/Components/SharedGalacticMarketComponent.cs | 1 - .../Components/SharedHumanoidAppearanceComponent.cs | 1 - .../Components/SharedMagicMirrorComponent.cs | 1 - Content.Shared/CharacterAppearance/HairStyles.cs | 1 - .../CharacterAppearance/HumanoidCharacterAppearance.cs | 3 +-- Content.Shared/CharacterAppearance/ICharacterAppearance.cs | 1 - Content.Shared/CharacterAppearance/Sex.cs | 3 +-- Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs | 1 - Content.Shared/Chat/ChatChannel.cs | 1 - Content.Shared/Chat/ChatMaxMsgLengthMessage.cs | 1 - Content.Shared/Chat/MsgChatMessage.cs | 1 - Content.Shared/Chemistry/ChemistrySystem.cs | 1 - .../Chemistry/Components/SharedChemMasterComponent.cs | 1 - .../Chemistry/Components/SharedHyposprayComponent.cs | 1 - Content.Shared/Chemistry/Components/SharedInjectorComponent.cs | 1 - .../Chemistry/Dispenser/ReagentDispenserInventoryPrototype.cs | 3 +-- .../Chemistry/Dispenser/SharedReagentDispenserComponent.cs | 3 +-- Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs | 3 +-- Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs | 3 +-- Content.Shared/Chemistry/Reaction/IReactionEffect.cs | 1 - Content.Shared/Chemistry/Reaction/ITileReaction.cs | 3 +-- Content.Shared/Chemistry/Reaction/ReactionPrototype.cs | 1 - .../Chemistry/Reaction/SharedChemicalReactionSystem.cs | 1 - Content.Shared/Chemistry/Reagent/ReagentPrototype.cs | 3 +-- Content.Shared/Chemistry/Reagent/ReagentUnit.cs | 1 - .../Solution/Components/ISolutionInteractionsComponent.cs | 3 +-- .../Solution/Components/SharedSolutionContainerComponent.cs | 1 - Content.Shared/Chemistry/Solution/Solution.cs | 1 - Content.Shared/Chemistry/Solution/SolutionContainerCaps.cs | 1 - Content.Shared/Climbing/SharedClimbableComponent.cs | 3 +-- Content.Shared/Climbing/SharedClimbingComponent.cs | 1 - Content.Shared/Cloning/AcceptCloningEuiMessage.cs | 3 +-- Content.Shared/Cloning/SharedCloningPodComponent.cs | 3 +-- Content.Shared/Clothing/ClothingComponentState.cs | 1 - Content.Shared/Clothing/SharedMagbootsComponent.cs | 1 - Content.Shared/Collections/RemList.cs | 1 - Content.Shared/CombatMode/CombatModeSystemMessages.cs | 1 - Content.Shared/CombatMode/SharedCombatModeComponent.cs | 1 - Content.Shared/CombatMode/SharedCombatModeSystem.cs | 1 - .../Communications/SharedCommunicationsConsoleComponent.cs | 1 - Content.Shared/Computer/SharedComputerComponent.cs | 1 - Content.Shared/Configurable/SharedConfigurationComponent.cs | 3 +-- Content.Shared/Construction/Conditions/LowWallInTile.cs | 3 +-- Content.Shared/Construction/Conditions/NoWindowsInTile.cs | 3 +-- Content.Shared/Construction/Conditions/TileNotBlocked.cs | 1 - Content.Shared/Construction/Conditions/TileType.cs | 3 +-- Content.Shared/Construction/Conditions/WallmountCondition.cs | 1 - Content.Shared/Construction/ConstructionGraphEdge.cs | 3 +-- Content.Shared/Construction/IGraphAction.cs | 3 +-- Content.Shared/Construction/IGraphCondition.cs | 3 +-- Content.Shared/Construction/MachineFrameVisuals.cs | 3 +-- .../Construction/Prototypes/ConstructionPrototype.cs | 3 +-- .../Construction/SharedCanBuildWindowOnTopComponent.cs | 3 +-- Content.Shared/Construction/SharedConstructionSystem.cs | 3 +-- .../Construction/Steps/ArbitraryInsertConstructionGraphStep.cs | 3 +-- .../Construction/Steps/ComponentConstructionGraphStep.cs | 3 +-- Content.Shared/Construction/Steps/ConstructionGraphStep.cs | 3 +-- .../Construction/Steps/ConstructionGraphStepTypeSerializer.cs | 3 +-- .../Construction/Steps/EntityInsertConstructionGraphStep.cs | 3 +-- .../Construction/Steps/MaterialConstructionGraphStep.cs | 1 - .../Construction/Steps/MultipleTagsConstructionGraphStep.cs | 1 - .../Construction/Steps/NestedConstructionGraphStep.cs | 3 +-- .../Construction/Steps/PrototypeConstructionGraphStep.cs | 3 +-- Content.Shared/Construction/Steps/TagConstructionGraphStep.cs | 1 - Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs | 1 - Content.Shared/Conveyor/SharedConveyorComponent.cs | 3 +-- Content.Shared/Cooldown/Cooldowns.cs | 3 +-- Content.Shared/Cooldown/ItemCooldownComponent.cs | 1 - Content.Shared/Coordinates/EntityCoordinatesExtensions.cs | 3 +-- Content.Shared/Crayon/SharedCrayonComponent.cs | 1 - Content.Shared/Cuffs/Components/SharedCuffableComponent.cs | 1 - Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs | 1 - Content.Shared/Damage/Components/DamageableComponent.cs | 1 - Content.Shared/Damage/Components/IDamageableComponent.cs | 1 - Content.Shared/Damage/Container/DamageContainerPrototype.cs | 3 +-- Content.Shared/Damage/DamageChangeData.cs | 3 +-- Content.Shared/Damage/DamageChangeParams.cs | 3 +-- Content.Shared/Damage/DamageChangedEventArgs.cs | 3 +-- Content.Shared/Damage/DamageChangedMessage.cs | 3 +-- Content.Shared/Damage/DamageClass.cs | 3 +-- Content.Shared/Damage/DamageSystem.cs | 3 +-- Content.Shared/Damage/DamageType.cs | 3 +-- Content.Shared/Damage/Resistances/ResistanceSet.cs | 3 +-- Content.Shared/Damage/Resistances/ResistanceSetPrototype.cs | 3 +-- Content.Shared/Dataset/DatasetPrototype.cs | 3 +-- Content.Shared/Directions/SharedDirectionExtensions.cs | 3 +-- .../Disposal/Components/SharedDisposalMailingUnitComponent.cs | 3 +-- .../Disposal/Components/SharedDisposalRouterComponent.cs | 3 +-- .../Disposal/Components/SharedDisposalTaggerComponent.cs | 3 +-- .../Disposal/Components/SharedDisposalTubeComponent.cs | 3 +-- .../Disposal/Components/SharedDisposalUnitComponent.cs | 1 - Content.Shared/Disposal/SharedDisposalUnitSystem.cs | 3 +-- Content.Shared/DoAfter/SharedDoAfterComponent.cs | 1 - Content.Shared/Doors/AirlockWireStatus.cs | 3 +-- Content.Shared/Doors/SharedDoorComponent.cs | 1 - Content.Shared/DragDrop/DragDropRequestEvent.cs | 1 - Content.Shared/DragDrop/IDragDropOn.cs | 1 - Content.Shared/DragDrop/IDraggable.cs | 1 - Content.Shared/DragDrop/IDropped.cs | 1 - Content.Shared/DrawDepth/DrawDepth.cs | 1 - Content.Shared/EffectBlocker/EffectBlockerExtensions.cs | 3 +-- Content.Shared/EffectBlocker/EffectBlockerSystem.cs | 3 +-- Content.Shared/EffectBlocker/IEffectBlocker.cs | 3 +-- Content.Shared/Emoting/SharedEmotingComponent.cs | 1 - Content.Shared/Entry/EntryPoint.cs | 1 - Content.Shared/Eui/EuiMessageBase.cs | 3 +-- Content.Shared/Eui/EuiStateBase.cs | 3 +-- Content.Shared/Eui/MsgEuiCtl.cs | 3 +-- Content.Shared/Eui/MsgEuiMessage.cs | 3 +-- Content.Shared/Eui/MsgEuiState.cs | 3 +-- Content.Shared/Examine/ExamineSystemMessages.cs | 1 - Content.Shared/Examine/ExamineSystemShared.cs | 3 +-- Content.Shared/Examine/ExaminerComponent.cs | 1 - Content.Shared/Explosion/SharedClusterFlashComponent.cs | 1 - Content.Shared/Flash/SharedFlashableComponent.cs | 1 - Content.Shared/Fluids/SharedSprayComponent.cs | 3 +-- Content.Shared/Foam/FoamVisuals.cs | 3 +-- Content.Shared/Friction/SharedTileFrictionController.cs | 1 - Content.Shared/Friction/TileFrictionModifier.cs | 1 - Content.Shared/GameTicking/RoundRestartCleanupEvent.cs | 1 - Content.Shared/GameTicking/SharedGameTicker.cs | 3 +-- Content.Shared/GameWindow/RequestWindowAttentionEvent.cs | 3 +-- Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs | 1 - Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs | 3 +-- Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs | 3 +-- Content.Shared/Ghost/Roles/SharedGhostRoleSystem.cs | 1 - Content.Shared/Gravity/GravityChangedMessage.cs | 1 - Content.Shared/Gravity/SharedGravityGeneratorComponent.cs | 1 - Content.Shared/Hands/Components/ISharedHandsComponent.cs | 3 +-- Content.Shared/Hands/Components/SharedHandsComponent.cs | 1 - Content.Shared/Hands/IEquippedHand.cs | 1 - Content.Shared/Hands/IHandDeselected.cs | 1 - Content.Shared/Hands/IHandSelected.cs | 1 - Content.Shared/Hands/IUnequippedHand.cs | 1 - Content.Shared/Input/ContentKeyFunctions.cs | 1 - Content.Shared/Instruments/SharedInstrumentComponent.cs | 1 - .../Interaction/Helpers/SharedUnobstructedExtensions.cs | 1 - .../Interaction/Helpers/SharedUnoccludedExtensions.cs | 3 +-- Content.Shared/Interaction/IAfterInteract.cs | 2 -- Content.Shared/Interaction/ITargetedInteractEventArgs.cs | 3 +-- Content.Shared/Inventory/EquipmentSlotDefinitions.cs | 3 +-- Content.Shared/Inventory/IEquipped.cs | 1 - Content.Shared/Inventory/IUnequipped.cs | 1 - Content.Shared/Inventory/InventoryTemplates.cs | 3 +-- Content.Shared/Item/SharedItemComponent.cs | 1 - .../Kitchen/Components/SharedKitchenSpikeComponent.cs | 1 - Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs | 1 - .../Kitchen/Components/SharedReagentGrinderComponent.cs | 1 - Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs | 3 +-- Content.Shared/Kitchen/RecipeManager.cs | 3 +-- Content.Shared/Lathe/SharedLatheComponent.cs | 1 - Content.Shared/Lathe/SharedLatheDatabaseComponent.cs | 1 - Content.Shared/Lathe/SharedMaterialStorageComponent.cs | 1 - Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs | 1 - .../Light/Component/SharedExpendableLightComponent.cs | 3 +-- Content.Shared/Light/Component/SharedHandheldLightComponent.cs | 1 - .../Light/Component/SharedLightBehaviourComponent.cs | 3 +-- Content.Shared/Light/SharedPoweredLightVisuals.cs | 1 - Content.Shared/MachineLinking/TwoWayLeverSignal.cs | 3 +-- Content.Shared/Maps/ContentTileDefinition.cs | 3 +-- Content.Shared/Maps/TurfHelpers.cs | 1 - Content.Shared/Markers/SharedSpawnPointComponent.cs | 1 - Content.Shared/Materials/MaterialPrototype.cs | 1 - Content.Shared/Maths/PhysicalConstants.cs | 1 - Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs | 1 - Content.Shared/MobState/Components/SharedMobStateComponent.cs | 1 - Content.Shared/MobState/DamageStateHelpers.cs | 3 +-- Content.Shared/MobState/DamageStateVisuals.cs | 1 - Content.Shared/MobState/IMobStateComponent.cs | 3 +-- Content.Shared/MobState/MobStateChangedMessage.cs | 3 +-- Content.Shared/MobState/State/BaseMobState.cs | 3 +-- Content.Shared/MobState/State/IMobState.cs | 3 +-- Content.Shared/MobState/State/SharedCriticalMobState.cs | 3 +-- Content.Shared/MobState/State/SharedNormalMobState.cs | 1 - Content.Shared/Module/IModuleManager.cs | 3 +-- Content.Shared/Module/SharedModuleTestingCallbacks.cs | 1 - Content.Shared/Morgue/SharedMorgue.cs | 3 +-- Content.Shared/Movement/Components/IMoverComponent.cs | 3 +-- Content.Shared/Movement/Components/IRelayMoveInput.cs | 1 - .../Movement/Components/MovementIgnoreGravityComponent.cs | 1 - .../Movement/Components/MovementSpeedModifierComponent.cs | 1 - .../Movement/Components/SharedDummyInputMoverComponent.cs | 1 - .../Movement/Components/SharedPlayerInputMoverComponent.cs | 1 - .../Movement/Components/SharedPlayerMobMoverComponent.cs | 1 - Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs | 1 - Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs | 1 - Content.Shared/Movement/SharedMoverController.cs | 1 - Content.Shared/Notification/Managers/SharedNotifyManager.cs | 1 - .../Nutrition/Components/SharedButcherableComponent.cs | 1 - .../Nutrition/Components/SharedCreamPiedComponent.cs | 3 +-- .../Nutrition/Components/SharedDrinkFoodContainerComponent.cs | 1 - Content.Shared/Nutrition/Components/SharedFoodComponent.cs | 1 - Content.Shared/Nutrition/Components/SharedHungerComponent.cs | 1 - Content.Shared/Nutrition/Components/SharedThirstComponent.cs | 1 - Content.Shared/Objectives/ConditionInfo.cs | 3 +-- Content.Shared/PDA/SharedPDAComponent.cs | 1 - Content.Shared/PDA/UplinkCategory.cs | 1 - Content.Shared/PDA/UplinkStoreListingPrototype.cs | 1 - Content.Shared/Paper/SharedPaperComponent.cs | 1 - Content.Shared/Physics/CollisionGroup.cs | 1 - Content.Shared/Physics/Pull/PullAttemptMessage.cs | 3 +-- Content.Shared/Physics/Pull/PullMessage.cs | 3 +-- Content.Shared/Physics/Pull/PullStartedMessage.cs | 3 +-- Content.Shared/Physics/Pull/PullStoppedMessage.cs | 3 +-- Content.Shared/Placeable/SharedPlaceableSurfaceComponent.cs | 1 - .../Pointing/Components/SharedPointingArrowComponent.cs | 3 +-- .../Pointing/Components/SharedRoguePointingArrowComponent.cs | 3 +-- Content.Shared/Portal/Components/SharedPortalComponent.cs | 1 - Content.Shared/Portal/Components/SharedTeleporterComponent.cs | 1 - Content.Shared/Power/SharedPower.cs | 3 +-- Content.Shared/Power/SharedPowerDevice.cs | 1 - Content.Shared/Power/SharedPowerItemCharger.cs | 1 - Content.Shared/PowerCell/SharedPowerCell.cs | 1 - Content.Shared/Preferences/BackpackPreference.cs | 1 - Content.Shared/Preferences/ClothingPreference.cs | 1 - Content.Shared/Preferences/GameSettings.cs | 1 - Content.Shared/Preferences/HumanoidCharacterProfile.cs | 1 - Content.Shared/Preferences/ICharacterProfile.cs | 1 - Content.Shared/Preferences/JobPriority.cs | 1 - Content.Shared/Preferences/MsgDeleteCharacter.cs | 3 +-- Content.Shared/Preferences/MsgPreferencesAndSettings.cs | 3 +-- Content.Shared/Preferences/MsgSelectCharacter.cs | 3 +-- Content.Shared/Preferences/MsgUpdateCharacter.cs | 3 +-- Content.Shared/Preferences/PlayerPreferences.cs | 1 - Content.Shared/Preferences/PreferenceUnavailableMode.cs | 1 - Content.Shared/Projectiles/SharedProjectileComponent.cs | 1 - Content.Shared/Prototypes/EntityPrototypeHelpers.cs | 3 +-- Content.Shared/Pulling/Components/SharedPullableComponent.cs | 1 - Content.Shared/Pulling/Components/SharedPullerComponent.cs | 3 +-- Content.Shared/Pulling/SharedPullingSystem.cs | 1 - Content.Shared/Radiation/IRadiationAct.cs | 3 +-- Content.Shared/Radiation/SharedRadiationStorm.cs | 1 - Content.Shared/Random/Helpers/SharedEntityExtensions.cs | 3 +-- Content.Shared/Recycling/SharedRecyclerComponent.cs | 3 +-- .../Research/Components/SharedResearchClientComponent.cs | 3 +-- .../Research/Components/SharedResearchConsoleComponent.cs | 1 - .../Research/Components/SharedTechnologyDatabaseComponent.cs | 1 - Content.Shared/Research/Prototypes/LatheRecipePrototype.cs | 1 - Content.Shared/Research/Prototypes/TechnologyPrototype.cs | 3 +-- Content.Shared/Roles/AntagPrototype.cs | 1 - Content.Shared/Roles/JobPrototype.cs | 1 - Content.Shared/Roles/JobSpecial.cs | 1 - Content.Shared/Roles/StartingGearPrototype.cs | 1 - Content.Shared/Rotatable/SharedRotatableComponent.cs | 1 - Content.Shared/Rotation/SharedRotationComponent.cs | 3 +-- Content.Shared/Rounding/ContentHelpers.cs | 3 +-- Content.Shared/SMES/SharedSmesComponent.cs | 3 +-- Content.Shared/Sandbox/SharedSandboxManager.cs | 3 +-- .../Singularity/Components/SharedEmitterComponent.cs | 3 +-- .../Components/SharedParticleAcceleratorComponent.cs | 3 +-- .../Components/SharedRadiationCollectorComponent.cs | 3 +-- Content.Shared/Singularity/SingularitySoundMessage.cs | 1 - Content.Shared/Slippery/SlipperyComponent.cs | 1 - Content.Shared/Slippery/SlipperySystem.cs | 3 +-- Content.Shared/Smoking/SharedBurningStates.cs | 3 +-- Content.Shared/Smoking/SmokeVisuals.cs | 3 +-- Content.Shared/Smoking/SmokingVisuals.cs | 3 +-- Content.Shared/Solar/SharedSolarControlConsoleComponent.cs | 1 - Content.Shared/Sound/SharedLoopingSoundComponent.cs | 1 - Content.Shared/Spawning/EntitySystemExtensions.cs | 3 +-- Content.Shared/Speech/SharedSpeechComponent.cs | 1 - Content.Shared/Stacks/StackPrototype.cs | 3 +-- Content.Shared/Stacks/StackVisuals.cs | 1 - Content.Shared/Standing/StandingStateSystem.cs | 1 - Content.Shared/StationEvents/MsgRequestStationEvents.cs | 3 +-- Content.Shared/StationEvents/MsgStationEvents.cs | 3 +-- Content.Shared/Storage/SharedBagOpenVisuals.cs | 1 - Content.Shared/Storage/SharedStorageComponent.cs | 1 - Content.Shared/Strip/Components/SharedStrippableComponent.cs | 3 +-- Content.Shared/Strip/Components/SharedStrippingComponent.cs | 1 - Content.Shared/Stunnable/SharedStunnableComponent.cs | 1 - Content.Shared/SubFloor/SubFloorHideComponent.cs | 1 - Content.Shared/SubFloor/SubFloorHideSystem.cs | 1 - Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs | 1 - Content.Shared/Suspicion/SuspicionMessages.cs | 3 +-- Content.Shared/Tag/TagComponent.cs | 3 +-- Content.Shared/Tag/TagComponentExtensions.cs | 3 +-- Content.Shared/Tag/TagComponentState.cs | 1 - Content.Shared/Tag/TagPrototype.cs | 3 +-- Content.Shared/Targeting/TargetingZone.cs | 1 - Content.Shared/Temperature/IHotItem.cs | 3 +-- Content.Shared/Temperature/TemperatureHelpers.cs | 3 +-- Content.Shared/Throwing/ILand.cs | 1 - Content.Shared/Throwing/IThrowCollide.cs | 1 - Content.Shared/Throwing/IThrown.cs | 1 - Content.Shared/Throwing/ThrownItemComponent.cs | 1 - Content.Shared/Throwing/ThrownItemSystem.cs | 1 - Content.Shared/Toilet/SharedWaterclosetVisuals.cs | 1 - Content.Shared/Tool/SharedToolComponent.cs | 1 - Content.Shared/Transform/TransformExtensions.cs | 3 +-- Content.Shared/Trigger/TriggerVisuals.cs | 3 +-- Content.Shared/Vapor/SharedVaporComponent.cs | 3 +-- .../VendingMachines/SharedVendingMachineComponent.cs | 1 - .../VendingMachines/VendingMachineInventoryPrototype.cs | 3 +-- Content.Shared/Verbs/GlobalVerb.cs | 3 +-- Content.Shared/Verbs/HideContextMenuComponent.cs | 3 +-- Content.Shared/Verbs/IShowContextMenu.cs | 3 +-- Content.Shared/Verbs/PlayerContainerVisibilityMessage.cs | 3 +-- Content.Shared/Verbs/SharedVerbSystem.cs | 1 - Content.Shared/Verbs/Verb.cs | 3 +-- Content.Shared/Verbs/VerbBase.cs | 3 +-- Content.Shared/Verbs/VerbCategories.cs | 1 - Content.Shared/Verbs/VerbCategoryData.cs | 1 - Content.Shared/Verbs/VerbData.cs | 1 - Content.Shared/Verbs/VerbSystemMessages.cs | 1 - Content.Shared/Verbs/VerbUtility.cs | 3 +-- Content.Shared/Verbs/VerbVisibility.cs | 1 - Content.Shared/Voting/MsgVoteCanCall.cs | 3 +-- Content.Shared/Voting/MsgVoteData.cs | 3 +-- Content.Shared/Wall/ReinforcedWallVisuals.cs | 3 +-- Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs | 1 - Content.Shared/Weapons/Melee/MeleeWeaponSystemMessages.cs | 1 - .../Ranged/Barrels/Components/SharedBatteryBarrelComponent.cs | 3 +-- .../Barrels/Components/SharedBoltActionBarrelComponent.cs | 3 +-- .../Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs | 1 - .../Ranged/Barrels/Components/SharedPumpBarrelComponent.cs | 3 +-- .../Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs | 3 +-- .../Weapons/Ranged/Components/SharedRangedBarrelComponent.cs | 3 +-- .../Weapons/Ranged/Components/SharedRangedWeaponComponent.cs | 1 - Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs | 1 - Content.Shared/Window/SharedWindowComponent.cs | 3 +-- Content.Shared/Wires/SharedWiresComponent.cs | 1 - 890 files changed, 354 insertions(+), 1246 deletions(-) diff --git a/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs index f527a28c8d..bb431027b0 100644 --- a/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs +++ b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Client.Administration.UI.Tabs; using Content.Client.HUD; diff --git a/Content.Client/Administration/UI/CustomControls/CommandButton.cs b/Content.Client/Administration/UI/CustomControls/CommandButton.cs index c4dce7e05d..9986eac3c1 100644 --- a/Content.Client/Administration/UI/CustomControls/CommandButton.cs +++ b/Content.Client/Administration/UI/CustomControls/CommandButton.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Client.Console; +using Robust.Client.Console; using Robust.Client.UserInterface.Controls; using Robust.Shared.IoC; diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs index c582b234c0..fa1dfeb613 100644 --- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs +++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using System.Linq; using Robust.Client.AutoGenerated; diff --git a/Content.Client/Administration/UI/CustomControls/UICommandButton.cs b/Content.Client/Administration/UI/CustomControls/UICommandButton.cs index dd38f32479..eeeb214397 100644 --- a/Content.Client/Administration/UI/CustomControls/UICommandButton.cs +++ b/Content.Client/Administration/UI/CustomControls/UICommandButton.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.IoC; diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs index aa9fc7307c..02dad6cbd2 100644 --- a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Client.AutoGenerated; +using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; namespace Content.Client.Administration.UI.Tabs.AdminTab diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs index f45c3c3250..834348c66e 100644 --- a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable -using JetBrains.Annotations; +using JetBrains.Annotations; using Robust.Client.AutoGenerated; using Robust.Client.Console; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml.cs index 761be3d836..786123fab2 100644 --- a/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable -using JetBrains.Annotations; +using JetBrains.Annotations; using Robust.Client.AutoGenerated; using Robust.Client.Console; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs index 5c8c5fc43b..f0b044c500 100644 --- a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable -using JetBrains.Annotations; +using JetBrains.Annotations; using Robust.Client.AutoGenerated; using Robust.Client.Console; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs index 20d22ceb0e..66de8a6417 100644 --- a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Client.Administration.Managers; +using Content.Client.Administration.Managers; using Robust.Client.AutoGenerated; using Robust.Client.Placement; using Robust.Client.ResourceManagement; diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs index f500ece192..a26d41934c 100644 --- a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Linq; using Content.Client.StationEvents.Managers; diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs index 6867a1bc8f..11390ea3b8 100644 --- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using JetBrains.Annotations; using Robust.Client.AutoGenerated; diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs index 273d194196..1d43aeeb23 100644 --- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Content.Client.Atmos.EntitySystems; using Content.Shared.Atmos; diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs index a27a42c07e..b7d682e12a 100644 --- a/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Client.AutoGenerated; +using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; namespace Content.Client.Administration.UI.Tabs.AtmosTab diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs index 2465d8c61d..6c51f34357 100644 --- a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Content.Client.Atmos.EntitySystems; using Content.Shared.Atmos; diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs index 234dde6a84..a5be641a21 100644 --- a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using JetBrains.Annotations; using Robust.Client.AutoGenerated; diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs index 020f64ade0..0492e42fad 100644 --- a/Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable - + using System.Collections.Generic; using Content.Shared.Administration.Menu; using Robust.Client.AutoGenerated; diff --git a/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs b/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs index bfe1dfe3af..0e897bd376 100644 --- a/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Client.AutoGenerated; +using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; namespace Content.Client.Administration.UI.Tabs diff --git a/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs index fbb52bf7b0..9f7d6a0e40 100644 --- a/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Client.AutoGenerated; +using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; namespace Content.Client.Administration.UI.Tabs diff --git a/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs b/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs index d714789aa0..72fa97c32a 100644 --- a/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs +++ b/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Client.Atmos.Overlays; using Content.Shared.Atmos; diff --git a/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs index 470c4cae0c..9beb61a3c9 100644 --- a/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs +++ b/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Client.Atmos.Overlays; diff --git a/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs b/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs index 1e6d3c05a7..9f7e58d31b 100644 --- a/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs +++ b/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Atmos; using Content.Shared.Atmos.Piping; diff --git a/Content.Client/Audio/BackgroundAudioSystem.cs b/Content.Client/Audio/BackgroundAudioSystem.cs index 9aa00712cd..4d79891649 100644 --- a/Content.Client/Audio/BackgroundAudioSystem.cs +++ b/Content.Client/Audio/BackgroundAudioSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Client.GameTicking.Managers; using Content.Client.Lobby; using Content.Client.Viewport; diff --git a/Content.Client/Buckle/BuckleComponent.cs b/Content.Client/Buckle/BuckleComponent.cs index 542fb4e3ef..2e342aa203 100644 --- a/Content.Client/Buckle/BuckleComponent.cs +++ b/Content.Client/Buckle/BuckleComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Buckle.Components; +using Content.Shared.Buckle.Components; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.cs index 36eb189c4b..9f31c1b4c4 100644 --- a/Content.Client/Cargo/UI/CargoConsoleMenu.cs +++ b/Content.Client/Cargo/UI/CargoConsoleMenu.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Client.Stylesheets; diff --git a/Content.Client/Changelog/ChangelogManager.cs b/Content.Client/Changelog/ChangelogManager.cs index d0a34a5e23..48854ba45b 100644 --- a/Content.Client/Changelog/ChangelogManager.cs +++ b/Content.Client/Changelog/ChangelogManager.cs @@ -13,7 +13,6 @@ using Robust.Shared.Serialization.Markdown; using Robust.Shared.Serialization.Markdown.Mapping; using Robust.Shared.Utility; -#nullable enable namespace Content.Client.Changelog { diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs index dfb9d4cfb3..47b39c4c96 100644 --- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs +++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Chemistry.Solution.Components; using JetBrains.Annotations; diff --git a/Content.Client/Clothing/ClothingComponent.cs b/Content.Client/Clothing/ClothingComponent.cs index 030ab4533b..4cd1d1ee46 100644 --- a/Content.Client/Clothing/ClothingComponent.cs +++ b/Content.Client/Clothing/ClothingComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Client.Inventory; using Content.Client.Items.Components; using Content.Shared.Clothing; diff --git a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs index 4fc1d7a908..9b02e7ce21 100644 --- a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs +++ b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Client.Graphics; using Robust.Shared.Enums; using Robust.Shared.IoC; diff --git a/Content.Client/Commands/GroupingContextMenuCommand.cs b/Content.Client/Commands/GroupingContextMenuCommand.cs index e306c7da11..1b640b0907 100644 --- a/Content.Client/Commands/GroupingContextMenuCommand.cs +++ b/Content.Client/Commands/GroupingContextMenuCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared; +using Content.Shared; using Content.Shared.CCVar; using Robust.Shared.Configuration; using Robust.Shared.Console; diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs index 7ffc1fbf81..e3524212dc 100644 --- a/Content.Client/Construction/ConstructionSystem.cs +++ b/Content.Client/Construction/ConstructionSystem.cs @@ -14,7 +14,6 @@ using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; -#nullable enable namespace Content.Client.Construction { diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs index b1182c005c..7ad635d6b7 100644 --- a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs +++ b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs @@ -7,7 +7,6 @@ using Robust.Client.UserInterface.XAML; using Robust.Shared.IoC; using Robust.Shared.Localization; -#nullable enable namespace Content.Client.Construction.UI { diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs index 53a174f9e7..78b93f5544 100644 --- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs +++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Client/ContextMenu/UI/ContextMenuElement.cs b/Content.Client/ContextMenu/UI/ContextMenuElement.cs index 540aa07679..0d1c624b2a 100644 --- a/Content.Client/ContextMenu/UI/ContextMenuElement.cs +++ b/Content.Client/ContextMenu/UI/ContextMenuElement.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using System.Linq; using Content.Client.Interactable.Components; diff --git a/Content.Client/ContextMenu/UI/ContextMenuPresenter.cs b/Content.Client/ContextMenu/UI/ContextMenuPresenter.cs index 21ca65f75a..d85eda0ce8 100644 --- a/Content.Client/ContextMenu/UI/ContextMenuPresenter.cs +++ b/Content.Client/ContextMenu/UI/ContextMenuPresenter.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Linq; using System.Threading; using Content.Client.Examine; diff --git a/Content.Client/ContextMenu/UI/ContextMenuView.cs b/Content.Client/ContextMenu/UI/ContextMenuView.cs index cef321f5b1..ed41f6314a 100644 --- a/Content.Client/ContextMenu/UI/ContextMenuView.cs +++ b/Content.Client/ContextMenu/UI/ContextMenuView.cs @@ -1,5 +1,4 @@ -#nullable enable - + using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Client/ContextMenu/UI/ContextMenuViewGrouping.cs b/Content.Client/ContextMenu/UI/ContextMenuViewGrouping.cs index 84797f8467..67556dbdc4 100644 --- a/Content.Client/ContextMenu/UI/ContextMenuViewGrouping.cs +++ b/Content.Client/ContextMenu/UI/ContextMenuViewGrouping.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using System.Linq; using Robust.Client.GameObjects; diff --git a/Content.Client/Flash/FlashableComponent.cs b/Content.Client/Flash/FlashableComponent.cs index 50b0d2a1e3..2c16df833a 100644 --- a/Content.Client/Flash/FlashableComponent.cs +++ b/Content.Client/Flash/FlashableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Flash; using Robust.Client.Graphics; diff --git a/Content.Client/Ghost/GhostGui.cs b/Content.Client/Ghost/GhostGui.cs index 1f2d9c289c..de7c7cfd27 100644 --- a/Content.Client/Ghost/GhostGui.cs +++ b/Content.Client/Ghost/GhostGui.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Shared.Ghost; using Robust.Client.Console; diff --git a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs index f7ce045357..7ec189cb43 100644 --- a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs +++ b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Client.AutoGenerated; +using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; using Robust.Shared.GameObjects; diff --git a/Content.Client/Gravity/GravityGeneratorVisualizer.cs b/Content.Client/Gravity/GravityGeneratorVisualizer.cs index ef43265d0c..2dffc2826b 100644 --- a/Content.Client/Gravity/GravityGeneratorVisualizer.cs +++ b/Content.Client/Gravity/GravityGeneratorVisualizer.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Content.Shared.Gravity; using JetBrains.Annotations; diff --git a/Content.Client/HealthOverlay/HealthOverlaySystem.cs b/Content.Client/HealthOverlay/HealthOverlaySystem.cs index 2e92fb4245..f3c5a79266 100644 --- a/Content.Client/HealthOverlay/HealthOverlaySystem.cs +++ b/Content.Client/HealthOverlay/HealthOverlaySystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Content.Client.HealthOverlay.UI; using Content.Shared.Damage.Components; using Content.Shared.GameTicking; diff --git a/Content.Client/HealthOverlay/UI/HealthOverlayGui.cs b/Content.Client/HealthOverlay/UI/HealthOverlayGui.cs index 8d1d546f48..c1d4eea275 100644 --- a/Content.Client/HealthOverlay/UI/HealthOverlayGui.cs +++ b/Content.Client/HealthOverlay/UI/HealthOverlayGui.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Client.IoC; using Content.Client.Resources; using Content.Shared.Damage.Components; diff --git a/Content.Client/Info/InfoWindow.cs b/Content.Client/Info/InfoWindow.cs index 9dd8b48d90..be54a29f2b 100644 --- a/Content.Client/Info/InfoWindow.cs +++ b/Content.Client/Info/InfoWindow.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.IO; diff --git a/Content.Client/Items/Components/ItemComponent.cs b/Content.Client/Items/Components/ItemComponent.cs index f26d349996..cd552ee288 100644 --- a/Content.Client/Items/Components/ItemComponent.cs +++ b/Content.Client/Items/Components/ItemComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Client.Hands; using Content.Shared.Item; using Robust.Shared.Containers; diff --git a/Content.Client/Kitchen/KitchenSpikeComponent.cs b/Content.Client/Kitchen/KitchenSpikeComponent.cs index 0c7acf3137..efae8b89e6 100644 --- a/Content.Client/Kitchen/KitchenSpikeComponent.cs +++ b/Content.Client/Kitchen/KitchenSpikeComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.DragDrop; using Content.Shared.Kitchen.Components; using Robust.Shared.GameObjects; diff --git a/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs b/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs index 582f758899..703c76a14a 100644 --- a/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs +++ b/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Light; using JetBrains.Annotations; diff --git a/Content.Client/MobState/DamageStateVisualizer.cs b/Content.Client/MobState/DamageStateVisualizer.cs index 2e25961141..00dc0c175d 100644 --- a/Content.Client/MobState/DamageStateVisualizer.cs +++ b/Content.Client/MobState/DamageStateVisualizer.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Shared.DrawDepth; using Content.Shared.MobState; diff --git a/Content.Client/Morgue/Visualizers/MorgueVisualizer.cs b/Content.Client/Morgue/Visualizers/MorgueVisualizer.cs index c1d5801780..cf1d385831 100644 --- a/Content.Client/Morgue/Visualizers/MorgueVisualizer.cs +++ b/Content.Client/Morgue/Visualizers/MorgueVisualizer.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Morgue; +using Content.Shared.Morgue; using Robust.Client.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs index 7b2d05aa50..de4e4eb7b3 100644 --- a/Content.Client/Physics/Controllers/MoverController.cs +++ b/Content.Client/Physics/Controllers/MoverController.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Movement; using Content.Shared.Movement.Components; using Robust.Client.Player; diff --git a/Content.Client/Rotatable/RotatableComponent.cs b/Content.Client/Rotatable/RotatableComponent.cs index 2e46278b35..5284292c8c 100644 --- a/Content.Client/Rotatable/RotatableComponent.cs +++ b/Content.Client/Rotatable/RotatableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Rotatable; using Robust.Shared.GameObjects; diff --git a/Content.Client/Singularity/SingularityOverlay.cs b/Content.Client/Singularity/SingularityOverlay.cs index fd546799c2..119dda3050 100644 --- a/Content.Client/Singularity/SingularityOverlay.cs +++ b/Content.Client/Singularity/SingularityOverlay.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Linq; using Content.Shared.Singularity.Components; diff --git a/Content.Client/Spawners/ClientEntitySpawnerComponent.cs b/Content.Client/Spawners/ClientEntitySpawnerComponent.cs index 3a35e0a14c..bb17ab1700 100644 --- a/Content.Client/Spawners/ClientEntitySpawnerComponent.cs +++ b/Content.Client/Spawners/ClientEntitySpawnerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Client/Stack/StackVisualizer.cs b/Content.Client/Stack/StackVisualizer.cs index 7324bd1b8a..092e81f5bd 100644 --- a/Content.Client/Stack/StackVisualizer.cs +++ b/Content.Client/Stack/StackVisualizer.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Shared.Rounding; diff --git a/Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs b/Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs index 96f95b10a8..38dabbee29 100644 --- a/Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs +++ b/Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs @@ -1,5 +1,4 @@ -#nullable enable - + using Content.Shared.Stacks; using Content.Shared.Storage; using JetBrains.Annotations; diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs index 3bdd6478cf..21005e0d0c 100644 --- a/Content.Client/Stylesheets/StyleNano.cs +++ b/Content.Client/Stylesheets/StyleNano.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using Content.Client.Actions.UI; using Content.Client.Examine; diff --git a/Content.Client/Suspicion/SuspicionRoleComponent.cs b/Content.Client/Suspicion/SuspicionRoleComponent.cs index cebcef3922..28b62ad913 100644 --- a/Content.Client/Suspicion/SuspicionRoleComponent.cs +++ b/Content.Client/Suspicion/SuspicionRoleComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Client.HUD; using Content.Shared.Suspicion; diff --git a/Content.Client/Voting/UI/VoteCallMenu.xaml.cs b/Content.Client/Voting/UI/VoteCallMenu.xaml.cs index 780b201069..f276d9c1f0 100644 --- a/Content.Client/Voting/UI/VoteCallMenu.xaml.cs +++ b/Content.Client/Voting/UI/VoteCallMenu.xaml.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Client.Stylesheets; using JetBrains.Annotations; using Robust.Client.AutoGenerated; diff --git a/Content.Client/Voting/VoteManager.cs b/Content.Client/Voting/VoteManager.cs index e73e098d9e..ab7dbe53f7 100644 --- a/Content.Client/Voting/VoteManager.cs +++ b/Content.Client/Voting/VoteManager.cs @@ -9,7 +9,6 @@ using Robust.Shared.IoC; using Robust.Shared.Network; using Robust.Shared.Timing; -#nullable enable namespace Content.Client.Voting { diff --git a/Content.Server/AI/Commands/AddAiCommand.cs b/Content.Server/AI/Commands/AddAiCommand.cs index 35067fe14d..24d4fc38fe 100644 --- a/Content.Server/AI/Commands/AddAiCommand.cs +++ b/Content.Server/AI/Commands/AddAiCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.AI.Components; using Content.Server.AI.Utility; using Content.Server.AI.Utility.AiLogic; diff --git a/Content.Server/AI/Components/AiControllerComponent.cs b/Content.Server/AI/Components/AiControllerComponent.cs index 138acd552e..389a1ca766 100644 --- a/Content.Server/AI/Components/AiControllerComponent.cs +++ b/Content.Server/AI/Components/AiControllerComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.GameTicking; +using Content.Server.GameTicking; using Content.Shared.Movement.Components; using Content.Shared.Roles; using Robust.Shared.GameObjects; diff --git a/Content.Server/AI/Components/AiFactionPrototype.cs b/Content.Server/AI/Components/AiFactionPrototype.cs index e88c4f53a4..b890a76ade 100644 --- a/Content.Server/AI/Components/AiFactionPrototype.cs +++ b/Content.Server/AI/Components/AiFactionPrototype.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/AI/Components/AiFactionTagComponent.cs b/Content.Server/AI/Components/AiFactionTagComponent.cs index 3b132c4ad1..5a7ca92326 100644 --- a/Content.Server/AI/Components/AiFactionTagComponent.cs +++ b/Content.Server/AI/Components/AiFactionTagComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.AI.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/AI/EntitySystems/AiFactionTagSystem.cs b/Content.Server/AI/EntitySystems/AiFactionTagSystem.cs index 2158c08e36..e87b74ead1 100644 --- a/Content.Server/AI/EntitySystems/AiFactionTagSystem.cs +++ b/Content.Server/AI/EntitySystems/AiFactionTagSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Server.AI.Components; diff --git a/Content.Server/AI/EntitySystems/AiSystem.cs b/Content.Server/AI/EntitySystems/AiSystem.cs index d6ff8acf9a..ab17ce6cf5 100644 --- a/Content.Server/AI/EntitySystems/AiSystem.cs +++ b/Content.Server/AI/EntitySystems/AiSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Server.AI.Components; diff --git a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs index defbf77b01..32250ab9b8 100644 --- a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs +++ b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.AI.Utility; +using Content.Server.AI.Utility; using Content.Server.AI.WorldState.States.Inventory; using Content.Server.Storage.Components; using Content.Shared.Interaction; diff --git a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs b/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs index 4fcab41407..7b2e60635a 100644 --- a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs +++ b/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Hands.Components; using Content.Server.Interaction; using Content.Server.Items; diff --git a/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs b/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs index 0ae76846f5..fec7a7b7a9 100644 --- a/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs +++ b/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Hands.Components; using Content.Server.Items; using Robust.Shared.GameObjects; diff --git a/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs b/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs index ded30b2b83..ff73ea4082 100644 --- a/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs +++ b/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Hands.Components; using Content.Server.Items; using Content.Server.Nutrition.Components; diff --git a/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs b/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs index 8b8668e31e..c92ae7d52e 100644 --- a/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs +++ b/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Hands.Components; using Content.Server.Items; using Content.Server.Nutrition.Components; diff --git a/Content.Server/AI/Pathfinding/Accessible/ReachableArgs.cs b/Content.Server/AI/Pathfinding/Accessible/ReachableArgs.cs index 2ce6a8a1d1..8ea9eab95e 100644 --- a/Content.Server/AI/Pathfinding/Accessible/ReachableArgs.cs +++ b/Content.Server/AI/Pathfinding/Accessible/ReachableArgs.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.Access.Components; using Content.Server.AI.Components; using Robust.Shared.GameObjects; diff --git a/Content.Server/AI/Utility/BehaviorSetPrototype.cs b/Content.Server/AI/Utility/BehaviorSetPrototype.cs index a6b0dc3e66..1ab3f3da82 100644 --- a/Content.Server/AI/Utility/BehaviorSetPrototype.cs +++ b/Content.Server/AI/Utility/BehaviorSetPrototype.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/AI/Utility/NpcBehaviorManager.cs b/Content.Server/AI/Utility/NpcBehaviorManager.cs index 4763f77899..8610bc4ed2 100644 --- a/Content.Server/AI/Utility/NpcBehaviorManager.cs +++ b/Content.Server/AI/Utility/NpcBehaviorManager.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Server.AI.EntitySystems; diff --git a/Content.Server/AME/AMENodeGroup.cs b/Content.Server/AME/AMENodeGroup.cs index a015d20a72..eb9acc62c3 100644 --- a/Content.Server/AME/AMENodeGroup.cs +++ b/Content.Server/AME/AMENodeGroup.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/AME/Components/AMEControllerComponent.cs b/Content.Server/AME/Components/AMEControllerComponent.cs index 54873aa4e8..896fafc254 100644 --- a/Content.Server/AME/Components/AMEControllerComponent.cs +++ b/Content.Server/AME/Components/AMEControllerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using System.Threading.Tasks; using Content.Server.Hands.Components; diff --git a/Content.Server/AME/Components/AMEFuelContainerComponent.cs b/Content.Server/AME/Components/AMEFuelContainerComponent.cs index 269a4077be..ff5558c917 100644 --- a/Content.Server/AME/Components/AMEFuelContainerComponent.cs +++ b/Content.Server/AME/Components/AMEFuelContainerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; diff --git a/Content.Server/AME/Components/AMEPartComponent.cs b/Content.Server/AME/Components/AMEPartComponent.cs index 42fc2de82e..001aa3b4c5 100644 --- a/Content.Server/AME/Components/AMEPartComponent.cs +++ b/Content.Server/AME/Components/AMEPartComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using System.Threading.Tasks; using Content.Server.Hands.Components; diff --git a/Content.Server/AME/Components/AMEShieldComponent.cs b/Content.Server/AME/Components/AMEShieldComponent.cs index b68646dcd1..4c64181a16 100644 --- a/Content.Server/AME/Components/AMEShieldComponent.cs +++ b/Content.Server/AME/Components/AMEShieldComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.AME; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; diff --git a/Content.Server/Access/Components/AccessComponent.cs b/Content.Server/Access/Components/AccessComponent.cs index f1393397ab..fd85a535d5 100644 --- a/Content.Server/Access/Components/AccessComponent.cs +++ b/Content.Server/Access/Components/AccessComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Access/Components/AccessReaderComponent.cs b/Content.Server/Access/Components/AccessReaderComponent.cs index 64ab8cafe6..2eafac583a 100644 --- a/Content.Server/Access/Components/AccessReaderComponent.cs +++ b/Content.Server/Access/Components/AccessReaderComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Access/Components/IAccess.cs b/Content.Server/Access/Components/IAccess.cs index 7b04b26c48..46f91f40a3 100644 --- a/Content.Server/Access/Components/IAccess.cs +++ b/Content.Server/Access/Components/IAccess.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; diff --git a/Content.Server/Access/Components/IdCardConsoleComponent.cs b/Content.Server/Access/Components/IdCardConsoleComponent.cs index f9de78f2ac..87f0085931 100644 --- a/Content.Server/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Server/Access/Components/IdCardConsoleComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; diff --git a/Content.Server/Access/Components/PresetIdCardComponent.cs b/Content.Server/Access/Components/PresetIdCardComponent.cs index 4442a07944..58c07df48c 100644 --- a/Content.Server/Access/Components/PresetIdCardComponent.cs +++ b/Content.Server/Access/Components/PresetIdCardComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Roles; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Actions/Actions/CombatMode.cs b/Content.Server/Actions/Actions/CombatMode.cs index b44cf63dda..4ce41fd4bb 100644 --- a/Content.Server/Actions/Actions/CombatMode.cs +++ b/Content.Server/Actions/Actions/CombatMode.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.CombatMode; using Content.Shared.Actions.Behaviors; using Content.Shared.Notification; diff --git a/Content.Server/Actions/Actions/DisarmAction.cs b/Content.Server/Actions/Actions/DisarmAction.cs index a54992a282..de435b5f5c 100644 --- a/Content.Server/Actions/Actions/DisarmAction.cs +++ b/Content.Server/Actions/Actions/DisarmAction.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Linq; using Content.Server.Act; diff --git a/Content.Server/Actions/Actions/GhostBoo.cs b/Content.Server/Actions/Actions/GhostBoo.cs index eec44b21ff..2287f123d1 100644 --- a/Content.Server/Actions/Actions/GhostBoo.cs +++ b/Content.Server/Actions/Actions/GhostBoo.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using Content.Server.Ghost; using Content.Shared.Actions.Behaviors; diff --git a/Content.Server/Actions/Actions/ScreamAction.cs b/Content.Server/Actions/Actions/ScreamAction.cs index 0f1fa8cfdb..a1cb8a6a95 100644 --- a/Content.Server/Actions/Actions/ScreamAction.cs +++ b/Content.Server/Actions/Actions/ScreamAction.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Server.CharacterAppearance.Components; diff --git a/Content.Server/Actions/Commands/CooldownAction.cs b/Content.Server/Actions/Commands/CooldownAction.cs index 6ae705647a..b4eeca63ea 100644 --- a/Content.Server/Actions/Commands/CooldownAction.cs +++ b/Content.Server/Actions/Commands/CooldownAction.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Administration; using Content.Server.Commands; diff --git a/Content.Server/Actions/Commands/GrantAction.cs b/Content.Server/Actions/Commands/GrantAction.cs index 2ad39f0b0c..b864e904ff 100644 --- a/Content.Server/Actions/Commands/GrantAction.cs +++ b/Content.Server/Actions/Commands/GrantAction.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Administration; using Content.Server.Commands; diff --git a/Content.Server/Actions/Commands/RevokeAction.cs b/Content.Server/Actions/Commands/RevokeAction.cs index 3c2f938099..4366c7fca3 100644 --- a/Content.Server/Actions/Commands/RevokeAction.cs +++ b/Content.Server/Actions/Commands/RevokeAction.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Administration; using Content.Server.Commands; diff --git a/Content.Server/Actions/ServerActionsComponent.cs b/Content.Server/Actions/ServerActionsComponent.cs index ab89458458..584de89606 100644 --- a/Content.Server/Actions/ServerActionsComponent.cs +++ b/Content.Server/Actions/ServerActionsComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.ActionBlocker; using Content.Shared.Actions; diff --git a/Content.Server/Administration/AdminRank.cs b/Content.Server/Administration/AdminRank.cs index 925022498e..2f27891ea7 100644 --- a/Content.Server/Administration/AdminRank.cs +++ b/Content.Server/Administration/AdminRank.cs @@ -1,6 +1,5 @@ using Content.Shared.Administration; -#nullable enable namespace Content.Server.Administration { diff --git a/Content.Server/Administration/Commands/BanCommand.cs b/Content.Server/Administration/Commands/BanCommand.cs index 64ebd4807f..e776000dd6 100644 --- a/Content.Server/Administration/Commands/BanCommand.cs +++ b/Content.Server/Administration/Commands/BanCommand.cs @@ -8,7 +8,6 @@ using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; -#nullable enable namespace Content.Server.Administration.Commands { diff --git a/Content.Server/Administration/Commands/DeAdminCommand.cs b/Content.Server/Administration/Commands/DeAdminCommand.cs index e53e5551a6..63feb7846b 100644 --- a/Content.Server/Administration/Commands/DeAdminCommand.cs +++ b/Content.Server/Administration/Commands/DeAdminCommand.cs @@ -5,7 +5,6 @@ using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; -#nullable enable namespace Content.Server.Administration.Commands { diff --git a/Content.Server/Administration/Commands/DeleteComponent.cs b/Content.Server/Administration/Commands/DeleteComponent.cs index 8c05561cc9..b22af15355 100644 --- a/Content.Server/Administration/Commands/DeleteComponent.cs +++ b/Content.Server/Administration/Commands/DeleteComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Administration; +using Content.Shared.Administration; using Robust.Shared.Console; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Administration/Commands/DeleteEntitiesWithId.cs b/Content.Server/Administration/Commands/DeleteEntitiesWithId.cs index 08551517cd..c9beaff729 100644 --- a/Content.Server/Administration/Commands/DeleteEntitiesWithId.cs +++ b/Content.Server/Administration/Commands/DeleteEntitiesWithId.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Administration; using Robust.Shared.Console; using Robust.Shared.GameObjects; diff --git a/Content.Server/Administration/Commands/ExplosionCommand.cs b/Content.Server/Administration/Commands/ExplosionCommand.cs index 7b7fc97250..50d553fd72 100644 --- a/Content.Server/Administration/Commands/ExplosionCommand.cs +++ b/Content.Server/Administration/Commands/ExplosionCommand.cs @@ -4,7 +4,6 @@ using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.Map; -#nullable enable namespace Content.Server.Administration.Commands { diff --git a/Content.Server/Administration/Commands/FindEntitiesWithComponents.cs b/Content.Server/Administration/Commands/FindEntitiesWithComponents.cs index 0e4b0b6190..a386be5263 100644 --- a/Content.Server/Administration/Commands/FindEntitiesWithComponents.cs +++ b/Content.Server/Administration/Commands/FindEntitiesWithComponents.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Administration/Commands/OpenPermissionsCommand.cs b/Content.Server/Administration/Commands/OpenPermissionsCommand.cs index 11628a0f26..2a1c00596a 100644 --- a/Content.Server/Administration/Commands/OpenPermissionsCommand.cs +++ b/Content.Server/Administration/Commands/OpenPermissionsCommand.cs @@ -5,7 +5,6 @@ using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; -#nullable enable namespace Content.Server.Administration.Commands { diff --git a/Content.Server/Administration/Commands/PardonCommand.cs b/Content.Server/Administration/Commands/PardonCommand.cs index da23be1e2d..ff088591ab 100644 --- a/Content.Server/Administration/Commands/PardonCommand.cs +++ b/Content.Server/Administration/Commands/PardonCommand.cs @@ -6,7 +6,6 @@ using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; -#nullable enable namespace Content.Server.Administration.Commands { diff --git a/Content.Server/Administration/Commands/PromoteHostCommand.cs b/Content.Server/Administration/Commands/PromoteHostCommand.cs index 7bd0b39cec..7b66ee4a4e 100644 --- a/Content.Server/Administration/Commands/PromoteHostCommand.cs +++ b/Content.Server/Administration/Commands/PromoteHostCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Administration.Managers; +using Content.Server.Administration.Managers; using JetBrains.Annotations; using Robust.Server.Player; using Robust.Shared.Console; diff --git a/Content.Server/Administration/Commands/ReAdminCommand.cs b/Content.Server/Administration/Commands/ReAdminCommand.cs index 760638228f..1d6764ee46 100644 --- a/Content.Server/Administration/Commands/ReAdminCommand.cs +++ b/Content.Server/Administration/Commands/ReAdminCommand.cs @@ -3,7 +3,6 @@ using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; -#nullable enable namespace Content.Server.Administration.Commands { diff --git a/Content.Server/Administration/Commands/ReadyAll.cs b/Content.Server/Administration/Commands/ReadyAll.cs index 33930bf2cd..c36ed3484f 100644 --- a/Content.Server/Administration/Commands/ReadyAll.cs +++ b/Content.Server/Administration/Commands/ReadyAll.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.GameTicking; +using Content.Server.GameTicking; using Content.Shared.Administration; using Robust.Server.Player; using Robust.Shared.Console; diff --git a/Content.Server/Administration/Commands/RemoveExtraComponents.cs b/Content.Server/Administration/Commands/RemoveExtraComponents.cs index 98f7834fe9..9feb0aa471 100644 --- a/Content.Server/Administration/Commands/RemoveExtraComponents.cs +++ b/Content.Server/Administration/Commands/RemoveExtraComponents.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Administration; +using Content.Shared.Administration; using Robust.Shared.Console; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Administration/Commands/SetAdminOOC.cs b/Content.Server/Administration/Commands/SetAdminOOC.cs index f18723d4c7..7dc3544e72 100644 --- a/Content.Server/Administration/Commands/SetAdminOOC.cs +++ b/Content.Server/Administration/Commands/SetAdminOOC.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Database; using Content.Server.Interfaces; diff --git a/Content.Server/Administration/Commands/SetMindCommand.cs b/Content.Server/Administration/Commands/SetMindCommand.cs index 88a25fd64d..9b24a636b5 100644 --- a/Content.Server/Administration/Commands/SetMindCommand.cs +++ b/Content.Server/Administration/Commands/SetMindCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Mind.Components; using Content.Server.Players; using Content.Shared.Administration; diff --git a/Content.Server/Administration/Commands/SetOutfitCommand.cs b/Content.Server/Administration/Commands/SetOutfitCommand.cs index 44a6e82a3c..9b46a69610 100644 --- a/Content.Server/Administration/Commands/SetOutfitCommand.cs +++ b/Content.Server/Administration/Commands/SetOutfitCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration.UI; using Content.Server.EUI; using Content.Server.Interfaces; diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs index 2815c6d9df..89fb59ecd0 100644 --- a/Content.Server/Administration/Managers/AdminManager.cs +++ b/Content.Server/Administration/Managers/AdminManager.cs @@ -23,7 +23,6 @@ using Robust.Shared.Network; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; -#nullable enable namespace Content.Server.Administration.Managers { diff --git a/Content.Server/Administration/Managers/IAdminManager.cs b/Content.Server/Administration/Managers/IAdminManager.cs index 553628c6c5..40ac0b27bb 100644 --- a/Content.Server/Administration/Managers/IAdminManager.cs +++ b/Content.Server/Administration/Managers/IAdminManager.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using Content.Shared.Administration; using Robust.Server.Player; -#nullable enable namespace Content.Server.Administration.Managers { diff --git a/Content.Server/Administration/UI/PermissionsEui.cs b/Content.Server/Administration/UI/PermissionsEui.cs index 0fce245536..aeaa14d02a 100644 --- a/Content.Server/Administration/UI/PermissionsEui.cs +++ b/Content.Server/Administration/UI/PermissionsEui.cs @@ -14,7 +14,6 @@ using Robust.Shared.Network; using DbAdminRank = Content.Server.Database.AdminRank; using static Content.Shared.Administration.PermissionsEuiMsg; -#nullable enable namespace Content.Server.Administration.UI { diff --git a/Content.Server/Administration/Verbs/AdminAddReagentVerb.cs b/Content.Server/Administration/Verbs/AdminAddReagentVerb.cs index 9abc73fcf1..dae951605b 100644 --- a/Content.Server/Administration/Verbs/AdminAddReagentVerb.cs +++ b/Content.Server/Administration/Verbs/AdminAddReagentVerb.cs @@ -13,7 +13,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; -#nullable enable namespace Content.Server.Administration.Verbs { diff --git a/Content.Server/Administration/Verbs/DeleteVerb.cs b/Content.Server/Administration/Verbs/DeleteVerb.cs index c1938af26c..262347fdda 100644 --- a/Content.Server/Administration/Verbs/DeleteVerb.cs +++ b/Content.Server/Administration/Verbs/DeleteVerb.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Verbs; using Robust.Server.Console; using Robust.Server.GameObjects; diff --git a/Content.Server/Alert/Click/RemoveCuffs.cs b/Content.Server/Alert/Click/RemoveCuffs.cs index f00c219928..6ef8fd87c4 100644 --- a/Content.Server/Alert/Click/RemoveCuffs.cs +++ b/Content.Server/Alert/Click/RemoveCuffs.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Cuffs.Components; using Content.Shared.Alert; using JetBrains.Annotations; diff --git a/Content.Server/Alert/Commands/ClearAlert.cs b/Content.Server/Alert/Commands/ClearAlert.cs index 415ac67921..3ddc04a72d 100644 --- a/Content.Server/Alert/Commands/ClearAlert.cs +++ b/Content.Server/Alert/Commands/ClearAlert.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Administration; using Content.Server.Commands; diff --git a/Content.Server/Alert/Commands/ShowAlert.cs b/Content.Server/Alert/Commands/ShowAlert.cs index 4a3e56679b..05cf1397a8 100644 --- a/Content.Server/Alert/Commands/ShowAlert.cs +++ b/Content.Server/Alert/Commands/ShowAlert.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Administration; using Content.Server.Commands; diff --git a/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs index 157b5e3b7f..dc9025f18c 100644 --- a/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs +++ b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs index 0e9f52b248..c8bce4cb76 100644 --- a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs +++ b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Server.Power.Components; using Content.Server.UserInterface; diff --git a/Content.Server/Atmos/AtmosHelpers.cs b/Content.Server/Atmos/AtmosHelpers.cs index a89bc200c7..6203e6badd 100644 --- a/Content.Server/Atmos/AtmosHelpers.cs +++ b/Content.Server/Atmos/AtmosHelpers.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using Content.Server.Atmos.EntitySystems; using Content.Shared.Atmos; using Robust.Shared.GameObjects; diff --git a/Content.Server/Atmos/Components/AirtightComponent.cs b/Content.Server/Atmos/Components/AirtightComponent.cs index aa4818c54c..a6b038e675 100644 --- a/Content.Server/Atmos/Components/AirtightComponent.cs +++ b/Content.Server/Atmos/Components/AirtightComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Atmos.EntitySystems; using Content.Shared.Atmos; using Robust.Shared.GameObjects; diff --git a/Content.Server/Atmos/Components/AtmosExposedComponent.cs b/Content.Server/Atmos/Components/AtmosExposedComponent.cs index e0ea5ee76a..e742458f10 100644 --- a/Content.Server/Atmos/Components/AtmosExposedComponent.cs +++ b/Content.Server/Atmos/Components/AtmosExposedComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Atmos.EntitySystems; +using Content.Server.Atmos.EntitySystems; using Content.Server.Temperature.Components; using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; diff --git a/Content.Server/Atmos/Components/BreathToolComponent.cs b/Content.Server/Atmos/Components/BreathToolComponent.cs index 2e715cf5f2..6b4ca06792 100644 --- a/Content.Server/Atmos/Components/BreathToolComponent.cs +++ b/Content.Server/Atmos/Components/BreathToolComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Body.Respiratory; +using Content.Server.Body.Respiratory; using Content.Shared.Inventory; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Atmos/Components/FirelockComponent.cs b/Content.Server/Atmos/Components/FirelockComponent.cs index 961cb51d84..fdcfb991aa 100644 --- a/Content.Server/Atmos/Components/FirelockComponent.cs +++ b/Content.Server/Atmos/Components/FirelockComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Atmos.EntitySystems; using Content.Server.Doors; using Content.Server.Doors.Components; diff --git a/Content.Server/Atmos/Components/GasAnalyzerComponent.cs b/Content.Server/Atmos/Components/GasAnalyzerComponent.cs index 23d7b499aa..0b2e4de32a 100644 --- a/Content.Server/Atmos/Components/GasAnalyzerComponent.cs +++ b/Content.Server/Atmos/Components/GasAnalyzerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Threading.Tasks; using Content.Server.Atmos.EntitySystems; diff --git a/Content.Server/Atmos/Components/GasTankComponent.cs b/Content.Server/Atmos/Components/GasTankComponent.cs index d30494b082..35e9201d25 100644 --- a/Content.Server/Atmos/Components/GasTankComponent.cs +++ b/Content.Server/Atmos/Components/GasTankComponent.cs @@ -1,4 +1,3 @@ -#nullable enable #nullable disable warnings using System; using Content.Server.Atmos.EntitySystems; diff --git a/Content.Server/Atmos/Components/GridAtmosphereComponent.cs b/Content.Server/Atmos/Components/GridAtmosphereComponent.cs index 6b7b902285..2e5a291e96 100644 --- a/Content.Server/Atmos/Components/GridAtmosphereComponent.cs +++ b/Content.Server/Atmos/Components/GridAtmosphereComponent.cs @@ -1,4 +1,3 @@ -#nullable enable // ReSharper disable once RedundantUsingDirective using System; using System.Collections; diff --git a/Content.Server/Atmos/Components/IGridAtmosphereComponent.cs b/Content.Server/Atmos/Components/IGridAtmosphereComponent.cs index e82e0a75b1..877e5e86a5 100644 --- a/Content.Server/Atmos/Components/IGridAtmosphereComponent.cs +++ b/Content.Server/Atmos/Components/IGridAtmosphereComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.Atmos.Piping.Components; using Content.Server.NodeContainer.NodeGroups; using Content.Shared.Atmos; diff --git a/Content.Server/Atmos/Components/MovedByPressureComponent.cs b/Content.Server/Atmos/Components/MovedByPressureComponent.cs index 3c7c2e7c09..75a72d4b55 100644 --- a/Content.Server/Atmos/Components/MovedByPressureComponent.cs +++ b/Content.Server/Atmos/Components/MovedByPressureComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Diagnostics.CodeAnalysis; using Content.Shared.Atmos; using Content.Shared.MobState; diff --git a/Content.Server/Atmos/Components/SpaceGridAtmosphereComponent.cs b/Content.Server/Atmos/Components/SpaceGridAtmosphereComponent.cs index ff63d979ea..c87caa0886 100644 --- a/Content.Server/Atmos/Components/SpaceGridAtmosphereComponent.cs +++ b/Content.Server/Atmos/Components/SpaceGridAtmosphereComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Content.Shared.Atmos; using Robust.Shared.GameObjects; diff --git a/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs b/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs index 090f506902..8aded0a2dd 100644 --- a/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs +++ b/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Server.Atmos.Piping.Components; using Content.Server.NodeContainer.NodeGroups; using Content.Shared.Atmos; diff --git a/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs index d7e66d5045..b2313f675f 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.Atmos.Components; using Content.Shared.Atmos; using Content.Shared.Atmos.EntitySystems; diff --git a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs index 4c9d0516b6..6c96d10e88 100644 --- a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs +++ b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Runtime.CompilerServices; diff --git a/Content.Server/Atmos/GasMixture.cs b/Content.Server/Atmos/GasMixture.cs index 31d609b579..1aa28daf63 100644 --- a/Content.Server/Atmos/GasMixture.cs +++ b/Content.Server/Atmos/GasMixture.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Runtime.CompilerServices; diff --git a/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs b/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs index 20637de79d..3880f93495 100644 --- a/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs +++ b/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Atmos.Components; using Robust.Shared.GameObjects; diff --git a/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs b/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs index ab5a4cc264..4c547215f4 100644 --- a/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs +++ b/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Atmos; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Atmos/Reactions/GasReactionPrototype.cs b/Content.Server/Atmos/Reactions/GasReactionPrototype.cs index deadbdb674..82cdd8cbb9 100644 --- a/Content.Server/Atmos/Reactions/GasReactionPrototype.cs +++ b/Content.Server/Atmos/Reactions/GasReactionPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Content.Server.Atmos.EntitySystems; using Content.Server.Interfaces; diff --git a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs index 4d34cd33cd..3a5564c929 100644 --- a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs +++ b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Atmos.EntitySystems; using Content.Server.Coordinates.Helpers; diff --git a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs index 3c71b26c15..5739dc797a 100644 --- a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs +++ b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Atmos.EntitySystems; using Content.Server.Coordinates.Helpers; using Content.Server.Interfaces; diff --git a/Content.Server/Atmos/Reactions/WaterVaporReaction.cs b/Content.Server/Atmos/Reactions/WaterVaporReaction.cs index 6f2c98d16c..d1935f10a8 100644 --- a/Content.Server/Atmos/Reactions/WaterVaporReaction.cs +++ b/Content.Server/Atmos/Reactions/WaterVaporReaction.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Atmos.EntitySystems; using Content.Server.Fluids.Components; using Content.Server.Interfaces; diff --git a/Content.Server/BarSign/BarSignComponent.cs b/Content.Server/BarSign/BarSignComponent.cs index a0b953dc22..1954a18c64 100644 --- a/Content.Server/BarSign/BarSignComponent.cs +++ b/Content.Server/BarSign/BarSignComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using Content.Server.Power.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/BarSign/BarSignPrototype.cs b/Content.Server/BarSign/BarSignPrototype.cs index 456c7ca38a..99e32cafec 100644 --- a/Content.Server/BarSign/BarSignPrototype.cs +++ b/Content.Server/BarSign/BarSignPrototype.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.Localization; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Body/Behavior/BrainBehavior.cs b/Content.Server/Body/Behavior/BrainBehavior.cs index a939c70fdc..e7f869bf03 100644 --- a/Content.Server/Body/Behavior/BrainBehavior.cs +++ b/Content.Server/Body/Behavior/BrainBehavior.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Ghost; +using Content.Server.Ghost; using Content.Server.Ghost.Components; using Content.Server.Mind.Components; using Content.Shared.Body.Components; diff --git a/Content.Server/Body/Behavior/LiverBehavior.cs b/Content.Server/Body/Behavior/LiverBehavior.cs index 83360b8edd..82e12b29ce 100644 --- a/Content.Server/Body/Behavior/LiverBehavior.cs +++ b/Content.Server/Body/Behavior/LiverBehavior.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using Content.Server.Body.Circulatory; using Content.Shared.Body.Networks; diff --git a/Content.Server/Body/Behavior/LungBehavior.cs b/Content.Server/Body/Behavior/LungBehavior.cs index 51130d9790..428ecb5698 100644 --- a/Content.Server/Body/Behavior/LungBehavior.cs +++ b/Content.Server/Body/Behavior/LungBehavior.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Atmos; using Content.Server.Atmos.Components; diff --git a/Content.Server/Body/Behavior/MechanismBehavior.cs b/Content.Server/Body/Behavior/MechanismBehavior.cs index 4446b991ec..ff5c468126 100644 --- a/Content.Server/Body/Behavior/MechanismBehavior.cs +++ b/Content.Server/Body/Behavior/MechanismBehavior.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Body.Behavior; +using Content.Shared.Body.Behavior; using Content.Shared.Body.Components; using Content.Shared.Body.Mechanism; using Content.Shared.Body.Part; diff --git a/Content.Server/Body/Behavior/StomachBehavior.cs b/Content.Server/Body/Behavior/StomachBehavior.cs index 6383a00eff..a6c903efe9 100644 --- a/Content.Server/Body/Behavior/StomachBehavior.cs +++ b/Content.Server/Body/Behavior/StomachBehavior.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Linq; using Content.Server.Body.Circulatory; diff --git a/Content.Server/Body/BodyComponent.cs b/Content.Server/Body/BodyComponent.cs index 9710f58a51..411065e0ac 100644 --- a/Content.Server/Body/BodyComponent.cs +++ b/Content.Server/Body/BodyComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.GameTicking; using Content.Server.Ghost; using Content.Server.Mind.Components; diff --git a/Content.Server/Body/Commands/AddHandCommand.cs b/Content.Server/Body/Commands/AddHandCommand.cs index bcba8d8f6f..ae8381c38e 100644 --- a/Content.Server/Body/Commands/AddHandCommand.cs +++ b/Content.Server/Body/Commands/AddHandCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.Body.Components; diff --git a/Content.Server/Body/Commands/AttachBodyPartCommand.cs b/Content.Server/Body/Commands/AttachBodyPartCommand.cs index 337ff4cd83..ba7e35c9d8 100644 --- a/Content.Server/Body/Commands/AttachBodyPartCommand.cs +++ b/Content.Server/Body/Commands/AttachBodyPartCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.Body.Components; diff --git a/Content.Server/Body/Commands/DestroyMechanismCommand.cs b/Content.Server/Body/Commands/DestroyMechanismCommand.cs index 4b13951a86..657e5f3459 100644 --- a/Content.Server/Body/Commands/DestroyMechanismCommand.cs +++ b/Content.Server/Body/Commands/DestroyMechanismCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.Body.Components; diff --git a/Content.Server/Body/Commands/RemoveHandCommand.cs b/Content.Server/Body/Commands/RemoveHandCommand.cs index 9668889628..184cf7141f 100644 --- a/Content.Server/Body/Commands/RemoveHandCommand.cs +++ b/Content.Server/Body/Commands/RemoveHandCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using Content.Server.Administration; using Content.Shared.Administration; diff --git a/Content.Server/Body/Mechanism/MechanismComponent.cs b/Content.Server/Body/Mechanism/MechanismComponent.cs index 3795cd15b9..de9c1c476f 100644 --- a/Content.Server/Body/Mechanism/MechanismComponent.cs +++ b/Content.Server/Body/Mechanism/MechanismComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Threading.Tasks; using Content.Server.UserInterface; diff --git a/Content.Server/Body/Part/BodyPartComponent.cs b/Content.Server/Body/Part/BodyPartComponent.cs index 38393f00a9..c3939acf98 100644 --- a/Content.Server/Body/Part/BodyPartComponent.cs +++ b/Content.Server/Body/Part/BodyPartComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Threading.Tasks; using Content.Server.UserInterface; diff --git a/Content.Server/Body/Respiratory/InternalsComponent.cs b/Content.Server/Body/Respiratory/InternalsComponent.cs index 85eba65e31..87ec4d7b6d 100644 --- a/Content.Server/Body/Respiratory/InternalsComponent.cs +++ b/Content.Server/Body/Respiratory/InternalsComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Atmos.Components; +using Content.Server.Atmos.Components; using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; diff --git a/Content.Server/Body/Scanner/BodyScannerComponent.cs b/Content.Server/Body/Scanner/BodyScannerComponent.cs index b9a3b668e3..c0363699e2 100644 --- a/Content.Server/Body/Scanner/BodyScannerComponent.cs +++ b/Content.Server/Body/Scanner/BodyScannerComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.UserInterface; +using Content.Server.UserInterface; using Content.Shared.Body.Components; using Content.Shared.Body.Scanner; using Content.Shared.Interaction; diff --git a/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs b/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs index 5d932a611f..870f0cd670 100644 --- a/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs +++ b/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs b/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs index 248f3fb6fa..50115a2b47 100644 --- a/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs +++ b/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/Content.Server/Botany/Components/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs index d3af8dc4b8..c7dc1f7eea 100644 --- a/Content.Server/Botany/Components/PlantHolderComponent.cs +++ b/Content.Server/Botany/Components/PlantHolderComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Linq; using System.Threading.Tasks; diff --git a/Content.Server/Botany/Components/ProduceComponent.cs b/Content.Server/Botany/Components/ProduceComponent.cs index 0a6cf284cb..88e456bb7c 100644 --- a/Content.Server/Botany/Components/ProduceComponent.cs +++ b/Content.Server/Botany/Components/ProduceComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Chemistry.Components; using Content.Shared.Chemistry.Reagent; using Robust.Server.GameObjects; diff --git a/Content.Server/Botany/Components/SeedComponent.cs b/Content.Server/Botany/Components/SeedComponent.cs index 9c2728e313..b535d28583 100644 --- a/Content.Server/Botany/Components/SeedComponent.cs +++ b/Content.Server/Botany/Components/SeedComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Examine; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Botany/Components/SeedExtractorComponent.cs b/Content.Server/Botany/Components/SeedExtractorComponent.cs index c195c4f869..6863e72d90 100644 --- a/Content.Server/Botany/Components/SeedExtractorComponent.cs +++ b/Content.Server/Botany/Components/SeedExtractorComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.Power.Components; using Content.Shared.Interaction; diff --git a/Content.Server/Botany/Seed.cs b/Content.Server/Botany/Seed.cs index d456503e74..de011031e8 100644 --- a/Content.Server/Botany/Seed.cs +++ b/Content.Server/Botany/Seed.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Buckle/BuckleSystem.cs b/Content.Server/Buckle/BuckleSystem.cs index c53cd503b5..4f262f7e18 100644 --- a/Content.Server/Buckle/BuckleSystem.cs +++ b/Content.Server/Buckle/BuckleSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Buckle.Components; using Content.Server.Interaction; using Content.Shared.Buckle; diff --git a/Content.Server/Buckle/Components/BuckleComponent.cs b/Content.Server/Buckle/Components/BuckleComponent.cs index 2291bbb4e0..db57e30d1a 100644 --- a/Content.Server/Buckle/Components/BuckleComponent.cs +++ b/Content.Server/Buckle/Components/BuckleComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Diagnostics.CodeAnalysis; using Content.Server.Alert; diff --git a/Content.Server/Buckle/Components/StrapComponent.cs b/Content.Server/Buckle/Components/StrapComponent.cs index e27355a13e..d8114786e7 100644 --- a/Content.Server/Buckle/Components/StrapComponent.cs +++ b/Content.Server/Buckle/Components/StrapComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Linq; using Content.Shared.ActionBlocker; diff --git a/Content.Server/Cargo/Components/CargoConsoleComponent.cs b/Content.Server/Cargo/Components/CargoConsoleComponent.cs index 4a53d52b48..82f70099fd 100644 --- a/Content.Server/Cargo/Components/CargoConsoleComponent.cs +++ b/Content.Server/Cargo/Components/CargoConsoleComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Server.Coordinates.Helpers; using Content.Server.Power.Components; diff --git a/Content.Server/Cargo/Components/CargoTelepadComponent.cs b/Content.Server/Cargo/Components/CargoTelepadComponent.cs index ba31eb3d13..e54a6ea821 100644 --- a/Content.Server/Cargo/Components/CargoTelepadComponent.cs +++ b/Content.Server/Cargo/Components/CargoTelepadComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Server.Power.Components; using Content.Shared.Cargo; diff --git a/Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs b/Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs index 39dcc61096..bdccf0cacb 100644 --- a/Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs +++ b/Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.UserInterface; using Content.Shared.CharacterAppearance; using Content.Shared.CharacterAppearance.Components; diff --git a/Content.Server/CharacterInfo/CharacterInfoComponent.cs b/Content.Server/CharacterInfo/CharacterInfoComponent.cs index f5ff7e976e..ca63dbee07 100644 --- a/Content.Server/CharacterInfo/CharacterInfoComponent.cs +++ b/Content.Server/CharacterInfo/CharacterInfoComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.Mind.Components; using Content.Server.Roles; using Content.Shared.CharacterInfo; diff --git a/Content.Server/Chat/Commands/AdminChatCommand.cs b/Content.Server/Chat/Commands/AdminChatCommand.cs index 0af611733d..50a4f207e2 100644 --- a/Content.Server/Chat/Commands/AdminChatCommand.cs +++ b/Content.Server/Chat/Commands/AdminChatCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.Chat.Managers; using Content.Shared.Administration; diff --git a/Content.Server/Chat/Commands/MeCommand.cs b/Content.Server/Chat/Commands/MeCommand.cs index 6aa2f05ab3..e19c8d2879 100644 --- a/Content.Server/Chat/Commands/MeCommand.cs +++ b/Content.Server/Chat/Commands/MeCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.Chat.Managers; using Content.Server.Players; diff --git a/Content.Server/Chat/Commands/OOCCommand.cs b/Content.Server/Chat/Commands/OOCCommand.cs index 22f72d10f1..440e1f8b5f 100644 --- a/Content.Server/Chat/Commands/OOCCommand.cs +++ b/Content.Server/Chat/Commands/OOCCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.Chat.Managers; using Robust.Server.Player; diff --git a/Content.Server/Chat/Commands/SayCommand.cs b/Content.Server/Chat/Commands/SayCommand.cs index 193798a976..f53302fb75 100644 --- a/Content.Server/Chat/Commands/SayCommand.cs +++ b/Content.Server/Chat/Commands/SayCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.Chat.Managers; using Content.Server.Ghost.Components; diff --git a/Content.Server/Chat/Commands/SuicideCommand.cs b/Content.Server/Chat/Commands/SuicideCommand.cs index a1bad9de9b..86686b6d99 100644 --- a/Content.Server/Chat/Commands/SuicideCommand.cs +++ b/Content.Server/Chat/Commands/SuicideCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using Content.Server.Act; using Content.Server.Administration; diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs index 7ae9b4193f..9a8bcea26f 100644 --- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs +++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs index c668d06a6f..ad3d1d821b 100644 --- a/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs +++ b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Body.Circulatory; +using Content.Server.Body.Circulatory; using Content.Server.Inventory.Components; using Content.Server.Items; using Content.Shared.Chemistry.Reagent; diff --git a/Content.Server/Chemistry/Components/InjectorComponent.cs b/Content.Server/Chemistry/Components/InjectorComponent.cs index 2d41190eff..cd404aaa0d 100644 --- a/Content.Server/Chemistry/Components/InjectorComponent.cs +++ b/Content.Server/Chemistry/Components/InjectorComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Threading.Tasks; using Content.Server.Body.Circulatory; diff --git a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs index 938f009b8e..9a1dab5aef 100644 --- a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs +++ b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Chemistry/Components/ReagentTankComponent.cs b/Content.Server/Chemistry/Components/ReagentTankComponent.cs index acd9480802..7d55f43d15 100644 --- a/Content.Server/Chemistry/Components/ReagentTankComponent.cs +++ b/Content.Server/Chemistry/Components/ReagentTankComponent.cs @@ -3,7 +3,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; -#nullable enable namespace Content.Server.Chemistry.Components { diff --git a/Content.Server/Chemistry/Components/RehydratableComponent.cs b/Content.Server/Chemistry/Components/RehydratableComponent.cs index 91cf6853dd..6d900b26a5 100644 --- a/Content.Server/Chemistry/Components/RehydratableComponent.cs +++ b/Content.Server/Chemistry/Components/RehydratableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Notification; using Content.Shared.Chemistry; using Content.Shared.Chemistry.Reagent; diff --git a/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs index 0e04210ba4..461b9b25c1 100644 --- a/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs +++ b/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Linq; +using System.Linq; using Content.Server.Body.Circulatory; using Content.Server.Body.Respiratory; using Content.Shared.Chemistry; diff --git a/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs index a68230ddd1..2932c2d1b0 100644 --- a/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Linq; using Content.Server.Atmos.Components; diff --git a/Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs b/Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs index 0d5a31304b..ff38721a16 100644 --- a/Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; diff --git a/Content.Server/Chemistry/Components/SolutionContainerComponent.cs b/Content.Server/Chemistry/Components/SolutionContainerComponent.cs index b9944a28fc..33adde72b2 100644 --- a/Content.Server/Chemistry/Components/SolutionContainerComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionContainerComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Chemistry.Solution.Components; +using Content.Shared.Chemistry.Solution.Components; using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.Components diff --git a/Content.Server/Chemistry/Components/SolutionTransferComponent.cs b/Content.Server/Chemistry/Components/SolutionTransferComponent.cs index 38238299d7..316b2daf30 100644 --- a/Content.Server/Chemistry/Components/SolutionTransferComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionTransferComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Solution.Components; diff --git a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs index fc55f861c5..ad01057a58 100644 --- a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs +++ b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Chemistry; using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Solution; diff --git a/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs index f60c5417c7..ad37aadd6f 100644 --- a/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; using Robust.Shared.Audio; diff --git a/Content.Server/Chemistry/EntitySystems/SolutionAreaEffectSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionAreaEffectSystem.cs index cacd3a5d6b..a647007644 100644 --- a/Content.Server/Chemistry/EntitySystems/SolutionAreaEffectSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionAreaEffectSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using Content.Server.Chemistry.Components; using JetBrains.Annotations; diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs index c0f7a742a8..7a718650e1 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using Content.Server.Botany.Components; using Content.Shared.Botany; using Robust.Shared.GameObjects; diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustHealth.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustHealth.cs index 960742d25b..9e3d539e2d 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustHealth.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustHealth.cs @@ -1,5 +1,4 @@ -#nullable enable -using JetBrains.Annotations; +using JetBrains.Annotations; using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustMutationLevel.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustMutationLevel.cs index 6437b0b39c..55501c86d7 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustMutationLevel.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustMutationLevel.cs @@ -1,5 +1,4 @@ -#nullable enable -using JetBrains.Annotations; +using JetBrains.Annotations; using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustMutationMod.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustMutationMod.cs index 0461aa9c5a..501932c885 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustMutationMod.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustMutationMod.cs @@ -1,5 +1,4 @@ -#nullable enable -using JetBrains.Annotations; +using JetBrains.Annotations; using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustNutrition.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustNutrition.cs index 2a2e00783d..22764fbcee 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustNutrition.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustNutrition.cs @@ -1,5 +1,4 @@ -#nullable enable -using JetBrains.Annotations; +using JetBrains.Annotations; using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustPests.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustPests.cs index 0245ba335c..c31a5d7138 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustPests.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustPests.cs @@ -1,5 +1,4 @@ -#nullable enable -using JetBrains.Annotations; +using JetBrains.Annotations; using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustToxins.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustToxins.cs index 544bb63b99..f9d281c0e4 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustToxins.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustToxins.cs @@ -1,5 +1,4 @@ -#nullable enable -using JetBrains.Annotations; +using JetBrains.Annotations; using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustWater.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustWater.cs index 9314506b05..f9b39b041d 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustWater.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustWater.cs @@ -1,5 +1,4 @@ -#nullable enable -using JetBrains.Annotations; +using JetBrains.Annotations; using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustWeeds.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustWeeds.cs index 66a0f8f480..e78c0cfe36 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustWeeds.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustWeeds.cs @@ -1,5 +1,4 @@ -#nullable enable -using JetBrains.Annotations; +using JetBrains.Annotations; using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism diff --git a/Content.Server/Chemistry/PlantMetabolism/AffectGrowth.cs b/Content.Server/Chemistry/PlantMetabolism/AffectGrowth.cs index 6962eabb94..5fc534b7ba 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AffectGrowth.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AffectGrowth.cs @@ -1,5 +1,4 @@ -#nullable enable -using JetBrains.Annotations; +using JetBrains.Annotations; using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism diff --git a/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs b/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs index 0320f8dc84..69eb5ddddd 100644 --- a/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs +++ b/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Server.Botany.Components; using Content.Shared.Botany; using JetBrains.Annotations; diff --git a/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs b/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs index 0a476a90e1..efecce3a79 100644 --- a/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs +++ b/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Botany.Components; +using Content.Server.Botany.Components; using Content.Shared.Botany; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs b/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs index f91877acd2..854310479b 100644 --- a/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs +++ b/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Botany.Components; +using Content.Server.Botany.Components; using Content.Shared.Botany; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs index ed9f447f0e..5fdac2690e 100644 --- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Chemistry.Components; using Content.Server.Coordinates.Helpers; diff --git a/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs index 29f496fedc..76f250dced 100644 --- a/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Chemistry.Components; +using Content.Server.Chemistry.Components; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs index ce575a619a..08032d183e 100644 --- a/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Chemistry.Components; +using Content.Server.Chemistry.Components; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Climbing/Components/ClimbingComponent.cs b/Content.Server/Climbing/Components/ClimbingComponent.cs index 00c871b125..8d06859605 100644 --- a/Content.Server/Climbing/Components/ClimbingComponent.cs +++ b/Content.Server/Climbing/Components/ClimbingComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Buckle.Components; using Content.Shared.Climbing; using Robust.Shared.GameObjects; diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs index 4622ae660b..0d0c37da75 100644 --- a/Content.Server/Cloning/CloningSystem.cs +++ b/Content.Server/Cloning/CloningSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Linq; using Content.Server.Cloning.Components; diff --git a/Content.Server/Clothing/Components/MagbootsComponent.cs b/Content.Server/Clothing/Components/MagbootsComponent.cs index 10b4cae51b..decec5873e 100644 --- a/Content.Server/Clothing/Components/MagbootsComponent.cs +++ b/Content.Server/Clothing/Components/MagbootsComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Alert; using Content.Server.Atmos.Components; using Content.Server.Inventory.Components; diff --git a/Content.Server/Commands/Atmos/AddAtmosCommand.cs b/Content.Server/Commands/Atmos/AddAtmosCommand.cs index 5afc24057b..16304113a8 100644 --- a/Content.Server/Commands/Atmos/AddAtmosCommand.cs +++ b/Content.Server/Commands/Atmos/AddAtmosCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.Atmos.Components; using Content.Shared.Administration; using Robust.Shared.Console; diff --git a/Content.Server/Commands/Atmos/AddGasCommand.cs b/Content.Server/Commands/Atmos/AddGasCommand.cs index b745caf81a..1f55647229 100644 --- a/Content.Server/Commands/Atmos/AddGasCommand.cs +++ b/Content.Server/Commands/Atmos/AddGasCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.Atmos.Components; using Content.Shared.Administration; using Content.Shared.Atmos; diff --git a/Content.Server/Commands/Atmos/AddUnsimulatedAtmosCommand.cs b/Content.Server/Commands/Atmos/AddUnsimulatedAtmosCommand.cs index 94c0e73e09..442012da7f 100644 --- a/Content.Server/Commands/Atmos/AddUnsimulatedAtmosCommand.cs +++ b/Content.Server/Commands/Atmos/AddUnsimulatedAtmosCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.Atmos.Components; using Content.Shared.Administration; using Robust.Shared.Console; diff --git a/Content.Server/Commands/Atmos/DeleteGasCommand.cs b/Content.Server/Commands/Atmos/DeleteGasCommand.cs index 2f03714c37..2752d07f93 100644 --- a/Content.Server/Commands/Atmos/DeleteGasCommand.cs +++ b/Content.Server/Commands/Atmos/DeleteGasCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Administration; using Content.Server.Atmos.Components; diff --git a/Content.Server/Commands/Atmos/FillGasCommand.cs b/Content.Server/Commands/Atmos/FillGasCommand.cs index 604f1f0165..0a70ffbec0 100644 --- a/Content.Server/Commands/Atmos/FillGasCommand.cs +++ b/Content.Server/Commands/Atmos/FillGasCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.Atmos.Components; using Content.Shared.Administration; using Content.Shared.Atmos; diff --git a/Content.Server/Commands/Atmos/FixGridAtmos.cs b/Content.Server/Commands/Atmos/FixGridAtmos.cs index 0a2885088e..18a2e95ded 100644 --- a/Content.Server/Commands/Atmos/FixGridAtmos.cs +++ b/Content.Server/Commands/Atmos/FixGridAtmos.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.Atmos; using Content.Server.Atmos.Components; diff --git a/Content.Server/Commands/Atmos/ListGasesCommand.cs b/Content.Server/Commands/Atmos/ListGasesCommand.cs index 9b90a51755..3694b3e2a5 100644 --- a/Content.Server/Commands/Atmos/ListGasesCommand.cs +++ b/Content.Server/Commands/Atmos/ListGasesCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.Atmos.EntitySystems; using Content.Shared.Administration; using Robust.Shared.Console; diff --git a/Content.Server/Commands/Atmos/RemoveGasCommand.cs b/Content.Server/Commands/Atmos/RemoveGasCommand.cs index a421bf0f35..ad4a213dab 100644 --- a/Content.Server/Commands/Atmos/RemoveGasCommand.cs +++ b/Content.Server/Commands/Atmos/RemoveGasCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.Atmos.Components; using Content.Shared.Administration; using Robust.Shared.Console; diff --git a/Content.Server/Commands/Atmos/SetAtmosTemperatureCommand.cs b/Content.Server/Commands/Atmos/SetAtmosTemperatureCommand.cs index 660173b566..18836eace9 100644 --- a/Content.Server/Commands/Atmos/SetAtmosTemperatureCommand.cs +++ b/Content.Server/Commands/Atmos/SetAtmosTemperatureCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.Atmos.Components; using Content.Shared.Administration; using Content.Shared.Atmos; diff --git a/Content.Server/Commands/Atmos/SetTemperatureCommand.cs b/Content.Server/Commands/Atmos/SetTemperatureCommand.cs index 792ea8c9ce..278320bc6a 100644 --- a/Content.Server/Commands/Atmos/SetTemperatureCommand.cs +++ b/Content.Server/Commands/Atmos/SetTemperatureCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.Atmos.Components; using Content.Shared.Administration; using Content.Shared.Atmos; diff --git a/Content.Server/Commands/Atmos/ShowAtmosCommand.cs b/Content.Server/Commands/Atmos/ShowAtmosCommand.cs index 35bbf3fc29..f408be6917 100644 --- a/Content.Server/Commands/Atmos/ShowAtmosCommand.cs +++ b/Content.Server/Commands/Atmos/ShowAtmosCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.Atmos.EntitySystems; using Content.Shared.Administration; diff --git a/Content.Server/Commands/CommandUtils.cs b/Content.Server/Commands/CommandUtils.cs index e5d8ce6b2a..29951dbce6 100644 --- a/Content.Server/Commands/CommandUtils.cs +++ b/Content.Server/Commands/CommandUtils.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Diagnostics.CodeAnalysis; using Robust.Server.Player; using Robust.Shared.Console; diff --git a/Content.Server/Communications/CommunicationsConsoleComponent.cs b/Content.Server/Communications/CommunicationsConsoleComponent.cs index cf0b768e78..e8a47ea2c4 100644 --- a/Content.Server/Communications/CommunicationsConsoleComponent.cs +++ b/Content.Server/Communications/CommunicationsConsoleComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Globalization; using System.Threading; diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs index bbc1382935..db0b1e1684 100644 --- a/Content.Server/Connection/ConnectionManager.cs +++ b/Content.Server/Connection/ConnectionManager.cs @@ -9,7 +9,6 @@ using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Network; -#nullable enable namespace Content.Server.Connection { diff --git a/Content.Server/Construction/Completions/AddContainer.cs b/Content.Server/Construction/Completions/AddContainer.cs index 426937a3c1..529b2f46a9 100644 --- a/Content.Server/Construction/Completions/AddContainer.cs +++ b/Content.Server/Construction/Completions/AddContainer.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Threading.Tasks; +using System.Threading.Tasks; using Content.Server.Construction.Components; using Content.Shared.Construction; using JetBrains.Annotations; diff --git a/Content.Server/Construction/Completions/BuildComputer.cs b/Content.Server/Construction/Completions/BuildComputer.cs index f3e0da8f02..8ea09c332a 100644 --- a/Content.Server/Construction/Completions/BuildComputer.cs +++ b/Content.Server/Construction/Completions/BuildComputer.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using System.Threading.Tasks; using Content.Server.Construction.Components; diff --git a/Content.Server/Construction/Completions/BuildMachine.cs b/Content.Server/Construction/Completions/BuildMachine.cs index 06874641c0..7828200220 100644 --- a/Content.Server/Construction/Completions/BuildMachine.cs +++ b/Content.Server/Construction/Completions/BuildMachine.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using System.Threading.Tasks; using Content.Server.Construction.Components; diff --git a/Content.Server/Construction/Completions/ConditionalAction.cs b/Content.Server/Construction/Completions/ConditionalAction.cs index da7fd719dd..24b5956664 100644 --- a/Content.Server/Construction/Completions/ConditionalAction.cs +++ b/Content.Server/Construction/Completions/ConditionalAction.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; diff --git a/Content.Server/Construction/Completions/DeleteEntitiesInContainer.cs b/Content.Server/Construction/Completions/DeleteEntitiesInContainer.cs index 8cfbd93953..ac3890d7dc 100644 --- a/Content.Server/Construction/Completions/DeleteEntitiesInContainer.cs +++ b/Content.Server/Construction/Completions/DeleteEntitiesInContainer.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using System.Threading.Tasks; using Content.Shared.Construction; diff --git a/Content.Server/Construction/Completions/DeleteEntity.cs b/Content.Server/Construction/Completions/DeleteEntity.cs index cf21ebf322..762a8d68d2 100644 --- a/Content.Server/Construction/Completions/DeleteEntity.cs +++ b/Content.Server/Construction/Completions/DeleteEntity.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Threading.Tasks; +using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Construction/Completions/DestroyEntity.cs b/Content.Server/Construction/Completions/DestroyEntity.cs index bce60a667a..82018dac97 100644 --- a/Content.Server/Construction/Completions/DestroyEntity.cs +++ b/Content.Server/Construction/Completions/DestroyEntity.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Construction/Completions/EmptyAllContainers.cs b/Content.Server/Construction/Completions/EmptyAllContainers.cs index f18ec92397..799c21d9ab 100644 --- a/Content.Server/Construction/Completions/EmptyAllContainers.cs +++ b/Content.Server/Construction/Completions/EmptyAllContainers.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Threading.Tasks; +using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Shared.Containers; diff --git a/Content.Server/Construction/Completions/EmptyContainer.cs b/Content.Server/Construction/Completions/EmptyContainer.cs index 6d76d7f713..3099e1dbff 100644 --- a/Content.Server/Construction/Completions/EmptyContainer.cs +++ b/Content.Server/Construction/Completions/EmptyContainer.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Linq; +using System.Linq; using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; diff --git a/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs b/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs index 0d5e580af0..c43dfee278 100644 --- a/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs +++ b/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Threading.Tasks; +using System.Threading.Tasks; using Content.Server.Construction.Components; using Content.Shared.Construction; using JetBrains.Annotations; diff --git a/Content.Server/Construction/Completions/MoveContainer.cs b/Content.Server/Construction/Completions/MoveContainer.cs index 9676273bc8..47a7fd0ae1 100644 --- a/Content.Server/Construction/Completions/MoveContainer.cs +++ b/Content.Server/Construction/Completions/MoveContainer.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using System.Threading.Tasks; using Content.Shared.Construction; diff --git a/Content.Server/Construction/Completions/PlaySound.cs b/Content.Server/Construction/Completions/PlaySound.cs index 6d0f7de98c..5772372446 100644 --- a/Content.Server/Construction/Completions/PlaySound.cs +++ b/Content.Server/Construction/Completions/PlaySound.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Shared.Audio; using Content.Shared.Construction; diff --git a/Content.Server/Construction/Completions/PopupEveryone.cs b/Content.Server/Construction/Completions/PopupEveryone.cs index b1f17c54e1..7c9132bfa2 100644 --- a/Content.Server/Construction/Completions/PopupEveryone.cs +++ b/Content.Server/Construction/Completions/PopupEveryone.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.Notification; using Content.Shared.Construction; diff --git a/Content.Server/Construction/Completions/PopupUser.cs b/Content.Server/Construction/Completions/PopupUser.cs index 026de3f7b0..f7d620e734 100644 --- a/Content.Server/Construction/Completions/PopupUser.cs +++ b/Content.Server/Construction/Completions/PopupUser.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Threading.Tasks; +using System.Threading.Tasks; using Content.Shared.Construction; using Content.Shared.Notification; using Content.Shared.Notification.Managers; diff --git a/Content.Server/Construction/Completions/SetAnchor.cs b/Content.Server/Construction/Completions/SetAnchor.cs index 54bdf62b88..7c9b781abe 100644 --- a/Content.Server/Construction/Completions/SetAnchor.cs +++ b/Content.Server/Construction/Completions/SetAnchor.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Threading.Tasks; +using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Construction/Completions/SetStackCount.cs b/Content.Server/Construction/Completions/SetStackCount.cs index 7934d6c967..1d25b42748 100644 --- a/Content.Server/Construction/Completions/SetStackCount.cs +++ b/Content.Server/Construction/Completions/SetStackCount.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Threading.Tasks; +using System.Threading.Tasks; using Content.Server.Stack; using Content.Shared.Construction; using JetBrains.Annotations; diff --git a/Content.Server/Construction/Completions/SnapToGrid.cs b/Content.Server/Construction/Completions/SnapToGrid.cs index 6f61665b24..5b5f7be369 100644 --- a/Content.Server/Construction/Completions/SnapToGrid.cs +++ b/Content.Server/Construction/Completions/SnapToGrid.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.Coordinates.Helpers; using Content.Shared.Construction; diff --git a/Content.Server/Construction/Completions/SpawnPrototype.cs b/Content.Server/Construction/Completions/SpawnPrototype.cs index e490b73ea6..caeeb7124a 100644 --- a/Content.Server/Construction/Completions/SpawnPrototype.cs +++ b/Content.Server/Construction/Completions/SpawnPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Threading.Tasks; +using System.Threading.Tasks; using Content.Server.Stack; using Content.Shared.Construction; using Content.Shared.Prototypes; diff --git a/Content.Server/Construction/Completions/SpawnPrototypeAtContainer.cs b/Content.Server/Construction/Completions/SpawnPrototypeAtContainer.cs index 489c4e7b77..10ef46f30c 100644 --- a/Content.Server/Construction/Completions/SpawnPrototypeAtContainer.cs +++ b/Content.Server/Construction/Completions/SpawnPrototypeAtContainer.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; diff --git a/Content.Server/Construction/Completions/SpriteChange.cs b/Content.Server/Construction/Completions/SpriteChange.cs index bf62c52b27..1628c3d913 100644 --- a/Content.Server/Construction/Completions/SpriteChange.cs +++ b/Content.Server/Construction/Completions/SpriteChange.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Threading.Tasks; +using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Server.GameObjects; diff --git a/Content.Server/Construction/Completions/SpriteStateChange.cs b/Content.Server/Construction/Completions/SpriteStateChange.cs index bef8330d92..ed94cec220 100644 --- a/Content.Server/Construction/Completions/SpriteStateChange.cs +++ b/Content.Server/Construction/Completions/SpriteStateChange.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Threading.Tasks; +using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Server.GameObjects; diff --git a/Content.Server/Construction/Completions/VisualizerDataInt.cs b/Content.Server/Construction/Completions/VisualizerDataInt.cs index 59ddaf7579..f9b5145b68 100644 --- a/Content.Server/Construction/Completions/VisualizerDataInt.cs +++ b/Content.Server/Construction/Completions/VisualizerDataInt.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Threading.Tasks; +using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Server.GameObjects; diff --git a/Content.Server/Construction/Components/AnchorableComponent.cs b/Content.Server/Construction/Components/AnchorableComponent.cs index bb8f86074c..e813f18abc 100644 --- a/Content.Server/Construction/Components/AnchorableComponent.cs +++ b/Content.Server/Construction/Components/AnchorableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Threading.Tasks; using Content.Server.Coordinates.Helpers; diff --git a/Content.Server/Construction/Components/ConstructionComponent.cs b/Content.Server/Construction/Components/ConstructionComponent.cs index a4de447e4c..0fa422c270 100644 --- a/Content.Server/Construction/Components/ConstructionComponent.cs +++ b/Content.Server/Construction/Components/ConstructionComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.IO; diff --git a/Content.Server/Construction/Components/WelderRefinableComponent.cs b/Content.Server/Construction/Components/WelderRefinableComponent.cs index 8c76a1755c..eb2042a29a 100644 --- a/Content.Server/Construction/Components/WelderRefinableComponent.cs +++ b/Content.Server/Construction/Components/WelderRefinableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Threading.Tasks; using Content.Server.Stack; diff --git a/Content.Server/Construction/Conditions/AirlockBolted.cs b/Content.Server/Construction/Conditions/AirlockBolted.cs index e0aa3972ae..7da5dc5073 100644 --- a/Content.Server/Construction/Conditions/AirlockBolted.cs +++ b/Content.Server/Construction/Conditions/AirlockBolted.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Construction/Conditions/ContainerEmpty.cs b/Content.Server/Construction/Conditions/ContainerEmpty.cs index 8b0518ab5f..88ca0ba042 100644 --- a/Content.Server/Construction/Conditions/ContainerEmpty.cs +++ b/Content.Server/Construction/Conditions/ContainerEmpty.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Threading.Tasks; +using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Shared.Containers; diff --git a/Content.Server/Construction/Conditions/ContainerNotEmpty.cs b/Content.Server/Construction/Conditions/ContainerNotEmpty.cs index 9224b977dd..13c129fdf7 100644 --- a/Content.Server/Construction/Conditions/ContainerNotEmpty.cs +++ b/Content.Server/Construction/Conditions/ContainerNotEmpty.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; diff --git a/Content.Server/Construction/Conditions/DoorWelded.cs b/Content.Server/Construction/Conditions/DoorWelded.cs index 85aa328982..6d51f2d3b1 100644 --- a/Content.Server/Construction/Conditions/DoorWelded.cs +++ b/Content.Server/Construction/Conditions/DoorWelded.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.Doors.Components; using Content.Shared.Construction; diff --git a/Content.Server/Construction/Conditions/ToiletLidClosed.cs b/Content.Server/Construction/Conditions/ToiletLidClosed.cs index 7fb338aebf..2f9cba7506 100644 --- a/Content.Server/Construction/Conditions/ToiletLidClosed.cs +++ b/Content.Server/Construction/Conditions/ToiletLidClosed.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.Toilet; using Content.Shared.Construction; diff --git a/Content.Server/Construction/ConstructionSystem.cs b/Content.Server/Construction/ConstructionSystem.cs index 4b4bcaab3c..11e7c41f72 100644 --- a/Content.Server/Construction/ConstructionSystem.cs +++ b/Content.Server/Construction/ConstructionSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/Content.Server/Containers/Commands/HideContainedContextCommand.cs b/Content.Server/Containers/Commands/HideContainedContextCommand.cs index f150d2bbad..8ec47ad4bf 100644 --- a/Content.Server/Containers/Commands/HideContainedContextCommand.cs +++ b/Content.Server/Containers/Commands/HideContainedContextCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.Verbs; using Content.Shared.Administration; diff --git a/Content.Server/Containers/Commands/ShowContainedContextCommand.cs b/Content.Server/Containers/Commands/ShowContainedContextCommand.cs index 5a556d4142..0780861d56 100644 --- a/Content.Server/Containers/Commands/ShowContainedContextCommand.cs +++ b/Content.Server/Containers/Commands/ShowContainedContextCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.Verbs; using Content.Shared.Administration; diff --git a/Content.Server/Conveyor/ConveyorComponent.cs b/Content.Server/Conveyor/ConveyorComponent.cs index 31983f36ef..6109ea9cdc 100644 --- a/Content.Server/Conveyor/ConveyorComponent.cs +++ b/Content.Server/Conveyor/ConveyorComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Items; using Content.Server.MachineLinking.Components; using Content.Server.Power.Components; diff --git a/Content.Server/Coordinates/Helpers/GridTileLookupHelpers.cs b/Content.Server/Coordinates/Helpers/GridTileLookupHelpers.cs index 5f1c7263be..41587963d4 100644 --- a/Content.Server/Coordinates/Helpers/GridTileLookupHelpers.cs +++ b/Content.Server/Coordinates/Helpers/GridTileLookupHelpers.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Runtime.CompilerServices; using Robust.Server.GameObjects; diff --git a/Content.Server/Crayon/CrayonComponent.cs b/Content.Server/Crayon/CrayonComponent.cs index 13d0f4b90b..e877a8d65c 100644 --- a/Content.Server/Crayon/CrayonComponent.cs +++ b/Content.Server/Crayon/CrayonComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using System.Threading.Tasks; using Content.Server.UserInterface; diff --git a/Content.Server/Cuffs/Components/CuffableComponent.cs b/Content.Server/Cuffs/Components/CuffableComponent.cs index 4293558043..17cbf5d728 100644 --- a/Content.Server/Cuffs/Components/CuffableComponent.cs +++ b/Content.Server/Cuffs/Components/CuffableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Cuffs/Components/HandcuffComponent.cs b/Content.Server/Cuffs/Components/HandcuffComponent.cs index bac2720916..5df22abaa6 100644 --- a/Content.Server/Cuffs/Components/HandcuffComponent.cs +++ b/Content.Server/Cuffs/Components/HandcuffComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Threading.Tasks; using Content.Server.DoAfter; diff --git a/Content.Server/Cuffs/CuffableSystem.cs b/Content.Server/Cuffs/CuffableSystem.cs index 66f374ea34..8b74b16e11 100644 --- a/Content.Server/Cuffs/CuffableSystem.cs +++ b/Content.Server/Cuffs/CuffableSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Cuffs.Components; using Content.Server.Hands.Components; using Content.Shared.Hands.Components; diff --git a/Content.Server/Damage/Commands/GodModeCommand.cs b/Content.Server/Damage/Commands/GodModeCommand.cs index bbb58323d4..84dbb22128 100644 --- a/Content.Server/Damage/Commands/GodModeCommand.cs +++ b/Content.Server/Damage/Commands/GodModeCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Shared.Administration; using Robust.Server.Player; diff --git a/Content.Server/Damage/Commands/HurtCommand.cs b/Content.Server/Damage/Commands/HurtCommand.cs index ccc9753be4..0184c18c7e 100644 --- a/Content.Server/Damage/Commands/HurtCommand.cs +++ b/Content.Server/Damage/Commands/HurtCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Diagnostics.CodeAnalysis; using System.Text; diff --git a/Content.Server/Damage/GodmodeSystem.cs b/Content.Server/Damage/GodmodeSystem.cs index 788fe4bca7..823c155fae 100644 --- a/Content.Server/Damage/GodmodeSystem.cs +++ b/Content.Server/Damage/GodmodeSystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.Atmos.Components; using System.Linq; using Content.Shared.Damage; diff --git a/Content.Server/Database/ServerBanDef.cs b/Content.Server/Database/ServerBanDef.cs index c1c1b32f8c..663f3e1135 100644 --- a/Content.Server/Database/ServerBanDef.cs +++ b/Content.Server/Database/ServerBanDef.cs @@ -3,7 +3,6 @@ using System.Collections.Immutable; using System.Net; using Robust.Shared.Network; -#nullable enable namespace Content.Server.Database { diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs index a79ce19338..5e9f67707a 100644 --- a/Content.Server/Database/ServerDbBase.cs +++ b/Content.Server/Database/ServerDbBase.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Collections.Immutable; diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs index 3618aec44e..b0d2d032e9 100644 --- a/Content.Server/Database/ServerDbManager.cs +++ b/Content.Server/Database/ServerDbManager.cs @@ -21,7 +21,6 @@ using Robust.Shared.Network; using LogLevel = Robust.Shared.Log.LogLevel; using MSLogLevel = Microsoft.Extensions.Logging.LogLevel; -#nullable enable namespace Content.Server.Database { diff --git a/Content.Server/Database/ServerDbPostgres.cs b/Content.Server/Database/ServerDbPostgres.cs index 7198c01edd..328cdb7796 100644 --- a/Content.Server/Database/ServerDbPostgres.cs +++ b/Content.Server/Database/ServerDbPostgres.cs @@ -9,7 +9,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using Robust.Shared.Network; -#nullable enable namespace Content.Server.Database { diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs index 6cc58614ac..bd840db20d 100644 --- a/Content.Server/Database/ServerDbSqlite.cs +++ b/Content.Server/Database/ServerDbSqlite.cs @@ -16,7 +16,6 @@ using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Network; -#nullable enable namespace Content.Server.Database { diff --git a/Content.Server/Destructible/DestructibleComponent.cs b/Content.Server/Destructible/DestructibleComponent.cs index d0383cb804..c7bdd18f9f 100644 --- a/Content.Server/Destructible/DestructibleComponent.cs +++ b/Content.Server/Destructible/DestructibleComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.Destructible.Thresholds; using Content.Shared.Damage; using Robust.Shared.GameObjects; diff --git a/Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs index 6aab46c822..fbf65bd941 100644 --- a/Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs +++ b/Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Server.Construction.Components; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Destructible/Thresholds/Behaviors/EmptyAllContainersBehaviour.cs b/Content.Server/Destructible/Thresholds/Behaviors/EmptyAllContainersBehaviour.cs index 7ade5c290d..f62489b985 100644 --- a/Content.Server/Destructible/Thresholds/Behaviors/EmptyAllContainersBehaviour.cs +++ b/Content.Server/Destructible/Thresholds/Behaviors/EmptyAllContainersBehaviour.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs index 43c9ccbe15..6cbbc49b07 100644 --- a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs +++ b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Server.Stack; diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs index a8d6ae0f36..6840c36188 100644 --- a/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs +++ b/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Chemistry.Components; using Content.Server.Fluids.Components; using JetBrains.Annotations; diff --git a/Content.Server/Destructible/Thresholds/Threshold.cs b/Content.Server/Destructible/Thresholds/Threshold.cs index 886d0b44b8..27c4a557af 100644 --- a/Content.Server/Destructible/Thresholds/Threshold.cs +++ b/Content.Server/Destructible/Thresholds/Threshold.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.Destructible.Thresholds.Behaviors; using Content.Server.Destructible.Thresholds.Triggers; using Content.Shared.Damage.Components; diff --git a/Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs index da293e7f90..55818309b5 100644 --- a/Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs +++ b/Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Content.Shared.Damage.Components; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Destructible/Thresholds/Triggers/DamageClassTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/DamageClassTrigger.cs index 43a4d595ac..606f99cc3b 100644 --- a/Content.Server/Destructible/Thresholds/Triggers/DamageClassTrigger.cs +++ b/Content.Server/Destructible/Thresholds/Triggers/DamageClassTrigger.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Damage; using Content.Shared.Damage.Components; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Destructible/Thresholds/Triggers/DamageTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/DamageTrigger.cs index ab2b10a7eb..a0ea9d10ea 100644 --- a/Content.Server/Destructible/Thresholds/Triggers/DamageTrigger.cs +++ b/Content.Server/Destructible/Thresholds/Triggers/DamageTrigger.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Damage.Components; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs index f46cf7e615..80451c0ae7 100644 --- a/Content.Server/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs +++ b/Content.Server/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Damage; using Content.Shared.Damage.Components; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Destructible/Thresholds/Triggers/IThresholdTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/IThresholdTrigger.cs index bc5ada7752..88d9a6d66a 100644 --- a/Content.Server/Destructible/Thresholds/Triggers/IThresholdTrigger.cs +++ b/Content.Server/Destructible/Thresholds/Triggers/IThresholdTrigger.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Damage.Components; +using Content.Shared.Damage.Components; namespace Content.Server.Destructible.Thresholds.Triggers { diff --git a/Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs index 016529f1ea..b19df41e51 100644 --- a/Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs +++ b/Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Content.Shared.Damage.Components; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs b/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs index bc202065f2..16bc40e0ab 100644 --- a/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs +++ b/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs index 33c7a83feb..45bb72bb99 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Text; diff --git a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs index 3dde6dee78..bd657678d3 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Disposal.Unit.Components; using Content.Server.Hands.Components; using Content.Server.UserInterface; diff --git a/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs index 27e5d2b6e7..4e0372f5f2 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Linq; using Content.Server.Construction.Components; diff --git a/Content.Server/Disposal/Tube/Components/IDisposalTubeComponent.cs b/Content.Server/Disposal/Tube/Components/IDisposalTubeComponent.cs index d615cf154a..31794739c6 100644 --- a/Content.Server/Disposal/Tube/Components/IDisposalTubeComponent.cs +++ b/Content.Server/Disposal/Tube/Components/IDisposalTubeComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Disposal.Unit.Components; using Robust.Shared.Containers; using Robust.Shared.GameObjects; diff --git a/Content.Server/Disposal/TubeConnectionsCommand.cs b/Content.Server/Disposal/TubeConnectionsCommand.cs index a442e8af95..ba56e48582 100644 --- a/Content.Server/Disposal/TubeConnectionsCommand.cs +++ b/Content.Server/Disposal/TubeConnectionsCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.Disposal.Tube.Components; using Content.Shared.Administration; diff --git a/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs b/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs index 331b11675c..2797b1c4db 100644 --- a/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs +++ b/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs b/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs index 1be9f11e74..c932e96d7c 100644 --- a/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs +++ b/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/DoAfter/DoAfter.cs b/Content.Server/DoAfter/DoAfter.cs index 4b929a060b..040db67654 100644 --- a/Content.Server/DoAfter/DoAfter.cs +++ b/Content.Server/DoAfter/DoAfter.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Threading.Tasks; using Content.Server.Hands.Components; using Content.Server.Items; diff --git a/Content.Server/DoAfter/DoAfterComponent.cs b/Content.Server/DoAfter/DoAfterComponent.cs index 053b741d6a..c1136ab853 100644 --- a/Content.Server/DoAfter/DoAfterComponent.cs +++ b/Content.Server/DoAfter/DoAfterComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Content.Shared.Damage; using Content.Shared.DoAfter; using Robust.Shared.GameObjects; diff --git a/Content.Server/DoAfter/DoAfterEventArgs.cs b/Content.Server/DoAfter/DoAfterEventArgs.cs index cb7002de60..8c1e9e4717 100644 --- a/Content.Server/DoAfter/DoAfterEventArgs.cs +++ b/Content.Server/DoAfter/DoAfterEventArgs.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Threading; using Content.Shared.Interaction.Helpers; using Content.Shared.Physics; diff --git a/Content.Server/DoAfter/DoAfterSystem.cs b/Content.Server/DoAfter/DoAfterSystem.cs index 6934a93c61..13978df78e 100644 --- a/Content.Server/DoAfter/DoAfterSystem.cs +++ b/Content.Server/DoAfter/DoAfterSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Doors/Components/AirlockComponent.cs b/Content.Server/Doors/Components/AirlockComponent.cs index ae59d4a65c..2e47a1b6d7 100644 --- a/Content.Server/Doors/Components/AirlockComponent.cs +++ b/Content.Server/Doors/Components/AirlockComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Threading; using Content.Server.Power.Components; diff --git a/Content.Server/Doors/Components/ServerDoorComponent.cs b/Content.Server/Doors/Components/ServerDoorComponent.cs index b608dc5304..7a020c4b0c 100644 --- a/Content.Server/Doors/Components/ServerDoorComponent.cs +++ b/Content.Server/Doors/Components/ServerDoorComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Linq; using System.Threading; diff --git a/Content.Server/Doors/DoorSystem.cs b/Content.Server/Doors/DoorSystem.cs index e6467f2b6b..a35c2056db 100644 --- a/Content.Server/Doors/DoorSystem.cs +++ b/Content.Server/Doors/DoorSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Doors; namespace Content.Server.Doors diff --git a/Content.Server/Doors/IDoorCheck.cs b/Content.Server/Doors/IDoorCheck.cs index dfa5810458..3c5989a5d8 100644 --- a/Content.Server/Doors/IDoorCheck.cs +++ b/Content.Server/Doors/IDoorCheck.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Doors; using Content.Shared.Interaction; diff --git a/Content.Server/EUI/BaseEui.cs b/Content.Server/EUI/BaseEui.cs index 0126a0f40f..097fbaa975 100644 --- a/Content.Server/EUI/BaseEui.cs +++ b/Content.Server/EUI/BaseEui.cs @@ -4,7 +4,6 @@ using Robust.Server.Player; using Robust.Shared.IoC; using Robust.Shared.Network; -#nullable enable namespace Content.Server.EUI { diff --git a/Content.Server/EUI/EuiManager.cs b/Content.Server/EUI/EuiManager.cs index 51b20f02c4..703d1f6216 100644 --- a/Content.Server/EUI/EuiManager.cs +++ b/Content.Server/EUI/EuiManager.cs @@ -8,7 +8,6 @@ using Robust.Shared.Log; using Robust.Shared.Network; using Robust.Shared.Utility; -#nullable enable namespace Content.Server.EUI { diff --git a/Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs b/Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs index ac0be9c81b..723def1b4a 100644 --- a/Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs +++ b/Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading; using Robust.Shared.GameObjects; using Robust.Shared.Prototypes; diff --git a/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs b/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs index 10151b2086..3a57414f4b 100644 --- a/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs +++ b/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs index ef71b16e43..fcf4bb1d85 100644 --- a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs +++ b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Coordinates.Helpers; using Content.Server.DoAfter; using Content.Server.Engineering.Components; diff --git a/Content.Server/Explosion/Components/ClusterFlashComponent.cs b/Content.Server/Explosion/Components/ClusterFlashComponent.cs index 30ed16254d..ae5d34f0a1 100644 --- a/Content.Server/Explosion/Components/ClusterFlashComponent.cs +++ b/Content.Server/Explosion/Components/ClusterFlashComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Diagnostics.CodeAnalysis; using System.Threading.Tasks; diff --git a/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs b/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs index eb428ed043..44d67d61c3 100644 --- a/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs +++ b/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Interaction; using Content.Shared.Trigger; using Robust.Server.GameObjects; diff --git a/Content.Server/Explosion/ExplosionHelper.cs b/Content.Server/Explosion/ExplosionHelper.cs index c85e1036fa..9a5c0c9463 100644 --- a/Content.Server/Explosion/ExplosionHelper.cs +++ b/Content.Server/Explosion/ExplosionHelper.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Extinguisher/FireExtinguisherComponent.cs b/Content.Server/Extinguisher/FireExtinguisherComponent.cs index a09bdf4e20..cf4499d94b 100644 --- a/Content.Server/Extinguisher/FireExtinguisherComponent.cs +++ b/Content.Server/Extinguisher/FireExtinguisherComponent.cs @@ -10,7 +10,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Player; -#nullable enable namespace Content.Server.Extinguisher { diff --git a/Content.Server/Fluids/Components/BucketComponent.cs b/Content.Server/Fluids/Components/BucketComponent.cs index 2774549cb8..d26cac0dd1 100644 --- a/Content.Server/Fluids/Components/BucketComponent.cs +++ b/Content.Server/Fluids/Components/BucketComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Threading.Tasks; using Content.Server.Chemistry.Components; diff --git a/Content.Server/Fluids/Components/MopComponent.cs b/Content.Server/Fluids/Components/MopComponent.cs index fa0c7ec11e..ecb84e8be2 100644 --- a/Content.Server/Fluids/Components/MopComponent.cs +++ b/Content.Server/Fluids/Components/MopComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.Chemistry.Components; using Content.Server.DoAfter; diff --git a/Content.Server/Fluids/Components/SpillExtensions.cs b/Content.Server/Fluids/Components/SpillExtensions.cs index 85f8725961..2a7a354362 100644 --- a/Content.Server/Fluids/Components/SpillExtensions.cs +++ b/Content.Server/Fluids/Components/SpillExtensions.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Server.Coordinates.Helpers; diff --git a/Content.Server/GameTicking/Commands/GoLobbyCommand.cs b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs index 6659938e40..0ae970f0dc 100644 --- a/Content.Server/GameTicking/Commands/GoLobbyCommand.cs +++ b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Server.Administration; using Content.Shared; using Content.Shared.Administration; diff --git a/Content.Server/GameTicking/Rules/RuleInactivityTimeRestart.cs b/Content.Server/GameTicking/Rules/RuleInactivityTimeRestart.cs index 746a2b9674..f17bd27c9c 100644 --- a/Content.Server/GameTicking/Rules/RuleInactivityTimeRestart.cs +++ b/Content.Server/GameTicking/Rules/RuleInactivityTimeRestart.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Threading; using Content.Server.Chat.Managers; diff --git a/Content.Server/Ghost/Components/GhostComponent.cs b/Content.Server/Ghost/Components/GhostComponent.cs index 84d217b0c6..0a2dcbc3d8 100644 --- a/Content.Server/Ghost/Components/GhostComponent.cs +++ b/Content.Server/Ghost/Components/GhostComponent.cs @@ -2,7 +2,6 @@ using System; using Content.Shared.Ghost; using Robust.Shared.GameObjects; -#nullable enable namespace Content.Server.Ghost.Components { [RegisterComponent] diff --git a/Content.Server/Ghost/Components/GhostOnMoveComponent.cs b/Content.Server/Ghost/Components/GhostOnMoveComponent.cs index 3153effde2..1496d0d6bf 100644 --- a/Content.Server/Ghost/Components/GhostOnMoveComponent.cs +++ b/Content.Server/Ghost/Components/GhostOnMoveComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.GameTicking; using Content.Server.Mind.Components; using Content.Shared.Movement.Components; diff --git a/Content.Server/Ghost/Ghost.cs b/Content.Server/Ghost/Ghost.cs index 60395091a6..8fd698db34 100644 --- a/Content.Server/Ghost/Ghost.cs +++ b/Content.Server/Ghost/Ghost.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.GameTicking; using Content.Server.Players; diff --git a/Content.Server/Ghost/IGhostBooAffected.cs b/Content.Server/Ghost/IGhostBooAffected.cs index 339ccd74b6..e797f4b0a7 100644 --- a/Content.Server/Ghost/IGhostBooAffected.cs +++ b/Content.Server/Ghost/IGhostBooAffected.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Actions.Behaviors; namespace Content.Server.Ghost diff --git a/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs b/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs index ab48146fce..7e6e876156 100644 --- a/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs +++ b/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.Ghost.Roles.Components; using Content.Server.Mind.Components; using Content.Shared.Administration; diff --git a/Content.Server/Ghost/Roles/MakeGhostRoleVerb.cs b/Content.Server/Ghost/Roles/MakeGhostRoleVerb.cs index 0724db5d74..32b424e9ce 100644 --- a/Content.Server/Ghost/Roles/MakeGhostRoleVerb.cs +++ b/Content.Server/Ghost/Roles/MakeGhostRoleVerb.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Mind.Components; using Content.Shared.Verbs; using Robust.Server.Console; diff --git a/Content.Server/Gravity/GravityGeneratorComponent.cs b/Content.Server/Gravity/GravityGeneratorComponent.cs index b148562c72..15605cd785 100644 --- a/Content.Server/Gravity/GravityGeneratorComponent.cs +++ b/Content.Server/Gravity/GravityGeneratorComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Power.Components; +using Content.Server.Power.Components; using Content.Server.UserInterface; using Content.Shared.Acts; using Content.Shared.Gravity; diff --git a/Content.Server/Hands/Components/HandsComponent.cs b/Content.Server/Hands/Components/HandsComponent.cs index 61a4b53661..c3f65060b5 100644 --- a/Content.Server/Hands/Components/HandsComponent.cs +++ b/Content.Server/Hands/Components/HandsComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; diff --git a/Content.Server/Hands/Components/IHandsComponent.cs b/Content.Server/Hands/Components/IHandsComponent.cs index c0d138742e..6bdda53d93 100644 --- a/Content.Server/Hands/Components/IHandsComponent.cs +++ b/Content.Server/Hands/Components/IHandsComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; diff --git a/Content.Server/Holiday/HolidayPrototype.cs b/Content.Server/Holiday/HolidayPrototype.cs index a2462efdfe..fa11bb9492 100644 --- a/Content.Server/Holiday/HolidayPrototype.cs +++ b/Content.Server/Holiday/HolidayPrototype.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Holiday.Celebrate; using Content.Server.Holiday.Greet; diff --git a/Content.Server/Instruments/InstrumentComponent.cs b/Content.Server/Instruments/InstrumentComponent.cs index 98fed4906d..c3484bbc20 100644 --- a/Content.Server/Instruments/InstrumentComponent.cs +++ b/Content.Server/Instruments/InstrumentComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Linq; using Content.Server.Stunnable.Components; diff --git a/Content.Server/Interaction/Components/ClumsyComponent.cs b/Content.Server/Interaction/Components/ClumsyComponent.cs index 7e2b8cacd7..bba250447d 100644 --- a/Content.Server/Interaction/Components/ClumsyComponent.cs +++ b/Content.Server/Interaction/Components/ClumsyComponent.cs @@ -2,7 +2,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Random; -#nullable enable namespace Content.Server.Interaction.Components { diff --git a/Content.Server/Interaction/TilePryCommand.cs b/Content.Server/Interaction/TilePryCommand.cs index 273799363c..39fa5f8de3 100644 --- a/Content.Server/Interaction/TilePryCommand.cs +++ b/Content.Server/Interaction/TilePryCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.Tools.Components; using Content.Shared.Administration; diff --git a/Content.Server/Interfaces/IGasReactionEffect.cs b/Content.Server/Interfaces/IGasReactionEffect.cs index 7268b8654e..1f2d7495db 100644 --- a/Content.Server/Interfaces/IGasReactionEffect.cs +++ b/Content.Server/Interfaces/IGasReactionEffect.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Atmos; using Content.Server.Atmos.EntitySystems; using Content.Server.Atmos.Reactions; diff --git a/Content.Server/Items/ItemComponent.cs b/Content.Server/Items/ItemComponent.cs index 853d9ffb61..3b8a17bfb9 100644 --- a/Content.Server/Items/ItemComponent.cs +++ b/Content.Server/Items/ItemComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Hands.Components; using Content.Shared.ActionBlocker; using Content.Shared.Interaction.Events; diff --git a/Content.Server/Jobs/JanitorSpecial.cs b/Content.Server/Jobs/JanitorSpecial.cs index cd845960ec..6b498fed83 100644 --- a/Content.Server/Jobs/JanitorSpecial.cs +++ b/Content.Server/Jobs/JanitorSpecial.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Hands.Components; using Content.Server.Holiday.Interfaces; using Content.Server.Items; diff --git a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs index 8e5c27d0fd..359b71e6b1 100644 --- a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs +++ b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Content.Server.Act; diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs index 20500291f9..7c26e0863e 100644 --- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs +++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs index f66a8f5734..5811d7f650 100644 --- a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs +++ b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Linq; using System.Threading.Tasks; diff --git a/Content.Server/Lathe/Components/LatheComponent.cs b/Content.Server/Lathe/Components/LatheComponent.cs index f5494064b8..df45d4f17f 100644 --- a/Content.Server/Lathe/Components/LatheComponent.cs +++ b/Content.Server/Lathe/Components/LatheComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Light/Components/EmergencyLightComponent.cs b/Content.Server/Light/Components/EmergencyLightComponent.cs index f775c18e52..5d7fd2a933 100644 --- a/Content.Server/Light/Components/EmergencyLightComponent.cs +++ b/Content.Server/Light/Components/EmergencyLightComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Server.Power.Components; diff --git a/Content.Server/Light/Components/HandheldLightComponent.cs b/Content.Server/Light/Components/HandheldLightComponent.cs index a2bc02aed3..f4d01f2d1b 100644 --- a/Content.Server/Light/Components/HandheldLightComponent.cs +++ b/Content.Server/Light/Components/HandheldLightComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.Clothing.Components; using Content.Server.Items; diff --git a/Content.Server/Light/Components/LightBulbComponent.cs b/Content.Server/Light/Components/LightBulbComponent.cs index 68d849a808..037b80b914 100644 --- a/Content.Server/Light/Components/LightBulbComponent.cs +++ b/Content.Server/Light/Components/LightBulbComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Acts; using Content.Shared.Audio; diff --git a/Content.Server/Light/Components/LightReplacerComponent.cs b/Content.Server/Light/Components/LightReplacerComponent.cs index d086ddc882..6a1b90bfd3 100644 --- a/Content.Server/Light/Components/LightReplacerComponent.cs +++ b/Content.Server/Light/Components/LightReplacerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Light/Components/MatchstickComponent.cs b/Content.Server/Light/Components/MatchstickComponent.cs index 670527effe..f97c0cda64 100644 --- a/Content.Server/Light/Components/MatchstickComponent.cs +++ b/Content.Server/Light/Components/MatchstickComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Shared.Audio; using Content.Shared.Interaction; diff --git a/Content.Server/Light/Components/PoweredLightComponent.cs b/Content.Server/Light/Components/PoweredLightComponent.cs index 3e5ecd5b19..9711bcb193 100644 --- a/Content.Server/Light/Components/PoweredLightComponent.cs +++ b/Content.Server/Light/Components/PoweredLightComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Threading.Tasks; using Content.Server.Ghost; diff --git a/Content.Server/Light/EntitySystems/LightReplacerSystem.cs b/Content.Server/Light/EntitySystems/LightReplacerSystem.cs index fa7aa3c5ad..fba3c80ce0 100644 --- a/Content.Server/Light/EntitySystems/LightReplacerSystem.cs +++ b/Content.Server/Light/EntitySystems/LightReplacerSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Light.Components; using Content.Server.Storage.Components; using Content.Shared.ActionBlocker; diff --git a/Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs b/Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs index 212ab41258..2ddad2d982 100644 --- a/Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs +++ b/Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Interaction; using Content.Shared.MachineLinking; using Content.Shared.Notification; diff --git a/Content.Server/Medical/Components/MedicalScannerComponent.cs b/Content.Server/Medical/Components/MedicalScannerComponent.cs index f093948611..dc1ca68355 100644 --- a/Content.Server/Medical/Components/MedicalScannerComponent.cs +++ b/Content.Server/Medical/Components/MedicalScannerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Server.Cloning; diff --git a/Content.Server/Metabolism/MetabolismComponent.cs b/Content.Server/Metabolism/MetabolismComponent.cs index 4499ef387f..1c1acde1d9 100644 --- a/Content.Server/Metabolism/MetabolismComponent.cs +++ b/Content.Server/Metabolism/MetabolismComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Mind/Commands/MakeSentientCommand.cs b/Content.Server/Mind/Commands/MakeSentientCommand.cs index d162fab864..0ed288df44 100644 --- a/Content.Server/Mind/Commands/MakeSentientCommand.cs +++ b/Content.Server/Mind/Commands/MakeSentientCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.AI.Components; using Content.Server.Mind.Components; diff --git a/Content.Server/Mind/Components/MindComponent.cs b/Content.Server/Mind/Components/MindComponent.cs index 4b27a312a5..b724e8a10c 100644 --- a/Content.Server/Mind/Components/MindComponent.cs +++ b/Content.Server/Mind/Components/MindComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.GameTicking; using Content.Server.Ghost.Components; using Content.Shared.Examine; diff --git a/Content.Server/Mind/Components/VisitingMindComponent.cs b/Content.Server/Mind/Components/VisitingMindComponent.cs index 11d9bfe2e7..53a5eca43b 100644 --- a/Content.Server/Mind/Components/VisitingMindComponent.cs +++ b/Content.Server/Mind/Components/VisitingMindComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; diff --git a/Content.Server/MobState/States/NormalMobState.cs b/Content.Server/MobState/States/NormalMobState.cs index 780bee0cbf..2238457d5a 100644 --- a/Content.Server/MobState/States/NormalMobState.cs +++ b/Content.Server/MobState/States/NormalMobState.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Alert; +using Content.Server.Alert; using Content.Shared.Alert; using Content.Shared.Damage.Components; using Content.Shared.MobState; diff --git a/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs b/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs index e35bcc1fb4..48c5b51efa 100644 --- a/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.Hands.Components; using Content.Server.Items; diff --git a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs index cd254c9e70..bc3187eac2 100644 --- a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading; using Content.Server.Act; using Content.Server.Chat.Managers; diff --git a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs index 5c6d77b47c..0699c6e19f 100644 --- a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Storage.Components; using Content.Shared.Body.Components; using Content.Shared.Directions; diff --git a/Content.Server/NodeContainer/NodeContainerComponent.cs b/Content.Server/NodeContainer/NodeContainerComponent.cs index b0943f7cb6..83f1836a4a 100644 --- a/Content.Server/NodeContainer/NodeContainerComponent.cs +++ b/Content.Server/NodeContainer/NodeContainerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Content.Server.NodeContainer.NodeGroups; diff --git a/Content.Server/NodeContainer/NodeGroups/BaseNodeGroup.cs b/Content.Server/NodeContainer/NodeGroups/BaseNodeGroup.cs index 81edd4e643..b65700b7e7 100644 --- a/Content.Server/NodeContainer/NodeGroups/BaseNodeGroup.cs +++ b/Content.Server/NodeContainer/NodeGroups/BaseNodeGroup.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Linq; using Content.Server.NodeContainer.EntitySystems; diff --git a/Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs b/Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs index 27ef01eafc..109af6f67f 100644 --- a/Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs +++ b/Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using JetBrains.Annotations; diff --git a/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs b/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs index 33b81a55d5..0722ea1dc4 100644 --- a/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs +++ b/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Reflection; diff --git a/Content.Server/NodeContainer/NodeGroups/PipeNet.cs b/Content.Server/NodeContainer/NodeGroups/PipeNet.cs index 573694cdd6..5d04e23189 100644 --- a/Content.Server/NodeContainer/NodeGroups/PipeNet.cs +++ b/Content.Server/NodeContainer/NodeGroups/PipeNet.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/NodeContainer/Nodes/AdjacentNode.cs b/Content.Server/NodeContainer/Nodes/AdjacentNode.cs index c28589aec9..90b3330139 100644 --- a/Content.Server/NodeContainer/Nodes/AdjacentNode.cs +++ b/Content.Server/NodeContainer/Nodes/AdjacentNode.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/NodeContainer/Nodes/Node.cs b/Content.Server/NodeContainer/Nodes/Node.cs index 58519e5e23..f544490d7e 100644 --- a/Content.Server/NodeContainer/Nodes/Node.cs +++ b/Content.Server/NodeContainer/Nodes/Node.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Server.NodeContainer.EntitySystems; using Content.Server.NodeContainer.NodeGroups; diff --git a/Content.Server/NodeContainer/Nodes/PipeNode.cs b/Content.Server/NodeContainer/Nodes/PipeNode.cs index d8418efb5a..6f72cc0ffc 100644 --- a/Content.Server/NodeContainer/Nodes/PipeNode.cs +++ b/Content.Server/NodeContainer/Nodes/PipeNode.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Server.Atmos; using Content.Server.Atmos.EntitySystems; diff --git a/Content.Server/Nutrition/Components/DrinkComponent.cs b/Content.Server/Nutrition/Components/DrinkComponent.cs index 62a05b7703..9ea94fa215 100644 --- a/Content.Server/Nutrition/Components/DrinkComponent.cs +++ b/Content.Server/Nutrition/Components/DrinkComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using System.Threading.Tasks; using Content.Server.Body.Behavior; diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs index 161e9e426e..d5b57f70c1 100644 --- a/Content.Server/Nutrition/Components/FoodComponent.cs +++ b/Content.Server/Nutrition/Components/FoodComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Nutrition/Components/SmokingComponent.cs b/Content.Server/Nutrition/Components/SmokingComponent.cs index f84b8efa74..ee75bc91a9 100644 --- a/Content.Server/Nutrition/Components/SmokingComponent.cs +++ b/Content.Server/Nutrition/Components/SmokingComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.Clothing.Components; using Content.Shared.Interaction; diff --git a/Content.Server/Nutrition/Components/UtensilComponent.cs b/Content.Server/Nutrition/Components/UtensilComponent.cs index ca243f04af..dd1e5fd348 100644 --- a/Content.Server/Nutrition/Components/UtensilComponent.cs +++ b/Content.Server/Nutrition/Components/UtensilComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Threading.Tasks; using Content.Shared.Interaction; diff --git a/Content.Server/Nutrition/Hungry.cs b/Content.Server/Nutrition/Hungry.cs index c84b59b713..c05ca157bb 100644 --- a/Content.Server/Nutrition/Hungry.cs +++ b/Content.Server/Nutrition/Hungry.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.Nutrition.Components; using Content.Shared.Administration; diff --git a/Content.Server/Objectives/Commands/AddObjectiveCommand.cs b/Content.Server/Objectives/Commands/AddObjectiveCommand.cs index 68c1f7d001..6345d7351f 100644 --- a/Content.Server/Objectives/Commands/AddObjectiveCommand.cs +++ b/Content.Server/Objectives/Commands/AddObjectiveCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.Players; using Content.Shared.Administration; using Robust.Server.Player; diff --git a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs index ba315995f8..ab2f438adf 100644 --- a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs +++ b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using Content.Server.Administration; using Content.Server.Players; diff --git a/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs b/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs index de3e0d61ce..34bcd3cf76 100644 --- a/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs +++ b/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.Players; using Content.Shared.Administration; using Robust.Server.Player; diff --git a/Content.Server/Objectives/Conditions/DieCondition.cs b/Content.Server/Objectives/Conditions/DieCondition.cs index c2dcaa97b9..352243b737 100644 --- a/Content.Server/Objectives/Conditions/DieCondition.cs +++ b/Content.Server/Objectives/Conditions/DieCondition.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Objectives.Interfaces; using JetBrains.Annotations; using Robust.Shared.Localization; diff --git a/Content.Server/Objectives/Conditions/KillPersonCondition.cs b/Content.Server/Objectives/Conditions/KillPersonCondition.cs index 3e75e8ec5d..8f37588b31 100644 --- a/Content.Server/Objectives/Conditions/KillPersonCondition.cs +++ b/Content.Server/Objectives/Conditions/KillPersonCondition.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Objectives.Interfaces; using Robust.Shared.Localization; using Robust.Shared.Utility; diff --git a/Content.Server/Objectives/Conditions/StayAliveCondition.cs b/Content.Server/Objectives/Conditions/StayAliveCondition.cs index 607e672f63..393853ad74 100644 --- a/Content.Server/Objectives/Conditions/StayAliveCondition.cs +++ b/Content.Server/Objectives/Conditions/StayAliveCondition.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Objectives.Interfaces; using JetBrains.Annotations; using Robust.Shared.Localization; diff --git a/Content.Server/Objectives/Conditions/StealCondition.cs b/Content.Server/Objectives/Conditions/StealCondition.cs index ea9ec71cf1..93de56b9a0 100644 --- a/Content.Server/Objectives/Conditions/StealCondition.cs +++ b/Content.Server/Objectives/Conditions/StealCondition.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Containers; using Content.Server.GameObjects; diff --git a/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs b/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs index a7c2f46e39..2cb0061632 100644 --- a/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs +++ b/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Utility; namespace Content.Server.Objectives.Interfaces diff --git a/Content.Server/Objectives/ObjectivePrototype.cs b/Content.Server/Objectives/ObjectivePrototype.cs index 0215013b16..55feadacb8 100644 --- a/Content.Server/Objectives/ObjectivePrototype.cs +++ b/Content.Server/Objectives/ObjectivePrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Content.Server.Objectives.Interfaces; using Robust.Shared.Prototypes; diff --git a/Content.Server/Objectives/ObjectivesManager.cs b/Content.Server/Objectives/ObjectivesManager.cs index 34857ec202..a17e252da3 100644 --- a/Content.Server/Objectives/ObjectivesManager.cs +++ b/Content.Server/Objectives/ObjectivesManager.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Content.Server.Objectives.Interfaces; using Robust.Shared.IoC; diff --git a/Content.Server/PDA/Managers/IPDAUplinkManager.cs b/Content.Server/PDA/Managers/IPDAUplinkManager.cs index 4ecae0c6de..5eb21183e9 100644 --- a/Content.Server/PDA/Managers/IPDAUplinkManager.cs +++ b/Content.Server/PDA/Managers/IPDAUplinkManager.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Content.Shared.PDA; diff --git a/Content.Server/PDA/Managers/PDAUplinkManager.cs b/Content.Server/PDA/Managers/PDAUplinkManager.cs index 2112ebf40c..83531adeae 100644 --- a/Content.Server/PDA/Managers/PDAUplinkManager.cs +++ b/Content.Server/PDA/Managers/PDAUplinkManager.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Content.Server.Mind.Components; diff --git a/Content.Server/PDA/PDAComponent.cs b/Content.Server/PDA/PDAComponent.cs index 0b01d5ed7d..22a9260b83 100644 --- a/Content.Server/PDA/PDAComponent.cs +++ b/Content.Server/PDA/PDAComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections; using System.Collections.Generic; diff --git a/Content.Server/PDA/PDAExtensions.cs b/Content.Server/PDA/PDAExtensions.cs index 13377fb1c6..5a0cbe4262 100644 --- a/Content.Server/PDA/PDAExtensions.cs +++ b/Content.Server/PDA/PDAExtensions.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using Content.Server.Access.Components; using Content.Server.Hands.Components; using Content.Server.Inventory.Components; diff --git a/Content.Server/Paper/PaperComponent.cs b/Content.Server/Paper/PaperComponent.cs index 709e24f26e..8378e76b4a 100644 --- a/Content.Server/Paper/PaperComponent.cs +++ b/Content.Server/Paper/PaperComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.UserInterface; using Content.Shared.Examine; diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs index 8562cccfbe..11cacdd052 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPartComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPartComponent.cs index 82fb8b9183..17c9a53035 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPartComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPartComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs index c37486bc81..5517069a65 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Power.Components; +using Content.Server.Power.Components; using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPartSystem.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPartSystem.cs index 79be10ebae..994c9a71b2 100644 --- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPartSystem.cs +++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPartSystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.ParticleAccelerator.Components; +using Content.Server.ParticleAccelerator.Components; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Physics/Controllers/ConveyorController.cs b/Content.Server/Physics/Controllers/ConveyorController.cs index 3c65195aaa..1587e2834c 100644 --- a/Content.Server/Physics/Controllers/ConveyorController.cs +++ b/Content.Server/Physics/Controllers/ConveyorController.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Server.Conveyor; diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs index 971a551029..20b6d97528 100644 --- a/Content.Server/Physics/Controllers/MoverController.cs +++ b/Content.Server/Physics/Controllers/MoverController.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Server.Inventory.Components; using Content.Server.Items; diff --git a/Content.Server/Physics/Controllers/PullController.cs b/Content.Server/Physics/Controllers/PullController.cs index 23a27af383..5ce023f43d 100644 --- a/Content.Server/Physics/Controllers/PullController.cs +++ b/Content.Server/Physics/Controllers/PullController.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Content.Shared.Pulling; using Robust.Shared.GameObjects; diff --git a/Content.Server/Physics/Controllers/SingularityController.cs b/Content.Server/Physics/Controllers/SingularityController.cs index 4347a194be..934bace7ca 100644 --- a/Content.Server/Physics/Controllers/SingularityController.cs +++ b/Content.Server/Physics/Controllers/SingularityController.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Ghost.Components; using Content.Server.Singularity.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/Physics/TestbedCommand.cs b/Content.Server/Physics/TestbedCommand.cs index 9dabbd0490..d3e52bc0c8 100644 --- a/Content.Server/Physics/TestbedCommand.cs +++ b/Content.Server/Physics/TestbedCommand.cs @@ -35,7 +35,6 @@ using Robust.Shared.Physics.Collision.Shapes; using Robust.Shared.Physics.Dynamics; using Robust.Shared.Timing; -#nullable enable namespace Content.Server.Physics { diff --git a/Content.Server/Players/PlayerData.cs b/Content.Server/Players/PlayerData.cs index cff16ce8e6..d9e363cd8d 100644 --- a/Content.Server/Players/PlayerData.cs +++ b/Content.Server/Players/PlayerData.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Server.Player; using Robust.Shared.Network; using Robust.Shared.ViewVariables; diff --git a/Content.Server/Pointing/Components/PointingArrowComponent.cs b/Content.Server/Pointing/Components/PointingArrowComponent.cs index ab39e8f226..832a23bb3b 100644 --- a/Content.Server/Pointing/Components/PointingArrowComponent.cs +++ b/Content.Server/Pointing/Components/PointingArrowComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Pointing.Components; +using Content.Shared.Pointing.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs b/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs index 7ce21d39ea..2fda3c2be7 100644 --- a/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs +++ b/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using Content.Server.Explosion; using Content.Shared.Pointing.Components; diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs index 0ad51b44dc..f31155ff11 100644 --- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs +++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Server.Ghost.Components; diff --git a/Content.Server/Portal/Components/PortalComponent.cs b/Content.Server/Portal/Components/PortalComponent.cs index ada1fa19ce..3d7b33bc90 100644 --- a/Content.Server/Portal/Components/PortalComponent.cs +++ b/Content.Server/Portal/Components/PortalComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Shared.Portal.Components; diff --git a/Content.Server/Portal/Components/TeleporterComponent.cs b/Content.Server/Portal/Components/TeleporterComponent.cs index b066c2cd22..4101e6fd16 100644 --- a/Content.Server/Portal/Components/TeleporterComponent.cs +++ b/Content.Server/Portal/Components/TeleporterComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Linq; using System.Threading.Tasks; diff --git a/Content.Server/Power/Components/ApcComponent.cs b/Content.Server/Power/Components/ApcComponent.cs index 5182551775..12d0c48e8e 100644 --- a/Content.Server/Power/Components/ApcComponent.cs +++ b/Content.Server/Power/Components/ApcComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Access.Components; using Content.Server.Power.NodeGroups; diff --git a/Content.Server/Power/Components/ApcPowerProviderComponent.cs b/Content.Server/Power/Components/ApcPowerProviderComponent.cs index c87e4b6c54..dd8c3501ce 100644 --- a/Content.Server/Power/Components/ApcPowerProviderComponent.cs +++ b/Content.Server/Power/Components/ApcPowerProviderComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Server.Power.NodeGroups; diff --git a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs index d27bcd25e9..16fa1791c5 100644 --- a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs +++ b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Diagnostics.CodeAnalysis; using Content.Server.Power.NodeGroups; diff --git a/Content.Server/Power/Components/BaseApcNetComponent.cs b/Content.Server/Power/Components/BaseApcNetComponent.cs index e004606107..634653c022 100644 --- a/Content.Server/Power/Components/BaseApcNetComponent.cs +++ b/Content.Server/Power/Components/BaseApcNetComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Power.NodeGroups; namespace Content.Server.Power.Components diff --git a/Content.Server/Power/Components/BaseCharger.cs b/Content.Server/Power/Components/BaseCharger.cs index 753e5d59e8..7177f9663b 100644 --- a/Content.Server/Power/Components/BaseCharger.cs +++ b/Content.Server/Power/Components/BaseCharger.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Threading.Tasks; using Content.Server.Hands.Components; diff --git a/Content.Server/Power/Components/BaseNetConnectorComponent.cs b/Content.Server/Power/Components/BaseNetConnectorComponent.cs index d24fb16191..3cdf243ca2 100644 --- a/Content.Server/Power/Components/BaseNetConnectorComponent.cs +++ b/Content.Server/Power/Components/BaseNetConnectorComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Server.NodeContainer; using Content.Server.NodeContainer.NodeGroups; diff --git a/Content.Server/Power/Components/BasePowerNetComponent.cs b/Content.Server/Power/Components/BasePowerNetComponent.cs index c25715abb4..98f24618f5 100644 --- a/Content.Server/Power/Components/BasePowerNetComponent.cs +++ b/Content.Server/Power/Components/BasePowerNetComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.NodeContainer.NodeGroups; using Content.Server.Power.NodeGroups; diff --git a/Content.Server/Power/Components/BatteryComponent.cs b/Content.Server/Power/Components/BatteryComponent.cs index 480afbde0e..4dd6b805ae 100644 --- a/Content.Server/Power/Components/BatteryComponent.cs +++ b/Content.Server/Power/Components/BatteryComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Maths; diff --git a/Content.Server/Power/Components/CableComponent.cs b/Content.Server/Power/Components/CableComponent.cs index b95f790953..4c0623f3cc 100644 --- a/Content.Server/Power/Components/CableComponent.cs +++ b/Content.Server/Power/Components/CableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.Stack; using Content.Server.Tools.Components; diff --git a/Content.Server/Power/Components/CablePlacerComponent.cs b/Content.Server/Power/Components/CablePlacerComponent.cs index a2eb805730..9542636d85 100644 --- a/Content.Server/Power/Components/CablePlacerComponent.cs +++ b/Content.Server/Power/Components/CablePlacerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.Stack; using Content.Shared.Interaction; diff --git a/Content.Server/Power/Components/ExaminableBatteryComponent.cs b/Content.Server/Power/Components/ExaminableBatteryComponent.cs index e5da57a61c..2327f32527 100644 --- a/Content.Server/Power/Components/ExaminableBatteryComponent.cs +++ b/Content.Server/Power/Components/ExaminableBatteryComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Examine; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Power/Components/PowerConsumerComponent.cs b/Content.Server/Power/Components/PowerConsumerComponent.cs index a9c44434bd..7e4e24de58 100644 --- a/Content.Server/Power/Components/PowerConsumerComponent.cs +++ b/Content.Server/Power/Components/PowerConsumerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Power.NodeGroups; using Content.Server.Power.Pow3r; using Robust.Shared.GameObjects; diff --git a/Content.Server/Power/Components/PowerSupplierComponent.cs b/Content.Server/Power/Components/PowerSupplierComponent.cs index c145cd6803..675bc85246 100644 --- a/Content.Server/Power/Components/PowerSupplierComponent.cs +++ b/Content.Server/Power/Components/PowerSupplierComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Power.NodeGroups; using Content.Server.Power.Pow3r; using Robust.Shared.GameObjects; diff --git a/Content.Server/Power/DrainAllBatteriesCommand.cs b/Content.Server/Power/DrainAllBatteriesCommand.cs index 431e68c4d8..068a3df89a 100644 --- a/Content.Server/Power/DrainAllBatteriesCommand.cs +++ b/Content.Server/Power/DrainAllBatteriesCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.Power.Components; using Content.Shared.Administration; diff --git a/Content.Server/Power/EntitySystems/BaseChargerSystem.cs b/Content.Server/Power/EntitySystems/BaseChargerSystem.cs index c758bf721f..bc2bb26f25 100644 --- a/Content.Server/Power/EntitySystems/BaseChargerSystem.cs +++ b/Content.Server/Power/EntitySystems/BaseChargerSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Power.Components; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs index ce54a7e866..44126d6810 100644 --- a/Content.Server/Power/EntitySystems/BatterySystem.cs +++ b/Content.Server/Power/EntitySystems/BatterySystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Power.Components; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Power/EntitySystems/PowerApcSystem.cs b/Content.Server/Power/EntitySystems/PowerApcSystem.cs index e44b66f260..c41a7a4df1 100644 --- a/Content.Server/Power/EntitySystems/PowerApcSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerApcSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Power.Components; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs index e2b54ac769..3b7f81fb25 100644 --- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Server.NodeContainer.EntitySystems; using Content.Server.Power.Components; diff --git a/Content.Server/Power/NodeGroups/ApcNet.cs b/Content.Server/Power/NodeGroups/ApcNet.cs index a2f77eedb0..142dbff1bd 100644 --- a/Content.Server/Power/NodeGroups/ApcNet.cs +++ b/Content.Server/Power/NodeGroups/ApcNet.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Linq; using Content.Server.NodeContainer.NodeGroups; diff --git a/Content.Server/Power/NodeGroups/BaseNetConnectorNodeGroup.cs b/Content.Server/Power/NodeGroups/BaseNetConnectorNodeGroup.cs index 17785078ef..8b69fd8712 100644 --- a/Content.Server/Power/NodeGroups/BaseNetConnectorNodeGroup.cs +++ b/Content.Server/Power/NodeGroups/BaseNetConnectorNodeGroup.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Linq; using Content.Server.NodeContainer.NodeGroups; diff --git a/Content.Server/Power/NodeGroups/PowerNet.cs b/Content.Server/Power/NodeGroups/PowerNet.cs index 38df0af231..01bae9f93f 100644 --- a/Content.Server/Power/NodeGroups/PowerNet.cs +++ b/Content.Server/Power/NodeGroups/PowerNet.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Linq; using Content.Server.NodeContainer.NodeGroups; diff --git a/Content.Server/Power/SMES/PowerSmesSystem.cs b/Content.Server/Power/SMES/PowerSmesSystem.cs index bf66d9daa0..e0dcc760a2 100644 --- a/Content.Server/Power/SMES/PowerSmesSystem.cs +++ b/Content.Server/Power/SMES/PowerSmesSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Power/SMES/SmesComponent.cs b/Content.Server/Power/SMES/SmesComponent.cs index 903d616011..fbb51b3d3d 100644 --- a/Content.Server/Power/SMES/SmesComponent.cs +++ b/Content.Server/Power/SMES/SmesComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Server.Power.Components; using Content.Shared.Power; using Content.Shared.Rounding; diff --git a/Content.Server/PowerCell/Components/PowerCellChargerComponent.cs b/Content.Server/PowerCell/Components/PowerCellChargerComponent.cs index 80cfa844ac..a8716e2540 100644 --- a/Content.Server/PowerCell/Components/PowerCellChargerComponent.cs +++ b/Content.Server/PowerCell/Components/PowerCellChargerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Power.Components; using Content.Shared.Interaction; using Robust.Shared.GameObjects; diff --git a/Content.Server/PowerCell/Components/PowerCellComponent.cs b/Content.Server/PowerCell/Components/PowerCellComponent.cs index 2ba23bf120..5b0378bea7 100644 --- a/Content.Server/PowerCell/Components/PowerCellComponent.cs +++ b/Content.Server/PowerCell/Components/PowerCellComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Chemistry.Components; using Content.Server.Explosion; diff --git a/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs index 5423f01441..dcb4959c86 100644 --- a/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs +++ b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Hands.Components; using Content.Server.Items; diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs index bfe7fe87f7..a5709b9eb9 100644 --- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs +++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs @@ -15,7 +15,6 @@ using Robust.Shared.Maths; using Robust.Shared.Network; using Robust.Shared.Prototypes; -#nullable enable namespace Content.Server.Preferences.Managers { diff --git a/Content.Server/Pulling/PullableComponent.cs b/Content.Server/Pulling/PullableComponent.cs index 56074a7072..d6bfcd7bb6 100644 --- a/Content.Server/Pulling/PullableComponent.cs +++ b/Content.Server/Pulling/PullableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Hands.Components; using Content.Shared.Interaction; using Content.Shared.Pulling.Components; diff --git a/Content.Server/Recycling/Components/RecyclableComponent.cs b/Content.Server/Recycling/Components/RecyclableComponent.cs index 8d86f40706..5e5f3c661b 100644 --- a/Content.Server/Recycling/Components/RecyclableComponent.cs +++ b/Content.Server/Recycling/Components/RecyclableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Recycling/Components/RecyclerComponent.cs b/Content.Server/Recycling/Components/RecyclerComponent.cs index bf0b04b219..fe3c60ed93 100644 --- a/Content.Server/Recycling/Components/RecyclerComponent.cs +++ b/Content.Server/Recycling/Components/RecyclerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Server.Act; using Content.Server.Chat.Managers; diff --git a/Content.Server/Repairable/RepairableComponent.cs b/Content.Server/Repairable/RepairableComponent.cs index cc0b28bd25..8c618957d0 100644 --- a/Content.Server/Repairable/RepairableComponent.cs +++ b/Content.Server/Repairable/RepairableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.Tools.Components; using Content.Shared.Damage.Components; diff --git a/Content.Server/Research/Components/ResearchClientComponent.cs b/Content.Server/Research/Components/ResearchClientComponent.cs index 946e38c452..cad05ed8f2 100644 --- a/Content.Server/Research/Components/ResearchClientComponent.cs +++ b/Content.Server/Research/Components/ResearchClientComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.UserInterface; +using Content.Server.UserInterface; using Content.Shared.Interaction; using Content.Shared.Research.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/Research/Components/ResearchConsoleComponent.cs b/Content.Server/Research/Components/ResearchConsoleComponent.cs index da1dea4ff9..421d5a9431 100644 --- a/Content.Server/Research/Components/ResearchConsoleComponent.cs +++ b/Content.Server/Research/Components/ResearchConsoleComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Power.Components; using Content.Server.UserInterface; using Content.Shared.Audio; diff --git a/Content.Server/Rotation/Components/FlippableComponent.cs b/Content.Server/Rotation/Components/FlippableComponent.cs index 007a6652b7..201900244d 100644 --- a/Content.Server/Rotation/Components/FlippableComponent.cs +++ b/Content.Server/Rotation/Components/FlippableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.ActionBlocker; using Content.Shared.Interaction.Events; using Content.Shared.Notification.Managers; diff --git a/Content.Server/Rotation/Components/RotatableComponent.cs b/Content.Server/Rotation/Components/RotatableComponent.cs index a3d0541d89..cd490bd2fc 100644 --- a/Content.Server/Rotation/Components/RotatableComponent.cs +++ b/Content.Server/Rotation/Components/RotatableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.ActionBlocker; using Content.Shared.Interaction.Events; using Content.Shared.Notification.Managers; diff --git a/Content.Server/Shuttle/ShuttleControllerComponent.cs b/Content.Server/Shuttle/ShuttleControllerComponent.cs index cf51c63045..f3e3bd5a5e 100644 --- a/Content.Server/Shuttle/ShuttleControllerComponent.cs +++ b/Content.Server/Shuttle/ShuttleControllerComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Alert; +using Content.Server.Alert; using Content.Server.Buckle.Components; using Content.Server.Mind.Components; using Content.Shared.Alert; diff --git a/Content.Server/Singularity/Components/ContainmentFieldComponent.cs b/Content.Server/Singularity/Components/ContainmentFieldComponent.cs index 0d15e6537f..072bddfd6b 100644 --- a/Content.Server/Singularity/Components/ContainmentFieldComponent.cs +++ b/Content.Server/Singularity/Components/ContainmentFieldComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; using Robust.Shared.Physics.Collision; using Robust.Shared.Physics.Dynamics; diff --git a/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs b/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs index 66b89dfdfa..eb6141157b 100644 --- a/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs +++ b/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Diagnostics.CodeAnalysis; using System.Linq; diff --git a/Content.Server/Singularity/Components/EmitterComponent.cs b/Content.Server/Singularity/Components/EmitterComponent.cs index cf87e7955c..45df1f00dd 100644 --- a/Content.Server/Singularity/Components/EmitterComponent.cs +++ b/Content.Server/Singularity/Components/EmitterComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Threading; using System.Threading.Tasks; @@ -24,7 +23,6 @@ using Robust.Shared.Utility; using Robust.Shared.ViewVariables; using Timer = Robust.Shared.Timing.Timer; -#nullable enable namespace Content.Server.Singularity.Components { diff --git a/Content.Server/Singularity/Components/RadiationCollectorComponent.cs b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs index 84a05b155b..ccb0fd897b 100644 --- a/Content.Server/Singularity/Components/RadiationCollectorComponent.cs +++ b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Power.Components; using Content.Shared.Interaction; diff --git a/Content.Server/Singularity/Components/ServerSingularityComponent.cs b/Content.Server/Singularity/Components/ServerSingularityComponent.cs index 2588e68c1e..768299350a 100644 --- a/Content.Server/Singularity/Components/ServerSingularityComponent.cs +++ b/Content.Server/Singularity/Components/ServerSingularityComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Singularity; using Content.Shared.Singularity.Components; using Robust.Shared.Audio; diff --git a/Content.Server/Singularity/StartSingularityEngineCommand.cs b/Content.Server/Singularity/StartSingularityEngineCommand.cs index 6a479f5fa1..4b1091e708 100644 --- a/Content.Server/Singularity/StartSingularityEngineCommand.cs +++ b/Content.Server/Singularity/StartSingularityEngineCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Server.ParticleAccelerator.Components; using Content.Server.Singularity.Components; diff --git a/Content.Server/Solar/Components/SolarControlConsoleComponent.cs b/Content.Server/Solar/Components/SolarControlConsoleComponent.cs index 134564ac1c..c55e6a3058 100644 --- a/Content.Server/Solar/Components/SolarControlConsoleComponent.cs +++ b/Content.Server/Solar/Components/SolarControlConsoleComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Solar; using Content.Server.Solar.EntitySystems; using Content.Server.GameObjects.Components; diff --git a/Content.Server/Solar/Components/SolarPanelComponent.cs b/Content.Server/Solar/Components/SolarPanelComponent.cs index d4f918beb6..108e591db1 100644 --- a/Content.Server/Solar/Components/SolarPanelComponent.cs +++ b/Content.Server/Solar/Components/SolarPanelComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Power.Components; using Content.Server.Solar.EntitySystems; diff --git a/Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs b/Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs index 410821b3e9..72bc7e5dfc 100644 --- a/Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs +++ b/Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Solar.Components; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs index 32460e5cae..06ce6e0527 100644 --- a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs +++ b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Linq; using Content.Server.Solar.Components; diff --git a/Content.Server/Speech/AddAccent.cs b/Content.Server/Speech/AddAccent.cs index 1afbe8e67a..4d448cc4f9 100644 --- a/Content.Server/Speech/AddAccent.cs +++ b/Content.Server/Speech/AddAccent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using System.Text; using Content.Server.Administration; diff --git a/Content.Server/Speech/Components/IAccentComponent.cs b/Content.Server/Speech/Components/IAccentComponent.cs index 14b356c550..8db4d7b1da 100644 --- a/Content.Server/Speech/Components/IAccentComponent.cs +++ b/Content.Server/Speech/Components/IAccentComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -namespace Content.Server.Speech.Components +namespace Content.Server.Speech.Components { internal interface IAccentComponent { diff --git a/Content.Server/StationEvents/Events/FalseAlarm.cs b/Content.Server/StationEvents/Events/FalseAlarm.cs index 8cd30ed98d..423220c551 100644 --- a/Content.Server/StationEvents/Events/FalseAlarm.cs +++ b/Content.Server/StationEvents/Events/FalseAlarm.cs @@ -1,5 +1,4 @@ -#nullable enable -using JetBrains.Annotations; +using JetBrains.Annotations; using Robust.Shared.GameObjects; namespace Content.Server.StationEvents.Events diff --git a/Content.Server/StationEvents/Events/GasLeak.cs b/Content.Server/StationEvents/Events/GasLeak.cs index 1b1a759993..07d3328e19 100644 --- a/Content.Server/StationEvents/Events/GasLeak.cs +++ b/Content.Server/StationEvents/Events/GasLeak.cs @@ -10,7 +10,6 @@ using Robust.Shared.Maths; using Robust.Shared.Player; using Robust.Shared.Random; -#nullable enable namespace Content.Server.StationEvents.Events { internal sealed class GasLeak : StationEvent diff --git a/Content.Server/StationEvents/Events/PowerGridCheck.cs b/Content.Server/StationEvents/Events/PowerGridCheck.cs index 6ff0b78e1a..999b7f9268 100644 --- a/Content.Server/StationEvents/Events/PowerGridCheck.cs +++ b/Content.Server/StationEvents/Events/PowerGridCheck.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Threading; using Content.Server.Power.Components; diff --git a/Content.Server/StationEvents/Events/RadiationStorm.cs b/Content.Server/StationEvents/Events/RadiationStorm.cs index a199a53038..7791c57695 100644 --- a/Content.Server/StationEvents/Events/RadiationStorm.cs +++ b/Content.Server/StationEvents/Events/RadiationStorm.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.GameTicking; using Content.Server.Radiation; using Content.Shared.Coordinates; diff --git a/Content.Server/StationEvents/Events/StationEvent.cs b/Content.Server/StationEvents/Events/StationEvent.cs index a092816cd1..5e9e0c717b 100644 --- a/Content.Server/StationEvents/Events/StationEvent.cs +++ b/Content.Server/StationEvents/Events/StationEvent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Chat.Managers; using Robust.Shared.Audio; using Robust.Shared.IoC; diff --git a/Content.Server/StationEvents/StationEventCommand.cs b/Content.Server/StationEvents/StationEventCommand.cs index 56ef7b8ce5..e126f50083 100644 --- a/Content.Server/StationEvents/StationEventCommand.cs +++ b/Content.Server/StationEvents/StationEventCommand.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Administration; using Content.Shared.Administration; using Robust.Server.Player; diff --git a/Content.Server/StationEvents/StationEventSystem.cs b/Content.Server/StationEvents/StationEventSystem.cs index 9dc20f2aaf..736590a5c3 100644 --- a/Content.Server/StationEvents/StationEventSystem.cs +++ b/Content.Server/StationEvents/StationEventSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs index 44993c0c19..5face20f31 100644 --- a/Content.Server/Storage/Components/EntityStorageComponent.cs +++ b/Content.Server/Storage/Components/EntityStorageComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Storage/Components/SecretStashComponent.cs b/Content.Server/Storage/Components/SecretStashComponent.cs index b3975c531b..b202ab19db 100644 --- a/Content.Server/Storage/Components/SecretStashComponent.cs +++ b/Content.Server/Storage/Components/SecretStashComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Hands.Components; using Content.Server.Items; using Content.Shared.Acts; diff --git a/Content.Server/Storage/Components/ServerStorageComponent.cs b/Content.Server/Storage/Components/ServerStorageComponent.cs index 41def850b7..34a51e5bbc 100644 --- a/Content.Server/Storage/Components/ServerStorageComponent.cs +++ b/Content.Server/Storage/Components/ServerStorageComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Storage/Components/StorageCounterComponent.cs b/Content.Server/Storage/Components/StorageCounterComponent.cs index 33f71d99c7..2279c66e52 100644 --- a/Content.Server/Storage/Components/StorageCounterComponent.cs +++ b/Content.Server/Storage/Components/StorageCounterComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Shared.Stacks; diff --git a/Content.Server/Storage/Components/StorageFillComponent.cs b/Content.Server/Storage/Components/StorageFillComponent.cs index 339d8ac5d8..db253074e9 100644 --- a/Content.Server/Storage/Components/StorageFillComponent.cs +++ b/Content.Server/Storage/Components/StorageFillComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Robust.Shared.GameObjects; diff --git a/Content.Server/Strip/StrippableComponent.cs b/Content.Server/Strip/StrippableComponent.cs index 240d0cd0fd..cd52255b4b 100644 --- a/Content.Server/Strip/StrippableComponent.cs +++ b/Content.Server/Strip/StrippableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Threading; using Content.Server.Cuffs.Components; diff --git a/Content.Server/Stunnable/Components/StunbatonComponent.cs b/Content.Server/Stunnable/Components/StunbatonComponent.cs index 1c1a754948..56185cac38 100644 --- a/Content.Server/Stunnable/Components/StunbatonComponent.cs +++ b/Content.Server/Stunnable/Components/StunbatonComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; diff --git a/Content.Server/Stunnable/Components/StunnableComponent.cs b/Content.Server/Stunnable/Components/StunnableComponent.cs index 1fec345fdb..66959428a3 100644 --- a/Content.Server/Stunnable/Components/StunnableComponent.cs +++ b/Content.Server/Stunnable/Components/StunnableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Act; using Content.Server.Notification; using Content.Shared.Audio; diff --git a/Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs b/Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs index 643d4a98cd..3e3c0213f3 100644 --- a/Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs +++ b/Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs @@ -8,7 +8,6 @@ using Robust.Shared.Enums; using Robust.Shared.GameObjects; using Robust.Shared.IoC; -#nullable enable namespace Content.Server.Suspicion.EntitySystems { diff --git a/Content.Server/Suspicion/SuspicionRoleComponent.cs b/Content.Server/Suspicion/SuspicionRoleComponent.cs index 2b36fef940..10ca4f61b5 100644 --- a/Content.Server/Suspicion/SuspicionRoleComponent.cs +++ b/Content.Server/Suspicion/SuspicionRoleComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Throwing/ThrowHelper.cs b/Content.Server/Throwing/ThrowHelper.cs index 52145f357b..514c3a16ce 100644 --- a/Content.Server/Throwing/ThrowHelper.cs +++ b/Content.Server/Throwing/ThrowHelper.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Server.Interaction; using Content.Server.Items; using Content.Shared.MobState; diff --git a/Content.Server/Toilet/ToiletComponent.cs b/Content.Server/Toilet/ToiletComponent.cs index be6f3b6e4e..033f20efd7 100644 --- a/Content.Server/Toilet/ToiletComponent.cs +++ b/Content.Server/Toilet/ToiletComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.Act; using Content.Server.Buckle.Components; diff --git a/Content.Server/Tools/Components/WelderComponent.cs b/Content.Server/Tools/Components/WelderComponent.cs index a33ae7b55e..31102eca1f 100644 --- a/Content.Server/Tools/Components/WelderComponent.cs +++ b/Content.Server/Tools/Components/WelderComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Threading.Tasks; using Content.Server.Act; diff --git a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs index ed90860068..d6e95e117d 100644 --- a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs +++ b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Threading.Tasks; using Content.Server.Inventory.Components; using Content.Server.Mind.Components; diff --git a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs index 72f053ec2f..1ef663d0b9 100644 --- a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs +++ b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Network; using Robust.Shared.ViewVariables; diff --git a/Content.Server/UserInterface/UserInterfaceHelpers.cs b/Content.Server/UserInterface/UserInterfaceHelpers.cs index c40d1ade3d..5072da1586 100644 --- a/Content.Server/UserInterface/UserInterfaceHelpers.cs +++ b/Content.Server/UserInterface/UserInterfaceHelpers.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Server.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; namespace Content.Server.UserInterface diff --git a/Content.Server/VendingMachines/VendingMachineComponent.cs b/Content.Server/VendingMachines/VendingMachineComponent.cs index 1634dd9bac..0b9934bc06 100644 --- a/Content.Server/VendingMachines/VendingMachineComponent.cs +++ b/Content.Server/VendingMachines/VendingMachineComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/Verbs/VerbSystem.cs b/Content.Server/Verbs/VerbSystem.cs index 5483f0d82a..34f53def99 100644 --- a/Content.Server/Verbs/VerbSystem.cs +++ b/Content.Server/Verbs/VerbSystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using System.Reflection; using Content.Shared.GameTicking; using Content.Shared.Verbs; diff --git a/Content.Server/Voting/Managers/IVoteManager.cs b/Content.Server/Voting/Managers/IVoteManager.cs index b83f35eded..8ab9340b79 100644 --- a/Content.Server/Voting/Managers/IVoteManager.cs +++ b/Content.Server/Voting/Managers/IVoteManager.cs @@ -2,7 +2,6 @@ using System.Diagnostics.CodeAnalysis; using Robust.Server.Player; -#nullable enable namespace Content.Server.Voting.Managers { diff --git a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs index 42ce63700e..669f2d688a 100644 --- a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs +++ b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Content.Server.GameTicking; using Content.Shared; diff --git a/Content.Server/Voting/Managers/VoteManager.cs b/Content.Server/Voting/Managers/VoteManager.cs index ec119400cf..ed5c93db9b 100644 --- a/Content.Server/Voting/Managers/VoteManager.cs +++ b/Content.Server/Voting/Managers/VoteManager.cs @@ -20,7 +20,6 @@ using Robust.Shared.Network; using Robust.Shared.Timing; using Robust.Shared.Utility; -#nullable enable namespace Content.Server.Voting.Managers { diff --git a/Content.Server/Voting/VoteCommands.cs b/Content.Server/Voting/VoteCommands.cs index d05546c370..0a81f9e438 100644 --- a/Content.Server/Voting/VoteCommands.cs +++ b/Content.Server/Voting/VoteCommands.cs @@ -10,7 +10,6 @@ using Robust.Shared.Console; using Robust.Shared.IoC; using Robust.Shared.Localization; -#nullable enable namespace Content.Server.Voting { diff --git a/Content.Server/Voting/VoteFinishedEventArgs.cs b/Content.Server/Voting/VoteFinishedEventArgs.cs index 24ca99f817..c704c9f080 100644 --- a/Content.Server/Voting/VoteFinishedEventArgs.cs +++ b/Content.Server/Voting/VoteFinishedEventArgs.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Immutable; -#nullable enable namespace Content.Server.Voting { diff --git a/Content.Server/Voting/VoteFinishedEventHandler.cs b/Content.Server/Voting/VoteFinishedEventHandler.cs index 6f3cca43f6..9debafd5c1 100644 --- a/Content.Server/Voting/VoteFinishedEventHandler.cs +++ b/Content.Server/Voting/VoteFinishedEventHandler.cs @@ -1,5 +1,4 @@ -#nullable enable - + namespace Content.Server.Voting { public delegate void VoteFinishedEventHandler(IVoteHandle sender, VoteFinishedEventArgs args); diff --git a/Content.Server/Voting/VoteOptions.cs b/Content.Server/Voting/VoteOptions.cs index c40d119194..5a5b38d090 100644 --- a/Content.Server/Voting/VoteOptions.cs +++ b/Content.Server/Voting/VoteOptions.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using Robust.Server.Player; using Robust.Shared.Localization; -#nullable enable namespace Content.Server.Voting { diff --git a/Content.Server/Weapon/WeaponCapacitorChargerComponent.cs b/Content.Server/Weapon/WeaponCapacitorChargerComponent.cs index 956bfcb5c4..a1e0236d24 100644 --- a/Content.Server/Weapon/WeaponCapacitorChargerComponent.cs +++ b/Content.Server/Weapon/WeaponCapacitorChargerComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Server.Power.Components; +using Content.Server.Power.Components; using Content.Server.PowerCell.Components; using Content.Server.Weapon.Ranged.Barrels.Components; using Content.Shared.Interaction; diff --git a/Content.Server/Window/WindowComponent.cs b/Content.Server/Window/WindowComponent.cs index 1a200d65e7..b1d129d2de 100644 --- a/Content.Server/Window/WindowComponent.cs +++ b/Content.Server/Window/WindowComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Server.Destructible; using Content.Server.Destructible.Thresholds.Triggers; diff --git a/Content.Server/WireHacking/WiresComponent.cs b/Content.Server/WireHacking/WiresComponent.cs index e48b1959dc..dae756292b 100644 --- a/Content.Server/WireHacking/WiresComponent.cs +++ b/Content.Server/WireHacking/WiresComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Shared/AI/SharedAiDebug.cs b/Content.Shared/AI/SharedAiDebug.cs index 92d2d60b20..48c70c2960 100644 --- a/Content.Shared/AI/SharedAiDebug.cs +++ b/Content.Shared/AI/SharedAiDebug.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Robust.Shared.GameObjects; diff --git a/Content.Shared/AME/SharedAMEControllerComponent.cs b/Content.Shared/AME/SharedAMEControllerComponent.cs index 162cb32a52..84674dec1c 100644 --- a/Content.Shared/AME/SharedAMEControllerComponent.cs +++ b/Content.Shared/AME/SharedAMEControllerComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/AME/SharedAMEShieldComponent.cs b/Content.Shared/AME/SharedAMEShieldComponent.cs index a2087c5b2e..1b45ccc5cc 100644 --- a/Content.Shared/AME/SharedAMEShieldComponent.cs +++ b/Content.Shared/AME/SharedAMEShieldComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/APC/SharedApc.cs b/Content.Shared/APC/SharedApc.cs index 0e48b19768..4a7644f8fd 100644 --- a/Content.Shared/APC/SharedApc.cs +++ b/Content.Shared/APC/SharedApc.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Access/AccessLevelPrototype.cs b/Content.Shared/Access/AccessLevelPrototype.cs index a245f798d7..c23e0db8ef 100644 --- a/Content.Shared/Access/AccessLevelPrototype.cs +++ b/Content.Shared/Access/AccessLevelPrototype.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.Localization; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Access/SharedIdCardConsoleComponent.cs b/Content.Shared/Access/SharedIdCardConsoleComponent.cs index ab33cfa054..3983febb2b 100644 --- a/Content.Shared/Access/SharedIdCardConsoleComponent.cs +++ b/Content.Shared/Access/SharedIdCardConsoleComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Robust.Shared.GameObjects; diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs index b0a7dd0580..a4f3080583 100644 --- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs +++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.DragDrop; +using Content.Shared.DragDrop; using Content.Shared.EffectBlocker; using Content.Shared.Emoting; using Content.Shared.Interaction.Events; diff --git a/Content.Shared/ActionBlocker/IActionBlocker.cs b/Content.Shared/ActionBlocker/IActionBlocker.cs index 5415fb43ac..2646a8ae4b 100644 --- a/Content.Shared/ActionBlocker/IActionBlocker.cs +++ b/Content.Shared/ActionBlocker/IActionBlocker.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.EffectBlocker; namespace Content.Shared.ActionBlocker diff --git a/Content.Shared/Actions/ActionManager.cs b/Content.Shared/Actions/ActionManager.cs index a7575a4e41..524fa6cb47 100644 --- a/Content.Shared/Actions/ActionManager.cs +++ b/Content.Shared/Actions/ActionManager.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Shared.Actions.Prototypes; diff --git a/Content.Shared/Actions/ActionType.cs b/Content.Shared/Actions/ActionType.cs index fdca3780ea..109a5c73f1 100644 --- a/Content.Shared/Actions/ActionType.cs +++ b/Content.Shared/Actions/ActionType.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Content.Shared.Actions { /// diff --git a/Content.Shared/Actions/Behaviors/IActionBehavior.cs b/Content.Shared/Actions/Behaviors/IActionBehavior.cs index 0486ac0e4e..74dc3ca08f 100644 --- a/Content.Shared/Actions/Behaviors/IActionBehavior.cs +++ b/Content.Shared/Actions/Behaviors/IActionBehavior.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Actions.Components; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Actions/Behaviors/IInstantAction.cs b/Content.Shared/Actions/Behaviors/IInstantAction.cs index 75922fa0ec..9d3c07bed7 100644 --- a/Content.Shared/Actions/Behaviors/IInstantAction.cs +++ b/Content.Shared/Actions/Behaviors/IInstantAction.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Actions.Behaviors { diff --git a/Content.Shared/Actions/Behaviors/ITargetEntityAction.cs b/Content.Shared/Actions/Behaviors/ITargetEntityAction.cs index f1bdf76f89..9e8e8b8579 100644 --- a/Content.Shared/Actions/Behaviors/ITargetEntityAction.cs +++ b/Content.Shared/Actions/Behaviors/ITargetEntityAction.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Actions.Behaviors { diff --git a/Content.Shared/Actions/Behaviors/ITargetEntityItemAction.cs b/Content.Shared/Actions/Behaviors/ITargetEntityItemAction.cs index 28841d6ae3..26d5c3eb62 100644 --- a/Content.Shared/Actions/Behaviors/ITargetEntityItemAction.cs +++ b/Content.Shared/Actions/Behaviors/ITargetEntityItemAction.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Actions.Behaviors.Item; +using Content.Shared.Actions.Behaviors.Item; using Robust.Shared.GameObjects; namespace Content.Shared.Actions.Behaviors diff --git a/Content.Shared/Actions/Behaviors/ITargetPointAction.cs b/Content.Shared/Actions/Behaviors/ITargetPointAction.cs index af0e24bfd4..6e03e7ef3e 100644 --- a/Content.Shared/Actions/Behaviors/ITargetPointAction.cs +++ b/Content.Shared/Actions/Behaviors/ITargetPointAction.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.Shared.Actions.Behaviors diff --git a/Content.Shared/Actions/Behaviors/ITargetPointItemAction.cs b/Content.Shared/Actions/Behaviors/ITargetPointItemAction.cs index a44a84a741..9619f092c4 100644 --- a/Content.Shared/Actions/Behaviors/ITargetPointItemAction.cs +++ b/Content.Shared/Actions/Behaviors/ITargetPointItemAction.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Actions.Behaviors.Item; +using Content.Shared.Actions.Behaviors.Item; using Robust.Shared.GameObjects; using Robust.Shared.Map; diff --git a/Content.Shared/Actions/Behaviors/IToggleAction.cs b/Content.Shared/Actions/Behaviors/IToggleAction.cs index 3fa04b3946..2c56ec3a97 100644 --- a/Content.Shared/Actions/Behaviors/IToggleAction.cs +++ b/Content.Shared/Actions/Behaviors/IToggleAction.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Actions.Behaviors { diff --git a/Content.Shared/Actions/Behaviors/Item/IInstantItemAction.cs b/Content.Shared/Actions/Behaviors/Item/IInstantItemAction.cs index 17891c2be4..4ac8656719 100644 --- a/Content.Shared/Actions/Behaviors/Item/IInstantItemAction.cs +++ b/Content.Shared/Actions/Behaviors/Item/IInstantItemAction.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Actions.Behaviors.Item { diff --git a/Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs b/Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs index 853da9d4b7..e49a6a9ba0 100644 --- a/Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs +++ b/Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Actions.Components; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Actions/Behaviors/Item/IToggleItemAction.cs b/Content.Shared/Actions/Behaviors/Item/IToggleItemAction.cs index 259a998f1f..d21ebf7cf5 100644 --- a/Content.Shared/Actions/Behaviors/Item/IToggleItemAction.cs +++ b/Content.Shared/Actions/Behaviors/Item/IToggleItemAction.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Actions.Behaviors.Item { diff --git a/Content.Shared/Actions/Components/ItemActionsComponent.cs b/Content.Shared/Actions/Components/ItemActionsComponent.cs index 70df7310dd..74f9f25299 100644 --- a/Content.Shared/Actions/Components/ItemActionsComponent.cs +++ b/Content.Shared/Actions/Components/ItemActionsComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Shared.Hands; diff --git a/Content.Shared/Actions/Components/SharedActionsComponent.cs b/Content.Shared/Actions/Components/SharedActionsComponent.cs index e6ab446a71..6ad8f5295c 100644 --- a/Content.Shared/Actions/Components/SharedActionsComponent.cs +++ b/Content.Shared/Actions/Components/SharedActionsComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; diff --git a/Content.Shared/Actions/IActionAttempt.cs b/Content.Shared/Actions/IActionAttempt.cs index f2cb365bb7..19c9c7c8fd 100644 --- a/Content.Shared/Actions/IActionAttempt.cs +++ b/Content.Shared/Actions/IActionAttempt.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Actions.Behaviors; +using Content.Shared.Actions.Behaviors; using Content.Shared.Actions.Behaviors.Item; using Content.Shared.Actions.Components; using Content.Shared.Actions.Prototypes; diff --git a/Content.Shared/Actions/Prototypes/ActionPrototype.cs b/Content.Shared/Actions/Prototypes/ActionPrototype.cs index 8d488b9249..bc4422d052 100644 --- a/Content.Shared/Actions/Prototypes/ActionPrototype.cs +++ b/Content.Shared/Actions/Prototypes/ActionPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Actions.Behaviors; +using Content.Shared.Actions.Behaviors; using Content.Shared.Module; using Robust.Shared.IoC; using Robust.Shared.Log; diff --git a/Content.Shared/Actions/Prototypes/BaseActionPrototype.cs b/Content.Shared/Actions/Prototypes/BaseActionPrototype.cs index 451dfb106e..ed7eb4b06e 100644 --- a/Content.Shared/Actions/Prototypes/BaseActionPrototype.cs +++ b/Content.Shared/Actions/Prototypes/BaseActionPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.Log; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Actions/Prototypes/ItemActionPrototype.cs b/Content.Shared/Actions/Prototypes/ItemActionPrototype.cs index 24a66fc8c6..3ab67b45a2 100644 --- a/Content.Shared/Actions/Prototypes/ItemActionPrototype.cs +++ b/Content.Shared/Actions/Prototypes/ItemActionPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Actions.Behaviors; +using Content.Shared.Actions.Behaviors; using Content.Shared.Actions.Behaviors.Item; using Content.Shared.Module; using Robust.Shared.IoC; diff --git a/Content.Shared/Actions/SharedActionSystem.cs b/Content.Shared/Actions/SharedActionSystem.cs index acec005de7..a5d90216ee 100644 --- a/Content.Shared/Actions/SharedActionSystem.cs +++ b/Content.Shared/Actions/SharedActionSystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Actions.Components; +using Content.Shared.Actions.Components; using Robust.Shared.GameObjects; namespace Content.Shared.Actions diff --git a/Content.Shared/Acts/ActSystem.cs b/Content.Shared/Acts/ActSystem.cs index 37d3fd009a..ba7b9e6fa2 100644 --- a/Content.Shared/Acts/ActSystem.cs +++ b/Content.Shared/Acts/ActSystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Linq; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Administration/AdminAddReagentEuiState.cs b/Content.Shared/Administration/AdminAddReagentEuiState.cs index 800251f1a3..87231ca7a0 100644 --- a/Content.Shared/Administration/AdminAddReagentEuiState.cs +++ b/Content.Shared/Administration/AdminAddReagentEuiState.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Chemistry; using Content.Shared.Chemistry.Reagent; using Content.Shared.Eui; diff --git a/Content.Shared/Administration/AdminData.cs b/Content.Shared/Administration/AdminData.cs index a0727efc67..947617fe82 100644 --- a/Content.Shared/Administration/AdminData.cs +++ b/Content.Shared/Administration/AdminData.cs @@ -1,5 +1,4 @@ -#nullable enable - + namespace Content.Shared.Administration { /// diff --git a/Content.Shared/Administration/AdminFlags.cs b/Content.Shared/Administration/AdminFlags.cs index 91f69c4384..b458f7a06b 100644 --- a/Content.Shared/Administration/AdminFlags.cs +++ b/Content.Shared/Administration/AdminFlags.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; namespace Content.Shared.Administration { diff --git a/Content.Shared/Administration/AdminFlagsHelper.cs b/Content.Shared/Administration/AdminFlagsHelper.cs index 7a33c04cfd..5a72d5f65e 100644 --- a/Content.Shared/Administration/AdminFlagsHelper.cs +++ b/Content.Shared/Administration/AdminFlagsHelper.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Numerics; diff --git a/Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs b/Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs index 67b45e057a..75ce4c7941 100644 --- a/Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs +++ b/Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Lidgren.Network; using Robust.Shared.Network; diff --git a/Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs b/Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs index c838b28dee..2c1de4f8ef 100644 --- a/Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs +++ b/Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs @@ -1,5 +1,4 @@ -#nullable enable -using Lidgren.Network; +using Lidgren.Network; using Robust.Shared.Network; namespace Content.Shared.Administration.Menu diff --git a/Content.Shared/Administration/MsgUpdateAdminStatus.cs b/Content.Shared/Administration/MsgUpdateAdminStatus.cs index 7b55b6a8d1..5a310393d1 100644 --- a/Content.Shared/Administration/MsgUpdateAdminStatus.cs +++ b/Content.Shared/Administration/MsgUpdateAdminStatus.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Lidgren.Network; using Robust.Shared.Network; diff --git a/Content.Shared/Administration/PermissionsEuiState.cs b/Content.Shared/Administration/PermissionsEuiState.cs index cf342aa6fe..e4de269ef9 100644 --- a/Content.Shared/Administration/PermissionsEuiState.cs +++ b/Content.Shared/Administration/PermissionsEuiState.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Content.Shared.Eui; using Robust.Shared.Network; diff --git a/Content.Shared/Administration/SetOutfitEuiState.cs b/Content.Shared/Administration/SetOutfitEuiState.cs index 92685b54b7..d16d55bb24 100644 --- a/Content.Shared/Administration/SetOutfitEuiState.cs +++ b/Content.Shared/Administration/SetOutfitEuiState.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Eui; using Robust.Shared.Serialization; using System; diff --git a/Content.Shared/Alert/AlertManager.cs b/Content.Shared/Alert/AlertManager.cs index dbea636ce1..4fa11c9482 100644 --- a/Content.Shared/Alert/AlertManager.cs +++ b/Content.Shared/Alert/AlertManager.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Robust.Shared.IoC; using Robust.Shared.Log; diff --git a/Content.Shared/Alert/AlertOrderPrototype.cs b/Content.Shared/Alert/AlertOrderPrototype.cs index 7be8f3cf2a..0e0463dd6e 100644 --- a/Content.Shared/Alert/AlertOrderPrototype.cs +++ b/Content.Shared/Alert/AlertOrderPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/Alert/AlertPrototype.cs b/Content.Shared/Alert/AlertPrototype.cs index 06901594fd..79eafd637d 100644 --- a/Content.Shared/Alert/AlertPrototype.cs +++ b/Content.Shared/Alert/AlertPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Globalization; using Robust.Shared.Log; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Alert/AlertType.cs b/Content.Shared/Alert/AlertType.cs index c2c37a8537..a4962a1d36 100644 --- a/Content.Shared/Alert/AlertType.cs +++ b/Content.Shared/Alert/AlertType.cs @@ -1,5 +1,4 @@ -#nullable enable -namespace Content.Shared.Alert +namespace Content.Shared.Alert { /// /// Every category of alert. Corresponds to category field in alert prototypes defined in YML diff --git a/Content.Shared/Alert/IAlertClick.cs b/Content.Shared/Alert/IAlertClick.cs index c11c52fde4..614c9ee6a0 100644 --- a/Content.Shared/Alert/IAlertClick.cs +++ b/Content.Shared/Alert/IAlertClick.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; namespace Content.Shared.Alert diff --git a/Content.Shared/Alert/SharedAlertsComponent.cs b/Content.Shared/Alert/SharedAlertsComponent.cs index 5fc76cd33e..3a8b6eec68 100644 --- a/Content.Shared/Alert/SharedAlertsComponent.cs +++ b/Content.Shared/Alert/SharedAlertsComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Arcade/BlockGameBlock.cs b/Content.Shared/Arcade/BlockGameBlock.cs index 75e248fbf1..1f32db1b33 100644 --- a/Content.Shared/Arcade/BlockGameBlock.cs +++ b/Content.Shared/Arcade/BlockGameBlock.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Shared/Arcade/BlockGameMessages.cs b/Content.Shared/Arcade/BlockGameMessages.cs index a1729edb96..02b6da2fe8 100644 --- a/Content.Shared/Arcade/BlockGameMessages.cs +++ b/Content.Shared/Arcade/BlockGameMessages.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Arcade/BlockGamePlayerAction.cs b/Content.Shared/Arcade/BlockGamePlayerAction.cs index 3b40ab638f..f88b213a56 100644 --- a/Content.Shared/Arcade/BlockGamePlayerAction.cs +++ b/Content.Shared/Arcade/BlockGamePlayerAction.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Arcade diff --git a/Content.Shared/Arcade/BlockGameUiKey.cs b/Content.Shared/Arcade/BlockGameUiKey.cs index c2d6880b69..6ffb216668 100644 --- a/Content.Shared/Arcade/BlockGameUiKey.cs +++ b/Content.Shared/Arcade/BlockGameUiKey.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Arcade diff --git a/Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs b/Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs index e188d797eb..2a26248717 100644 --- a/Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs +++ b/Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Atmos/AtmosCommandUtils.cs b/Content.Shared/Atmos/AtmosCommandUtils.cs index f23a13224b..8536b546c8 100644 --- a/Content.Shared/Atmos/AtmosCommandUtils.cs +++ b/Content.Shared/Atmos/AtmosCommandUtils.cs @@ -1,4 +1,3 @@ -#nullable enable using System; namespace Content.Shared.Atmos @@ -24,4 +23,4 @@ namespace Content.Shared.Atmos return ((x >= 0) && (x < Atmospherics.TotalNumberOfGases)); } } -} \ No newline at end of file +} diff --git a/Content.Shared/Atmos/AtmosDirection.cs b/Content.Shared/Atmos/AtmosDirection.cs index d6989f0db6..96023a55e8 100644 --- a/Content.Shared/Atmos/AtmosDirection.cs +++ b/Content.Shared/Atmos/AtmosDirection.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Runtime.CompilerServices; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs index c43ef7b441..2bb88f02a4 100644 --- a/Content.Shared/Atmos/Atmospherics.cs +++ b/Content.Shared/Atmos/Atmospherics.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.Maths; using Robust.Shared.Serialization; using System; diff --git a/Content.Shared/Atmos/Components/SharedFlammableComponent.cs b/Content.Shared/Atmos/Components/SharedFlammableComponent.cs index cb965945b7..3012c9e6d0 100644 --- a/Content.Shared/Atmos/Components/SharedFlammableComponent.cs +++ b/Content.Shared/Atmos/Components/SharedFlammableComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Atmos/Components/SharedGasTankComponent.cs b/Content.Shared/Atmos/Components/SharedGasTankComponent.cs index de5b64c6eb..b3d5ff3b85 100644 --- a/Content.Shared/Atmos/Components/SharedGasTankComponent.cs +++ b/Content.Shared/Atmos/Components/SharedGasTankComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Atmos/EntitySystems/SharedAtmosDebugOverlaySystem.cs b/Content.Shared/Atmos/EntitySystems/SharedAtmosDebugOverlaySystem.cs index 33e69fa700..35d92557c3 100644 --- a/Content.Shared/Atmos/EntitySystems/SharedAtmosDebugOverlaySystem.cs +++ b/Content.Shared/Atmos/EntitySystems/SharedAtmosDebugOverlaySystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs index 9e52787813..22a0b4f5fa 100644 --- a/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs +++ b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Content.Shared.Atmos.Prototypes; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs index 3092ec0bae..b589114362 100644 --- a/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs +++ b/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.GameObjects; using Robust.Shared.Map; diff --git a/Content.Shared/Atmos/GasOverlayChunk.cs b/Content.Shared/Atmos/GasOverlayChunk.cs index 74162f5b55..36a65b98ea 100644 --- a/Content.Shared/Atmos/GasOverlayChunk.cs +++ b/Content.Shared/Atmos/GasOverlayChunk.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Shared.Atmos.EntitySystems; using Robust.Shared.Map; diff --git a/Content.Shared/Atmos/PipeDirection.cs b/Content.Shared/Atmos/PipeDirection.cs index c7f30f064d..598c9d9878 100644 --- a/Content.Shared/Atmos/PipeDirection.cs +++ b/Content.Shared/Atmos/PipeDirection.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs index 3e7e250481..d1c05b25b3 100644 --- a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs +++ b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Atmos/Prototypes/GasPrototype.cs b/Content.Shared/Atmos/Prototypes/GasPrototype.cs index 37442375d6..fdf4ba643a 100644 --- a/Content.Shared/Atmos/Prototypes/GasPrototype.cs +++ b/Content.Shared/Atmos/Prototypes/GasPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.Prototypes; +using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/Audio/AudioHelpers.cs b/Content.Shared/Audio/AudioHelpers.cs index 887f3ac1fb..a8a47fbdf5 100644 --- a/Content.Shared/Audio/AudioHelpers.cs +++ b/Content.Shared/Audio/AudioHelpers.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Audio; using Robust.Shared.IoC; diff --git a/Content.Shared/Audio/SoundCollectionPrototype.cs b/Content.Shared/Audio/SoundCollectionPrototype.cs index b9e966501d..45b615c790 100644 --- a/Content.Shared/Audio/SoundCollectionPrototype.cs +++ b/Content.Shared/Audio/SoundCollectionPrototype.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Body/Behavior/SharedMechanismBehavior.cs b/Content.Shared/Body/Behavior/SharedMechanismBehavior.cs index f67adc0db6..4f2f7dad96 100644 --- a/Content.Shared/Body/Behavior/SharedMechanismBehavior.cs +++ b/Content.Shared/Body/Behavior/SharedMechanismBehavior.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Body.Components; +using Content.Shared.Body.Components; using Content.Shared.Body.Mechanism; using Content.Shared.Body.Part; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Body/Components/SharedBodyComponent.cs b/Content.Shared/Body/Components/SharedBodyComponent.cs index 115d174477..cf4b2551e1 100644 --- a/Content.Shared/Body/Components/SharedBodyComponent.cs +++ b/Content.Shared/Body/Components/SharedBodyComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; diff --git a/Content.Shared/Body/Mechanism/MechanismSystem.cs b/Content.Shared/Body/Mechanism/MechanismSystem.cs index 53d7655a66..af5057fd55 100644 --- a/Content.Shared/Body/Mechanism/MechanismSystem.cs +++ b/Content.Shared/Body/Mechanism/MechanismSystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using JetBrains.Annotations; +using JetBrains.Annotations; using Robust.Shared.GameObjects; namespace Content.Shared.Body.Mechanism diff --git a/Content.Shared/Body/Mechanism/SharedMechanismComponent.cs b/Content.Shared/Body/Mechanism/SharedMechanismComponent.cs index 47940141bb..5ee2f0b558 100644 --- a/Content.Shared/Body/Mechanism/SharedMechanismComponent.cs +++ b/Content.Shared/Body/Mechanism/SharedMechanismComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using System.Linq; using Content.Shared.Body.Behavior; diff --git a/Content.Shared/Body/Networks/SharedBloodstreamComponent.cs b/Content.Shared/Body/Networks/SharedBloodstreamComponent.cs index 0641403b73..0ca35f5ff5 100644 --- a/Content.Shared/Body/Networks/SharedBloodstreamComponent.cs +++ b/Content.Shared/Body/Networks/SharedBloodstreamComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Chemistry.Solution; +using Content.Shared.Chemistry.Solution; using Robust.Shared.GameObjects; namespace Content.Shared.Body.Networks diff --git a/Content.Shared/Body/Part/BodyPartCompatibility.cs b/Content.Shared/Body/Part/BodyPartCompatibility.cs index 390bf8c904..aba82d8873 100644 --- a/Content.Shared/Body/Part/BodyPartCompatibility.cs +++ b/Content.Shared/Body/Part/BodyPartCompatibility.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Body.Part diff --git a/Content.Shared/Body/Part/BodyPartSymmetry.cs b/Content.Shared/Body/Part/BodyPartSymmetry.cs index aaf6f958de..b21bd1dc2b 100644 --- a/Content.Shared/Body/Part/BodyPartSymmetry.cs +++ b/Content.Shared/Body/Part/BodyPartSymmetry.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Body.Part diff --git a/Content.Shared/Body/Part/BodyPartType.cs b/Content.Shared/Body/Part/BodyPartType.cs index 40c58d0eb4..535f68ed35 100644 --- a/Content.Shared/Body/Part/BodyPartType.cs +++ b/Content.Shared/Body/Part/BodyPartType.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Body.Part diff --git a/Content.Shared/Body/Part/IBodyPartAdded.cs b/Content.Shared/Body/Part/IBodyPartAdded.cs index 4f16560c24..d299d80541 100644 --- a/Content.Shared/Body/Part/IBodyPartAdded.cs +++ b/Content.Shared/Body/Part/IBodyPartAdded.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; namespace Content.Shared.Body.Part diff --git a/Content.Shared/Body/Part/IBodyPartContainer.cs b/Content.Shared/Body/Part/IBodyPartContainer.cs index 35f49a6236..bad145939e 100644 --- a/Content.Shared/Body/Part/IBodyPartContainer.cs +++ b/Content.Shared/Body/Part/IBodyPartContainer.cs @@ -1,5 +1,4 @@ -#nullable enable - + namespace Content.Shared.Body.Part { /// diff --git a/Content.Shared/Body/Part/IBodyPartRemoved.cs b/Content.Shared/Body/Part/IBodyPartRemoved.cs index eeff0b8b7e..04f5d2dfb5 100644 --- a/Content.Shared/Body/Part/IBodyPartRemoved.cs +++ b/Content.Shared/Body/Part/IBodyPartRemoved.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; namespace Content.Shared.Body.Part { diff --git a/Content.Shared/Body/Part/Property/BodyPartPropertyComponent.cs b/Content.Shared/Body/Part/Property/BodyPartPropertyComponent.cs index e1f6e5f577..7b75457be7 100644 --- a/Content.Shared/Body/Part/Property/BodyPartPropertyComponent.cs +++ b/Content.Shared/Body/Part/Property/BodyPartPropertyComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Body/Part/Property/ExtensionComponent.cs b/Content.Shared/Body/Part/Property/ExtensionComponent.cs index b613ee830a..bf2df77de7 100644 --- a/Content.Shared/Body/Part/Property/ExtensionComponent.cs +++ b/Content.Shared/Body/Part/Property/ExtensionComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Body/Part/Property/GraspComponent.cs b/Content.Shared/Body/Part/Property/GraspComponent.cs index 6d021d0a6a..dca53e6112 100644 --- a/Content.Shared/Body/Part/Property/GraspComponent.cs +++ b/Content.Shared/Body/Part/Property/GraspComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Body.Part.Property { diff --git a/Content.Shared/Body/Part/Property/IBodyPartProperty.cs b/Content.Shared/Body/Part/Property/IBodyPartProperty.cs index ff3c5ba627..ff29c38b7b 100644 --- a/Content.Shared/Body/Part/Property/IBodyPartProperty.cs +++ b/Content.Shared/Body/Part/Property/IBodyPartProperty.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Body.Part.Property { diff --git a/Content.Shared/Body/Part/Property/LegComponent.cs b/Content.Shared/Body/Part/Property/LegComponent.cs index 1bc75378bd..0766db0145 100644 --- a/Content.Shared/Body/Part/Property/LegComponent.cs +++ b/Content.Shared/Body/Part/Property/LegComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Body/Part/SharedBodyPartComponent.cs b/Content.Shared/Body/Part/SharedBodyPartComponent.cs index a204d1eb86..1fd1f4dee9 100644 --- a/Content.Shared/Body/Part/SharedBodyPartComponent.cs +++ b/Content.Shared/Body/Part/SharedBodyPartComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; diff --git a/Content.Shared/Body/Preset/BodyPresetPrototype.cs b/Content.Shared/Body/Preset/BodyPresetPrototype.cs index 49736b46df..bc12ba059f 100644 --- a/Content.Shared/Body/Preset/BodyPresetPrototype.cs +++ b/Content.Shared/Body/Preset/BodyPresetPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Content.Shared.Body.Components; using Content.Shared.Body.Part; diff --git a/Content.Shared/Body/Scanner/SharedBodyScannerComponent.cs b/Content.Shared/Body/Scanner/SharedBodyScannerComponent.cs index c8657fa68a..0de5b61c09 100644 --- a/Content.Shared/Body/Scanner/SharedBodyScannerComponent.cs +++ b/Content.Shared/Body/Scanner/SharedBodyScannerComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Body/Surgery/SurgeryDataComponent.cs b/Content.Shared/Body/Surgery/SurgeryDataComponent.cs index ac4e2faff5..9bfd1a1476 100644 --- a/Content.Shared/Body/Surgery/SurgeryDataComponent.cs +++ b/Content.Shared/Body/Surgery/SurgeryDataComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Body.Mechanism; +using Content.Shared.Body.Mechanism; using Content.Shared.Body.Part; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Body/Surgery/SurgeryType.cs b/Content.Shared/Body/Surgery/SurgeryType.cs index 446e067092..2879399834 100644 --- a/Content.Shared/Body/Surgery/SurgeryType.cs +++ b/Content.Shared/Body/Surgery/SurgeryType.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Body.Surgery diff --git a/Content.Shared/Body/Surgery/SurgeryUIKey.cs b/Content.Shared/Body/Surgery/SurgeryUIKey.cs index 3213fc0899..e27bd910a1 100644 --- a/Content.Shared/Body/Surgery/SurgeryUIKey.cs +++ b/Content.Shared/Body/Surgery/SurgeryUIKey.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Body.Surgery diff --git a/Content.Shared/Body/Surgery/SurgeryUIMessages.cs b/Content.Shared/Body/Surgery/SurgeryUIMessages.cs index 85b9cded33..72817f8581 100644 --- a/Content.Shared/Body/Surgery/SurgeryUIMessages.cs +++ b/Content.Shared/Body/Surgery/SurgeryUIMessages.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Body/Template/BodyTemplatePrototype.cs b/Content.Shared/Body/Template/BodyTemplatePrototype.cs index 324b995c03..84320087e2 100644 --- a/Content.Shared/Body/Template/BodyTemplatePrototype.cs +++ b/Content.Shared/Body/Template/BodyTemplatePrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Content.Shared.Body.Components; using Content.Shared.Body.Part; diff --git a/Content.Shared/Botany/IPlantMetabolizable.cs b/Content.Shared/Botany/IPlantMetabolizable.cs index 1cf90b281e..e70b271194 100644 --- a/Content.Shared/Botany/IPlantMetabolizable.cs +++ b/Content.Shared/Botany/IPlantMetabolizable.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; namespace Content.Shared.Botany diff --git a/Content.Shared/Botany/PlantHolderVisuals.cs b/Content.Shared/Botany/PlantHolderVisuals.cs index 03bde50d48..04680f050b 100644 --- a/Content.Shared/Botany/PlantHolderVisuals.cs +++ b/Content.Shared/Botany/PlantHolderVisuals.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Botany diff --git a/Content.Shared/Buckle/Components/SharedBuckleComponent.cs b/Content.Shared/Buckle/Components/SharedBuckleComponent.cs index ea50af6ec0..73e5026e3e 100644 --- a/Content.Shared/Buckle/Components/SharedBuckleComponent.cs +++ b/Content.Shared/Buckle/Components/SharedBuckleComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.ActionBlocker; using Content.Shared.DragDrop; diff --git a/Content.Shared/Buckle/Components/SharedStrapComponent.cs b/Content.Shared/Buckle/Components/SharedStrapComponent.cs index ad68e0b697..c6ea85eb1b 100644 --- a/Content.Shared/Buckle/Components/SharedStrapComponent.cs +++ b/Content.Shared/Buckle/Components/SharedStrapComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.DragDrop; using Content.Shared.Interaction.Helpers; diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index b67f343f63..2538e65852 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared; using Robust.Shared.Configuration; diff --git a/Content.Shared/Cabinet/ItemCabinetVisuals.cs b/Content.Shared/Cabinet/ItemCabinetVisuals.cs index 49ab6ee9f5..9ac46e1fa8 100644 --- a/Content.Shared/Cabinet/ItemCabinetVisuals.cs +++ b/Content.Shared/Cabinet/ItemCabinetVisuals.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Cabinet diff --git a/Content.Shared/Camera/SharedCameraRecoilComponent.cs b/Content.Shared/Camera/SharedCameraRecoilComponent.cs index 7161ded265..964d82e3fb 100644 --- a/Content.Shared/Camera/SharedCameraRecoilComponent.cs +++ b/Content.Shared/Camera/SharedCameraRecoilComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/Cargo/CargoOrderData.cs b/Content.Shared/Cargo/CargoOrderData.cs index ad784b6a7b..770cc18856 100644 --- a/Content.Shared/Cargo/CargoOrderData.cs +++ b/Content.Shared/Cargo/CargoOrderData.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Cargo diff --git a/Content.Shared/Cargo/CargoProductPrototype.cs b/Content.Shared/Cargo/CargoProductPrototype.cs index a7f620ad78..65099c20f9 100644 --- a/Content.Shared/Cargo/CargoProductPrototype.cs +++ b/Content.Shared/Cargo/CargoProductPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs b/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs index 4637785555..2abee2f1c4 100644 --- a/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs +++ b/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs b/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs index aa9a1219ce..d7d8f1661d 100644 --- a/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs +++ b/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs b/Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs index af319fc76c..166489fb3c 100644 --- a/Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs +++ b/Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections; using System.Collections.Generic; diff --git a/Content.Shared/CharacterAppearance/Components/SharedHumanoidAppearanceComponent.cs b/Content.Shared/CharacterAppearance/Components/SharedHumanoidAppearanceComponent.cs index 38da99afed..9685f00d09 100644 --- a/Content.Shared/CharacterAppearance/Components/SharedHumanoidAppearanceComponent.cs +++ b/Content.Shared/CharacterAppearance/Components/SharedHumanoidAppearanceComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Preferences; using Robust.Shared.Enums; diff --git a/Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs b/Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs index ebf6ca6caf..babd9efbd7 100644 --- a/Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs +++ b/Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Maths; diff --git a/Content.Shared/CharacterAppearance/HairStyles.cs b/Content.Shared/CharacterAppearance/HairStyles.cs index 0bc7cd0c22..99a016d741 100644 --- a/Content.Shared/CharacterAppearance/HairStyles.cs +++ b/Content.Shared/CharacterAppearance/HairStyles.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Robust.Shared.Maths; diff --git a/Content.Shared/CharacterAppearance/HumanoidCharacterAppearance.cs b/Content.Shared/CharacterAppearance/HumanoidCharacterAppearance.cs index 665adb3cf0..bd09b43d1f 100644 --- a/Content.Shared/CharacterAppearance/HumanoidCharacterAppearance.cs +++ b/Content.Shared/CharacterAppearance/HumanoidCharacterAppearance.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Random; diff --git a/Content.Shared/CharacterAppearance/ICharacterAppearance.cs b/Content.Shared/CharacterAppearance/ICharacterAppearance.cs index 41216e08c3..2a49c231f9 100644 --- a/Content.Shared/CharacterAppearance/ICharacterAppearance.cs +++ b/Content.Shared/CharacterAppearance/ICharacterAppearance.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Content.Shared.CharacterAppearance { diff --git a/Content.Shared/CharacterAppearance/Sex.cs b/Content.Shared/CharacterAppearance/Sex.cs index d5f40bc50e..b0ea69f869 100644 --- a/Content.Shared/CharacterAppearance/Sex.cs +++ b/Content.Shared/CharacterAppearance/Sex.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Dataset; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs b/Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs index aae606b76f..e3e860198f 100644 --- a/Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs +++ b/Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Shared.Objectives; diff --git a/Content.Shared/Chat/ChatChannel.cs b/Content.Shared/Chat/ChatChannel.cs index 9d76beb32c..ba5afe0be2 100644 --- a/Content.Shared/Chat/ChatChannel.cs +++ b/Content.Shared/Chat/ChatChannel.cs @@ -1,4 +1,3 @@ -#nullable enable using System; namespace Content.Shared.Chat diff --git a/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs b/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs index 7848184874..f00062b21b 100644 --- a/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs +++ b/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs @@ -1,4 +1,3 @@ -#nullable enable using Lidgren.Network; using Robust.Shared.Network; diff --git a/Content.Shared/Chat/MsgChatMessage.cs b/Content.Shared/Chat/MsgChatMessage.cs index 69c8a441f5..f2ca14a048 100644 --- a/Content.Shared/Chat/MsgChatMessage.cs +++ b/Content.Shared/Chat/MsgChatMessage.cs @@ -1,4 +1,3 @@ -#nullable enable using JetBrains.Annotations; using Lidgren.Network; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Chemistry/ChemistrySystem.cs b/Content.Shared/Chemistry/ChemistrySystem.cs index 5f5703d927..45881a2050 100644 --- a/Content.Shared/Chemistry/ChemistrySystem.cs +++ b/Content.Shared/Chemistry/ChemistrySystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Linq; using Content.Shared.Chemistry.Reaction; diff --git a/Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs b/Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs index d75488350a..d9817f97b7 100644 --- a/Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs +++ b/Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Shared.Chemistry.Reagent; diff --git a/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs b/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs index b87ebff88f..975abbad91 100644 --- a/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs +++ b/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Chemistry.Reagent; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs b/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs index f5adc2852d..c2ff3487eb 100644 --- a/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs +++ b/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Chemistry.Reagent; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Chemistry/Dispenser/ReagentDispenserInventoryPrototype.cs b/Content.Shared/Chemistry/Dispenser/ReagentDispenserInventoryPrototype.cs index 9ca8446944..16d6ae4369 100644 --- a/Content.Shared/Chemistry/Dispenser/ReagentDispenserInventoryPrototype.cs +++ b/Content.Shared/Chemistry/Dispenser/ReagentDispenserInventoryPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs b/Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs index a8f404e7cb..defe521834 100644 --- a/Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs +++ b/Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Content.Shared.Chemistry.Reagent; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs b/Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs index d69187e378..cbd10016a5 100644 --- a/Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs +++ b/Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Chemistry.Reagent; +using Content.Shared.Chemistry.Reagent; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs b/Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs index 1c96f07e53..e08e209a0c 100644 --- a/Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs +++ b/Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Chemistry.Reagent; +using Content.Shared.Chemistry.Reagent; using Robust.Shared.GameObjects; namespace Content.Shared.Chemistry.Metabolizable diff --git a/Content.Shared/Chemistry/Reaction/IReactionEffect.cs b/Content.Shared/Chemistry/Reaction/IReactionEffect.cs index 671c79b859..9b8762dd28 100644 --- a/Content.Shared/Chemistry/Reaction/IReactionEffect.cs +++ b/Content.Shared/Chemistry/Reaction/IReactionEffect.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; namespace Content.Shared.Chemistry.Reaction diff --git a/Content.Shared/Chemistry/Reaction/ITileReaction.cs b/Content.Shared/Chemistry/Reaction/ITileReaction.cs index 4e4acf45c9..8310652b11 100644 --- a/Content.Shared/Chemistry/Reaction/ITileReaction.cs +++ b/Content.Shared/Chemistry/Reaction/ITileReaction.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Chemistry.Reagent; +using Content.Shared.Chemistry.Reagent; using Robust.Shared.Map; namespace Content.Shared.Chemistry.Reaction diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs index c538ba8339..4867339708 100644 --- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs +++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Shared.Chemistry.Reagent; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs index daaa0d1003..bb39151e54 100644 --- a/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs +++ b/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Shared.Chemistry.Reagent; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs index 1fbf8dc8e6..30de264604 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Content.Shared.Botany; using Content.Shared.Chemistry.Metabolizable; diff --git a/Content.Shared/Chemistry/Reagent/ReagentUnit.cs b/Content.Shared/Chemistry/Reagent/ReagentUnit.cs index 1a653b76c8..d03f111376 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentUnit.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentUnit.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Globalization; using System.Linq; diff --git a/Content.Shared/Chemistry/Solution/Components/ISolutionInteractionsComponent.cs b/Content.Shared/Chemistry/Solution/Components/ISolutionInteractionsComponent.cs index 853629c38a..d1965f970e 100644 --- a/Content.Shared/Chemistry/Solution/Components/ISolutionInteractionsComponent.cs +++ b/Content.Shared/Chemistry/Solution/Components/ISolutionInteractionsComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Chemistry.Reagent; +using Content.Shared.Chemistry.Reagent; using Robust.Shared.GameObjects; namespace Content.Shared.Chemistry.Solution.Components diff --git a/Content.Shared/Chemistry/Solution/Components/SharedSolutionContainerComponent.cs b/Content.Shared/Chemistry/Solution/Components/SharedSolutionContainerComponent.cs index c37a7f4e55..0e6e5c97f9 100644 --- a/Content.Shared/Chemistry/Solution/Components/SharedSolutionContainerComponent.cs +++ b/Content.Shared/Chemistry/Solution/Components/SharedSolutionContainerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Shared.Chemistry.Reaction; diff --git a/Content.Shared/Chemistry/Solution/Solution.cs b/Content.Shared/Chemistry/Solution/Solution.cs index 9b93c53fca..ceae2a17f7 100644 --- a/Content.Shared/Chemistry/Solution/Solution.cs +++ b/Content.Shared/Chemistry/Solution/Solution.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections; using System.Collections.Generic; diff --git a/Content.Shared/Chemistry/Solution/SolutionContainerCaps.cs b/Content.Shared/Chemistry/Solution/SolutionContainerCaps.cs index 261625eb7d..510018dff1 100644 --- a/Content.Shared/Chemistry/Solution/SolutionContainerCaps.cs +++ b/Content.Shared/Chemistry/Solution/SolutionContainerCaps.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Chemistry.Solution.Components; using Robust.Shared.Serialization; diff --git a/Content.Shared/Climbing/SharedClimbableComponent.cs b/Content.Shared/Climbing/SharedClimbableComponent.cs index b5d61c4ca5..b27b44dc93 100644 --- a/Content.Shared/Climbing/SharedClimbableComponent.cs +++ b/Content.Shared/Climbing/SharedClimbableComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.DragDrop; +using Content.Shared.DragDrop; using Content.Shared.Interaction; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Climbing/SharedClimbingComponent.cs b/Content.Shared/Climbing/SharedClimbingComponent.cs index 468696d3c9..3f8c99c64f 100644 --- a/Content.Shared/Climbing/SharedClimbingComponent.cs +++ b/Content.Shared/Climbing/SharedClimbingComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.ActionBlocker; using Content.Shared.Physics; diff --git a/Content.Shared/Cloning/AcceptCloningEuiMessage.cs b/Content.Shared/Cloning/AcceptCloningEuiMessage.cs index 72fbfee8a1..f919422746 100644 --- a/Content.Shared/Cloning/AcceptCloningEuiMessage.cs +++ b/Content.Shared/Cloning/AcceptCloningEuiMessage.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Eui; using Robust.Shared.Serialization; diff --git a/Content.Shared/Cloning/SharedCloningPodComponent.cs b/Content.Shared/Cloning/SharedCloningPodComponent.cs index 1dd0f852af..f90319bfe2 100644 --- a/Content.Shared/Cloning/SharedCloningPodComponent.cs +++ b/Content.Shared/Cloning/SharedCloningPodComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Clothing/ClothingComponentState.cs b/Content.Shared/Clothing/ClothingComponentState.cs index 71d55be319..a063fe53e3 100644 --- a/Content.Shared/Clothing/ClothingComponentState.cs +++ b/Content.Shared/Clothing/ClothingComponentState.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Clothing/SharedMagbootsComponent.cs b/Content.Shared/Clothing/SharedMagbootsComponent.cs index 7756a4e792..4740f6cdf1 100644 --- a/Content.Shared/Clothing/SharedMagbootsComponent.cs +++ b/Content.Shared/Clothing/SharedMagbootsComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Movement.Components; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Collections/RemList.cs b/Content.Shared/Collections/RemList.cs index 57134921db..965adb64d6 100644 --- a/Content.Shared/Collections/RemList.cs +++ b/Content.Shared/Collections/RemList.cs @@ -2,7 +2,6 @@ using System.Collections; using System.Collections.Generic; -#nullable enable namespace Content.Shared.Collections { diff --git a/Content.Shared/CombatMode/CombatModeSystemMessages.cs b/Content.Shared/CombatMode/CombatModeSystemMessages.cs index a621eac51c..e547495b6d 100644 --- a/Content.Shared/CombatMode/CombatModeSystemMessages.cs +++ b/Content.Shared/CombatMode/CombatModeSystemMessages.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Targeting; using Robust.Shared.GameObjects; diff --git a/Content.Shared/CombatMode/SharedCombatModeComponent.cs b/Content.Shared/CombatMode/SharedCombatModeComponent.cs index 54b649ad7b..faaf00b3cc 100644 --- a/Content.Shared/CombatMode/SharedCombatModeComponent.cs +++ b/Content.Shared/CombatMode/SharedCombatModeComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Targeting; using Robust.Shared.GameObjects; diff --git a/Content.Shared/CombatMode/SharedCombatModeSystem.cs b/Content.Shared/CombatMode/SharedCombatModeSystem.cs index 65abb41027..70101b35bf 100644 --- a/Content.Shared/CombatMode/SharedCombatModeSystem.cs +++ b/Content.Shared/CombatMode/SharedCombatModeSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; namespace Content.Shared.CombatMode diff --git a/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs index 78a8378b6d..1cf3ced253 100644 --- a/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs +++ b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Computer/SharedComputerComponent.cs b/Content.Shared/Computer/SharedComputerComponent.cs index 4f50e62b0b..7a9ebf1229 100644 --- a/Content.Shared/Computer/SharedComputerComponent.cs +++ b/Content.Shared/Computer/SharedComputerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Configurable/SharedConfigurationComponent.cs b/Content.Shared/Configurable/SharedConfigurationComponent.cs index d0b5610abc..f20c17eedf 100644 --- a/Content.Shared/Configurable/SharedConfigurationComponent.cs +++ b/Content.Shared/Configurable/SharedConfigurationComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Construction/Conditions/LowWallInTile.cs b/Content.Shared/Construction/Conditions/LowWallInTile.cs index 62d1d9a0e1..62b0b8186a 100644 --- a/Content.Shared/Construction/Conditions/LowWallInTile.cs +++ b/Content.Shared/Construction/Conditions/LowWallInTile.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Maps; +using Content.Shared.Maps; using Content.Shared.Window; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Construction/Conditions/NoWindowsInTile.cs b/Content.Shared/Construction/Conditions/NoWindowsInTile.cs index a13cf0558e..81b3e4786c 100644 --- a/Content.Shared/Construction/Conditions/NoWindowsInTile.cs +++ b/Content.Shared/Construction/Conditions/NoWindowsInTile.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Maps; +using Content.Shared.Maps; using Content.Shared.Window; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Construction/Conditions/TileNotBlocked.cs b/Content.Shared/Construction/Conditions/TileNotBlocked.cs index 2167db08c9..5ad9b06461 100644 --- a/Content.Shared/Construction/Conditions/TileNotBlocked.cs +++ b/Content.Shared/Construction/Conditions/TileNotBlocked.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Maps; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Construction/Conditions/TileType.cs b/Content.Shared/Construction/Conditions/TileType.cs index 82efb7793f..c57da7a87e 100644 --- a/Content.Shared/Construction/Conditions/TileType.cs +++ b/Content.Shared/Construction/Conditions/TileType.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Content.Shared.Maps; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Construction/Conditions/WallmountCondition.cs b/Content.Shared/Construction/Conditions/WallmountCondition.cs index 0391558f5e..ae5a3ce7a0 100644 --- a/Content.Shared/Construction/Conditions/WallmountCondition.cs +++ b/Content.Shared/Construction/Conditions/WallmountCondition.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Linq; using Content.Shared.Physics; using Content.Shared.Tag; diff --git a/Content.Shared/Construction/ConstructionGraphEdge.cs b/Content.Shared/Construction/ConstructionGraphEdge.cs index a84f1861bf..0fd82978f9 100644 --- a/Content.Shared/Construction/ConstructionGraphEdge.cs +++ b/Content.Shared/Construction/ConstructionGraphEdge.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Content.Shared.Construction.Steps; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Construction/IGraphAction.cs b/Content.Shared/Construction/IGraphAction.cs index d9bbe30688..c51a84fc18 100644 --- a/Content.Shared/Construction/IGraphAction.cs +++ b/Content.Shared/Construction/IGraphAction.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Threading.Tasks; +using System.Threading.Tasks; using Robust.Shared.GameObjects; namespace Content.Shared.Construction diff --git a/Content.Shared/Construction/IGraphCondition.cs b/Content.Shared/Construction/IGraphCondition.cs index ec29bba2a7..18a09984b8 100644 --- a/Content.Shared/Construction/IGraphCondition.cs +++ b/Content.Shared/Construction/IGraphCondition.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Threading.Tasks; +using System.Threading.Tasks; using Robust.Shared.GameObjects; using Robust.Shared.Utility; diff --git a/Content.Shared/Construction/MachineFrameVisuals.cs b/Content.Shared/Construction/MachineFrameVisuals.cs index 99b2bc29d4..97091945b1 100644 --- a/Content.Shared/Construction/MachineFrameVisuals.cs +++ b/Content.Shared/Construction/MachineFrameVisuals.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.Serialization; +using Robust.Shared.Serialization; namespace Content.Shared.Construction { diff --git a/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs b/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs index b30fa5d39a..20ea712841 100644 --- a/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs +++ b/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Content.Shared.Construction.Conditions; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs b/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs index dd508764cd..9aed112d1d 100644 --- a/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs +++ b/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Construction { diff --git a/Content.Shared/Construction/SharedConstructionSystem.cs b/Content.Shared/Construction/SharedConstructionSystem.cs index 6d588e0412..6472e58265 100644 --- a/Content.Shared/Construction/SharedConstructionSystem.cs +++ b/Content.Shared/Construction/SharedConstructionSystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs index 0e60d05c13..16aab18b29 100644 --- a/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs +++ b/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.Localization; +using Robust.Shared.Localization; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Utility; diff --git a/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs index 32f952377e..55d8908fe0 100644 --- a/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs +++ b/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Utility; diff --git a/Content.Shared/Construction/Steps/ConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ConstructionGraphStep.cs index 2ddb0fec5d..e9e6e5aba9 100644 --- a/Content.Shared/Construction/Steps/ConstructionGraphStep.cs +++ b/Content.Shared/Construction/Steps/ConstructionGraphStep.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Utility; diff --git a/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs b/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs index 977a6677a2..9bfac04394 100644 --- a/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs +++ b/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.IoC; using Robust.Shared.Serialization.Manager; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs b/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs index 8c74e95c18..e77f4de32f 100644 --- a/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs +++ b/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Shared.Construction.Steps diff --git a/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs b/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs index 8e3929476c..98e71b3ce7 100644 --- a/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs +++ b/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Diagnostics.CodeAnalysis; using Content.Shared.Stacks; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs b/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs index de1f4b19b0..8d79712774 100644 --- a/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs +++ b/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Shared.Tag; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Construction/Steps/NestedConstructionGraphStep.cs b/Content.Shared/Construction/Steps/NestedConstructionGraphStep.cs index 863a806c73..cf42bd333b 100644 --- a/Content.Shared/Construction/Steps/NestedConstructionGraphStep.cs +++ b/Content.Shared/Construction/Steps/NestedConstructionGraphStep.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; using Robust.Shared.Serialization; diff --git a/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs b/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs index 18f19dda20..548ea9b203 100644 --- a/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs +++ b/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Utility; diff --git a/Content.Shared/Construction/Steps/TagConstructionGraphStep.cs b/Content.Shared/Construction/Steps/TagConstructionGraphStep.cs index 19c94bcace..c8880764ff 100644 --- a/Content.Shared/Construction/Steps/TagConstructionGraphStep.cs +++ b/Content.Shared/Construction/Steps/TagConstructionGraphStep.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Tag; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs index 73ccf75a0c..dd0fae8999 100644 --- a/Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs +++ b/Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Tool; using Robust.Shared.Localization; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Conveyor/SharedConveyorComponent.cs b/Content.Shared/Conveyor/SharedConveyorComponent.cs index 6e98d5c21c..83b19dd0dc 100644 --- a/Content.Shared/Conveyor/SharedConveyorComponent.cs +++ b/Content.Shared/Conveyor/SharedConveyorComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Conveyor diff --git a/Content.Shared/Cooldown/Cooldowns.cs b/Content.Shared/Cooldown/Cooldowns.cs index 7d45ac7adc..7ad00bbb01 100644 --- a/Content.Shared/Cooldown/Cooldowns.cs +++ b/Content.Shared/Cooldown/Cooldowns.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.IoC; using Robust.Shared.Timing; diff --git a/Content.Shared/Cooldown/ItemCooldownComponent.cs b/Content.Shared/Cooldown/ItemCooldownComponent.cs index 329d52be51..7dd2d2544a 100644 --- a/Content.Shared/Cooldown/ItemCooldownComponent.cs +++ b/Content.Shared/Cooldown/ItemCooldownComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs b/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs index c1f7c17f6d..c6eaace7a1 100644 --- a/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs +++ b/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Shared/Crayon/SharedCrayonComponent.cs b/Content.Shared/Crayon/SharedCrayonComponent.cs index 525d4fec78..d7269c7b76 100644 --- a/Content.Shared/Crayon/SharedCrayonComponent.cs +++ b/Content.Shared/Crayon/SharedCrayonComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Cuffs/Components/SharedCuffableComponent.cs b/Content.Shared/Cuffs/Components/SharedCuffableComponent.cs index f8a7698c09..f3b6a7a59f 100644 --- a/Content.Shared/Cuffs/Components/SharedCuffableComponent.cs +++ b/Content.Shared/Cuffs/Components/SharedCuffableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.ActionBlocker; using Content.Shared.Pulling.Components; diff --git a/Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs b/Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs index 31af149097..59a8a00d16 100644 --- a/Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs +++ b/Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/Damage/Components/DamageableComponent.cs b/Content.Shared/Damage/Components/DamageableComponent.cs index a46808ca9d..71df457e1e 100644 --- a/Content.Shared/Damage/Components/DamageableComponent.cs +++ b/Content.Shared/Damage/Components/DamageableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Shared/Damage/Components/IDamageableComponent.cs b/Content.Shared/Damage/Components/IDamageableComponent.cs index 6f51161d8d..e00bc605a8 100644 --- a/Content.Shared/Damage/Components/IDamageableComponent.cs +++ b/Content.Shared/Damage/Components/IDamageableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Shared.Acts; using Content.Shared.Damage.Resistances; diff --git a/Content.Shared/Damage/Container/DamageContainerPrototype.cs b/Content.Shared/Damage/Container/DamageContainerPrototype.cs index 2cda46b225..37d0b3afea 100644 --- a/Content.Shared/Damage/Container/DamageContainerPrototype.cs +++ b/Content.Shared/Damage/Container/DamageContainerPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/Damage/DamageChangeData.cs b/Content.Shared/Damage/DamageChangeData.cs index 5d726232e1..98b54f490d 100644 --- a/Content.Shared/Damage/DamageChangeData.cs +++ b/Content.Shared/Damage/DamageChangeData.cs @@ -1,5 +1,4 @@ -#nullable enable -namespace Content.Shared.Damage +namespace Content.Shared.Damage { /// /// Data class with information on how the value of a diff --git a/Content.Shared/Damage/DamageChangeParams.cs b/Content.Shared/Damage/DamageChangeParams.cs index be802b8466..26c043d136 100644 --- a/Content.Shared/Damage/DamageChangeParams.cs +++ b/Content.Shared/Damage/DamageChangeParams.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Body.Components; using Content.Shared.Damage.Components; diff --git a/Content.Shared/Damage/DamageChangedEventArgs.cs b/Content.Shared/Damage/DamageChangedEventArgs.cs index 3efddf777a..d7a3a7552d 100644 --- a/Content.Shared/Damage/DamageChangedEventArgs.cs +++ b/Content.Shared/Damage/DamageChangedEventArgs.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Content.Shared.Damage.Components; diff --git a/Content.Shared/Damage/DamageChangedMessage.cs b/Content.Shared/Damage/DamageChangedMessage.cs index cb6ceac546..5e7c2dc478 100644 --- a/Content.Shared/Damage/DamageChangedMessage.cs +++ b/Content.Shared/Damage/DamageChangedMessage.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Content.Shared.Damage.Components; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Damage/DamageClass.cs b/Content.Shared/Damage/DamageClass.cs index c97041b8eb..b34671b487 100644 --- a/Content.Shared/Damage/DamageClass.cs +++ b/Content.Shared/Damage/DamageClass.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; diff --git a/Content.Shared/Damage/DamageSystem.cs b/Content.Shared/Damage/DamageSystem.cs index 6bdc6c821d..d2d7d7dc87 100644 --- a/Content.Shared/Damage/DamageSystem.cs +++ b/Content.Shared/Damage/DamageSystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using System.Collections.Immutable; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Damage/DamageType.cs b/Content.Shared/Damage/DamageType.cs index a6d62575be..65f1912f77 100644 --- a/Content.Shared/Damage/DamageType.cs +++ b/Content.Shared/Damage/DamageType.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using System.Linq; using Robust.Shared.Serialization; diff --git a/Content.Shared/Damage/Resistances/ResistanceSet.cs b/Content.Shared/Damage/Resistances/ResistanceSet.cs index 81a9fb6973..01016fab37 100644 --- a/Content.Shared/Damage/Resistances/ResistanceSet.cs +++ b/Content.Shared/Damage/Resistances/ResistanceSet.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/Damage/Resistances/ResistanceSetPrototype.cs b/Content.Shared/Damage/Resistances/ResistanceSetPrototype.cs index 96b88b4850..854dd05463 100644 --- a/Content.Shared/Damage/Resistances/ResistanceSetPrototype.cs +++ b/Content.Shared/Damage/Resistances/ResistanceSetPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/Dataset/DatasetPrototype.cs b/Content.Shared/Dataset/DatasetPrototype.cs index b1aab3ab6c..3c024b4669 100644 --- a/Content.Shared/Dataset/DatasetPrototype.cs +++ b/Content.Shared/Dataset/DatasetPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/Directions/SharedDirectionExtensions.cs b/Content.Shared/Directions/SharedDirectionExtensions.cs index 61c056d479..d70ee27851 100644 --- a/Content.Shared/Directions/SharedDirectionExtensions.cs +++ b/Content.Shared/Directions/SharedDirectionExtensions.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Content.Shared.Maps; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Shared/Disposal/Components/SharedDisposalMailingUnitComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalMailingUnitComponent.cs index a0d79f628e..213f6f5cb0 100644 --- a/Content.Shared/Disposal/Components/SharedDisposalMailingUnitComponent.cs +++ b/Content.Shared/Disposal/Components/SharedDisposalMailingUnitComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs index 24d54b12db..da89fb9040 100644 --- a/Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs +++ b/Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Text.RegularExpressions; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs index 45694f86c8..ba5c3db608 100644 --- a/Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs +++ b/Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Text.RegularExpressions; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Disposal/Components/SharedDisposalTubeComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalTubeComponent.cs index e2382f255d..fc6bec2178 100644 --- a/Content.Shared/Disposal/Components/SharedDisposalTubeComponent.cs +++ b/Content.Shared/Disposal/Components/SharedDisposalTubeComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Disposal.Components diff --git a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs index 5521b6b873..dd030ba32a 100644 --- a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs +++ b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Body.Components; using Content.Shared.DragDrop; diff --git a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs index 9acb37a14a..8c8e8980a9 100644 --- a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs +++ b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Disposal.Components; +using Content.Shared.Disposal.Components; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/DoAfter/SharedDoAfterComponent.cs b/Content.Shared/DoAfter/SharedDoAfterComponent.cs index ddea2d747f..4d625ee35e 100644 --- a/Content.Shared/DoAfter/SharedDoAfterComponent.cs +++ b/Content.Shared/DoAfter/SharedDoAfterComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Doors/AirlockWireStatus.cs b/Content.Shared/Doors/AirlockWireStatus.cs index 9a5175aeff..62c3400639 100644 --- a/Content.Shared/Doors/AirlockWireStatus.cs +++ b/Content.Shared/Doors/AirlockWireStatus.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Doors diff --git a/Content.Shared/Doors/SharedDoorComponent.cs b/Content.Shared/Doors/SharedDoorComponent.cs index 6de0068f44..db6902c5c6 100644 --- a/Content.Shared/Doors/SharedDoorComponent.cs +++ b/Content.Shared/Doors/SharedDoorComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Robust.Shared.GameObjects; diff --git a/Content.Shared/DragDrop/DragDropRequestEvent.cs b/Content.Shared/DragDrop/DragDropRequestEvent.cs index 8a4632c651..0fd2fdf33e 100644 --- a/Content.Shared/DragDrop/DragDropRequestEvent.cs +++ b/Content.Shared/DragDrop/DragDropRequestEvent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Map; diff --git a/Content.Shared/DragDrop/IDragDropOn.cs b/Content.Shared/DragDrop/IDragDropOn.cs index fa8fb58a6f..9087c1c3be 100644 --- a/Content.Shared/DragDrop/IDragDropOn.cs +++ b/Content.Shared/DragDrop/IDragDropOn.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.Analyzers; namespace Content.Shared.DragDrop diff --git a/Content.Shared/DragDrop/IDraggable.cs b/Content.Shared/DragDrop/IDraggable.cs index 735850e946..f646eafbe2 100644 --- a/Content.Shared/DragDrop/IDraggable.cs +++ b/Content.Shared/DragDrop/IDraggable.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; using Robust.Shared.Map; diff --git a/Content.Shared/DragDrop/IDropped.cs b/Content.Shared/DragDrop/IDropped.cs index 5848167a46..c09f7fc7df 100644 --- a/Content.Shared/DragDrop/IDropped.cs +++ b/Content.Shared/DragDrop/IDropped.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using JetBrains.Annotations; using Robust.Shared.Analyzers; diff --git a/Content.Shared/DrawDepth/DrawDepth.cs b/Content.Shared/DrawDepth/DrawDepth.cs index 82a415d577..6ea6bb3f3a 100644 --- a/Content.Shared/DrawDepth/DrawDepth.cs +++ b/Content.Shared/DrawDepth/DrawDepth.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.Serialization; using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth; diff --git a/Content.Shared/EffectBlocker/EffectBlockerExtensions.cs b/Content.Shared/EffectBlocker/EffectBlockerExtensions.cs index e2cc0c8058..ae1c6abe99 100644 --- a/Content.Shared/EffectBlocker/EffectBlockerExtensions.cs +++ b/Content.Shared/EffectBlocker/EffectBlockerExtensions.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.EffectBlocker { diff --git a/Content.Shared/EffectBlocker/EffectBlockerSystem.cs b/Content.Shared/EffectBlocker/EffectBlockerSystem.cs index 9494427f10..c8428f2d53 100644 --- a/Content.Shared/EffectBlocker/EffectBlockerSystem.cs +++ b/Content.Shared/EffectBlocker/EffectBlockerSystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.ActionBlocker; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/EffectBlocker/IEffectBlocker.cs b/Content.Shared/EffectBlocker/IEffectBlocker.cs index 4e3d9d9927..c8c3d05d2e 100644 --- a/Content.Shared/EffectBlocker/IEffectBlocker.cs +++ b/Content.Shared/EffectBlocker/IEffectBlocker.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.ActionBlocker; +using Content.Shared.ActionBlocker; namespace Content.Shared.EffectBlocker { diff --git a/Content.Shared/Emoting/SharedEmotingComponent.cs b/Content.Shared/Emoting/SharedEmotingComponent.cs index 47a277c1ad..48972b5628 100644 --- a/Content.Shared/Emoting/SharedEmotingComponent.cs +++ b/Content.Shared/Emoting/SharedEmotingComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.ActionBlocker; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Entry/EntryPoint.cs b/Content.Shared/Entry/EntryPoint.cs index b00bbb2832..642056a1d7 100644 --- a/Content.Shared/Entry/EntryPoint.cs +++ b/Content.Shared/Entry/EntryPoint.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Shared.CharacterAppearance; diff --git a/Content.Shared/Eui/EuiMessageBase.cs b/Content.Shared/Eui/EuiMessageBase.cs index 1d2052ff5a..5a252572d5 100644 --- a/Content.Shared/Eui/EuiMessageBase.cs +++ b/Content.Shared/Eui/EuiMessageBase.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; namespace Content.Shared.Eui { diff --git a/Content.Shared/Eui/EuiStateBase.cs b/Content.Shared/Eui/EuiStateBase.cs index 461a1f1b4b..c1fe469c35 100644 --- a/Content.Shared/Eui/EuiStateBase.cs +++ b/Content.Shared/Eui/EuiStateBase.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Eui diff --git a/Content.Shared/Eui/MsgEuiCtl.cs b/Content.Shared/Eui/MsgEuiCtl.cs index 265a9168cf..aad55f8aa4 100644 --- a/Content.Shared/Eui/MsgEuiCtl.cs +++ b/Content.Shared/Eui/MsgEuiCtl.cs @@ -1,5 +1,4 @@ -#nullable enable -using Lidgren.Network; +using Lidgren.Network; using Robust.Shared.Network; namespace Content.Shared.Eui diff --git a/Content.Shared/Eui/MsgEuiMessage.cs b/Content.Shared/Eui/MsgEuiMessage.cs index b598c40bb9..39a417f391 100644 --- a/Content.Shared/Eui/MsgEuiMessage.cs +++ b/Content.Shared/Eui/MsgEuiMessage.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.IO; using Lidgren.Network; using Robust.Shared.IoC; diff --git a/Content.Shared/Eui/MsgEuiState.cs b/Content.Shared/Eui/MsgEuiState.cs index 41b295ef31..8dd3115581 100644 --- a/Content.Shared/Eui/MsgEuiState.cs +++ b/Content.Shared/Eui/MsgEuiState.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.IO; using Lidgren.Network; using Robust.Shared.IoC; diff --git a/Content.Shared/Examine/ExamineSystemMessages.cs b/Content.Shared/Examine/ExamineSystemMessages.cs index dc56a9134e..c8e0d41bdb 100644 --- a/Content.Shared/Examine/ExamineSystemMessages.cs +++ b/Content.Shared/Examine/ExamineSystemMessages.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs index 23694c18aa..4d83f5d694 100644 --- a/Content.Shared/Examine/ExamineSystemShared.cs +++ b/Content.Shared/Examine/ExamineSystemShared.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Linq; using Content.Shared.DragDrop; using Content.Shared.Interaction; diff --git a/Content.Shared/Examine/ExaminerComponent.cs b/Content.Shared/Examine/ExaminerComponent.cs index ebd91f02be..386d31f28c 100644 --- a/Content.Shared/Examine/ExaminerComponent.cs +++ b/Content.Shared/Examine/ExaminerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/Explosion/SharedClusterFlashComponent.cs b/Content.Shared/Explosion/SharedClusterFlashComponent.cs index ae838554f7..d58b1f16e6 100644 --- a/Content.Shared/Explosion/SharedClusterFlashComponent.cs +++ b/Content.Shared/Explosion/SharedClusterFlashComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Serialization; diff --git a/Content.Shared/Flash/SharedFlashableComponent.cs b/Content.Shared/Flash/SharedFlashableComponent.cs index 702fd6502d..78c48cbdd2 100644 --- a/Content.Shared/Flash/SharedFlashableComponent.cs +++ b/Content.Shared/Flash/SharedFlashableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/Fluids/SharedSprayComponent.cs b/Content.Shared/Fluids/SharedSprayComponent.cs index 32c55a39cf..ef46ea9644 100644 --- a/Content.Shared/Fluids/SharedSprayComponent.cs +++ b/Content.Shared/Fluids/SharedSprayComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Foam/FoamVisuals.cs b/Content.Shared/Foam/FoamVisuals.cs index d6a7382c1e..676b1e4036 100644 --- a/Content.Shared/Foam/FoamVisuals.cs +++ b/Content.Shared/Foam/FoamVisuals.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Foam diff --git a/Content.Shared/Friction/SharedTileFrictionController.cs b/Content.Shared/Friction/SharedTileFrictionController.cs index 3f7017232b..606873f435 100644 --- a/Content.Shared/Friction/SharedTileFrictionController.cs +++ b/Content.Shared/Friction/SharedTileFrictionController.cs @@ -11,7 +11,6 @@ using Robust.Shared.Physics.Broadphase; using Robust.Shared.Physics.Controllers; using Robust.Shared.Physics.Dynamics; -#nullable enable namespace Content.Shared.Friction { diff --git a/Content.Shared/Friction/TileFrictionModifier.cs b/Content.Shared/Friction/TileFrictionModifier.cs index dcf2191af0..052af70447 100644 --- a/Content.Shared/Friction/TileFrictionModifier.cs +++ b/Content.Shared/Friction/TileFrictionModifier.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Maths; diff --git a/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs b/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs index 0537925b56..1fc9b23fbf 100644 --- a/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs +++ b/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs @@ -2,7 +2,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.Serialization; -#nullable enable namespace Content.Shared.GameTicking { diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs index 471935839b..944246ca72 100644 --- a/Content.Shared/GameTicking/SharedGameTicker.cs +++ b/Content.Shared/GameTicking/SharedGameTicker.cs @@ -1,5 +1,4 @@ -#nullable enable - + using System; using System.Collections.Generic; using Robust.Shared.GameObjects; diff --git a/Content.Shared/GameWindow/RequestWindowAttentionEvent.cs b/Content.Shared/GameWindow/RequestWindowAttentionEvent.cs index dc37f415bb..2d18460c8c 100644 --- a/Content.Shared/GameWindow/RequestWindowAttentionEvent.cs +++ b/Content.Shared/GameWindow/RequestWindowAttentionEvent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs b/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs index ea832d2bf9..b37ebb1f47 100644 --- a/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs +++ b/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Eui; using Robust.Shared.Serialization; diff --git a/Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs b/Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs index 6f7a648c5f..c28f338d6f 100644 --- a/Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs +++ b/Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Eui; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs b/Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs index 7f5d933bdb..68754df2a8 100644 --- a/Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs +++ b/Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Eui; using Robust.Shared.Serialization; diff --git a/Content.Shared/Ghost/Roles/SharedGhostRoleSystem.cs b/Content.Shared/Ghost/Roles/SharedGhostRoleSystem.cs index 4977d54870..876097783e 100644 --- a/Content.Shared/Ghost/Roles/SharedGhostRoleSystem.cs +++ b/Content.Shared/Ghost/Roles/SharedGhostRoleSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Gravity/GravityChangedMessage.cs b/Content.Shared/Gravity/GravityChangedMessage.cs index de07cb39af..b8955f1d6f 100644 --- a/Content.Shared/Gravity/GravityChangedMessage.cs +++ b/Content.Shared/Gravity/GravityChangedMessage.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; using Robust.Shared.Map; diff --git a/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs b/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs index dd5070b2ec..41214e037a 100644 --- a/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs +++ b/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/Hands/Components/ISharedHandsComponent.cs b/Content.Shared/Hands/Components/ISharedHandsComponent.cs index 11ef111c20..0eac928ba8 100644 --- a/Content.Shared/Hands/Components/ISharedHandsComponent.cs +++ b/Content.Shared/Hands/Components/ISharedHandsComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Hands.Components { diff --git a/Content.Shared/Hands/Components/SharedHandsComponent.cs b/Content.Shared/Hands/Components/SharedHandsComponent.cs index 1ebab628e4..0fd7749917 100644 --- a/Content.Shared/Hands/Components/SharedHandsComponent.cs +++ b/Content.Shared/Hands/Components/SharedHandsComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; diff --git a/Content.Shared/Hands/IEquippedHand.cs b/Content.Shared/Hands/IEquippedHand.cs index 79bffd4f84..dd01e37e6c 100644 --- a/Content.Shared/Hands/IEquippedHand.cs +++ b/Content.Shared/Hands/IEquippedHand.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Hands.Components; using Content.Shared.Inventory; diff --git a/Content.Shared/Hands/IHandDeselected.cs b/Content.Shared/Hands/IHandDeselected.cs index 1399ccb2b2..980f3dd489 100644 --- a/Content.Shared/Hands/IHandDeselected.cs +++ b/Content.Shared/Hands/IHandDeselected.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using JetBrains.Annotations; using Robust.Shared.Analyzers; diff --git a/Content.Shared/Hands/IHandSelected.cs b/Content.Shared/Hands/IHandSelected.cs index f0709a1da0..5e34cef951 100644 --- a/Content.Shared/Hands/IHandSelected.cs +++ b/Content.Shared/Hands/IHandSelected.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using JetBrains.Annotations; using Robust.Shared.Analyzers; diff --git a/Content.Shared/Hands/IUnequippedHand.cs b/Content.Shared/Hands/IUnequippedHand.cs index ccc24cbb0f..9abf762e8c 100644 --- a/Content.Shared/Hands/IUnequippedHand.cs +++ b/Content.Shared/Hands/IUnequippedHand.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Hands.Components; using Content.Shared.Inventory; diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs index 9a3f504f0d..5a86bc6615 100644 --- a/Content.Shared/Input/ContentKeyFunctions.cs +++ b/Content.Shared/Input/ContentKeyFunctions.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.Input; namespace Content.Shared.Input diff --git a/Content.Shared/Instruments/SharedInstrumentComponent.cs b/Content.Shared/Instruments/SharedInstrumentComponent.cs index f19c1ff53f..d33eb6e44a 100644 --- a/Content.Shared/Instruments/SharedInstrumentComponent.cs +++ b/Content.Shared/Instruments/SharedInstrumentComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Audio.Midi; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs b/Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs index 7c09cc36e6..691943ab69 100644 --- a/Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs +++ b/Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.DragDrop; using Content.Shared.Physics; using Robust.Shared.Containers; diff --git a/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs b/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs index 2e2b395330..18b5537460 100644 --- a/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs +++ b/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.DragDrop; +using Content.Shared.DragDrop; using Content.Shared.Examine; using Robust.Shared.Containers; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Interaction/IAfterInteract.cs b/Content.Shared/Interaction/IAfterInteract.cs index 9fc7ddcde0..a9d12a0b7e 100644 --- a/Content.Shared/Interaction/IAfterInteract.cs +++ b/Content.Shared/Interaction/IAfterInteract.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Threading.Tasks; using JetBrains.Annotations; @@ -6,7 +5,6 @@ using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; using Robust.Shared.Map; -#nullable enable namespace Content.Shared.Interaction { diff --git a/Content.Shared/Interaction/ITargetedInteractEventArgs.cs b/Content.Shared/Interaction/ITargetedInteractEventArgs.cs index cb0e51d73c..1b52dbed2c 100644 --- a/Content.Shared/Interaction/ITargetedInteractEventArgs.cs +++ b/Content.Shared/Interaction/ITargetedInteractEventArgs.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Interaction { diff --git a/Content.Shared/Inventory/EquipmentSlotDefinitions.cs b/Content.Shared/Inventory/EquipmentSlotDefinitions.cs index 578a74ac59..7fec296312 100644 --- a/Content.Shared/Inventory/EquipmentSlotDefinitions.cs +++ b/Content.Shared/Inventory/EquipmentSlotDefinitions.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using JetBrains.Annotations; using Robust.Shared.Serialization; diff --git a/Content.Shared/Inventory/IEquipped.cs b/Content.Shared/Inventory/IEquipped.cs index d27d4f4054..9021190108 100644 --- a/Content.Shared/Inventory/IEquipped.cs +++ b/Content.Shared/Inventory/IEquipped.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Hands; using JetBrains.Annotations; diff --git a/Content.Shared/Inventory/IUnequipped.cs b/Content.Shared/Inventory/IUnequipped.cs index 8699316513..2a3985231e 100644 --- a/Content.Shared/Inventory/IUnequipped.cs +++ b/Content.Shared/Inventory/IUnequipped.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Hands; using JetBrains.Annotations; diff --git a/Content.Shared/Inventory/InventoryTemplates.cs b/Content.Shared/Inventory/InventoryTemplates.cs index dab4b662b4..56c8d98ad9 100644 --- a/Content.Shared/Inventory/InventoryTemplates.cs +++ b/Content.Shared/Inventory/InventoryTemplates.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using JetBrains.Annotations; using static Content.Shared.Inventory.EquipmentSlotDefines; diff --git a/Content.Shared/Item/SharedItemComponent.cs b/Content.Shared/Item/SharedItemComponent.cs index 74c4c83cd5..50782c35b3 100644 --- a/Content.Shared/Item/SharedItemComponent.cs +++ b/Content.Shared/Item/SharedItemComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.ActionBlocker; using Content.Shared.Hands.Components; diff --git a/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs b/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs index 020d4b23a5..3f8209a35c 100644 --- a/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs +++ b/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.DragDrop; using Content.Shared.Nutrition.Components; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs b/Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs index d23cb794a1..bd0b511317 100644 --- a/Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs +++ b/Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Chemistry.Solution; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs b/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs index 758f6794ed..ca1eae6923 100644 --- a/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs +++ b/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Chemistry.Solution; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs index d1ebef976f..891cba433e 100644 --- a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs +++ b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Robust.Shared.Localization; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Kitchen/RecipeManager.cs b/Content.Shared/Kitchen/RecipeManager.cs index bb5461def6..93c69e8b62 100644 --- a/Content.Shared/Kitchen/RecipeManager.cs +++ b/Content.Shared/Kitchen/RecipeManager.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Lathe/SharedLatheComponent.cs b/Content.Shared/Lathe/SharedLatheComponent.cs index d57696bf9f..ee1dc79546 100644 --- a/Content.Shared/Lathe/SharedLatheComponent.cs +++ b/Content.Shared/Lathe/SharedLatheComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Shared.Research.Prototypes; diff --git a/Content.Shared/Lathe/SharedLatheDatabaseComponent.cs b/Content.Shared/Lathe/SharedLatheDatabaseComponent.cs index 5fbe7ef301..fbb146adc3 100644 --- a/Content.Shared/Lathe/SharedLatheDatabaseComponent.cs +++ b/Content.Shared/Lathe/SharedLatheDatabaseComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections; using System.Collections.Generic; diff --git a/Content.Shared/Lathe/SharedMaterialStorageComponent.cs b/Content.Shared/Lathe/SharedMaterialStorageComponent.cs index ecd996795a..509e7d55c9 100644 --- a/Content.Shared/Lathe/SharedMaterialStorageComponent.cs +++ b/Content.Shared/Lathe/SharedMaterialStorageComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections; using System.Collections.Generic; diff --git a/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs b/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs index 6c42221575..d7e28bc707 100644 --- a/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs +++ b/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Shared.Research.Prototypes; diff --git a/Content.Shared/Light/Component/SharedExpendableLightComponent.cs b/Content.Shared/Light/Component/SharedExpendableLightComponent.cs index 618b0edfc1..f6f057ea23 100644 --- a/Content.Shared/Light/Component/SharedExpendableLightComponent.cs +++ b/Content.Shared/Light/Component/SharedExpendableLightComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/Light/Component/SharedHandheldLightComponent.cs b/Content.Shared/Light/Component/SharedHandheldLightComponent.cs index 6e0d68136f..f377a733f9 100644 --- a/Content.Shared/Light/Component/SharedHandheldLightComponent.cs +++ b/Content.Shared/Light/Component/SharedHandheldLightComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/Light/Component/SharedLightBehaviourComponent.cs b/Content.Shared/Light/Component/SharedLightBehaviourComponent.cs index 789279bc3e..603cd767a6 100644 --- a/Content.Shared/Light/Component/SharedLightBehaviourComponent.cs +++ b/Content.Shared/Light/Component/SharedLightBehaviourComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -namespace Content.Shared.Light.Component +namespace Content.Shared.Light.Component { /// /// A component which applies a specific behaviour to a PointLightComponent on its owner. diff --git a/Content.Shared/Light/SharedPoweredLightVisuals.cs b/Content.Shared/Light/SharedPoweredLightVisuals.cs index 1f9aa3ba6a..20f4ddd61e 100644 --- a/Content.Shared/Light/SharedPoweredLightVisuals.cs +++ b/Content.Shared/Light/SharedPoweredLightVisuals.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Serialization; diff --git a/Content.Shared/MachineLinking/TwoWayLeverSignal.cs b/Content.Shared/MachineLinking/TwoWayLeverSignal.cs index ed6394acb7..9ab282bc08 100644 --- a/Content.Shared/MachineLinking/TwoWayLeverSignal.cs +++ b/Content.Shared/MachineLinking/TwoWayLeverSignal.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.MachineLinking diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index 7d5281a1e0..89cc4be463 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using JetBrains.Annotations; using Robust.Shared.Map; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Maps/TurfHelpers.cs b/Content.Shared/Maps/TurfHelpers.cs index 91350454de..c04fe25278 100644 --- a/Content.Shared/Maps/TurfHelpers.cs +++ b/Content.Shared/Maps/TurfHelpers.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Linq; using System.Runtime.CompilerServices; diff --git a/Content.Shared/Markers/SharedSpawnPointComponent.cs b/Content.Shared/Markers/SharedSpawnPointComponent.cs index 7bac08dbf1..98ab965eef 100644 --- a/Content.Shared/Markers/SharedSpawnPointComponent.cs +++ b/Content.Shared/Markers/SharedSpawnPointComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; namespace Content.Shared.Markers diff --git a/Content.Shared/Materials/MaterialPrototype.cs b/Content.Shared/Materials/MaterialPrototype.cs index d2cdce2411..a4b83fd36a 100644 --- a/Content.Shared/Materials/MaterialPrototype.cs +++ b/Content.Shared/Materials/MaterialPrototype.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Stacks; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Maths/PhysicalConstants.cs b/Content.Shared/Maths/PhysicalConstants.cs index 7f6d9254c7..301861a0eb 100644 --- a/Content.Shared/Maths/PhysicalConstants.cs +++ b/Content.Shared/Maths/PhysicalConstants.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Content.Shared.Maths { /// diff --git a/Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs b/Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs index c2b24308d1..2d7af4a463 100644 --- a/Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs +++ b/Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Shared.Body.Components; diff --git a/Content.Shared/MobState/Components/SharedMobStateComponent.cs b/Content.Shared/MobState/Components/SharedMobStateComponent.cs index c5df49b537..79dc0977d8 100644 --- a/Content.Shared/MobState/Components/SharedMobStateComponent.cs +++ b/Content.Shared/MobState/Components/SharedMobStateComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; diff --git a/Content.Shared/MobState/DamageStateHelpers.cs b/Content.Shared/MobState/DamageStateHelpers.cs index d5bb97be1c..462f4a9218 100644 --- a/Content.Shared/MobState/DamageStateHelpers.cs +++ b/Content.Shared/MobState/DamageStateHelpers.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; namespace Content.Shared.MobState diff --git a/Content.Shared/MobState/DamageStateVisuals.cs b/Content.Shared/MobState/DamageStateVisuals.cs index 30c8de65da..a7628bbfc8 100644 --- a/Content.Shared/MobState/DamageStateVisuals.cs +++ b/Content.Shared/MobState/DamageStateVisuals.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/MobState/IMobStateComponent.cs b/Content.Shared/MobState/IMobStateComponent.cs index ab29c8ac1e..5f709b763b 100644 --- a/Content.Shared/MobState/IMobStateComponent.cs +++ b/Content.Shared/MobState/IMobStateComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using Content.Shared.MobState.State; using Robust.Shared.GameObjects; diff --git a/Content.Shared/MobState/MobStateChangedMessage.cs b/Content.Shared/MobState/MobStateChangedMessage.cs index 39513a3751..337caa42db 100644 --- a/Content.Shared/MobState/MobStateChangedMessage.cs +++ b/Content.Shared/MobState/MobStateChangedMessage.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.MobState.State; +using Content.Shared.MobState.State; using Robust.Shared.GameObjects; namespace Content.Shared.MobState diff --git a/Content.Shared/MobState/State/BaseMobState.cs b/Content.Shared/MobState/State/BaseMobState.cs index a159c2d347..760c33e3eb 100644 --- a/Content.Shared/MobState/State/BaseMobState.cs +++ b/Content.Shared/MobState/State/BaseMobState.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Shared.MobState.State diff --git a/Content.Shared/MobState/State/IMobState.cs b/Content.Shared/MobState/State/IMobState.cs index b2d3c636d4..9f79a3806c 100644 --- a/Content.Shared/MobState/State/IMobState.cs +++ b/Content.Shared/MobState/State/IMobState.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.ActionBlocker; +using Content.Shared.ActionBlocker; using Robust.Shared.GameObjects; namespace Content.Shared.MobState.State diff --git a/Content.Shared/MobState/State/SharedCriticalMobState.cs b/Content.Shared/MobState/State/SharedCriticalMobState.cs index 01ba1c36cb..038b14e77b 100644 --- a/Content.Shared/MobState/State/SharedCriticalMobState.cs +++ b/Content.Shared/MobState/State/SharedCriticalMobState.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Alert; +using Content.Shared.Alert; using Content.Shared.Hands; using Content.Shared.Standing; using Robust.Shared.GameObjects; diff --git a/Content.Shared/MobState/State/SharedNormalMobState.cs b/Content.Shared/MobState/State/SharedNormalMobState.cs index 5f2b968bed..f6ec05ae90 100644 --- a/Content.Shared/MobState/State/SharedNormalMobState.cs +++ b/Content.Shared/MobState/State/SharedNormalMobState.cs @@ -1,7 +1,6 @@ using Content.Shared.Standing; using Robust.Shared.GameObjects; -#nullable enable namespace Content.Shared.MobState.State { diff --git a/Content.Shared/Module/IModuleManager.cs b/Content.Shared/Module/IModuleManager.cs index 57833b008a..9644c9cd2e 100644 --- a/Content.Shared/Module/IModuleManager.cs +++ b/Content.Shared/Module/IModuleManager.cs @@ -1,5 +1,4 @@ -#nullable enable -namespace Content.Shared.Module +namespace Content.Shared.Module { /// /// Provides a simple way to check whether calling code is being run by diff --git a/Content.Shared/Module/SharedModuleTestingCallbacks.cs b/Content.Shared/Module/SharedModuleTestingCallbacks.cs index 12074296e3..dfa0272b52 100644 --- a/Content.Shared/Module/SharedModuleTestingCallbacks.cs +++ b/Content.Shared/Module/SharedModuleTestingCallbacks.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.ContentPack; diff --git a/Content.Shared/Morgue/SharedMorgue.cs b/Content.Shared/Morgue/SharedMorgue.cs index bc66ad1c01..cb56adbe07 100644 --- a/Content.Shared/Morgue/SharedMorgue.cs +++ b/Content.Shared/Morgue/SharedMorgue.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Morgue diff --git a/Content.Shared/Movement/Components/IMoverComponent.cs b/Content.Shared/Movement/Components/IMoverComponent.cs index 184afa9a26..d0a511116b 100644 --- a/Content.Shared/Movement/Components/IMoverComponent.cs +++ b/Content.Shared/Movement/Components/IMoverComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; namespace Content.Shared.Movement.Components diff --git a/Content.Shared/Movement/Components/IRelayMoveInput.cs b/Content.Shared/Movement/Components/IRelayMoveInput.cs index 86f8e9f0ab..cd93814028 100644 --- a/Content.Shared/Movement/Components/IRelayMoveInput.cs +++ b/Content.Shared/Movement/Components/IRelayMoveInput.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.Players; namespace Content.Shared.Movement.Components diff --git a/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs b/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs index f206517966..4fb57b6736 100644 --- a/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs +++ b/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Gravity; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs index 2300b1d2a5..a8b8dde087 100644 --- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs +++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs b/Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs index 2e9412f898..6de12adabd 100644 --- a/Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs +++ b/Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; using Robust.Shared.Maths; diff --git a/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs b/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs index 33fa733144..eed34bdad5 100644 --- a/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs +++ b/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.CCVar; using Robust.Shared.Configuration; diff --git a/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs b/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs index ba0378744f..f521ff6e81 100644 --- a/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs +++ b/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs b/Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs index 8a8cea08ab..462c12760f 100644 --- a/Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs +++ b/Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Movement.Components; using Robust.Shared.GameObjects; using Robust.Shared.Maths; diff --git a/Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs b/Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs index 86843d8ef3..36302161f2 100644 --- a/Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs +++ b/Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Diagnostics.CodeAnalysis; using Content.Shared.MobState; using Content.Shared.Movement.Components; diff --git a/Content.Shared/Movement/SharedMoverController.cs b/Content.Shared/Movement/SharedMoverController.cs index 114000f328..59e2e81774 100644 --- a/Content.Shared/Movement/SharedMoverController.cs +++ b/Content.Shared/Movement/SharedMoverController.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.ActionBlocker; using Content.Shared.MobState; using Content.Shared.Movement.Components; diff --git a/Content.Shared/Notification/Managers/SharedNotifyManager.cs b/Content.Shared/Notification/Managers/SharedNotifyManager.cs index 8c9e4e8739..7f43acde85 100644 --- a/Content.Shared/Notification/Managers/SharedNotifyManager.cs +++ b/Content.Shared/Notification/Managers/SharedNotifyManager.cs @@ -1,4 +1,3 @@ -#nullable enable using Lidgren.Network; using Robust.Shared.GameObjects; using Robust.Shared.Map; diff --git a/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs b/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs index f8c3188da4..11a6bd4661 100644 --- a/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs +++ b/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.DragDrop; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Nutrition/Components/SharedCreamPiedComponent.cs b/Content.Shared/Nutrition/Components/SharedCreamPiedComponent.cs index 38ad6fb9d2..b599257de0 100644 --- a/Content.Shared/Nutrition/Components/SharedCreamPiedComponent.cs +++ b/Content.Shared/Nutrition/Components/SharedCreamPiedComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Nutrition/Components/SharedDrinkFoodContainerComponent.cs b/Content.Shared/Nutrition/Components/SharedDrinkFoodContainerComponent.cs index 3a15366656..a4fb1d0288 100644 --- a/Content.Shared/Nutrition/Components/SharedDrinkFoodContainerComponent.cs +++ b/Content.Shared/Nutrition/Components/SharedDrinkFoodContainerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Nutrition/Components/SharedFoodComponent.cs b/Content.Shared/Nutrition/Components/SharedFoodComponent.cs index 3f61d1f47d..91c3b6b8c4 100644 --- a/Content.Shared/Nutrition/Components/SharedFoodComponent.cs +++ b/Content.Shared/Nutrition/Components/SharedFoodComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Serialization; diff --git a/Content.Shared/Nutrition/Components/SharedHungerComponent.cs b/Content.Shared/Nutrition/Components/SharedHungerComponent.cs index 8a46310df8..009aeaa45a 100644 --- a/Content.Shared/Nutrition/Components/SharedHungerComponent.cs +++ b/Content.Shared/Nutrition/Components/SharedHungerComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Movement.Components; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Nutrition/Components/SharedThirstComponent.cs b/Content.Shared/Nutrition/Components/SharedThirstComponent.cs index f852b13879..e7a7cba426 100644 --- a/Content.Shared/Nutrition/Components/SharedThirstComponent.cs +++ b/Content.Shared/Nutrition/Components/SharedThirstComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Movement.Components; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Objectives/ConditionInfo.cs b/Content.Shared/Objectives/ConditionInfo.cs index 152c3fd27b..de0e7f934b 100644 --- a/Content.Shared/Objectives/ConditionInfo.cs +++ b/Content.Shared/Objectives/ConditionInfo.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Shared/PDA/SharedPDAComponent.cs b/Content.Shared/PDA/SharedPDAComponent.cs index 6050a82b3d..307b124b60 100644 --- a/Content.Shared/PDA/SharedPDAComponent.cs +++ b/Content.Shared/PDA/SharedPDAComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/PDA/UplinkCategory.cs b/Content.Shared/PDA/UplinkCategory.cs index a094652188..2b21a230a0 100644 --- a/Content.Shared/PDA/UplinkCategory.cs +++ b/Content.Shared/PDA/UplinkCategory.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Content.Shared.PDA { diff --git a/Content.Shared/PDA/UplinkStoreListingPrototype.cs b/Content.Shared/PDA/UplinkStoreListingPrototype.cs index e79ba8f0d6..27d718a60c 100644 --- a/Content.Shared/PDA/UplinkStoreListingPrototype.cs +++ b/Content.Shared/PDA/UplinkStoreListingPrototype.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/Paper/SharedPaperComponent.cs b/Content.Shared/Paper/SharedPaperComponent.cs index 8444845815..d65a158ee4 100644 --- a/Content.Shared/Paper/SharedPaperComponent.cs +++ b/Content.Shared/Paper/SharedPaperComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs index eb63c2abfa..5fd039e99b 100644 --- a/Content.Shared/Physics/CollisionGroup.cs +++ b/Content.Shared/Physics/CollisionGroup.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using JetBrains.Annotations; using Robust.Shared.Map; diff --git a/Content.Shared/Physics/Pull/PullAttemptMessage.cs b/Content.Shared/Physics/Pull/PullAttemptMessage.cs index 945d58f678..85617f5f27 100644 --- a/Content.Shared/Physics/Pull/PullAttemptMessage.cs +++ b/Content.Shared/Physics/Pull/PullAttemptMessage.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.Physics; +using Robust.Shared.Physics; namespace Content.Shared.Physics.Pull { diff --git a/Content.Shared/Physics/Pull/PullMessage.cs b/Content.Shared/Physics/Pull/PullMessage.cs index d72e15d642..cbdb5af3a1 100644 --- a/Content.Shared/Physics/Pull/PullMessage.cs +++ b/Content.Shared/Physics/Pull/PullMessage.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Physics; namespace Content.Shared.Physics.Pull diff --git a/Content.Shared/Physics/Pull/PullStartedMessage.cs b/Content.Shared/Physics/Pull/PullStartedMessage.cs index 0f138cf12c..d4364c36fd 100644 --- a/Content.Shared/Physics/Pull/PullStartedMessage.cs +++ b/Content.Shared/Physics/Pull/PullStartedMessage.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.Physics; +using Robust.Shared.Physics; namespace Content.Shared.Physics.Pull { diff --git a/Content.Shared/Physics/Pull/PullStoppedMessage.cs b/Content.Shared/Physics/Pull/PullStoppedMessage.cs index 0b91a38d83..177c1b4f4f 100644 --- a/Content.Shared/Physics/Pull/PullStoppedMessage.cs +++ b/Content.Shared/Physics/Pull/PullStoppedMessage.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.Physics; +using Robust.Shared.Physics; namespace Content.Shared.Physics.Pull { diff --git a/Content.Shared/Placeable/SharedPlaceableSurfaceComponent.cs b/Content.Shared/Placeable/SharedPlaceableSurfaceComponent.cs index 3485151359..63e7f97804 100644 --- a/Content.Shared/Placeable/SharedPlaceableSurfaceComponent.cs +++ b/Content.Shared/Placeable/SharedPlaceableSurfaceComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs b/Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs index a1b2810809..ed6761d84e 100644 --- a/Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs +++ b/Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Pointing.Components { diff --git a/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs b/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs index 856a531dcd..f58890b919 100644 --- a/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs +++ b/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Portal/Components/SharedPortalComponent.cs b/Content.Shared/Portal/Components/SharedPortalComponent.cs index eaad2fe7d1..766718f7e9 100644 --- a/Content.Shared/Portal/Components/SharedPortalComponent.cs +++ b/Content.Shared/Portal/Components/SharedPortalComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Physics; diff --git a/Content.Shared/Portal/Components/SharedTeleporterComponent.cs b/Content.Shared/Portal/Components/SharedTeleporterComponent.cs index ba9f079bf8..9758501c74 100644 --- a/Content.Shared/Portal/Components/SharedTeleporterComponent.cs +++ b/Content.Shared/Portal/Components/SharedTeleporterComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Map; diff --git a/Content.Shared/Power/SharedPower.cs b/Content.Shared/Power/SharedPower.cs index 82b89d3b75..16f36ee765 100644 --- a/Content.Shared/Power/SharedPower.cs +++ b/Content.Shared/Power/SharedPower.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Power diff --git a/Content.Shared/Power/SharedPowerDevice.cs b/Content.Shared/Power/SharedPowerDevice.cs index d80d7e01e2..1083495611 100644 --- a/Content.Shared/Power/SharedPowerDevice.cs +++ b/Content.Shared/Power/SharedPowerDevice.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Serialization; diff --git a/Content.Shared/Power/SharedPowerItemCharger.cs b/Content.Shared/Power/SharedPowerItemCharger.cs index cd2d2ade00..1c3575468f 100644 --- a/Content.Shared/Power/SharedPowerItemCharger.cs +++ b/Content.Shared/Power/SharedPowerItemCharger.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Serialization; diff --git a/Content.Shared/PowerCell/SharedPowerCell.cs b/Content.Shared/PowerCell/SharedPowerCell.cs index e7a6797233..b90b83bcbb 100644 --- a/Content.Shared/PowerCell/SharedPowerCell.cs +++ b/Content.Shared/PowerCell/SharedPowerCell.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Serialization; diff --git a/Content.Shared/Preferences/BackpackPreference.cs b/Content.Shared/Preferences/BackpackPreference.cs index cb6e6e072b..da2c4b8fe8 100644 --- a/Content.Shared/Preferences/BackpackPreference.cs +++ b/Content.Shared/Preferences/BackpackPreference.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Content.Shared.Preferences { /// diff --git a/Content.Shared/Preferences/ClothingPreference.cs b/Content.Shared/Preferences/ClothingPreference.cs index f660b2ecce..24a4b206c7 100644 --- a/Content.Shared/Preferences/ClothingPreference.cs +++ b/Content.Shared/Preferences/ClothingPreference.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Content.Shared.Preferences { /// diff --git a/Content.Shared/Preferences/GameSettings.cs b/Content.Shared/Preferences/GameSettings.cs index bf25d8a14a..f41811bc36 100644 --- a/Content.Shared/Preferences/GameSettings.cs +++ b/Content.Shared/Preferences/GameSettings.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Serialization; diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index 22ca05e337..5b44b715b5 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Shared/Preferences/ICharacterProfile.cs b/Content.Shared/Preferences/ICharacterProfile.cs index 80e94ebf98..2efa088105 100644 --- a/Content.Shared/Preferences/ICharacterProfile.cs +++ b/Content.Shared/Preferences/ICharacterProfile.cs @@ -1,6 +1,5 @@ using Content.Shared.CharacterAppearance; -#nullable enable namespace Content.Shared.Preferences { diff --git a/Content.Shared/Preferences/JobPriority.cs b/Content.Shared/Preferences/JobPriority.cs index 8d70d51bb4..b42884cd00 100644 --- a/Content.Shared/Preferences/JobPriority.cs +++ b/Content.Shared/Preferences/JobPriority.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Content.Shared.Preferences { diff --git a/Content.Shared/Preferences/MsgDeleteCharacter.cs b/Content.Shared/Preferences/MsgDeleteCharacter.cs index f2c353476c..0378551918 100644 --- a/Content.Shared/Preferences/MsgDeleteCharacter.cs +++ b/Content.Shared/Preferences/MsgDeleteCharacter.cs @@ -1,5 +1,4 @@ -#nullable enable -using Lidgren.Network; +using Lidgren.Network; using Robust.Shared.Network; namespace Content.Shared.Preferences diff --git a/Content.Shared/Preferences/MsgPreferencesAndSettings.cs b/Content.Shared/Preferences/MsgPreferencesAndSettings.cs index 8056340641..85d6041c5b 100644 --- a/Content.Shared/Preferences/MsgPreferencesAndSettings.cs +++ b/Content.Shared/Preferences/MsgPreferencesAndSettings.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.IO; +using System.IO; using Lidgren.Network; using Robust.Shared.IoC; using Robust.Shared.Network; diff --git a/Content.Shared/Preferences/MsgSelectCharacter.cs b/Content.Shared/Preferences/MsgSelectCharacter.cs index 7e81df9f7b..423666c185 100644 --- a/Content.Shared/Preferences/MsgSelectCharacter.cs +++ b/Content.Shared/Preferences/MsgSelectCharacter.cs @@ -1,5 +1,4 @@ -#nullable enable -using Lidgren.Network; +using Lidgren.Network; using Robust.Shared.Network; namespace Content.Shared.Preferences diff --git a/Content.Shared/Preferences/MsgUpdateCharacter.cs b/Content.Shared/Preferences/MsgUpdateCharacter.cs index 21f93bd51b..bc44c860ca 100644 --- a/Content.Shared/Preferences/MsgUpdateCharacter.cs +++ b/Content.Shared/Preferences/MsgUpdateCharacter.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.IO; +using System.IO; using Lidgren.Network; using Robust.Shared.IoC; using Robust.Shared.Network; diff --git a/Content.Shared/Preferences/PlayerPreferences.cs b/Content.Shared/Preferences/PlayerPreferences.cs index afd90e4211..bf6003dd82 100644 --- a/Content.Shared/Preferences/PlayerPreferences.cs +++ b/Content.Shared/Preferences/PlayerPreferences.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Robust.Shared.Maths; diff --git a/Content.Shared/Preferences/PreferenceUnavailableMode.cs b/Content.Shared/Preferences/PreferenceUnavailableMode.cs index 2b06f80f4f..0df1a6bfa7 100644 --- a/Content.Shared/Preferences/PreferenceUnavailableMode.cs +++ b/Content.Shared/Preferences/PreferenceUnavailableMode.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Content.Shared.Preferences { diff --git a/Content.Shared/Projectiles/SharedProjectileComponent.cs b/Content.Shared/Projectiles/SharedProjectileComponent.cs index 5e9547d5a8..c2d40c6346 100644 --- a/Content.Shared/Projectiles/SharedProjectileComponent.cs +++ b/Content.Shared/Projectiles/SharedProjectileComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/Prototypes/EntityPrototypeHelpers.cs b/Content.Shared/Prototypes/EntityPrototypeHelpers.cs index dceb11c6e3..2560efaa79 100644 --- a/Content.Shared/Prototypes/EntityPrototypeHelpers.cs +++ b/Content.Shared/Prototypes/EntityPrototypeHelpers.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Shared/Pulling/Components/SharedPullableComponent.cs b/Content.Shared/Pulling/Components/SharedPullableComponent.cs index 032a09f29c..34890165eb 100644 --- a/Content.Shared/Pulling/Components/SharedPullableComponent.cs +++ b/Content.Shared/Pulling/Components/SharedPullableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.ActionBlocker; using Content.Shared.Alert; diff --git a/Content.Shared/Pulling/Components/SharedPullerComponent.cs b/Content.Shared/Pulling/Components/SharedPullerComponent.cs index 83902e42c2..12a539ab12 100644 --- a/Content.Shared/Pulling/Components/SharedPullerComponent.cs +++ b/Content.Shared/Pulling/Components/SharedPullerComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Alert; +using Content.Shared.Alert; using Content.Shared.Movement.Components; using Content.Shared.Physics.Pull; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Pulling/SharedPullingSystem.cs b/Content.Shared/Pulling/SharedPullingSystem.cs index 9660f7f1bc..0bb04d19b4 100644 --- a/Content.Shared/Pulling/SharedPullingSystem.cs +++ b/Content.Shared/Pulling/SharedPullingSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; diff --git a/Content.Shared/Radiation/IRadiationAct.cs b/Content.Shared/Radiation/IRadiationAct.cs index a0378f9d6c..d681f2a015 100644 --- a/Content.Shared/Radiation/IRadiationAct.cs +++ b/Content.Shared/Radiation/IRadiationAct.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.Analyzers; +using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; namespace Content.Shared.Radiation diff --git a/Content.Shared/Radiation/SharedRadiationStorm.cs b/Content.Shared/Radiation/SharedRadiationStorm.cs index a43e65ae55..5b4b4a070f 100644 --- a/Content.Shared/Radiation/SharedRadiationStorm.cs +++ b/Content.Shared/Radiation/SharedRadiationStorm.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/Random/Helpers/SharedEntityExtensions.cs b/Content.Shared/Random/Helpers/SharedEntityExtensions.cs index ed13ef5b73..bd33c46bd5 100644 --- a/Content.Shared/Random/Helpers/SharedEntityExtensions.cs +++ b/Content.Shared/Random/Helpers/SharedEntityExtensions.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; diff --git a/Content.Shared/Recycling/SharedRecyclerComponent.cs b/Content.Shared/Recycling/SharedRecyclerComponent.cs index 385513320e..203dc45906 100644 --- a/Content.Shared/Recycling/SharedRecyclerComponent.cs +++ b/Content.Shared/Recycling/SharedRecyclerComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Recycling diff --git a/Content.Shared/Research/Components/SharedResearchClientComponent.cs b/Content.Shared/Research/Components/SharedResearchClientComponent.cs index f0460f6e63..cf9f65ee10 100644 --- a/Content.Shared/Research/Components/SharedResearchClientComponent.cs +++ b/Content.Shared/Research/Components/SharedResearchClientComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs index e449733d32..bebb8cf1c9 100644 --- a/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs +++ b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs b/Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs index 3906693026..1b511cc983 100644 --- a/Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs +++ b/Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections; using System.Collections.Generic; diff --git a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs index 07246f4a37..021f2aca1d 100644 --- a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs +++ b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Content.Shared.Materials; diff --git a/Content.Shared/Research/Prototypes/TechnologyPrototype.cs b/Content.Shared/Research/Prototypes/TechnologyPrototype.cs index b4cba7d5cf..46e1e601d1 100644 --- a/Content.Shared/Research/Prototypes/TechnologyPrototype.cs +++ b/Content.Shared/Research/Prototypes/TechnologyPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/Roles/AntagPrototype.cs b/Content.Shared/Roles/AntagPrototype.cs index 87ab88c6d8..3f03f22377 100644 --- a/Content.Shared/Roles/AntagPrototype.cs +++ b/Content.Shared/Roles/AntagPrototype.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs index 3c9367cc27..fea7913f3e 100644 --- a/Content.Shared/Roles/JobPrototype.cs +++ b/Content.Shared/Roles/JobPrototype.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Roles/JobSpecial.cs b/Content.Shared/Roles/JobSpecial.cs index 3d174466cc..c2924eb014 100644 --- a/Content.Shared/Roles/JobSpecial.cs +++ b/Content.Shared/Roles/JobSpecial.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs index e64c89467e..02bdf1331c 100644 --- a/Content.Shared/Roles/StartingGearPrototype.cs +++ b/Content.Shared/Roles/StartingGearPrototype.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using Content.Shared.Preferences; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Rotatable/SharedRotatableComponent.cs b/Content.Shared/Rotatable/SharedRotatableComponent.cs index 9ea50ccc00..b8754ea856 100644 --- a/Content.Shared/Rotatable/SharedRotatableComponent.cs +++ b/Content.Shared/Rotatable/SharedRotatableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/Rotation/SharedRotationComponent.cs b/Content.Shared/Rotation/SharedRotationComponent.cs index 688dc74b26..4091b81141 100644 --- a/Content.Shared/Rotation/SharedRotationComponent.cs +++ b/Content.Shared/Rotation/SharedRotationComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Rotation diff --git a/Content.Shared/Rounding/ContentHelpers.cs b/Content.Shared/Rounding/ContentHelpers.cs index d81e2ebe93..f3f89184aa 100644 --- a/Content.Shared/Rounding/ContentHelpers.cs +++ b/Content.Shared/Rounding/ContentHelpers.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; namespace Content.Shared.Rounding { diff --git a/Content.Shared/SMES/SharedSmesComponent.cs b/Content.Shared/SMES/SharedSmesComponent.cs index 2d7fd5ede2..c6bfd9a543 100644 --- a/Content.Shared/SMES/SharedSmesComponent.cs +++ b/Content.Shared/SMES/SharedSmesComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.SMES diff --git a/Content.Shared/Sandbox/SharedSandboxManager.cs b/Content.Shared/Sandbox/SharedSandboxManager.cs index b87bd56fee..96adbd2b07 100644 --- a/Content.Shared/Sandbox/SharedSandboxManager.cs +++ b/Content.Shared/Sandbox/SharedSandboxManager.cs @@ -1,5 +1,4 @@ -#nullable enable -using Lidgren.Network; +using Lidgren.Network; using Robust.Shared.Network; namespace Content.Shared.Sandbox diff --git a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs index e82e5d7c5b..d5d128bcb2 100644 --- a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs +++ b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Singularity.Components diff --git a/Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs b/Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs index 0ef9a1482a..24884fce7b 100644 --- a/Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs +++ b/Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Singularity/Components/SharedRadiationCollectorComponent.cs b/Content.Shared/Singularity/Components/SharedRadiationCollectorComponent.cs index dd347381bf..32890c42c5 100644 --- a/Content.Shared/Singularity/Components/SharedRadiationCollectorComponent.cs +++ b/Content.Shared/Singularity/Components/SharedRadiationCollectorComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Singularity.Components diff --git a/Content.Shared/Singularity/SingularitySoundMessage.cs b/Content.Shared/Singularity/SingularitySoundMessage.cs index ef736d01bb..6554b81b24 100644 --- a/Content.Shared/Singularity/SingularitySoundMessage.cs +++ b/Content.Shared/Singularity/SingularitySoundMessage.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Slippery/SlipperyComponent.cs b/Content.Shared/Slippery/SlipperyComponent.cs index 3a4b4fb935..4b88fd53ab 100644 --- a/Content.Shared/Slippery/SlipperyComponent.cs +++ b/Content.Shared/Slippery/SlipperyComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs index 8eb6b67ac6..3ea6a60b01 100644 --- a/Content.Shared/Slippery/SlipperySystem.cs +++ b/Content.Shared/Slippery/SlipperySystem.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Linq; +using System.Linq; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Smoking/SharedBurningStates.cs b/Content.Shared/Smoking/SharedBurningStates.cs index 30473b4b96..2d83827552 100644 --- a/Content.Shared/Smoking/SharedBurningStates.cs +++ b/Content.Shared/Smoking/SharedBurningStates.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Smoking diff --git a/Content.Shared/Smoking/SmokeVisuals.cs b/Content.Shared/Smoking/SmokeVisuals.cs index 41621e3c72..70dddff63a 100644 --- a/Content.Shared/Smoking/SmokeVisuals.cs +++ b/Content.Shared/Smoking/SmokeVisuals.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Smoking diff --git a/Content.Shared/Smoking/SmokingVisuals.cs b/Content.Shared/Smoking/SmokingVisuals.cs index bea1705a7d..c571852882 100644 --- a/Content.Shared/Smoking/SmokingVisuals.cs +++ b/Content.Shared/Smoking/SmokingVisuals.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Smoking diff --git a/Content.Shared/Solar/SharedSolarControlConsoleComponent.cs b/Content.Shared/Solar/SharedSolarControlConsoleComponent.cs index 492e83f7f0..9154efd066 100644 --- a/Content.Shared/Solar/SharedSolarControlConsoleComponent.cs +++ b/Content.Shared/Solar/SharedSolarControlConsoleComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Maths; diff --git a/Content.Shared/Sound/SharedLoopingSoundComponent.cs b/Content.Shared/Sound/SharedLoopingSoundComponent.cs index 7bc427ad7c..b31234d03e 100644 --- a/Content.Shared/Sound/SharedLoopingSoundComponent.cs +++ b/Content.Shared/Sound/SharedLoopingSoundComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Audio; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Spawning/EntitySystemExtensions.cs b/Content.Shared/Spawning/EntitySystemExtensions.cs index c7ab1ac712..a9b98eb8a0 100644 --- a/Content.Shared/Spawning/EntitySystemExtensions.cs +++ b/Content.Shared/Spawning/EntitySystemExtensions.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using Content.Shared.Physics; using Robust.Shared.GameObjects; using Robust.Shared.Map; diff --git a/Content.Shared/Speech/SharedSpeechComponent.cs b/Content.Shared/Speech/SharedSpeechComponent.cs index c783b0b17c..fdc736447d 100644 --- a/Content.Shared/Speech/SharedSpeechComponent.cs +++ b/Content.Shared/Speech/SharedSpeechComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.ActionBlocker; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Stacks/StackPrototype.cs b/Content.Shared/Stacks/StackPrototype.cs index 67e700e406..185eaed14e 100644 --- a/Content.Shared/Stacks/StackPrototype.cs +++ b/Content.Shared/Stacks/StackPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.Prototypes; +using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/Stacks/StackVisuals.cs b/Content.Shared/Stacks/StackVisuals.cs index e942efd2ad..b4099abf96 100644 --- a/Content.Shared/Stacks/StackVisuals.cs +++ b/Content.Shared/Stacks/StackVisuals.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Serialization; diff --git a/Content.Shared/Standing/StandingStateSystem.cs b/Content.Shared/Standing/StandingStateSystem.cs index 51b98b7070..72cab87035 100644 --- a/Content.Shared/Standing/StandingStateSystem.cs +++ b/Content.Shared/Standing/StandingStateSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Audio; using Content.Shared.Hands; using Content.Shared.Rotation; diff --git a/Content.Shared/StationEvents/MsgRequestStationEvents.cs b/Content.Shared/StationEvents/MsgRequestStationEvents.cs index a7390781a1..aeb8c5d9ca 100644 --- a/Content.Shared/StationEvents/MsgRequestStationEvents.cs +++ b/Content.Shared/StationEvents/MsgRequestStationEvents.cs @@ -1,5 +1,4 @@ -#nullable enable -using Lidgren.Network; +using Lidgren.Network; using Robust.Shared.Network; namespace Content.Shared.StationEvents diff --git a/Content.Shared/StationEvents/MsgStationEvents.cs b/Content.Shared/StationEvents/MsgStationEvents.cs index 7c88c8e34e..b03e6db7f7 100644 --- a/Content.Shared/StationEvents/MsgStationEvents.cs +++ b/Content.Shared/StationEvents/MsgStationEvents.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.IO; using Lidgren.Network; using Robust.Shared.IoC; diff --git a/Content.Shared/Storage/SharedBagOpenVisuals.cs b/Content.Shared/Storage/SharedBagOpenVisuals.cs index f894452e8f..be4a8013d4 100644 --- a/Content.Shared/Storage/SharedBagOpenVisuals.cs +++ b/Content.Shared/Storage/SharedBagOpenVisuals.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Serialization; diff --git a/Content.Shared/Storage/SharedStorageComponent.cs b/Content.Shared/Storage/SharedStorageComponent.cs index a38a3c1987..46877f6050 100644 --- a/Content.Shared/Storage/SharedStorageComponent.cs +++ b/Content.Shared/Storage/SharedStorageComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Shared/Strip/Components/SharedStrippableComponent.cs b/Content.Shared/Strip/Components/SharedStrippableComponent.cs index 8a6e11d266..bf211a76c0 100644 --- a/Content.Shared/Strip/Components/SharedStrippableComponent.cs +++ b/Content.Shared/Strip/Components/SharedStrippableComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Content.Shared.ActionBlocker; using Content.Shared.DragDrop; diff --git a/Content.Shared/Strip/Components/SharedStrippingComponent.cs b/Content.Shared/Strip/Components/SharedStrippingComponent.cs index 32145088eb..294f5c331f 100644 --- a/Content.Shared/Strip/Components/SharedStrippingComponent.cs +++ b/Content.Shared/Strip/Components/SharedStrippingComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.DragDrop; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Stunnable/SharedStunnableComponent.cs b/Content.Shared/Stunnable/SharedStunnableComponent.cs index 331dab5e40..2ac8f3c1f5 100644 --- a/Content.Shared/Stunnable/SharedStunnableComponent.cs +++ b/Content.Shared/Stunnable/SharedStunnableComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Threading; using Content.Shared.ActionBlocker; diff --git a/Content.Shared/SubFloor/SubFloorHideComponent.cs b/Content.Shared/SubFloor/SubFloorHideComponent.cs index 9a3c8f71dd..a76c73473e 100644 --- a/Content.Shared/SubFloor/SubFloorHideComponent.cs +++ b/Content.Shared/SubFloor/SubFloorHideComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; namespace Content.Shared.SubFloor diff --git a/Content.Shared/SubFloor/SubFloorHideSystem.cs b/Content.Shared/SubFloor/SubFloorHideSystem.cs index 963cc44d6a..5dd30a86a3 100644 --- a/Content.Shared/SubFloor/SubFloorHideSystem.cs +++ b/Content.Shared/SubFloor/SubFloorHideSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using Content.Shared.Maps; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs b/Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs index feb3c1b38e..10f0acda99 100644 --- a/Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs +++ b/Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/Suspicion/SuspicionMessages.cs b/Content.Shared/Suspicion/SuspicionMessages.cs index 2b1220f123..41be6f0545 100644 --- a/Content.Shared/Suspicion/SuspicionMessages.cs +++ b/Content.Shared/Suspicion/SuspicionMessages.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Tag/TagComponent.cs b/Content.Shared/Tag/TagComponent.cs index 6bf08db2f7..ba0332ec07 100644 --- a/Content.Shared/Tag/TagComponent.cs +++ b/Content.Shared/Tag/TagComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Shared/Tag/TagComponentExtensions.cs b/Content.Shared/Tag/TagComponentExtensions.cs index d8fb85d428..082a160705 100644 --- a/Content.Shared/Tag/TagComponentExtensions.cs +++ b/Content.Shared/Tag/TagComponentExtensions.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Collections.Generic; +using System.Collections.Generic; using Robust.Shared.GameObjects; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Tag/TagComponentState.cs b/Content.Shared/Tag/TagComponentState.cs index 7aee653d85..bd19aae427 100644 --- a/Content.Shared/Tag/TagComponentState.cs +++ b/Content.Shared/Tag/TagComponentState.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Tag/TagPrototype.cs b/Content.Shared/Tag/TagPrototype.cs index 212bbf900f..7ce6b1f03a 100644 --- a/Content.Shared/Tag/TagPrototype.cs +++ b/Content.Shared/Tag/TagPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.Prototypes; +using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/Targeting/TargetingZone.cs b/Content.Shared/Targeting/TargetingZone.cs index 269a401afe..2fb936bf41 100644 --- a/Content.Shared/Targeting/TargetingZone.cs +++ b/Content.Shared/Targeting/TargetingZone.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Serialization; diff --git a/Content.Shared/Temperature/IHotItem.cs b/Content.Shared/Temperature/IHotItem.cs index 5f7d952642..8cac8aa13d 100644 --- a/Content.Shared/Temperature/IHotItem.cs +++ b/Content.Shared/Temperature/IHotItem.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.Analyzers; +using Robust.Shared.Analyzers; namespace Content.Shared.Temperature { diff --git a/Content.Shared/Temperature/TemperatureHelpers.cs b/Content.Shared/Temperature/TemperatureHelpers.cs index 62f7c0c00b..a92f62f851 100644 --- a/Content.Shared/Temperature/TemperatureHelpers.cs +++ b/Content.Shared/Temperature/TemperatureHelpers.cs @@ -1,5 +1,4 @@ -#nullable enable -using Content.Shared.Maths; +using Content.Shared.Maths; namespace Content.Shared.Temperature { diff --git a/Content.Shared/Throwing/ILand.cs b/Content.Shared/Throwing/ILand.cs index 96d0aa4a4d..449ec198bf 100644 --- a/Content.Shared/Throwing/ILand.cs +++ b/Content.Shared/Throwing/ILand.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using JetBrains.Annotations; using Robust.Shared.Analyzers; diff --git a/Content.Shared/Throwing/IThrowCollide.cs b/Content.Shared/Throwing/IThrowCollide.cs index 4969d231f6..ed5903029d 100644 --- a/Content.Shared/Throwing/IThrowCollide.cs +++ b/Content.Shared/Throwing/IThrowCollide.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Throwing/IThrown.cs b/Content.Shared/Throwing/IThrown.cs index f3e7de048f..03e308232d 100644 --- a/Content.Shared/Throwing/IThrown.cs +++ b/Content.Shared/Throwing/IThrown.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using JetBrains.Annotations; using Robust.Shared.Analyzers; diff --git a/Content.Shared/Throwing/ThrownItemComponent.cs b/Content.Shared/Throwing/ThrownItemComponent.cs index 041911be05..b192afcef9 100644 --- a/Content.Shared/Throwing/ThrownItemComponent.cs +++ b/Content.Shared/Throwing/ThrownItemComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.GameObjects; namespace Content.Shared.Throwing diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs index 61b94ef4cf..cabfe81d1c 100644 --- a/Content.Shared/Throwing/ThrownItemSystem.cs +++ b/Content.Shared/Throwing/ThrownItemSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Linq; using Content.Shared.Physics; diff --git a/Content.Shared/Toilet/SharedWaterclosetVisuals.cs b/Content.Shared/Toilet/SharedWaterclosetVisuals.cs index d933c61b77..6c66ef8305 100644 --- a/Content.Shared/Toilet/SharedWaterclosetVisuals.cs +++ b/Content.Shared/Toilet/SharedWaterclosetVisuals.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Serialization; diff --git a/Content.Shared/Tool/SharedToolComponent.cs b/Content.Shared/Tool/SharedToolComponent.cs index 64278c829a..028516e952 100644 --- a/Content.Shared/Tool/SharedToolComponent.cs +++ b/Content.Shared/Tool/SharedToolComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Transform/TransformExtensions.cs b/Content.Shared/Transform/TransformExtensions.cs index 3358d9e5da..2872034bc2 100644 --- a/Content.Shared/Transform/TransformExtensions.cs +++ b/Content.Shared/Transform/TransformExtensions.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Transform { diff --git a/Content.Shared/Trigger/TriggerVisuals.cs b/Content.Shared/Trigger/TriggerVisuals.cs index 61b6664edf..193ecd5478 100644 --- a/Content.Shared/Trigger/TriggerVisuals.cs +++ b/Content.Shared/Trigger/TriggerVisuals.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Trigger diff --git a/Content.Shared/Vapor/SharedVaporComponent.cs b/Content.Shared/Vapor/SharedVaporComponent.cs index 1746fbb4c1..0d9754dcf7 100644 --- a/Content.Shared/Vapor/SharedVaporComponent.cs +++ b/Content.Shared/Vapor/SharedVaporComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs b/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs index 5394181881..407ba232e7 100644 --- a/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Robust.Shared.GameObjects; diff --git a/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs b/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs index 1e9aa05771..08921b6ad9 100644 --- a/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs +++ b/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/Verbs/GlobalVerb.cs b/Content.Shared/Verbs/GlobalVerb.cs index 32f4ac1857..84e8a74913 100644 --- a/Content.Shared/Verbs/GlobalVerb.cs +++ b/Content.Shared/Verbs/GlobalVerb.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Verbs/HideContextMenuComponent.cs b/Content.Shared/Verbs/HideContextMenuComponent.cs index 8600ae066f..bebccac2ec 100644 --- a/Content.Shared/Verbs/HideContextMenuComponent.cs +++ b/Content.Shared/Verbs/HideContextMenuComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Verbs { diff --git a/Content.Shared/Verbs/IShowContextMenu.cs b/Content.Shared/Verbs/IShowContextMenu.cs index bcd65229ec..3839ceb49d 100644 --- a/Content.Shared/Verbs/IShowContextMenu.cs +++ b/Content.Shared/Verbs/IShowContextMenu.cs @@ -1,5 +1,4 @@ -#nullable enable -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Verbs { diff --git a/Content.Shared/Verbs/PlayerContainerVisibilityMessage.cs b/Content.Shared/Verbs/PlayerContainerVisibilityMessage.cs index dafd3de76f..1b5ed824c7 100644 --- a/Content.Shared/Verbs/PlayerContainerVisibilityMessage.cs +++ b/Content.Shared/Verbs/PlayerContainerVisibilityMessage.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Verbs/SharedVerbSystem.cs b/Content.Shared/Verbs/SharedVerbSystem.cs index 84589a7811..c7628da9a6 100644 --- a/Content.Shared/Verbs/SharedVerbSystem.cs +++ b/Content.Shared/Verbs/SharedVerbSystem.cs @@ -1,4 +1,3 @@ -#nullable enable using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; diff --git a/Content.Shared/Verbs/Verb.cs b/Content.Shared/Verbs/Verb.cs index 76ab513335..41cb116d86 100644 --- a/Content.Shared/Verbs/Verb.cs +++ b/Content.Shared/Verbs/Verb.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Verbs/VerbBase.cs b/Content.Shared/Verbs/VerbBase.cs index 1a18a83f9d..40d0c0f0b4 100644 --- a/Content.Shared/Verbs/VerbBase.cs +++ b/Content.Shared/Verbs/VerbBase.cs @@ -1,5 +1,4 @@ -#nullable enable - + namespace Content.Shared.Verbs { public abstract class VerbBase diff --git a/Content.Shared/Verbs/VerbCategories.cs b/Content.Shared/Verbs/VerbCategories.cs index bcc1fadb13..287cf3d85b 100644 --- a/Content.Shared/Verbs/VerbCategories.cs +++ b/Content.Shared/Verbs/VerbCategories.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Content.Shared.Verbs { diff --git a/Content.Shared/Verbs/VerbCategoryData.cs b/Content.Shared/Verbs/VerbCategoryData.cs index f5a1f1c7f9..b0ee545159 100644 --- a/Content.Shared/Verbs/VerbCategoryData.cs +++ b/Content.Shared/Verbs/VerbCategoryData.cs @@ -1,4 +1,3 @@ -#nullable enable using Robust.Shared.Utility; namespace Content.Shared.Verbs diff --git a/Content.Shared/Verbs/VerbData.cs b/Content.Shared/Verbs/VerbData.cs index 09f0ea5a53..20a8edbdee 100644 --- a/Content.Shared/Verbs/VerbData.cs +++ b/Content.Shared/Verbs/VerbData.cs @@ -1,4 +1,3 @@ -#nullable enable using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Utility; diff --git a/Content.Shared/Verbs/VerbSystemMessages.cs b/Content.Shared/Verbs/VerbSystemMessages.cs index bbc2eb3728..7452e8440b 100644 --- a/Content.Shared/Verbs/VerbSystemMessages.cs +++ b/Content.Shared/Verbs/VerbSystemMessages.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Verbs/VerbUtility.cs b/Content.Shared/Verbs/VerbUtility.cs index 289181fc91..08289ff5e6 100644 --- a/Content.Shared/Verbs/VerbUtility.cs +++ b/Content.Shared/Verbs/VerbUtility.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Collections.Generic; using System.Reflection; using Robust.Shared.Containers; diff --git a/Content.Shared/Verbs/VerbVisibility.cs b/Content.Shared/Verbs/VerbVisibility.cs index b1fd22495e..dadf19dd58 100644 --- a/Content.Shared/Verbs/VerbVisibility.cs +++ b/Content.Shared/Verbs/VerbVisibility.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Content.Shared.Verbs { diff --git a/Content.Shared/Voting/MsgVoteCanCall.cs b/Content.Shared/Voting/MsgVoteCanCall.cs index dc9d3f592f..bdfaf6753c 100644 --- a/Content.Shared/Voting/MsgVoteCanCall.cs +++ b/Content.Shared/Voting/MsgVoteCanCall.cs @@ -1,5 +1,4 @@ -#nullable enable -using Lidgren.Network; +using Lidgren.Network; using Robust.Shared.Network; namespace Content.Shared.Voting diff --git a/Content.Shared/Voting/MsgVoteData.cs b/Content.Shared/Voting/MsgVoteData.cs index de91996809..b9df59a36c 100644 --- a/Content.Shared/Voting/MsgVoteData.cs +++ b/Content.Shared/Voting/MsgVoteData.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Lidgren.Network; using Robust.Shared.Network; diff --git a/Content.Shared/Wall/ReinforcedWallVisuals.cs b/Content.Shared/Wall/ReinforcedWallVisuals.cs index eba46accbb..17a99c033e 100644 --- a/Content.Shared/Wall/ReinforcedWallVisuals.cs +++ b/Content.Shared/Wall/ReinforcedWallVisuals.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.Wall diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs b/Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs index c617968dcb..7cc7a7da45 100644 --- a/Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs +++ b/Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponSystemMessages.cs b/Content.Shared/Weapons/Melee/MeleeWeaponSystemMessages.cs index 4321051f6e..088fec634b 100644 --- a/Content.Shared/Weapons/Melee/MeleeWeaponSystemMessages.cs +++ b/Content.Shared/Weapons/Melee/MeleeWeaponSystemMessages.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBatteryBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBatteryBarrelComponent.cs index 94f12193a9..c82b2bcf68 100644 --- a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBatteryBarrelComponent.cs +++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBatteryBarrelComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs index 726f31644c..0f21330a70 100644 --- a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs +++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs index 71d0713ab5..246e2fea37 100644 --- a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs +++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs index 8ee85b7be9..24b8564006 100644 --- a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs +++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs index a3f4108a0b..0e4e3dcfb2 100644 --- a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs +++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs index 7436dd11bc..62aa2d87d6 100644 --- a/Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs b/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs index a3d8d75e18..b9493cb6c1 100644 --- a/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs b/Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs index 632e905f6a..047b64c89c 100644 --- a/Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs +++ b/Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Window/SharedWindowComponent.cs b/Content.Shared/Window/SharedWindowComponent.cs index c4dbc9e027..f2be96b98d 100644 --- a/Content.Shared/Window/SharedWindowComponent.cs +++ b/Content.Shared/Window/SharedWindowComponent.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/Wires/SharedWiresComponent.cs b/Content.Shared/Wires/SharedWiresComponent.cs index c392d93af7..862be567ab 100644 --- a/Content.Shared/Wires/SharedWiresComponent.cs +++ b/Content.Shared/Wires/SharedWiresComponent.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Diagnostics.CodeAnalysis; using JetBrains.Annotations; From 97a3866a408e3d1336947801f2840a524b7746dc Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sat, 17 Jul 2021 14:34:18 +0200 Subject: [PATCH 02/99] Use replicated CVars for max chat message length. --- Content.Client/Chat/Managers/ChatManager.cs | 24 ++++----------- Content.Server/Chat/Managers/ChatManager.cs | 17 +---------- Content.Shared/CCVar/CCVars.cs | 7 +++++ .../Chat/ChatMaxMsgLengthMessage.cs | 29 ------------------- 4 files changed, 14 insertions(+), 63 deletions(-) delete mode 100644 Content.Shared/Chat/ChatMaxMsgLengthMessage.cs diff --git a/Content.Client/Chat/Managers/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs index 4af4b111e4..6ec3cfffa7 100644 --- a/Content.Client/Chat/Managers/ChatManager.cs +++ b/Content.Client/Chat/Managers/ChatManager.cs @@ -4,12 +4,14 @@ using Content.Client.Administration.Managers; using Content.Client.Chat.UI; using Content.Client.Ghost; using Content.Shared.Administration; +using Content.Shared.CCVar; using Content.Shared.Chat; using Robust.Client.Console; using Robust.Client.Graphics; using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; +using Robust.Shared.Configuration; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; @@ -52,7 +54,7 @@ namespace Content.Client.Chat.Managers /// /// The max amount of characters an entity can send in one message /// - private int _maxMessageLength = 1000; + private int MaxMessageLength => _cfg.GetCVar(CCVars.ChatMaxMessageLength); public const char ConCmdSlash = '/'; public const char OOCAlias = '['; @@ -100,6 +102,7 @@ namespace Content.Client.Chat.Managers [Dependency] private readonly IEyeManager _eyeManager = default!; [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; [Dependency] private readonly IClientAdminManager _adminMgr = default!; + [Dependency] private readonly IConfigurationManager _cfg = default!; /// /// Current chat box control. This can be modified, so do not depend on saving a reference to this. @@ -128,15 +131,11 @@ namespace Content.Client.Chat.Managers public void Initialize() { _netManager.RegisterNetMessage(OnChatMessage); - _netManager.RegisterNetMessage(OnMaxLengthReceived); _speechBubbleRoot = new LayoutContainer(); LayoutContainer.SetAnchorPreset(_speechBubbleRoot, LayoutContainer.LayoutPreset.Wide); _userInterfaceManager.StateRoot.AddChild(_speechBubbleRoot); _speechBubbleRoot.SetPositionFirst(); - - // When connexion is achieved, request the max chat message length - _netManager.Connected += RequestMaxLength; } public void PostInject() @@ -383,12 +382,12 @@ namespace Content.Client.Chat.Managers return; // Check if message is longer than the character limit - if (text.Length > _maxMessageLength) + if (text.Length > MaxMessageLength) { if (CurrentChatBox != null) { string locWarning = Loc.GetString("chat-manager-max-message-length", - ("maxMessageLength", _maxMessageLength)); + ("maxMessageLength", MaxMessageLength)); CurrentChatBox.AddLine(locWarning, ChatChannel.Server, Color.Orange); CurrentChatBox.ClearOnEnter = false; // The text shouldn't be cleared if it hasn't been sent } @@ -510,17 +509,6 @@ namespace Content.Client.Chat.Managers } } - private void OnMaxLengthReceived(ChatMaxMsgLengthMessage msg) - { - _maxMessageLength = msg.MaxMessageLength; - } - - private void RequestMaxLength(object? sender, NetChannelArgs args) - { - ChatMaxMsgLengthMessage msg = _netManager.CreateNetMessage(); - _netManager.ClientSendMessage(msg); - } - private void AddSpeechBubble(MsgChatMessage msg, SpeechBubble.SpeechType speechType) { if (!_entityManager.TryGetEntity(msg.SenderEntity, out var entity)) diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index 17e24a7078..8bc32991b4 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -12,10 +12,8 @@ using Content.Shared.ActionBlocker; using Content.Shared.Administration; using Content.Shared.CCVar; using Content.Shared.Chat; -using Content.Shared.Emoting; using Content.Shared.Inventory; using Content.Shared.Notification.Managers; -using Content.Shared.Speech; using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.Configuration; @@ -52,7 +50,7 @@ namespace Content.Server.Chat.Managers /// /// The maximum length a player-sent message can be sent /// - public const int MaxMessageLength = 1000; + public int MaxMessageLength => _configurationManager.GetCVar(CCVars.ChatMaxMessageLength); private const int VoiceRange = 7; // how far voice goes in world units @@ -64,12 +62,6 @@ namespace Content.Server.Chat.Managers public void Initialize() { _netManager.RegisterNetMessage(); - _netManager.RegisterNetMessage(OnMaxLengthRequest); - - // Tell all the connected players the chat's character limit - var msg = _netManager.CreateNetMessage(); - msg.MaxMessageLength = MaxMessageLength; - _netManager.ServerSendToAll(msg); _configurationManager.OnValueChanged(CCVars.OocEnabled, OnOocEnabledChanged, true); _configurationManager.OnValueChanged(CCVars.AdminOocEnabled, OnAdminOocEnabledChanged, true); @@ -368,13 +360,6 @@ namespace Content.Server.Chat.Managers _netManager.ServerSendToAll(msg); } - private void OnMaxLengthRequest(ChatMaxMsgLengthMessage msg) - { - var response = _netManager.CreateNetMessage(); - response.MaxMessageLength = MaxMessageLength; - _netManager.ServerSendMessage(response, msg.MsgChannel); - } - public void RegisterChatTransform(TransformChat handler) { _chatTransformHandlers.Add(handler); diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 2538e65852..6ba43c71e8 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -345,5 +345,12 @@ namespace Content.Shared.CCVar public static readonly CVarDef ViewportScaleRender = CVarDef.Create("viewport.scale_render", true, CVar.CLIENTONLY | CVar.ARCHIVE); + + /* + * CHAT + */ + + public static readonly CVarDef ChatMaxMessageLength = + CVarDef.Create("chat.max_message_length", 1000, CVar.SERVER | CVar.REPLICATED); } } diff --git a/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs b/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs deleted file mode 100644 index f00062b21b..0000000000 --- a/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Lidgren.Network; -using Robust.Shared.Network; - -namespace Content.Shared.Chat -{ - /// - /// This message is sent by the server to let clients know what is the chat's character limit for this server. - /// It is first sent by the client as a request - /// - public sealed class ChatMaxMsgLengthMessage : NetMessage - { - public override MsgGroups MsgGroup => MsgGroups.Command; - - /// - /// The max length a player-sent message can get - /// - public int MaxMessageLength { get; set; } - - public override void ReadFromBuffer(NetIncomingMessage buffer) - { - MaxMessageLength = buffer.ReadInt32(); - } - - public override void WriteToBuffer(NetOutgoingMessage buffer) - { - buffer.Write(MaxMessageLength); - } - } -} From 0a93e602caaf5245da650544f010ad5980963dc2 Mon Sep 17 00:00:00 2001 From: Eugene Date: Sun, 18 Jul 2021 00:04:04 +0300 Subject: [PATCH 03/99] Add missing space (#4281) --- Content.Server/Speech/Components/SpanishAccentComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Speech/Components/SpanishAccentComponent.cs b/Content.Server/Speech/Components/SpanishAccentComponent.cs index dec155f7fd..73272bd3d0 100644 --- a/Content.Server/Speech/Components/SpanishAccentComponent.cs +++ b/Content.Server/Speech/Components/SpanishAccentComponent.cs @@ -19,7 +19,7 @@ namespace Content.Server.Speech.Components private string InsertS(string message) { // Replace every new Word that starts with s/S - var msg = message.Replace(" s", " es").Replace(" S", "Es"); + var msg = message.Replace(" s", " es").Replace(" S", " Es"); // Still need to check if the beginning of the message starts if (msg.StartsWith("s")) From 8410fc239c3812e33d2171fb55d60c315339fb72 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Sun, 18 Jul 2021 14:59:40 +0200 Subject: [PATCH 04/99] Fix handheld instruments not working --- Content.Server/Instruments/InstrumentComponent.cs | 4 +++- Resources/Changelog/Parts/instrument.yml | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Resources/Changelog/Parts/instrument.yml diff --git a/Content.Server/Instruments/InstrumentComponent.cs b/Content.Server/Instruments/InstrumentComponent.cs index c3484bbc20..499d0a3e6d 100644 --- a/Content.Server/Instruments/InstrumentComponent.cs +++ b/Content.Server/Instruments/InstrumentComponent.cs @@ -307,7 +307,9 @@ namespace Content.Server.Instruments { if (!user.TryGetComponent(out ActorComponent? actor)) return; - if (InstrumentPlayer != null || !EntitySystem.Get().CanInteract(user)) return; + if ((!Handheld && InstrumentPlayer != null) + || (Handheld && actor.PlayerSession != InstrumentPlayer) + || !EntitySystem.Get().CanInteract(user)) return; InstrumentPlayer = actor.PlayerSession; OpenUserInterface(InstrumentPlayer); diff --git a/Resources/Changelog/Parts/instrument.yml b/Resources/Changelog/Parts/instrument.yml new file mode 100644 index 0000000000..69629bb1e9 --- /dev/null +++ b/Resources/Changelog/Parts/instrument.yml @@ -0,0 +1,4 @@ +author: Zumorica +changes: + - type: Fix # One of the following: Add, Remove, Tweak, Fix + message: Fixes handheld instruments not working. From 0d1af2c5ff432bf6e321d97cfd6efb09939632e7 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 18 Jul 2021 09:00:50 -0400 Subject: [PATCH 05/99] Automatic changelog update --- Resources/Changelog/Changelog.yml | 10 ++++++++++ Resources/Changelog/Parts/instrument.yml | 4 ---- 2 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 Resources/Changelog/Parts/instrument.yml diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4dea8dc5e0..26cb549060 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1477,3 +1477,13 @@ Entries: - {message: Added the dual-port air vent., type: Add} id: 261 time: '2021-07-15T13:24:45.0000000+00:00' +- author: Fogapod + changes: + - {message: Added missing space in Spanish accent., type: Fix} + id: 262 + time: '2021-07-17T21:04:04.0000000+00:00' +- author: Zumorica + changes: + - {message: Fixes handheld instruments not working., type: Fix} + id: 263 + time: '2021-07-18T13:00:50.345009+00:00' diff --git a/Resources/Changelog/Parts/instrument.yml b/Resources/Changelog/Parts/instrument.yml deleted file mode 100644 index 69629bb1e9..0000000000 --- a/Resources/Changelog/Parts/instrument.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Zumorica -changes: - - type: Fix # One of the following: Add, Remove, Tweak, Fix - message: Fixes handheld instruments not working. From bf493c39b739a485a90cd130cfe35a279684421d Mon Sep 17 00:00:00 2001 From: Visne <39844191+Visne@users.noreply.github.com> Date: Sun, 18 Jul 2021 18:39:31 +0200 Subject: [PATCH 06/99] Replace most VBox/HBoxContainers with BoxContainers (#4274) --- Content.Client/AI/ClientAiDebugSystem.cs | 4 +- Content.Client/AME/UI/AMEWindow.cs | 25 ++-- .../Access/UI/IdCardConsoleWindow.cs | 6 +- .../Actions/UI/ActionAlertTooltip.cs | 9 +- Content.Client/Actions/UI/ActionMenu.cs | 7 +- Content.Client/Actions/UI/ActionSlot.cs | 7 +- Content.Client/Actions/UI/ActionsUI.cs | 12 +- .../Administration/UI/AdminAddReagentUI.cs | 7 +- .../UI/CustomControls/PlayerListControl.xaml | 8 +- .../Administration/UI/PermissionsEui.cs | 34 ++++-- .../UI/SetOutfit/SetOutfitMenu.xaml | 12 +- .../UI/Tabs/AdminTab/AdminTab.xaml | 4 +- .../UI/Tabs/AdminTab/BanWindow.xaml | 16 +-- .../UI/Tabs/AdminTab/KickWindow.xaml | 8 +- .../UI/Tabs/AdminTab/TeleportWindow.xaml | 4 +- .../Tabs/AdminbusTab/StationEventsWindow.xaml | 8 +- .../UI/Tabs/AtmosTab/AddAtmosWindow.xaml | 8 +- .../UI/Tabs/AtmosTab/AddGasWindow.xaml | 24 ++-- .../UI/Tabs/AtmosTab/FillGasWindow.xaml | 16 +-- .../Tabs/AtmosTab/SetTemperatureWindow.xaml | 20 ++-- .../Administration/UI/Tabs/PlayerTab.xaml | 10 +- .../Administration/UI/Tabs/PlayerTab.xaml.cs | 7 +- Content.Client/Arcade/BlockGameMenu.cs | 27 +++-- Content.Client/Atmos/UI/GasAnalyzerMenu.cs | 31 +++-- .../Atmos/UI/GasCanisterWindow.xaml | 48 ++++---- Content.Client/Body/UI/BodyScannerDisplay.cs | 13 +- Content.Client/Body/UI/SurgeryWindow.cs | 12 +- Content.Client/Cargo/UI/CargoConsoleMenu.cs | 67 ++++++++--- .../Cargo/UI/CargoConsoleOrderMenu.cs | 6 +- Content.Client/Changelog/ChangelogWindow.xaml | 10 +- .../Changelog/ChangelogWindow.xaml.cs | 14 ++- .../MagicMirrorBoundUserInterface.cs | 22 +++- .../Components/CharacterInfoComponent.cs | 24 ++-- .../CharacterInterfaceComponent.cs | 8 +- Content.Client/Chat/UI/ChatBox.cs | 20 ++-- .../Chemistry/UI/ChemMasterWindow.cs | 52 +++++--- .../Chemistry/UI/ReagentDispenserWindow.cs | 24 ++-- .../Cloning/UI/AcceptCloningWindow.cs | 12 +- Content.Client/Cloning/UI/CloningPodWindow.cs | 20 +++- .../UI/CommunicationsConsoleMenu.cs | 15 ++- .../Configurable/UI/ConfigurationMenu.cs | 26 ++-- .../Construction/UI/ConstructionMenu.xaml | 32 ++--- .../ContextMenu/UI/ContextMenuElement.cs | 17 ++- Content.Client/Crayon/UI/CrayonWindow.cs | 6 +- Content.Client/Credits/CreditsWindow.cs | 13 +- .../Disposal/UI/DisposalMailingUnitWindow.cs | 40 +++++-- .../Disposal/UI/DisposalRouterWindow.cs | 7 +- .../Disposal/UI/DisposalTaggerWindow.cs | 7 +- .../Disposal/UI/DisposalUnitWindow.cs | 13 +- Content.Client/EscapeMenu/UI/EscapeMenu.xaml | 4 +- .../EscapeMenu/UI/OptionsMenu.Audio.cs | 19 ++- .../EscapeMenu/UI/OptionsMenu.Graphics.cs | 26 ++-- .../EscapeMenu/UI/OptionsMenu.KeyRebind.cs | 16 ++- Content.Client/Examine/ExamineSystem.cs | 12 +- Content.Client/Ghost/GhostGui.cs | 9 +- .../Ghost/Roles/UI/GhostRolesEntry.xaml | 8 +- .../Ghost/Roles/UI/GhostRolesWindow.xaml | 2 +- .../Ghost/Roles/UI/MakeGhostRoleWindow.xaml | 24 ++-- .../GravityGeneratorBoundUserInterface.cs | 4 +- Content.Client/HUD/GameHud.cs | 42 ++++--- Content.Client/Hands/HandsGui.cs | 15 ++- Content.Client/Info/InfoWindow.cs | 13 +- Content.Client/Info/ServerInfo.cs | 5 +- .../Instruments/UI/InstrumentMenu.xaml | 16 +-- .../HumanInventoryInterfaceController.cs | 10 +- Content.Client/Items/UI/ItemStatusPanel.cs | 11 +- .../Kitchen/UI/MicrowaveBoundUserInterface.cs | 26 ++-- .../UI/ReagentGrinderBoundUserInterface.cs | 11 +- Content.Client/LateJoin/LateJoinGui.cs | 17 ++- Content.Client/Lathe/UI/LatheMenu.cs | 10 +- Content.Client/Lathe/UI/LatheQueueMenu.cs | 14 ++- .../Launcher/LauncherConnectingGui.xaml | 28 ++--- .../Components/HandheldLightComponent.cs | 4 +- .../Lobby/UI/LobbyCharacterPreviewPanel.cs | 19 ++- Content.Client/Lobby/UI/LobbyGui.xaml | 26 ++-- Content.Client/Lobby/UI/LobbyGui.xaml.cs | 13 +- Content.Client/MainMenu/MainMenu.cs | 10 +- .../MedicalScanner/UI/MedicalScannerWindow.cs | 4 +- Content.Client/PDA/PDABoundUserInterface.cs | 31 +++-- Content.Client/Paper/UI/PaperWindow.cs | 6 +- .../UI/ParticleAcceleratorControlMenu.cs | 27 +++-- .../Power/APC/ApcBoundUserInterface.cs | 21 +++- Content.Client/Power/SolarControlWindow.xaml | 4 +- .../Preferences/UI/CharacterSetupGui.cs | 23 +++- .../Preferences/UI/HumanoidProfileEditor.cs | 113 +++++++++++++----- .../Research/UI/ResearchConsoleMenu.cs | 21 ++-- .../RoundEnd/RoundEndSummaryWindow.cs | 16 ++- Content.Client/Sandbox/SandboxManager.cs | 7 +- .../Storage/ClientStorageComponent.cs | 14 ++- Content.Client/Strip/StrippingMenu.cs | 9 +- Content.Client/Suspicion/SuspicionGui.xaml | 4 +- .../Atmos/GasTank/GasTankWindow.cs | 20 +++- Content.Client/Verbs/VerbSystem.cs | 14 ++- Content.Client/Voting/UI/VoteCallMenu.xaml | 12 +- Content.Client/Voting/UI/VotePopup.xaml | 8 +- .../ClientBatteryBarrelComponent.cs | 9 +- .../ClientBoltActionBarrelComponent.cs | 20 +++- .../ClientMagazineBarrelComponent.cs | 9 +- .../Components/ClientPumpBarrelComponent.cs | 20 +++- .../ClientRevolverBarrelComponent.cs | 6 +- Content.Client/Wires/UI/WiresMenu.cs | 36 ++++-- 101 files changed, 1143 insertions(+), 567 deletions(-) diff --git a/Content.Client/AI/ClientAiDebugSystem.cs b/Content.Client/AI/ClientAiDebugSystem.cs index e60014f48f..fb3a657c4b 100644 --- a/Content.Client/AI/ClientAiDebugSystem.cs +++ b/Content.Client/AI/ClientAiDebugSystem.cs @@ -8,6 +8,7 @@ using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.AI { @@ -169,8 +170,9 @@ namespace Content.Client.AI MouseFilter = Control.MouseFilterMode.Ignore, }; - var vBox = new VBoxContainer() + var vBox = new BoxContainer() { + Orientation = LayoutOrientation.Vertical, SeparationOverride = 15, Children = {actionLabel, pathfindingLabel}, }; diff --git a/Content.Client/AME/UI/AMEWindow.cs b/Content.Client/AME/UI/AMEWindow.cs index 0b56471431..e9104e6f67 100644 --- a/Content.Client/AME/UI/AMEWindow.cs +++ b/Content.Client/AME/UI/AMEWindow.cs @@ -6,6 +6,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using static Content.Shared.AME.SharedAMEControllerComponent; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.AME.UI { @@ -30,58 +31,66 @@ namespace Content.Client.AME.UI MinSize = SetSize = (250, 250); - Contents.AddChild(new VBoxContainer + Contents.AddChild(new BoxContainer { + Orientation = LayoutOrientation.Vertical, Children = { - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label {Text = Loc.GetString("ame-window-engine-status-label") + " "}, (InjectionStatus = new Label {Text = Loc.GetString("ame-window-engine-injection-status-not-injecting-label")}) } }, - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { (ToggleInjection = new Button {Text = Loc.GetString("ame-window-toggle-injection-button"), StyleClasses = {StyleBase.ButtonOpenBoth}, Disabled = true}), } }, - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label {Text = Loc.GetString("ame-window-fuel-status-label") + " "}, (FuelAmount = new Label {Text = Loc.GetString("ame-window-fuel-not-inserted-text")}) } }, - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { (EjectButton = new Button {Text = Loc.GetString("ame-window-eject-button"), StyleClasses = {StyleBase.ButtonOpenBoth}, Disabled = true}), } }, - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label {Text = Loc.GetString("ame-window-injection-amount-label") + " "}, (InjectionAmount = new Label {Text = "0"}) } }, - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { (IncreaseFuelButton = new Button {Text = Loc.GetString("ame-window-increase-fuel-button"), StyleClasses = {StyleBase.ButtonOpenRight}}), (DecreaseFuelButton = new Button {Text = Loc.GetString("ame-window-decrease-fuel-button"), StyleClasses = {StyleBase.ButtonOpenLeft}}), } }, - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label { Text = Loc.GetString("ame-window-core-count-label") + " "}, diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.cs b/Content.Client/Access/UI/IdCardConsoleWindow.cs index 450aa0ebdd..4c3093baa2 100644 --- a/Content.Client/Access/UI/IdCardConsoleWindow.cs +++ b/Content.Client/Access/UI/IdCardConsoleWindow.cs @@ -8,6 +8,7 @@ using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Prototypes; using static Content.Shared.Access.SharedIdCardConsoleComponent; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Access.UI { @@ -38,7 +39,10 @@ namespace Content.Client.Access.UI { MinSize = SetSize = (650, 290); _owner = owner; - var vBox = new VBoxContainer(); + var vBox = new BoxContainer + { + Orientation = LayoutOrientation.Vertical + }; vBox.AddChild(new GridContainer { diff --git a/Content.Client/Actions/UI/ActionAlertTooltip.cs b/Content.Client/Actions/UI/ActionAlertTooltip.cs index 8ebb9c8642..b64faa56b1 100644 --- a/Content.Client/Actions/UI/ActionAlertTooltip.cs +++ b/Content.Client/Actions/UI/ActionAlertTooltip.cs @@ -4,6 +4,7 @@ using Robust.Client.UserInterface.Controls; using Robust.Shared.IoC; using Robust.Shared.Timing; using Robust.Shared.Utility; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Actions.UI { @@ -28,8 +29,12 @@ namespace Content.Client.Actions.UI SetOnlyStyleClass(StyleNano.StyleClassTooltipPanel); - VBoxContainer vbox; - AddChild(vbox = new VBoxContainer {RectClipContent = true}); + BoxContainer vbox; + AddChild(vbox = new BoxContainer + { + Orientation = LayoutOrientation.Vertical, + RectClipContent = true + }); var nameLabel = new RichTextLabel { MaxWidth = TooltipTextMaxWidth, diff --git a/Content.Client/Actions/UI/ActionMenu.cs b/Content.Client/Actions/UI/ActionMenu.cs index f935adfd3c..bb7f996ad0 100644 --- a/Content.Client/Actions/UI/ActionMenu.cs +++ b/Content.Client/Actions/UI/ActionMenu.cs @@ -19,6 +19,7 @@ using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Timing; using static Robust.Client.UserInterface.Controls.BaseButton; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Actions.UI { @@ -71,12 +72,14 @@ namespace Content.Client.Actions.UI Title = Loc.GetString("ui-actionmenu-title"); MinSize = (300, 300); - Contents.AddChild(new VBoxContainer + Contents.AddChild(new BoxContainer { + Orientation = LayoutOrientation.Vertical, Children = { - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { (_searchBar = new LineEdit diff --git a/Content.Client/Actions/UI/ActionSlot.cs b/Content.Client/Actions/UI/ActionSlot.cs index 29b4b48b82..36702eddd9 100644 --- a/Content.Client/Actions/UI/ActionSlot.cs +++ b/Content.Client/Actions/UI/ActionSlot.cs @@ -16,6 +16,7 @@ using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Timing; using Robust.Shared.Utility; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Actions.UI { @@ -174,8 +175,9 @@ namespace Content.Client.Actions.UI _cooldownGraphic = new CooldownGraphic {Progress = 0, Visible = false}; // padding to the left of the number to shift it right - var paddingBox = new HBoxContainer() + var paddingBox = new BoxContainer { + Orientation = LayoutOrientation.Horizontal, HorizontalExpand = true, VerticalExpand = true, MinSize = (64, 64) @@ -187,8 +189,9 @@ namespace Content.Client.Actions.UI paddingBox.AddChild(_number); // padding to the left of the small icon - var paddingBoxItemIcon = new HBoxContainer() + var paddingBoxItemIcon = new BoxContainer { + Orientation = LayoutOrientation.Horizontal, HorizontalExpand = true, VerticalExpand = true, MinSize = (64, 64) diff --git a/Content.Client/Actions/UI/ActionsUI.cs b/Content.Client/Actions/UI/ActionsUI.cs index 7c9b5ca86b..7544bece52 100644 --- a/Content.Client/Actions/UI/ActionsUI.cs +++ b/Content.Client/Actions/UI/ActionsUI.cs @@ -18,6 +18,7 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Timing; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Actions.UI { @@ -42,7 +43,7 @@ namespace Content.Client.Actions.UI private readonly Label _loadoutNumber; private readonly Texture _lockTexture; private readonly Texture _unlockTexture; - private readonly HBoxContainer _loadoutContainer; + private readonly BoxContainer _loadoutContainer; private readonly TextureRect _dragShadow; @@ -108,15 +109,17 @@ namespace Content.Client.Actions.UI }; AddChild(panelContainer); - var hotbarContainer = new VBoxContainer + var hotbarContainer = new BoxContainer { + Orientation = LayoutOrientation.Vertical, SeparationOverride = 3, HorizontalAlignment = HAlignment.Left }; panelContainer.AddChild(hotbarContainer); - var settingsContainer = new HBoxContainer + var settingsContainer = new BoxContainer { + Orientation = LayoutOrientation.Horizontal, HorizontalExpand = true }; hotbarContainer.AddChild(settingsContainer); @@ -156,8 +159,9 @@ namespace Content.Client.Actions.UI }; hotbarContainer.AddChild(_slotContainer); - _loadoutContainer = new HBoxContainer + _loadoutContainer = new BoxContainer { + Orientation = LayoutOrientation.Horizontal, HorizontalExpand = true, MouseFilter = MouseFilterMode.Stop }; diff --git a/Content.Client/Administration/UI/AdminAddReagentUI.cs b/Content.Client/Administration/UI/AdminAddReagentUI.cs index 397b899369..425fb16746 100644 --- a/Content.Client/Administration/UI/AdminAddReagentUI.cs +++ b/Content.Client/Administration/UI/AdminAddReagentUI.cs @@ -8,6 +8,7 @@ using Robust.Client.UserInterface.CustomControls; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Prototypes; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Administration.UI { @@ -65,8 +66,9 @@ namespace Content.Client.Administration.UI Title = Loc.GetString("admin-add-reagent-eui-title"); - Contents.AddChild(new VBoxContainer + Contents.AddChild(new BoxContainer { + Orientation = LayoutOrientation.Vertical, Children = { new GridContainer @@ -88,8 +90,9 @@ namespace Content.Client.Administration.UI HorizontalExpand = true, VerticalExpand = true }, - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { (_errorLabel = new Label diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml index 33d5d6d535..4f64435d42 100644 --- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml +++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml @@ -1,13 +1,13 @@ - - + - + - + diff --git a/Content.Client/Administration/UI/PermissionsEui.cs b/Content.Client/Administration/UI/PermissionsEui.cs index feaa2b751d..8aa8b32a6f 100644 --- a/Content.Client/Administration/UI/PermissionsEui.cs +++ b/Content.Client/Administration/UI/PermissionsEui.cs @@ -14,6 +14,7 @@ using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Utility; using static Content.Shared.Administration.PermissionsEuiMsg; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Administration.UI { @@ -316,15 +317,17 @@ namespace Content.Client.Administration.UI }; AdminsList = new GridContainer {Columns = 5, VerticalExpand = true}; - var adminVBox = new VBoxContainer + var adminVBox = new BoxContainer { + Orientation = LayoutOrientation.Vertical, Children = {AdminsList, AddAdminButton}, }; TabContainer.SetTabTitle(adminVBox, Loc.GetString("permissions-eui-menu-admins-tab-title")); AdminRanksList = new GridContainer {Columns = 3}; - var rankVBox = new VBoxContainer + var rankVBox = new BoxContainer { + Orientation = LayoutOrientation.Vertical, Children = { AdminRanksList, AddAdminRankButton} }; TabContainer.SetTabTitle(rankVBox, Loc.GetString("permissions-eui-menu-admin-ranks-tab-title")); @@ -451,7 +454,10 @@ namespace Content.Client.Administration.UI FlagButtons.Add(flag, (inherit, sub, plus)); } - var bottomButtons = new HBoxContainer(); + var bottomButtons = new BoxContainer + { + Orientation = LayoutOrientation.Horizontal + }; if (data != null) { // show remove button. @@ -461,17 +467,20 @@ namespace Content.Client.Administration.UI bottomButtons.AddChild(SaveButton); - Contents.AddChild(new VBoxContainer + Contents.AddChild(new BoxContainer { + Orientation = LayoutOrientation.Vertical, Children = { - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, SeparationOverride = 2, Children = { - new VBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Vertical, HorizontalExpand = true, Children = { @@ -541,7 +550,10 @@ namespace Content.Client.Administration.UI HorizontalAlignment = HAlignment.Right, HorizontalExpand = true }; - var flagsBox = new VBoxContainer(); + var flagsBox = new BoxContainer + { + Orientation = LayoutOrientation.Vertical + }; foreach (var flag in AdminFlagsHelper.AllFlags) { @@ -565,7 +577,10 @@ namespace Content.Client.Administration.UI flagsBox.AddChild(checkBox); } - var bottomButtons = new HBoxContainer(); + var bottomButtons = new BoxContainer + { + Orientation = LayoutOrientation.Horizontal + }; if (data != null) { // show remove button. @@ -575,8 +590,9 @@ namespace Content.Client.Administration.UI bottomButtons.AddChild(SaveButton); - Contents.AddChild(new VBoxContainer + Contents.AddChild(new BoxContainer { + Orientation = LayoutOrientation.Vertical, Children = { NameEdit, diff --git a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml index 6cdafeb1c8..efb831cd1b 100644 --- a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml +++ b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml @@ -1,15 +1,15 @@ - - - + + - + public class CharacterWindow : SS14Window { - private readonly VBoxContainer _contentsVBox; + private readonly BoxContainer _contentsVBox; private readonly List _windowComponents; public CharacterWindow(List windowComponents) { Title = "Character"; - _contentsVBox = new VBoxContainer(); + _contentsVBox = new BoxContainer + { + Orientation = LayoutOrientation.Vertical + }; Contents.AddChild(_contentsVBox); windowComponents.Sort((a, b) => ((int) a.Priority).CompareTo((int) b.Priority)); diff --git a/Content.Client/Chat/UI/ChatBox.cs b/Content.Client/Chat/UI/ChatBox.cs index 1052f499c2..f94cdcaded 100644 --- a/Content.Client/Chat/UI/ChatBox.cs +++ b/Content.Client/Chat/UI/ChatBox.cs @@ -19,6 +19,7 @@ using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Timing; using Robust.Shared.Utility; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Chat.UI { @@ -78,11 +79,11 @@ namespace Content.Client.Chat.UI private readonly Popup _channelSelectorPopup; private readonly Button _channelSelector; - private readonly HBoxContainer _channelSelectorHBox; + private readonly BoxContainer _channelSelectorHBox; private readonly FilterButton _filterButton; private readonly Popup _filterPopup; private readonly PanelContainer _filterPopupPanel; - private readonly VBoxContainer _filterVBox; + private readonly BoxContainer _filterVBox; private DragMode _currentDrag = DragMode.None; private Vector2 _dragOffsetTopLeft; private Vector2 _dragOffsetBottomRight; @@ -126,8 +127,9 @@ namespace Content.Client.Chat.UI HorizontalExpand = true, Children = { - new VBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Vertical, Children = { (Contents = new OutputPanel @@ -140,8 +142,9 @@ namespace Content.Client.Chat.UI HorizontalExpand = true, Children = { - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, HorizontalExpand = true, SeparationOverride = 4, Children = @@ -181,13 +184,15 @@ namespace Content.Client.Chat.UI StyleClasses = {StyleNano.StyleClassBorderedWindowPanel}, Children = { - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Control{MinSize = (4,0)}, - (_filterVBox = new VBoxContainer + (_filterVBox = new BoxContainer { + Orientation = LayoutOrientation.Vertical, SeparationOverride = 4 }) } @@ -201,8 +206,9 @@ namespace Content.Client.Chat.UI { Children = { - (_channelSelectorHBox = new HBoxContainer + (_channelSelectorHBox = new BoxContainer { + Orientation = LayoutOrientation.Horizontal, SeparationOverride = 1 }) } diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.cs index f46fc8fd0e..c627470286 100644 --- a/Content.Client/Chemistry/UI/ChemMasterWindow.cs +++ b/Content.Client/Chemistry/UI/ChemMasterWindow.cs @@ -14,6 +14,7 @@ using Robust.Shared.Maths; using Robust.Shared.Prototypes; using static Content.Shared.Chemistry.Components.SharedChemMasterComponent; using static Robust.Client.UserInterface.Controls.BaseButton; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Chemistry.UI { @@ -25,11 +26,11 @@ namespace Content.Client.Chemistry.UI [Dependency] private readonly IPrototypeManager _prototypeManager = default!; /// Contains info about the reagent container such as it's contents, if one is loaded into the dispenser. - private readonly VBoxContainer ContainerInfo; + private readonly BoxContainer ContainerInfo; - private readonly VBoxContainer BufferInfo; + private readonly BoxContainer BufferInfo; - private readonly VBoxContainer PackagingInfo; + private readonly BoxContainer PackagingInfo; /// Ejects the reagent container from the dispenser. public Button EjectButton { get; } @@ -41,8 +42,8 @@ namespace Content.Client.Chemistry.UI public event Action? OnChemButtonPressed; - public HBoxContainer PillInfo { get; set; } - public HBoxContainer BottleInfo { get; set; } + public BoxContainer PillInfo { get; set; } + public BoxContainer BottleInfo { get; set; } public SpinBox PillAmount { get; set; } public SpinBox BottleAmount { get; set; } public Button CreatePills { get; } @@ -57,13 +58,15 @@ namespace Content.Client.Chemistry.UI MinSize = SetSize = (400, 525); IoCManager.InjectDependencies(this); - Contents.AddChild(new VBoxContainer + Contents.AddChild(new BoxContainer { + Orientation = LayoutOrientation.Vertical, Children = { //Container - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label {Text = Loc.GetString("chem-master-window-container-label")}, @@ -84,8 +87,9 @@ namespace Content.Client.Chemistry.UI Children = { //Currently empty, when server sends state data this will have container contents and fill volume. - (ContainerInfo = new VBoxContainer + (ContainerInfo = new BoxContainer { + Orientation = LayoutOrientation.Vertical, HorizontalExpand = true, Children = { @@ -102,8 +106,9 @@ namespace Content.Client.Chemistry.UI new Control {MinSize = (0.0f, 10.0f)}, //Buffer - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label {Text = Loc.GetString("chem-master-window-buffer-text")}, @@ -126,8 +131,9 @@ namespace Content.Client.Chemistry.UI Children = { //Buffer reagent list - (BufferInfo = new VBoxContainer + (BufferInfo = new BoxContainer { + Orientation = LayoutOrientation.Vertical, HorizontalExpand = true, Children = { @@ -144,8 +150,9 @@ namespace Content.Client.Chemistry.UI new Control {MinSize = (0.0f, 10.0f)}, //Packaging - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label {Text = $"{Loc.GetString("chem-master-window-packaging-text")} "}, @@ -165,8 +172,9 @@ namespace Content.Client.Chemistry.UI Children = { //Packaging options - (PackagingInfo = new VBoxContainer + (PackagingInfo = new BoxContainer { + Orientation = LayoutOrientation.Vertical, HorizontalExpand = true, }), @@ -176,8 +184,9 @@ namespace Content.Client.Chemistry.UI }); //Pills - PillInfo = new HBoxContainer + PillInfo = new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label @@ -213,8 +222,9 @@ namespace Content.Client.Chemistry.UI PillInfo.AddChild(CreatePills); //Bottles - BottleInfo = new HBoxContainer + BottleInfo = new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label @@ -315,8 +325,9 @@ namespace Content.Client.Chemistry.UI return; } - ContainerInfo.Children.Add(new HBoxContainer // Name of the container and its fill status (Ex: 44/100u) + ContainerInfo.Children.Add(new BoxContainer // Name of the container and its fill status (Ex: 44/100u) { + Orientation = LayoutOrientation.Horizontal, Children = { new Label {Text = $"{state.ContainerName}: "}, @@ -339,8 +350,9 @@ namespace Content.Client.Chemistry.UI if (proto != null) { - ContainerInfo.Children.Add(new HBoxContainer + ContainerInfo.Children.Add(new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label {Text = $"{name}: "}, @@ -371,7 +383,10 @@ namespace Content.Client.Chemistry.UI return; } - var bufferHBox = new HBoxContainer(); + var bufferHBox = new BoxContainer + { + Orientation = LayoutOrientation.Horizontal + }; BufferInfo.AddChild(bufferHBox); var bufferLabel = new Label { Text = $"{Loc.GetString("chem-master-window-buffer-label")} " }; @@ -394,8 +409,9 @@ namespace Content.Client.Chemistry.UI if (proto != null) { - BufferInfo.Children.Add(new HBoxContainer + BufferInfo.Children.Add(new BoxContainer { + Orientation = LayoutOrientation.Horizontal, //SizeFlagsHorizontal = SizeFlags.ShrinkEnd, Children = { diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs b/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs index acf11ca5fc..e5b3571027 100644 --- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs +++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs @@ -12,6 +12,7 @@ using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Prototypes; using static Content.Shared.Chemistry.Dispenser.SharedReagentDispenserComponent; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Chemistry.UI { @@ -23,7 +24,7 @@ namespace Content.Client.Chemistry.UI [Dependency] private readonly IPrototypeManager _prototypeManager = default!; /// Contains info about the reagent container such as it's contents, if one is loaded into the dispenser. - private readonly VBoxContainer ContainerInfo; + private readonly BoxContainer ContainerInfo; /// Sets the dispense amount to 1 when pressed. public Button DispenseButton1 { get; } @@ -72,13 +73,15 @@ namespace Content.Client.Chemistry.UI var dispenseAmountGroup = new ButtonGroup(); - Contents.AddChild(new VBoxContainer + Contents.AddChild(new BoxContainer { + Orientation = LayoutOrientation.Vertical, Children = { //First, our dispense amount buttons - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label {Text = Loc.GetString("reagent-dispenser-window-amount-to-dispense-label")}, @@ -104,8 +107,9 @@ namespace Content.Client.Chemistry.UI }), //Padding new Control {MinSize = (0.0f, 10.0f)}, - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label {Text = Loc.GetString("reagent-dispenser-window-container-label") + " "}, @@ -126,8 +130,9 @@ namespace Content.Client.Chemistry.UI Children = { //Currently empty, when server sends state data this will have container contents and fill volume. - (ContainerInfo = new VBoxContainer + (ContainerInfo = new BoxContainer { + Orientation = LayoutOrientation.Vertical, HorizontalExpand = true, Children = { @@ -263,8 +268,9 @@ namespace Content.Client.Chemistry.UI return; } - ContainerInfo.Children.Add(new HBoxContainer // Name of the container and its fill status (Ex: 44/100u) + ContainerInfo.Children.Add(new BoxContainer // Name of the container and its fill status (Ex: 44/100u) { + Orientation = LayoutOrientation.Horizontal, Children = { new Label {Text = $"{state.ContainerName}: "}, @@ -293,8 +299,9 @@ namespace Content.Client.Chemistry.UI //Check if the reagent is being moused over. If so, color it green. if (proto != null && proto.ID == highlightedReagentId) { - ContainerInfo.Children.Add(new HBoxContainer + ContainerInfo.Children.Add(new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label @@ -312,8 +319,9 @@ namespace Content.Client.Chemistry.UI } else //Otherwise, color it the normal colors. { - ContainerInfo.Children.Add(new HBoxContainer + ContainerInfo.Children.Add(new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label {Text = $"{name}: "}, diff --git a/Content.Client/Cloning/UI/AcceptCloningWindow.cs b/Content.Client/Cloning/UI/AcceptCloningWindow.cs index c26d95a30f..b37e693679 100644 --- a/Content.Client/Cloning/UI/AcceptCloningWindow.cs +++ b/Content.Client/Cloning/UI/AcceptCloningWindow.cs @@ -2,6 +2,7 @@ using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Localization; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Cloning.UI { @@ -15,21 +16,24 @@ namespace Content.Client.Cloning.UI Title = Loc.GetString("accept-cloning-window-title"); - Contents.AddChild(new VBoxContainer + Contents.AddChild(new BoxContainer { + Orientation = LayoutOrientation.Vertical, Children = { - new VBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Vertical, Children = { (new Label() { Text = Loc.GetString("accept-cloning-window-prompt-text-part") }), - new HBoxContainer + new BoxContainer { - Align = BoxContainer.AlignMode.Center, + Orientation = LayoutOrientation.Horizontal, + Align = AlignMode.Center, Children = { (AcceptButton = new Button diff --git a/Content.Client/Cloning/UI/CloningPodWindow.cs b/Content.Client/Cloning/UI/CloningPodWindow.cs index b085c5294d..a52ef93ebd 100644 --- a/Content.Client/Cloning/UI/CloningPodWindow.cs +++ b/Content.Client/Cloning/UI/CloningPodWindow.cs @@ -9,6 +9,7 @@ using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Timing; using static Content.Shared.Cloning.SharedCloningPodComponent; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Cloning.UI { @@ -16,7 +17,7 @@ namespace Content.Client.Cloning.UI { private Dictionary _scanManager; - private readonly VBoxContainer _scanList; + private readonly BoxContainer _scanList; public readonly Button CloneButton; public readonly Button EjectButton; private CloningScanButton? _selectedButton; @@ -35,8 +36,9 @@ namespace Content.Client.Cloning.UI Title = Loc.GetString("cloning-pod-window-title"); - Contents.AddChild(new VBoxContainer + Contents.AddChild(new BoxContainer { + Orientation = LayoutOrientation.Vertical, Children = { new ScrollContainer @@ -45,11 +47,15 @@ namespace Content.Client.Cloning.UI VerticalExpand = true, Children = { - (_scanList = new VBoxContainer()) + (_scanList = new BoxContainer + { + Orientation = LayoutOrientation.Vertical + }) } }, - new VBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Vertical, Children = { (CloneButton = new Button @@ -74,8 +80,9 @@ namespace Content.Client.Cloning.UI { Text = Loc.GetString("cloning-pod-eject-body-button") }), - new HBoxContainer + new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { new Label() @@ -219,8 +226,9 @@ namespace Content.Client.Cloning.UI ToggleMode = true, }); - AddChild(new HBoxContainer + AddChild(new BoxContainer { + Orientation = LayoutOrientation.Horizontal, Children = { (EntityTextureRect = new TextureRect diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs index 56d8497104..af12b76965 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs @@ -5,6 +5,7 @@ using Robust.Client.UserInterface.CustomControls; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; +using static Robust.Client.UserInterface.Controls.BoxContainer; using Timer = Robust.Shared.Timing.Timer; namespace Content.Client.Communications.UI @@ -42,7 +43,12 @@ namespace Content.Client.Communications.UI EmergencyShuttleButton.OnPressed += (_) => Owner.EmergencyShuttleButtonPressed(); EmergencyShuttleButton.Disabled = !owner.CanCall; - var vbox = new VBoxContainer() {HorizontalExpand = true, VerticalExpand = true}; + var vbox = new BoxContainer + { + Orientation = LayoutOrientation.Vertical, + HorizontalExpand = true, + VerticalExpand = true + }; vbox.AddChild(_messageInput); vbox.AddChild(new Control(){MinSize = new Vector2(0,10), HorizontalExpand = true}); vbox.AddChild(AnnounceButton); @@ -50,7 +56,12 @@ namespace Content.Client.Communications.UI vbox.AddChild(_countdownLabel); vbox.AddChild(EmergencyShuttleButton); - var hbox = new HBoxContainer() {HorizontalExpand = true, VerticalExpand = true}; + var hbox = new BoxContainer + { + Orientation = LayoutOrientation.Horizontal, + HorizontalExpand = true, + VerticalExpand = true + }; hbox.AddChild(new Control(){MinSize = new Vector2(100,0), HorizontalExpand = true}); hbox.AddChild(vbox); hbox.AddChild(new Control(){MinSize = new Vector2(100,0), HorizontalExpand = true}); diff --git a/Content.Client/Configurable/UI/ConfigurationMenu.cs b/Content.Client/Configurable/UI/ConfigurationMenu.cs index ea0c717b3d..07ad8ecf99 100644 --- a/Content.Client/Configurable/UI/ConfigurationMenu.cs +++ b/Content.Client/Configurable/UI/ConfigurationMenu.cs @@ -6,6 +6,7 @@ using Robust.Shared.Localization; using Robust.Shared.Maths; using static Content.Shared.Configurable.SharedConfigurationComponent; using static Robust.Client.UserInterface.Controls.BaseButton; +using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Configurable.UI { @@ -13,9 +14,8 @@ namespace Content.Client.Configurable.UI { public ConfigurationBoundUserInterface Owner { get; } - private readonly VBoxContainer _baseContainer; - private readonly VBoxContainer _column; - private readonly HBoxContainer _row; + private readonly BoxContainer _column; + private readonly BoxContainer _row; private readonly List<(string name, LineEdit input)> _inputs; @@ -28,20 +28,23 @@ namespace Content.Client.Configurable.UI Title = Loc.GetString("configuration-menu-device-title"); - _baseContainer = new VBoxContainer + BoxContainer baseContainer = new BoxContainer { + Orientation = LayoutOrientation.Vertical, VerticalExpand = true, HorizontalExpand = true }; - _column = new VBoxContainer + _column = new BoxContainer { + Orientation = LayoutOrientation.Vertical, Margin = new Thickness(8), SeparationOverride = 16, }; - _row = new HBoxContainer + _row = new BoxContainer { + Orientation = LayoutOrientation.Horizontal, SeparationOverride = 16, HorizontalExpand = true }; @@ -63,9 +66,9 @@ namespace Content.Client.Configurable.UI }; outerColumn.AddChild(_column); - _baseContainer.AddChild(outerColumn); - _baseContainer.AddChild(confirmButton); - Contents.AddChild(_baseContainer); + baseContainer.AddChild(outerColumn); + baseContainer.AddChild(confirmButton); + Contents.AddChild(baseContainer); } public void Populate(ConfigurationBoundUserInterfaceState state) @@ -97,7 +100,10 @@ namespace Content.Client.Configurable.UI _inputs.Add((field.Key, input)); - var row = new HBoxContainer(); + var row = new BoxContainer + { + Orientation = LayoutOrientation.Horizontal + }; CopyProperties(_row, row); row.AddChild(label); diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml b/Content.Client/Construction/UI/ConstructionMenu.xaml index b95c4d4f58..2c943206bb 100644 --- a/Content.Client/Construction/UI/ConstructionMenu.xaml +++ b/Content.Client/Construction/UI/ConstructionMenu.xaml @@ -1,32 +1,32 @@ - - - + + + - + - + - + - + - + - - + + - + [ViewVariables(VVAccess.ReadWrite)] [DataField("bumpOpen")] - private bool _bumpOpen = true; + public bool BumpOpen = true; /// /// Whether the door starts open when it's first loaded from prototype. A door won't start open if its prototype is also welded shut. @@ -208,24 +208,6 @@ namespace Content.Server.Doors.Components } } - void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold) - { - if (State != DoorState.Closed) - { - return; - } - - if (!_bumpOpen) - { - return; - } - - // Disabled because it makes it suck hard to walk through double doors. - - TryOpen(otherFixture.Body.Owner); - - } - #region Opening public void TryOpen(IEntity user) diff --git a/Content.Server/Doors/DoorSystem.cs b/Content.Server/Doors/DoorSystem.cs index a35c2056db..286caf371d 100644 --- a/Content.Server/Doors/DoorSystem.cs +++ b/Content.Server/Doors/DoorSystem.cs @@ -1,4 +1,7 @@ +using Content.Server.Doors.Components; using Content.Shared.Doors; +using Robust.Shared.GameObjects; +using Robust.Shared.Physics.Dynamics; namespace Content.Server.Doors { @@ -37,6 +40,24 @@ namespace Content.Server.Doors base.Initialize(); AccessType = AccessTypes.Id; + SubscribeLocalEvent(HandleCollide); + } + + private void HandleCollide(EntityUid uid, ServerDoorComponent component, StartCollideEvent args) + { + if (component.State != SharedDoorComponent.DoorState.Closed) + { + return; + } + + if (!component.BumpOpen) + { + return; + } + + // Disabled because it makes it suck hard to walk through double doors. + + component.TryOpen(args.OtherFixture.Body.Owner); } } } From e93692245e6e7da8a1f9d0bd1784aca4f00aef5c Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 21 Jul 2021 20:32:00 +1000 Subject: [PATCH 28/99] Remove IStartCollide from flammable (#4314) I ported some stuff to be ECS but didn't feel like porting the rest, sue me. --- .../Atmos/Components/FlammableComponent.cs | 55 ++---------------- .../Atmos/EntitySystems/FlammableSystem.cs | 56 +++++++++++++++++++ 2 files changed, 62 insertions(+), 49 deletions(-) create mode 100644 Content.Server/Atmos/EntitySystems/FlammableSystem.cs diff --git a/Content.Server/Atmos/Components/FlammableComponent.cs b/Content.Server/Atmos/Components/FlammableComponent.cs index 88ca5255b7..99aa2402f8 100644 --- a/Content.Server/Atmos/Components/FlammableComponent.cs +++ b/Content.Server/Atmos/Components/FlammableComponent.cs @@ -18,24 +18,22 @@ using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Physics; -using Robust.Shared.Physics.Collision; -using Robust.Shared.Physics.Dynamics; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; namespace Content.Server.Atmos.Components { [RegisterComponent] - public class FlammableComponent : SharedFlammableComponent, IStartCollide, IFireAct, IInteractUsing + public class FlammableComponent : SharedFlammableComponent, IFireAct, IInteractUsing { private bool _resisting = false; private readonly List _collided = new(); [ViewVariables(VVAccess.ReadWrite)] - public bool OnFire { get; private set; } + public bool OnFire { get; set; } [ViewVariables(VVAccess.ReadWrite)] - public float FireStacks { get; private set; } + public float FireStacks { get; set; } [ViewVariables(VVAccess.ReadWrite)] [DataField("fireSpread")] @@ -45,17 +43,6 @@ namespace Content.Server.Atmos.Components [DataField("canResistFire")] public bool CanResistFire { get; private set; } = false; - public void Ignite() - { - if (FireStacks > 0 && !OnFire) - { - OnFire = true; - - } - - UpdateAppearance(); - } - public void Extinguish() { if (!OnFire) return; @@ -145,37 +132,7 @@ namespace Content.Server.Atmos.Components } } - void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold) - { - if (!otherFixture.Body.Owner.TryGetComponent(out FlammableComponent? otherFlammable)) - return; - - if (!FireSpread || !otherFlammable.FireSpread) - return; - - if (OnFire) - { - if (otherFlammable.OnFire) - { - var fireSplit = (FireStacks + otherFlammable.FireStacks) / 2; - FireStacks = fireSplit; - otherFlammable.FireStacks = fireSplit; - } - else - { - FireStacks /= 2; - otherFlammable.FireStacks += FireStacks; - otherFlammable.Ignite(); - } - } else if (otherFlammable.OnFire) - { - otherFlammable.FireStacks /= 2; - FireStacks += otherFlammable.FireStacks; - Ignite(); - } - } - - private void UpdateAppearance() + public void UpdateAppearance() { if (Owner.Deleted || !Owner.TryGetComponent(out AppearanceComponent? appearanceComponent)) return; appearanceComponent.SetData(FireVisuals.OnFire, OnFire); @@ -185,7 +142,7 @@ namespace Content.Server.Atmos.Components public void FireAct(float temperature, float volume) { AdjustFireStacks(3); - Ignite(); + EntitySystem.Get().Ignite(this); } // This needs some improvements... @@ -212,7 +169,7 @@ namespace Content.Server.Atmos.Components { if (hotItem.IsCurrentlyHot()) { - Ignite(); + EntitySystem.Get().Ignite(this); return true; } } diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs new file mode 100644 index 0000000000..3a253f64e9 --- /dev/null +++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs @@ -0,0 +1,56 @@ +using Content.Server.Atmos.Components; +using Robust.Shared.GameObjects; +using Robust.Shared.Physics.Dynamics; + +namespace Content.Server.Atmos.EntitySystems +{ + internal sealed class FlammableSystem : EntitySystem + { + // TODO: Port the rest of Flammable. + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(HandleCollide); + } + + private void HandleCollide(EntityUid uid, FlammableComponent component, StartCollideEvent args) + { + if (!args.OtherFixture.Body.Owner.TryGetComponent(out FlammableComponent? otherFlammable)) + return; + + if (!component.FireSpread || !otherFlammable.FireSpread) + return; + + if (component.OnFire) + { + if (otherFlammable.OnFire) + { + var fireSplit = (component.FireStacks + otherFlammable.FireStacks) / 2; + component.FireStacks = fireSplit; + otherFlammable.FireStacks = fireSplit; + } + else + { + component.FireStacks /= 2; + otherFlammable.FireStacks += component.FireStacks; + Ignite(otherFlammable); + } + } else if (otherFlammable.OnFire) + { + otherFlammable.FireStacks /= 2; + component.FireStacks += otherFlammable.FireStacks; + Ignite(component); + } + } + + internal void Ignite(FlammableComponent component) + { + if (component.FireStacks > 0 && !component.OnFire) + { + component.OnFire = true; + } + + component.UpdateAppearance(); + } + } +} From 224bd9849b4478b2b1ad34d1e9397f003bc87492 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 21 Jul 2021 20:33:22 +1000 Subject: [PATCH 29/99] Remove IStartCollide from singulo (#4313) I accidentally glanced at the rest of singulo code and went blind. --- .../Components/ServerSingularityComponent.cs | 42 +--------------- .../EntitySystems/SingularitySystem.cs | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+), 41 deletions(-) diff --git a/Content.Server/Singularity/Components/ServerSingularityComponent.cs b/Content.Server/Singularity/Components/ServerSingularityComponent.cs index 768299350a..4440da7ff7 100644 --- a/Content.Server/Singularity/Components/ServerSingularityComponent.cs +++ b/Content.Server/Singularity/Components/ServerSingularityComponent.cs @@ -14,7 +14,7 @@ namespace Content.Server.Singularity.Components { [RegisterComponent] [ComponentReference(typeof(SharedSingularityComponent))] - public class ServerSingularityComponent : SharedSingularityComponent, IStartCollide + public class ServerSingularityComponent : SharedSingularityComponent { private SharedSingularitySystem _singularitySystem = default!; @@ -94,46 +94,6 @@ namespace Content.Server.Singularity.Components Energy -= EnergyDrain * seconds; } - void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold) - { - // If we're being deleted by another singularity, this call is probably for that singularity. - // Even if not, just don't bother. - if (BeingDeletedByAnotherSingularity) - return; - - var otherEntity = otherFixture.Body.Owner; - - if (otherEntity.TryGetComponent(out var mapGridComponent)) - { - foreach (var tile in mapGridComponent.Grid.GetTilesIntersecting(ourFixture.Body.GetWorldAABB())) - { - mapGridComponent.Grid.SetTile(tile.GridIndices, Robust.Shared.Map.Tile.Empty); - Energy++; - } - return; - } - - if (otherEntity.HasComponent() || - (otherEntity.TryGetComponent(out var component) && component.CanRepell(Owner))) - { - return; - } - - if (otherEntity.IsInContainer()) - return; - - // Singularity priority management / etc. - if (otherEntity.TryGetComponent(out var otherSingulo)) - otherSingulo.BeingDeletedByAnotherSingularity = true; - - otherEntity.QueueDelete(); - - if (otherEntity.TryGetComponent(out var singuloFood)) - Energy += singuloFood.Energy; - else - Energy++; - } - protected override void OnRemove() { _playingSound?.Stop(); diff --git a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs index cc457295d3..eafc982c37 100644 --- a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs +++ b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs @@ -1,6 +1,9 @@ using Content.Server.Singularity.Components; using Content.Shared.Singularity; using JetBrains.Annotations; +using Robust.Shared.Containers; +using Robust.Shared.GameObjects; +using Robust.Shared.Physics.Dynamics; namespace Content.Server.Singularity.EntitySystems { @@ -10,6 +13,52 @@ namespace Content.Server.Singularity.EntitySystems private float _updateInterval = 1.0f; private float _accumulator; + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(HandleCollide); + } + + private void HandleCollide(EntityUid uid, ServerSingularityComponent component, StartCollideEvent args) + { + // If we're being deleted by another singularity, this call is probably for that singularity. + // Even if not, just don't bother. + if (component.BeingDeletedByAnotherSingularity) + return; + + var otherEntity = args.OtherFixture.Body.Owner; + + if (otherEntity.TryGetComponent(out var mapGridComponent)) + { + foreach (var tile in mapGridComponent.Grid.GetTilesIntersecting(args.OurFixture.Body.GetWorldAABB())) + { + mapGridComponent.Grid.SetTile(tile.GridIndices, Robust.Shared.Map.Tile.Empty); + component.Energy++; + } + return; + } + + if (otherEntity.HasComponent() || + (otherEntity.TryGetComponent(out var containmentField) && containmentField.CanRepell(component.Owner))) + { + return; + } + + if (otherEntity.IsInContainer()) + return; + + // Singularity priority management / etc. + if (otherEntity.TryGetComponent(out var otherSingulo)) + otherSingulo.BeingDeletedByAnotherSingularity = true; + + otherEntity.QueueDelete(); + + if (otherEntity.TryGetComponent(out var singuloFood)) + component.Energy += singuloFood.Energy; + else + component.Energy++; + } + public override void Update(float frameTime) { base.Update(frameTime); From 55087a6f1648c5b75e6734dc02406c7248db102d Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 21 Jul 2021 20:35:45 +1000 Subject: [PATCH 30/99] Remove IStartCollide from Recyclers (#4312) --- .../Recycling/Components/RecyclerComponent.cs | 52 ++-------------- Content.Server/Recycling/RecyclerSystem.cs | 59 +++++++++++++++++++ 2 files changed, 64 insertions(+), 47 deletions(-) create mode 100644 Content.Server/Recycling/RecyclerSystem.cs diff --git a/Content.Server/Recycling/Components/RecyclerComponent.cs b/Content.Server/Recycling/Components/RecyclerComponent.cs index fe3c60ed93..1b321641e6 100644 --- a/Content.Server/Recycling/Components/RecyclerComponent.cs +++ b/Content.Server/Recycling/Components/RecyclerComponent.cs @@ -27,7 +27,7 @@ namespace Content.Server.Recycling.Components { // TODO: Add sound and safe beep [RegisterComponent] - public class RecyclerComponent : Component, IStartCollide, ISuicideAct + public class RecyclerComponent : Component, ISuicideAct { public override string Name => "Recycler"; @@ -37,26 +37,18 @@ namespace Content.Server.Recycling.Components /// Whether or not sentient beings will be recycled /// [ViewVariables(VVAccess.ReadWrite)] [DataField("safe")] - private bool _safe = true; + internal bool Safe = true; /// /// The percentage of material that will be recovered /// [ViewVariables(VVAccess.ReadWrite)] [DataField("efficiency")] - private float _efficiency = 0.25f; + internal float Efficiency = 0.25f; - private bool Powered => + internal bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; - private void Bloodstain() - { - if (Owner.TryGetComponent(out AppearanceComponent? appearance)) - { - appearance.SetData(RecyclerVisuals.Bloody, true); - } - } - private void Clean() { if (Owner.TryGetComponent(out AppearanceComponent? appearance)) @@ -65,35 +57,6 @@ namespace Content.Server.Recycling.Components } } - private bool CanGib(IEntity entity) - { - // We suppose this entity has a Recyclable component. - return entity.HasComponent() && !_safe && Powered; - } - - private void Recycle(IEntity entity) - { - if (!Intersecting.Contains(entity)) - { - Intersecting.Add(entity); - } - - // TODO: Prevent collision with recycled items - - // Can only recycle things that are recyclable... And also check the safety of the thing to recycle. - if (!entity.TryGetComponent(out RecyclableComponent? recyclable) || !recyclable.Safe && _safe) return; - - // Mobs are a special case! - if (CanGib(entity)) - { - entity.GetComponent().Gib(true); - Bloodstain(); - return; - } - - recyclable.Recycle(_efficiency); - } - public bool CanRun() { if (Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) && @@ -141,11 +104,6 @@ namespace Content.Server.Recycling.Components return true; } - void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold) - { - Recycle(otherFixture.Body.Owner); - } - SuicideKind ISuicideAct.Suicide(IEntity victim, IChatManager chat) { var mind = victim.PlayerSession()?.ContentData()?.Mind; @@ -163,7 +121,7 @@ namespace Content.Server.Recycling.Components body.Gib(true); } - Bloodstain(); + EntitySystem.Get().Bloodstain(this); return SuicideKind.Bloodloss; } diff --git a/Content.Server/Recycling/RecyclerSystem.cs b/Content.Server/Recycling/RecyclerSystem.cs new file mode 100644 index 0000000000..050f09a44c --- /dev/null +++ b/Content.Server/Recycling/RecyclerSystem.cs @@ -0,0 +1,59 @@ +using Content.Server.Recycling.Components; +using Content.Shared.Body.Components; +using Content.Shared.Recycling; +using Robust.Shared.GameObjects; +using Robust.Shared.Physics.Dynamics; + +namespace Content.Server.Recycling +{ + internal sealed class RecyclerSystem: EntitySystem + { + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(HandleCollide); + } + + private void HandleCollide(EntityUid uid, RecyclerComponent component, StartCollideEvent args) + { + Recycle(component, args.OtherFixture.Body.Owner); + } + + private void Recycle(RecyclerComponent component, IEntity entity) + { + if (!component.Intersecting.Contains(entity)) + { + component.Intersecting.Add(entity); + } + + // TODO: Prevent collision with recycled items + + // Can only recycle things that are recyclable... And also check the safety of the thing to recycle. + if (!entity.TryGetComponent(out RecyclableComponent? recyclable) || !recyclable.Safe && component.Safe) return; + + // Mobs are a special case! + if (CanGib(component, entity)) + { + entity.GetComponent().Gib(true); + Bloodstain(component); + return; + } + + recyclable.Recycle(component.Efficiency); + } + + private bool CanGib(RecyclerComponent component, IEntity entity) + { + // We suppose this entity has a Recyclable component. + return entity.HasComponent() && !component.Safe && component.Powered; + } + + public void Bloodstain(RecyclerComponent component) + { + if (component.Owner.TryGetComponent(out SharedAppearanceComponent? appearance)) + { + appearance.SetData(RecyclerVisuals.Bloody, true); + } + } + } +} From 500b9cb1ea421d4a476f31e840ee71d9a1c80e34 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 21 Jul 2021 21:15:12 +1000 Subject: [PATCH 31/99] Make Saltern driveable (#4257) * Broadphase refactor (content) * Shuttle jank * Fixes * Testing jank * Features and things * Balance stuffsies * AHHHHHHHHHHHHHHHH * Mass and stuff working * Fix drops * Another balance pass * Balance AGEN * Add in stuff for rotating shuttles for debugging * Nothing to see here * Testbed stuffsies * Fix some tests * Fixen test * Try fixing map * Shuttle movement balance pass * lasaggne * Basic Helmsman console working * Slight docking cleanup * Helmsman requires power * Basic shuttle test * Stuff * Fix computations * Add shuttle console to saltern * Rename helmsman to shuttleconsole * Final stretch * More tweaks * Fix piloting prediction for now. --- .../Shuttles/ShuttleConsoleComponent.cs | 12 + .../Shuttles/ShuttleConsoleSystem.cs | 9 + .../Tools/Components/WelderComponent.cs | 1 - .../Tests/Doors/AirlockTest.cs | 4 +- .../Tests/SaveLoadMapTest.cs | 4 +- Content.IntegrationTests/Tests/ShuttleTest.cs | 49 + .../Utility/EntitySystemExtensionsTest.cs | 3 +- Content.Server/AI/Utils/Visibility.cs | 2 +- Content.Server/Alert/Click/StopPiloting.cs | 9 +- .../Doors/Components/ServerDoorComponent.cs | 3 +- .../Physics/Controllers/MoverController.cs | 76 +- Content.Server/Physics/TestbedCommand.cs | 40 +- .../Shuttle/ShuttleControllerComponent.cs | 197 -- Content.Server/Shuttles/ShuttleComponent.cs | 11 + .../Shuttles/ShuttleConsoleComponent.cs | 21 + .../Shuttles/ShuttleConsoleSystem.cs | 169 ++ Content.Server/Shuttles/ShuttleSystem.cs | 147 ++ .../ContainmentFieldGeneratorComponent.cs | 2 +- .../Solar/EntitySystems/PowerSolarSystem.cs | 2 +- .../Weapon/Melee/MeleeWeaponSystem.cs | 2 +- .../Components/ServerRangedBarrelComponent.cs | 4 +- Content.Shared/CCVar/CCVars.cs | 8 + .../Conditions/WallmountCondition.cs | 2 +- Content.Shared/Examine/ExamineSystemShared.cs | 3 + .../Friction/SharedTileFrictionController.cs | 6 +- .../Interaction/SharedInteractionSystem.cs | 4 +- Content.Shared/Maps/TurfHelpers.cs | 2 +- .../Movement/SharedMoverController.cs | 8 +- Content.Shared/Shuttles/PilotComponent.cs | 58 + .../Shuttles/SharedShuttleComponent.cs | 28 + .../Shuttles/SharedShuttleConsoleComponent.cs | 14 + .../Shuttles/SharedShuttleConsoleSystem.cs | 20 + .../Spawning/EntitySystemExtensions.cs | 13 +- Content.Shared/Throwing/ThrownItemSystem.cs | 6 +- Resources/Locale/en-US/shuttles/console.ftl | 2 + Resources/Maps/saltern.yml | 1623 ++++------------- Resources/Prototypes/Alerts/alerts.yml | 2 +- .../Entities/Mobs/Species/human.yml | 2 + .../Structures/Furniture/pilot_chair.yml | 33 - .../Entities/Structures/Furniture/seats.yml | 23 + .../Machines/Computers/computers.yml | 15 +- .../Storage/Closets/Lockers/base.yml | 1 + Resources/Prototypes/tags.yml | 3 + .../Textures/Interface/Alerts/piloting.png | Bin 0 -> 255 bytes 44 files changed, 1042 insertions(+), 1601 deletions(-) create mode 100644 Content.Client/Shuttles/ShuttleConsoleComponent.cs create mode 100644 Content.Client/Shuttles/ShuttleConsoleSystem.cs create mode 100644 Content.IntegrationTests/Tests/ShuttleTest.cs delete mode 100644 Content.Server/Shuttle/ShuttleControllerComponent.cs create mode 100644 Content.Server/Shuttles/ShuttleComponent.cs create mode 100644 Content.Server/Shuttles/ShuttleConsoleComponent.cs create mode 100644 Content.Server/Shuttles/ShuttleConsoleSystem.cs create mode 100644 Content.Server/Shuttles/ShuttleSystem.cs create mode 100644 Content.Shared/Shuttles/PilotComponent.cs create mode 100644 Content.Shared/Shuttles/SharedShuttleComponent.cs create mode 100644 Content.Shared/Shuttles/SharedShuttleConsoleComponent.cs create mode 100644 Content.Shared/Shuttles/SharedShuttleConsoleSystem.cs create mode 100644 Resources/Locale/en-US/shuttles/console.ftl delete mode 100644 Resources/Prototypes/Entities/Structures/Furniture/pilot_chair.yml create mode 100644 Resources/Textures/Interface/Alerts/piloting.png diff --git a/Content.Client/Shuttles/ShuttleConsoleComponent.cs b/Content.Client/Shuttles/ShuttleConsoleComponent.cs new file mode 100644 index 0000000000..e5632721f3 --- /dev/null +++ b/Content.Client/Shuttles/ShuttleConsoleComponent.cs @@ -0,0 +1,12 @@ +using Content.Shared.Shuttles; +using Robust.Shared.GameObjects; + +namespace Content.Client.Shuttles +{ + [RegisterComponent] + [ComponentReference(typeof(SharedShuttleConsoleComponent))] + internal sealed class ShuttleConsoleComponent : SharedShuttleConsoleComponent + { + + } +} diff --git a/Content.Client/Shuttles/ShuttleConsoleSystem.cs b/Content.Client/Shuttles/ShuttleConsoleSystem.cs new file mode 100644 index 0000000000..cb0f6f7b0c --- /dev/null +++ b/Content.Client/Shuttles/ShuttleConsoleSystem.cs @@ -0,0 +1,9 @@ +using Content.Shared.Shuttles; + +namespace Content.Client.Shuttles +{ + internal sealed class ShuttleConsoleSystem : SharedShuttleConsoleSystem + { + + } +} diff --git a/Content.Client/Tools/Components/WelderComponent.cs b/Content.Client/Tools/Components/WelderComponent.cs index 9c9beb6e82..91efcaf270 100644 --- a/Content.Client/Tools/Components/WelderComponent.cs +++ b/Content.Client/Tools/Components/WelderComponent.cs @@ -15,7 +15,6 @@ namespace Content.Client.Tools.Components { [RegisterComponent] [NetworkedComponent()] - public class WelderComponent : SharedToolComponent, IItemStatus { public override string Name => "Welder"; diff --git a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs index 9e8433b6e0..4bbd571e78 100644 --- a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs +++ b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs @@ -126,8 +126,7 @@ namespace Content.IntegrationTests.Tests.Doors server.Assert(() => { - var mapId = new MapId(1); - mapManager.CreateNewMapEntity(mapId); + var mapId = mapManager.CreateMap(); var humanCoordinates = new MapCoordinates((physicsDummyStartingX, 0), mapId); physicsDummy = entityManager.SpawnEntity("PhysicsDummy", humanCoordinates); @@ -159,6 +158,7 @@ namespace Content.IntegrationTests.Tests.Doors // Sanity check // Sloth: Okay I'm sorry but I hate having to rewrite tests for every refactor // If you see this yell at me in discord so I can continue to pretend this didn't happen. + // REMINDER THAT I STILL HAVE TO FIX THIS TEST EVERY OTHER PHYSICS PR // Assert.That(physicsDummy.Transform.MapPosition.X, Is.GreaterThan(physicsDummyStartingX)); // Blocked by the airlock diff --git a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs index 0769aca59c..61cb861f87 100644 --- a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs +++ b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs @@ -27,12 +27,12 @@ namespace Content.IntegrationTests.Tests var mapLoader = server.ResolveDependency(); var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); + var resManager = server.ResolveDependency(); server.Post(() => { var dir = new ResourcePath(mapPath).Directory; - IoCManager.Resolve() - .UserData.CreateDir(dir); + resManager.UserData.CreateDir(dir); var mapId = mapManager.CreateMap(new MapId(5)); diff --git a/Content.IntegrationTests/Tests/ShuttleTest.cs b/Content.IntegrationTests/Tests/ShuttleTest.cs new file mode 100644 index 0000000000..1696f36bec --- /dev/null +++ b/Content.IntegrationTests/Tests/ShuttleTest.cs @@ -0,0 +1,49 @@ +#nullable enable +using System.Threading.Tasks; +using Content.Server.Shuttles; +using NUnit.Framework; +using Robust.Shared.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Physics; + +namespace Content.IntegrationTests.Tests +{ + [TestFixture] + public class ShuttleTest : ContentIntegrationTest + { + [Test] + public async Task Test() + { + var server = StartServer(); + + await server.WaitIdleAsync(); + + var entMan = server.ResolveDependency(); + var mapMan = server.ResolveDependency(); + IEntity? gridEnt = null; + + await server.WaitAssertion(() => + { + var mapId = mapMan.CreateMap(); + var grid = mapMan.CreateGrid(mapId); + gridEnt = entMan.GetEntity(grid.GridEntityId); + + Assert.That(gridEnt.TryGetComponent(out ShuttleComponent? shuttleComponent)); + Assert.That(gridEnt.TryGetComponent(out PhysicsComponent? physicsComponent)); + Assert.That(physicsComponent!.BodyType, Is.EqualTo(BodyType.Dynamic)); + Assert.That(gridEnt.Transform.LocalPosition, Is.EqualTo(Vector2.Zero)); + physicsComponent.ApplyLinearImpulse(Vector2.One); + }); + + // TODO: Should have tests that collision + rendertree + pointlights work on a moved grid but I'll deal with that + // when we get rotations. + await server.WaitRunTicks(1); + + await server.WaitAssertion(() => + { + Assert.That(gridEnt?.Transform.LocalPosition, Is.Not.EqualTo(Vector2.Zero)); + }); + } + } +} diff --git a/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs b/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs index 8f3b154593..08f8a411f5 100644 --- a/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs +++ b/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs @@ -5,6 +5,7 @@ using Content.Shared.Spawning; using NUnit.Framework; using Robust.Shared.GameObjects; using Robust.Shared.Map; +using Robust.Shared.Physics; using Robust.Shared.Physics.Broadphase; namespace Content.IntegrationTests.Tests.Utility @@ -39,7 +40,7 @@ namespace Content.IntegrationTests.Tests.Utility var sMapManager = server.ResolveDependency(); var sEntityManager = server.ResolveDependency(); - var broady = server.ResolveDependency().GetEntitySystem(); + var broady = server.ResolveDependency().GetEntitySystem(); await server.WaitAssertion(() => { diff --git a/Content.Server/AI/Utils/Visibility.cs b/Content.Server/AI/Utils/Visibility.cs index c374b6534a..ad79951620 100644 --- a/Content.Server/AI/Utils/Visibility.cs +++ b/Content.Server/AI/Utils/Visibility.cs @@ -41,7 +41,7 @@ namespace Content.Server.AI.Utils angle.ToVec(), (int)(CollisionGroup.Opaque | CollisionGroup.Impassable | CollisionGroup.MobImpassable)); - var rayCastResults = EntitySystem.Get().IntersectRay(owner.Transform.MapID, ray, range, owner).ToList(); + var rayCastResults = EntitySystem.Get().IntersectRay(owner.Transform.MapID, ray, range, owner).ToList(); return rayCastResults.Count > 0 && rayCastResults[0].HitEntity == target; } diff --git a/Content.Server/Alert/Click/StopPiloting.cs b/Content.Server/Alert/Click/StopPiloting.cs index 3708bd2a7f..51d5cb17bc 100644 --- a/Content.Server/Alert/Click/StopPiloting.cs +++ b/Content.Server/Alert/Click/StopPiloting.cs @@ -1,6 +1,8 @@ -using Content.Server.Shuttle; +using Content.Server.Shuttles; using Content.Shared.Alert; +using Content.Shared.Shuttles; using JetBrains.Annotations; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.Alert.Click @@ -14,9 +16,10 @@ namespace Content.Server.Alert.Click { public void AlertClicked(ClickAlertEventArgs args) { - if (args.Player.TryGetComponent(out ShuttleControllerComponent? controller)) + if (args.Player.TryGetComponent(out PilotComponent? pilotComponent) && + pilotComponent.Console != null) { - controller.RemoveController(); + EntitySystem.Get().RemovePilot(pilotComponent); } } } diff --git a/Content.Server/Doors/Components/ServerDoorComponent.cs b/Content.Server/Doors/Components/ServerDoorComponent.cs index 589ead48fd..278e8f8695 100644 --- a/Content.Server/Doors/Components/ServerDoorComponent.cs +++ b/Content.Server/Doors/Components/ServerDoorComponent.cs @@ -19,6 +19,7 @@ using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Log; using Robust.Shared.Maths; +using Robust.Shared.Physics; using Robust.Shared.Physics.Broadphase; using Robust.Shared.Physics.Collision; using Robust.Shared.Physics.Dynamics; @@ -387,7 +388,7 @@ namespace Content.Server.Doors.Components if (safety && Owner.TryGetComponent(out PhysicsComponent? physicsComponent)) { - var broadPhaseSystem = EntitySystem.Get(); + var broadPhaseSystem = EntitySystem.Get(); // Use this version so we can ignore the CanCollide being false foreach(var e in broadPhaseSystem.GetCollidingEntities(physicsComponent.Owner.Transform.MapID, physicsComponent.GetWorldAABB())) diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs index 20b6d97528..cfdcd0a655 100644 --- a/Content.Server/Physics/Controllers/MoverController.cs +++ b/Content.Server/Physics/Controllers/MoverController.cs @@ -1,21 +1,26 @@ +using System; using System.Collections.Generic; using Content.Server.Inventory.Components; using Content.Server.Items; using Content.Server.Movement.Components; -using Content.Server.Shuttle; +using Content.Server.Shuttles; using Content.Shared.Audio; +using Content.Shared.CCVar; using Content.Shared.Inventory; using Content.Shared.Maps; using Content.Shared.Movement; using Content.Shared.Movement.Components; +using Content.Shared.Shuttles; using Content.Shared.Tag; using Robust.Server.GameObjects; using Robust.Shared.Audio; +using Robust.Shared.Configuration; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Physics; using Robust.Shared.Physics.Collision.Shapes; using Robust.Shared.Physics.Dynamics; using Robust.Shared.Player; @@ -37,12 +42,17 @@ namespace Content.Server.Physics.Controllers private const float StepSoundMoveDistanceRunning = 2; private const float StepSoundMoveDistanceWalking = 1.5f; + private float _shuttleDockSpeedCap; + private HashSet _excludedMobs = new(); public override void Initialize() { base.Initialize(); _audioSystem = EntitySystem.Get(); + + var configManager = IoCManager.Resolve(); + configManager.OnValueChanged(CCVars.ShuttleDockSpeedCap, value => _shuttleDockSpeedCap = value, true); } public override void UpdateBeforeSolve(bool prediction, float frameTime) @@ -56,8 +66,9 @@ namespace Content.Server.Physics.Controllers HandleMobMovement(mover, physics, mobMover); } - foreach (var mover in ComponentManager.EntityQuery()) + foreach (var (pilot, mover) in ComponentManager.EntityQuery()) { + if (pilot.Console == null) continue; _excludedMobs.Add(mover.Owner.Uid); HandleShuttleMovement(mover); } @@ -76,13 +87,70 @@ namespace Content.Server.Physics.Controllers * The reason for this is that vehicles change direction very slowly compared to players so you don't really have the requirement for quick movement anyway * As such could probably just look at applying a force / impulse to the shuttle server-side only so it controls like the titanic. */ - private void HandleShuttleMovement(ShuttleControllerComponent mover) + private void HandleShuttleMovement(SharedPlayerInputMoverComponent mover) { var gridId = mover.Owner.Transform.GridID; if (!_mapManager.TryGetGrid(gridId, out var grid) || !EntityManager.TryGetEntity(grid.GridEntityId, out var gridEntity)) return; - // This is on shuttle branch trust me + if (!gridEntity.TryGetComponent(out ShuttleComponent? shuttleComponent) || + !gridEntity.TryGetComponent(out PhysicsComponent? physicsComponent)) + { + return; + } + + // Depending whether you have "cruise" mode on (tank controls, higher speed) or "docking" mode on (strafing, lower speed) + // inputs will do different things. + // TODO: Do that + float speedCap; + // This is comically fast for debugging + var angularSpeed = 20000f; + + // ShuttleSystem has already worked out the ratio so we'll just multiply it back by the mass. + var movement = (mover.VelocityDir.walking + mover.VelocityDir.sprinting); + + switch (shuttleComponent.Mode) + { + case ShuttleMode.Docking: + if (movement.Length != 0f) + physicsComponent.ApplyLinearImpulse(physicsComponent.Owner.Transform.WorldRotation.RotateVec(movement) * shuttleComponent.SpeedMultipler * physicsComponent.Mass); + + speedCap = _shuttleDockSpeedCap; + break; + case ShuttleMode.Cruise: + if (movement.Length != 0.0f) + { + // Currently this is slow BUT we'd have a separate multiplier for docking and cruising or whatever. + physicsComponent.ApplyLinearImpulse((physicsComponent.Owner.Transform.WorldRotation + new Angle(MathF.PI / 2)).ToVec() * + shuttleComponent.SpeedMultipler * + physicsComponent.Mass * + movement.Y * + 10); + physicsComponent.ApplyAngularImpulse(movement.X * angularSpeed); + } + + // TODO WHEN THIS ACTUALLY WORKS + speedCap = _shuttleDockSpeedCap * 10; + break; + default: + throw new ArgumentOutOfRangeException(); + } + + // Look don't my ride ass on this stuff most of the PR was just getting the thing working, we can + // ideaguys the shit out of it later. + + var velocity = physicsComponent.LinearVelocity; + + if (velocity.Length < 0.1f && movement.Length == 0f) + { + physicsComponent.LinearVelocity = Vector2.Zero; + return; + } + + if (velocity.Length > speedCap) + { + physicsComponent.LinearVelocity = velocity.Normalized * speedCap; + } } protected override void HandleFootsteps(IMoverComponent mover, IMobMoverComponent mobMover) diff --git a/Content.Server/Physics/TestbedCommand.cs b/Content.Server/Physics/TestbedCommand.cs index d3e52bc0c8..fbc0e37b07 100644 --- a/Content.Server/Physics/TestbedCommand.cs +++ b/Content.Server/Physics/TestbedCommand.cs @@ -50,7 +50,7 @@ namespace Content.Server.Physics public class TestbedCommand : IConsoleCommand { public string Command => "testbed"; - public string Description => "Loads a physics testbed and teleports your player there"; + public string Description => "Loads a physics testbed on the specified map."; public string Help => $"{Command} "; public void Execute(IConsoleShell shell, string argStr, string[] args) { @@ -127,7 +127,10 @@ namespace Content.Server.Physics CollisionMask = (int) CollisionGroup.Impassable, Hard = true }; - ground.AddFixture(horizontalFixture); + + var broadphase = EntitySystem.Get(); + + broadphase.CreateFixture(ground, horizontalFixture); var vertical = new EdgeShape(new Vector2(10, 0), new Vector2(10, 10)); var verticalFixture = new Fixture(ground, vertical) @@ -136,7 +139,8 @@ namespace Content.Server.Physics CollisionMask = (int) CollisionGroup.Impassable, Hard = true }; - ground.AddFixture(verticalFixture); + + broadphase.CreateFixture(ground, verticalFixture); var xs = new[] { @@ -157,7 +161,6 @@ namespace Content.Server.Physics new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId)).AddComponent(); box.BodyType = BodyType.Dynamic; - box.SleepingAllowed = false; shape = new PolygonShape(); shape.SetAsBox(0.5f, 0.5f); box.FixedRotation = false; @@ -169,7 +172,8 @@ namespace Content.Server.Physics CollisionLayer = (int) CollisionGroup.Impassable, Hard = true, }; - box.AddFixture(fixture); + + broadphase.CreateFixture(box, fixture); } } } @@ -187,7 +191,9 @@ namespace Content.Server.Physics CollisionMask = (int) CollisionGroup.Impassable, Hard = true }; - ground.AddFixture(horizontalFixture); + + var broadphase = EntitySystem.Get(); + broadphase.CreateFixture(ground, horizontalFixture); var vertical = new EdgeShape(new Vector2(10, 0), new Vector2(10, 10)); var verticalFixture = new Fixture(ground, vertical) @@ -196,7 +202,8 @@ namespace Content.Server.Physics CollisionMask = (int) CollisionGroup.Impassable, Hard = true }; - ground.AddFixture(verticalFixture); + + broadphase.CreateFixture(ground, verticalFixture); var xs = new[] { @@ -217,7 +224,6 @@ namespace Content.Server.Physics new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId)).AddComponent(); box.BodyType = BodyType.Dynamic; - box.SleepingAllowed = false; shape = new PhysShapeCircle {Radius = 0.5f}; box.FixedRotation = false; // TODO: Need to detect shape and work out if we need to use fixedrotation @@ -228,7 +234,8 @@ namespace Content.Server.Physics CollisionLayer = (int) CollisionGroup.Impassable, Hard = true, }; - box.AddFixture(fixture); + + broadphase.CreateFixture(box, fixture); } } } @@ -249,7 +256,8 @@ namespace Content.Server.Physics Hard = true }; - ground.AddFixture(horizontalFixture); + var broadphase = EntitySystem.Get(); + broadphase.CreateFixture(ground, horizontalFixture); // Setup boxes float a = 0.5f; @@ -270,13 +278,13 @@ namespace Content.Server.Physics var box = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId)).AddComponent(); box.BodyType = BodyType.Dynamic; box.Owner.Transform.WorldPosition = y; - box.AddFixture( + broadphase.CreateFixture(box, new Fixture(box, shape) { - CollisionLayer = (int) CollisionGroup.Impassable, - CollisionMask = (int) CollisionGroup.Impassable, - Hard = true, - Mass = 5.0f, - }); + CollisionLayer = (int) CollisionGroup.Impassable, + CollisionMask = (int) CollisionGroup.Impassable, + Hard = true, + Mass = 5.0f, + }); y += deltaY; } diff --git a/Content.Server/Shuttle/ShuttleControllerComponent.cs b/Content.Server/Shuttle/ShuttleControllerComponent.cs deleted file mode 100644 index f3e3bd5a5e..0000000000 --- a/Content.Server/Shuttle/ShuttleControllerComponent.cs +++ /dev/null @@ -1,197 +0,0 @@ -using Content.Server.Alert; -using Content.Server.Buckle.Components; -using Content.Server.Mind.Components; -using Content.Shared.Alert; -using Content.Shared.Buckle.Components; -using Content.Shared.Movement.Components; -using Robust.Shared.GameObjects; -using Robust.Shared.Log; -using Robust.Shared.Maths; -using Robust.Shared.Serialization.Manager.Attributes; -using Robust.Shared.ViewVariables; - -namespace Content.Server.Shuttle -{ - [RegisterComponent] - [ComponentReference(typeof(IMoverComponent))] - internal class ShuttleControllerComponent : Component, IMoverComponent - { - private bool _movingUp; - private bool _movingDown; - private bool _movingLeft; - private bool _movingRight; - - /// - /// ID of the alert to show when piloting - /// - [DataField("pilotingAlertType")] - private AlertType _pilotingAlertType = AlertType.PilotingShuttle; - - /// - /// The entity that's currently controlling this component. - /// Changed from and - /// - private IEntity? _controller; - - public override string Name => "ShuttleController"; - - public bool IgnorePaused => false; - - [ViewVariables(VVAccess.ReadWrite)] - public float CurrentWalkSpeed { get; } = 8; - public float CurrentSprintSpeed => 0; - - public bool Sprinting => false; - - public (Vector2 walking, Vector2 sprinting) VelocityDir { get; set; } = (Vector2.Zero, Vector2.Zero); - - public void SetVelocityDirection(Direction direction, ushort subTick, bool enabled) - { - VelocityDir = (CalcNewVelocity(direction, enabled), Vector2.Zero); - } - - public void SetSprinting(ushort subTick, bool walking) - { - // Shuttles can't sprint. - } - - private Vector2 CalcNewVelocity(Direction direction, bool enabled) - { - switch (direction) - { - case Direction.East: - _movingRight = enabled; - break; - case Direction.North: - _movingUp = enabled; - break; - case Direction.West: - _movingLeft = enabled; - break; - case Direction.South: - _movingDown = enabled; - break; - } - - // key directions are in screen coordinates - // _moveDir is in world coordinates - // if the camera is moved, this needs to be changed - - var x = 0; - x -= _movingLeft ? 1 : 0; - x += _movingRight ? 1 : 0; - - var y = 0; - y -= _movingDown ? 1 : 0; - y += _movingUp ? 1 : 0; - - var result = new Vector2(x, y); - - // can't normalize zero length vector - if (result.LengthSquared > 1.0e-6) - { - result = result.Normalized; - } - - return result; - } - - /// - /// Changes the entity currently controlling this shuttle controller - /// - /// The entity to set - private void SetController(IEntity entity) - { - if (_controller != null || - !entity.TryGetComponent(out MindComponent? mind) || - mind.Mind == null || - !Owner.TryGetComponent(out ServerAlertsComponent? status)) - { - return; - } - - mind.Mind.Visit(Owner); - _controller = entity; - - status.ShowAlert(_pilotingAlertType); - } - - /// - /// Removes the current controller - /// - /// The entity to remove, or null to force the removal of any current controller - public void RemoveController(IEntity? entity = null) - { - if (_controller == null) - { - return; - } - - // If we are not forcing a controller removal and the entity is not the current controller - if (entity != null && entity != _controller) - { - return; - } - - UpdateRemovedEntity(entity ?? _controller); - - _controller = null; - } - - /// - /// Updates the state of an entity that is no longer controlling this shuttle controller. - /// Called from - /// - /// The entity to update - private void UpdateRemovedEntity(IEntity entity) - { - if (Owner.TryGetComponent(out ServerAlertsComponent? status)) - { - status.ClearAlert(_pilotingAlertType); - } - - if (entity.TryGetComponent(out MindComponent? mind)) - { - mind.Mind?.UnVisit(); - } - - if (entity.TryGetComponent(out BuckleComponent? buckle)) - { - buckle.TryUnbuckle(entity, true); - } - } - - private void BuckleChanged(IEntity entity, in bool buckled) - { - Logger.DebugS("shuttle", $"Pilot={entity.Name}, buckled={buckled}"); - - if (buckled) - { - SetController(entity); - } - else - { - RemoveController(entity); - } - } - - protected override void Initialize() - { - base.Initialize(); - Owner.EnsureComponent(); - } - - /// - public override void HandleMessage(ComponentMessage message, IComponent? component) - { - base.HandleMessage(message, component); - - switch (message) - { - case StrapChangeMessage strap: - BuckleChanged(strap.Entity, strap.Buckled); - break; - } - } - } -} diff --git a/Content.Server/Shuttles/ShuttleComponent.cs b/Content.Server/Shuttles/ShuttleComponent.cs new file mode 100644 index 0000000000..5cbf09536d --- /dev/null +++ b/Content.Server/Shuttles/ShuttleComponent.cs @@ -0,0 +1,11 @@ +using Content.Shared.Shuttles; +using Robust.Shared.GameObjects; + +namespace Content.Server.Shuttles +{ + [RegisterComponent] + public class ShuttleComponent : SharedShuttleComponent + { + + } +} diff --git a/Content.Server/Shuttles/ShuttleConsoleComponent.cs b/Content.Server/Shuttles/ShuttleConsoleComponent.cs new file mode 100644 index 0000000000..4a7e1ffc4d --- /dev/null +++ b/Content.Server/Shuttles/ShuttleConsoleComponent.cs @@ -0,0 +1,21 @@ +using System.Collections.Generic; +using Content.Shared.Shuttles; +using Robust.Shared.GameObjects; +using Robust.Shared.ViewVariables; + +namespace Content.Server.Shuttles +{ + [RegisterComponent] + [ComponentReference(typeof(SharedShuttleConsoleComponent))] + internal sealed class ShuttleConsoleComponent : SharedShuttleConsoleComponent + { + [ViewVariables] + public List SubscribedPilots = new(); + + /// + /// Whether the console can be used to pilot. Toggled whenever it gets powered / unpowered. + /// + [ViewVariables] + public bool Enabled { get; set; } = false; + } +} diff --git a/Content.Server/Shuttles/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/ShuttleConsoleSystem.cs new file mode 100644 index 0000000000..d31eaf492a --- /dev/null +++ b/Content.Server/Shuttles/ShuttleConsoleSystem.cs @@ -0,0 +1,169 @@ +using System.Linq; +using Content.Server.Alert; +using Content.Server.Power.Components; +using Content.Shared.ActionBlocker; +using Content.Shared.Alert; +using Content.Shared.Interaction; +using Content.Shared.Notification.Managers; +using Content.Shared.Shuttles; +using Content.Shared.Tag; +using Robust.Shared.GameObjects; +using Robust.Shared.Localization; + +namespace Content.Server.Shuttles +{ + internal sealed class ShuttleConsoleSystem : SharedShuttleConsoleSystem + { + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(HandleConsoleShutdown); + SubscribeLocalEvent(HandlePilotShutdown); + SubscribeLocalEvent(HandleConsoleInteract); + SubscribeLocalEvent(HandlePilotMove); + SubscribeLocalEvent(HandlePowerChange); + } + + public override void Update(float frameTime) + { + base.Update(frameTime); + foreach (var comp in ComponentManager.EntityQuery().ToArray()) + { + if (comp.Console == null) continue; + + if (!Get().CanInteract(comp.Owner)) + { + RemovePilot(comp); + } + } + } + + /// + /// Console requires power to operate. + /// + private void HandlePowerChange(EntityUid uid, ShuttleConsoleComponent component, PowerChangedEvent args) + { + if (!args.Powered) + { + component.Enabled = false; + + ClearPilots(component); + } + else + { + component.Enabled = true; + } + } + + /// + /// If pilot is moved then we'll stop them from piloting. + /// + private void HandlePilotMove(EntityUid uid, PilotComponent component, MoveEvent args) + { + if (component.Console == null) return; + RemovePilot(component); + } + + /// + /// For now pilots just interact with the console and can start piloting with wasd. + /// + private void HandleConsoleInteract(EntityUid uid, ShuttleConsoleComponent component, ActivateInWorldEvent args) + { + if (!args.User.HasTag("CanPilot")) + { + return; + } + + var pilotComponent = args.User.EnsureComponent(); + + if (!component.Enabled) + { + args.User.PopupMessage($"Console is not powered."); + return; + } + + args.Handled = true; + var console = pilotComponent.Console; + + if (console != null) + { + RemovePilot(pilotComponent); + + if (console != component) + { + return; + } + } + + AddPilot(args.User, component); + } + + private void HandlePilotShutdown(EntityUid uid, PilotComponent component, ComponentShutdown args) + { + RemovePilot(component); + } + + private void HandleConsoleShutdown(EntityUid uid, ShuttleConsoleComponent component, ComponentShutdown args) + { + ClearPilots(component); + } + + public void AddPilot(IEntity entity, ShuttleConsoleComponent component) + { + if (!Get().CanInteract(entity) || + !entity.TryGetComponent(out PilotComponent? pilotComponent) || + component.SubscribedPilots.Contains(pilotComponent)) + { + return; + } + + component.SubscribedPilots.Add(pilotComponent); + + if (entity.TryGetComponent(out ServerAlertsComponent? alertsComponent)) + { + alertsComponent.ShowAlert(AlertType.PilotingShuttle); + } + + entity.PopupMessage(Loc.GetString("shuttle-pilot-start")); + pilotComponent.Console = component; + pilotComponent.Dirty(); + } + + public void RemovePilot(PilotComponent pilotComponent) + { + var console = pilotComponent.Console; + + if (console is not ShuttleConsoleComponent helmsman) return; + + pilotComponent.Console = null; + + if (!helmsman.SubscribedPilots.Remove(pilotComponent)) return; + + if (pilotComponent.Owner.TryGetComponent(out ServerAlertsComponent? alertsComponent)) + { + alertsComponent.ClearAlert(AlertType.PilotingShuttle); + } + + pilotComponent.Owner.PopupMessage(Loc.GetString("shuttle-pilot-end")); + // TODO: RemoveComponent is cooked and doesn't sync to client so this fucks up movement prediction. + // ComponentManager.RemoveComponent(pilotComponent.Owner.Uid); + pilotComponent.Console = null; + pilotComponent.Dirty(); + } + + public void RemovePilot(IEntity entity) + { + if (!entity.TryGetComponent(out PilotComponent? pilotComponent)) return; + + RemovePilot(pilotComponent); + } + + public void ClearPilots(ShuttleConsoleComponent component) + { + foreach (var pilot in component.SubscribedPilots) + { + RemovePilot(pilot); + } + } + } +} diff --git a/Content.Server/Shuttles/ShuttleSystem.cs b/Content.Server/Shuttles/ShuttleSystem.cs new file mode 100644 index 0000000000..8479d00148 --- /dev/null +++ b/Content.Server/Shuttles/ShuttleSystem.cs @@ -0,0 +1,147 @@ +using System; +using Content.Shared.Shuttles; +using JetBrains.Annotations; +using Robust.Server.Physics; +using Robust.Shared.Configuration; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Physics; + +namespace Content.Server.Shuttles +{ + [UsedImplicitly] + internal sealed class ShuttleSystem : EntitySystem + { + private const float TileMassMultiplier = 1f; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(HandleShuttleStartup); + SubscribeLocalEvent(HandleShuttleShutdown); + + SubscribeLocalEvent(HandleGridInit); + SubscribeLocalEvent(HandleGridFixtureChange); + } + + private void HandleGridFixtureChange(GridFixtureChangeEvent args) + { + var fixture = args.NewFixture; + + if (fixture == null) return; + + fixture.Mass = fixture.Area * TileMassMultiplier; + + if (fixture.Body.Owner.TryGetComponent(out ShuttleComponent? shuttleComponent)) + { + RecalculateSpeedMultiplier(shuttleComponent, fixture.Body); + } + } + + private void HandleGridInit(GridInitializeEvent ev) + { + EntityManager.GetEntity(ev.EntityUid).EnsureComponent(); + } + + /// + /// Cache the thrust available to this shuttle. + /// + private void RecalculateSpeedMultiplier(SharedShuttleComponent shuttle, PhysicsComponent physics) + { + // TODO: Need per direction speed (Never Eat Soggy Weetbix). + // TODO: This will need hella tweaking. + var thrusters = physics.FixtureCount; + + if (thrusters == 0) + { + shuttle.SpeedMultipler = 0f; + } + + const float ThrustPerThruster = 0.25f; + const float MinimumThrustRequired = 0.005f; + + // Just so someone can't slap a single thruster on a station and call it a day; need to hit a minimum amount. + var thrustRatio = Math.Max(0, thrusters * ThrustPerThruster / physics.Mass); + + if (thrustRatio < MinimumThrustRequired) + shuttle.SpeedMultipler = 0f; + + const float MaxThrust = 10f; + // This doesn't need to align with MinimumThrustRequired; if you set this higher it just means the first few additional + // thrusters won't do anything. + const float MinThrust = MinimumThrustRequired; + + shuttle.SpeedMultipler = MathF.Max(MinThrust, MathF.Min(MaxThrust, thrustRatio)); + } + + private void HandleShuttleStartup(EntityUid uid, ShuttleComponent component, ComponentStartup args) + { + if (!component.Owner.HasComponent()) + { + return; + } + + if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent)) + { + return; + } + + if (component.Enabled) + { + Enable(physicsComponent); + } + + if (component.Owner.TryGetComponent(out ShuttleComponent? shuttleComponent)) + { + RecalculateSpeedMultiplier(shuttleComponent, physicsComponent); + } + } + + public void Toggle(ShuttleComponent component) + { + if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent)) return; + + component.Enabled = !component.Enabled; + + if (component.Enabled) + { + Enable(physicsComponent); + } + else + { + Disable(physicsComponent); + } + } + + private void Enable(PhysicsComponent component) + { + component.BodyType = BodyType.Dynamic; + component.BodyStatus = BodyStatus.InAir; + //component.FixedRotation = false; TODO WHEN ROTATING SHUTTLES FIXED. + component.FixedRotation = true; + component.LinearDamping = 0.05f; + } + + private void Disable(PhysicsComponent component) + { + component.BodyType = BodyType.Static; + component.BodyStatus = BodyStatus.OnGround; + component.FixedRotation = true; + } + + private void HandleShuttleShutdown(EntityUid uid, ShuttleComponent component, ComponentShutdown args) + { + if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent)) + { + return; + } + + Disable(physicsComponent); + + foreach (var fixture in physicsComponent.Fixtures) + { + fixture.Mass = 0f; + } + } + } +} diff --git a/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs b/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs index eb6141157b..c0e21f9b5b 100644 --- a/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs +++ b/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs @@ -100,7 +100,7 @@ namespace Content.Server.Singularity.Components var dirVec = direction.ToVec(); var ray = new CollisionRay(Owner.Transform.WorldPosition, dirVec, (int) CollisionGroup.MobMask); - var rawRayCastResults = EntitySystem.Get().IntersectRay(Owner.Transform.MapID, ray, 4.5f, Owner, false); + var rawRayCastResults = EntitySystem.Get().IntersectRay(Owner.Transform.MapID, ray, 4.5f, Owner, false); var rayCastResults = rawRayCastResults as RayCastResults[] ?? rawRayCastResults.ToArray(); if(!rayCastResults.Any()) continue; diff --git a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs index 06ce6e0527..31a952594d 100644 --- a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs +++ b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs @@ -137,7 +137,7 @@ namespace Content.Server.Solar.EntitySystems // Determine if the solar panel is occluded, and zero out coverage if so. // FIXME: The "Opaque" collision group doesn't seem to work right now. var ray = new CollisionRay(entity.Transform.WorldPosition, TowardsSun.ToWorldVec(), (int) CollisionGroup.Opaque); - var rayCastResults = EntitySystem.Get().IntersectRay(entity.Transform.MapID, ray, SunOcclusionCheckDistance, entity); + var rayCastResults = EntitySystem.Get().IntersectRay(entity.Transform.MapID, ray, SunOcclusionCheckDistance, entity); if (rayCastResults.Any()) coverage = 0; } diff --git a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs index 0c7a42785c..c369d8f794 100644 --- a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs +++ b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs @@ -217,7 +217,7 @@ namespace Content.Server.Weapon.Melee for (var i = 0; i < increments; i++) { var castAngle = new Angle(baseAngle + increment * i); - var res = EntitySystem.Get().IntersectRay(mapId, + var res = EntitySystem.Get().IntersectRay(mapId, new CollisionRay(position, castAngle.ToWorldVec(), (int) (CollisionGroup.Impassable | CollisionGroup.MobImpassable)), range, ignore).ToList(); diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs index 754757d7e9..fc9b52cf66 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs @@ -366,7 +366,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components // FIXME: Work around issue where inserting and removing an entity from a container, // then setting its linear velocity in the same tick resets velocity back to zero. - // See SharedBroadPhaseSystem.HandleContainerInsert()... It sets Awake to false, which causes this. + // See SharedBroadphaseSystem.HandleContainerInsert()... It sets Awake to false, which causes this. projectile.SpawnTimer(TimeSpan.FromMilliseconds(25), () => { projectile @@ -402,7 +402,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components private void FireHitscan(IEntity shooter, HitscanComponent hitscan, Angle angle) { var ray = new CollisionRay(Owner.Transform.Coordinates.ToMapPos(Owner.EntityManager), angle.ToVec(), (int) hitscan.CollisionMask); - var physicsManager = EntitySystem.Get(); + var physicsManager = EntitySystem.Get(); var rayCastResults = physicsManager.IntersectRay(Owner.Transform.MapID, ray, hitscan.MaxLength, shooter, false).ToList(); if (rayCastResults.Count >= 1) diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index d1fc2f7856..54d7c4bd89 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -339,6 +339,14 @@ namespace Content.Shared.CCVar public static readonly CVarDef BanHardwareIds = CVarDef.Create("ban.hardware_ids", false, CVar.SERVERONLY); + + /* + * Shuttles + */ + // Once cruising actually gets implemented I'd likely drop this speed to 3 maybe. + public static readonly CVarDef ShuttleDockSpeedCap = + CVarDef.Create("shuttle.dock_speed_cap", 5f, CVar.SERVERONLY); + /* * VIEWPORT */ diff --git a/Content.Shared/Construction/Conditions/WallmountCondition.cs b/Content.Shared/Construction/Conditions/WallmountCondition.cs index ae5a3ce7a0..f86fa59d8f 100644 --- a/Content.Shared/Construction/Conditions/WallmountCondition.cs +++ b/Content.Shared/Construction/Conditions/WallmountCondition.cs @@ -33,7 +33,7 @@ namespace Content.Shared.Construction.Conditions return false; // now we need to check that user actually tries to build wallmount on a wall - var physics = EntitySystem.Get(); + var physics = EntitySystem.Get(); var rUserToObj = new CollisionRay(userWorldPosition, userToObject.Normalized, (int) CollisionGroup.Impassable); var length = userToObject.Length; var userToObjRaycastResults = physics.IntersectRayWithPredicate(user.Transform.MapID, rUserToObj, maxLength: length, diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs index 4d83f5d694..1785fbc795 100644 --- a/Content.Shared/Examine/ExamineSystemShared.cs +++ b/Content.Shared/Examine/ExamineSystemShared.cs @@ -72,6 +72,9 @@ namespace Content.Shared.Examine public static bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true) { + if (origin.MapId == MapId.Nullspace || + other.MapId == MapId.Nullspace) return false; + var occluderSystem = Get(); if (!origin.InRange(other, range)) return false; diff --git a/Content.Shared/Friction/SharedTileFrictionController.cs b/Content.Shared/Friction/SharedTileFrictionController.cs index 606873f435..9140a6d272 100644 --- a/Content.Shared/Friction/SharedTileFrictionController.cs +++ b/Content.Shared/Friction/SharedTileFrictionController.cs @@ -7,7 +7,7 @@ using Robust.Shared.Configuration; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; -using Robust.Shared.Physics.Broadphase; +using Robust.Shared.Physics; using Robust.Shared.Physics.Controllers; using Robust.Shared.Physics.Dynamics; @@ -20,7 +20,7 @@ namespace Content.Shared.Friction [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; - private SharedBroadPhaseSystem _broadPhaseSystem = default!; + private SharedBroadphaseSystem _broadPhaseSystem = default!; private float _stopSpeed; @@ -29,7 +29,7 @@ namespace Content.Shared.Friction public override void Initialize() { base.Initialize(); - _broadPhaseSystem = EntitySystem.Get(); + _broadPhaseSystem = EntitySystem.Get(); _frictionModifier = _configManager.GetCVar(CCVars.TileFrictionModifier); _configManager.OnValueChanged(CCVars.TileFrictionModifier, value => _frictionModifier = value); diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index d15e0ee256..7f50cf0063 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -46,7 +46,7 @@ namespace Content.Shared.Interaction predicate ??= _ => false; var ray = new CollisionRay(origin.Position, dir.Normalized, collisionMask); - var rayResults = Get().IntersectRayWithPredicate(origin.MapId, ray, dir.Length, predicate.Invoke, false).ToList(); + var rayResults = Get().IntersectRayWithPredicate(origin.MapId, ray, dir.Length, predicate.Invoke, false).ToList(); if (rayResults.Count == 0) return dir.Length; return (rayResults[0].HitPos - origin.Position).Length; @@ -122,7 +122,7 @@ namespace Content.Shared.Interaction predicate ??= _ => false; var ray = new CollisionRay(origin.Position, dir.Normalized, (int) collisionMask); - var rayResults = Get().IntersectRayWithPredicate(origin.MapId, ray, dir.Length, predicate.Invoke, false).ToList(); + var rayResults = Get().IntersectRayWithPredicate(origin.MapId, ray, dir.Length, predicate.Invoke, false).ToList(); if (rayResults.Count == 0) return true; diff --git a/Content.Shared/Maps/TurfHelpers.cs b/Content.Shared/Maps/TurfHelpers.cs index c04fe25278..6b6613b617 100644 --- a/Content.Shared/Maps/TurfHelpers.cs +++ b/Content.Shared/Maps/TurfHelpers.cs @@ -181,7 +181,7 @@ namespace Content.Shared.Maps /// public static bool IsBlockedTurf(this TileRef turf, bool filterMobs) { - var physics = EntitySystem.Get(); + var physics = EntitySystem.Get(); var worldBox = GetWorldTileBox(turf); diff --git a/Content.Shared/Movement/SharedMoverController.cs b/Content.Shared/Movement/SharedMoverController.cs index 59e2e81774..d48d7ff3b9 100644 --- a/Content.Shared/Movement/SharedMoverController.cs +++ b/Content.Shared/Movement/SharedMoverController.cs @@ -20,12 +20,12 @@ namespace Content.Shared.Movement { [Dependency] private readonly IMapManager _mapManager = default!; - private SharedBroadPhaseSystem _broadPhaseSystem = default!; + private SharedBroadphaseSystem _broadPhaseSystem = default!; public override void Initialize() { base.Initialize(); - _broadPhaseSystem = EntitySystem.Get(); + _broadPhaseSystem = EntitySystem.Get(); } /// @@ -100,7 +100,7 @@ namespace Content.Shared.Movement physicsComponent.LinearVelocity = total; } - public static bool UseMobMovement(SharedBroadPhaseSystem broadPhaseSystem, PhysicsComponent body, IMapManager mapManager) + public static bool UseMobMovement(SharedBroadphaseSystem broadPhaseSystem, PhysicsComponent body, IMapManager mapManager) { return (body.BodyStatus == BodyStatus.OnGround) & body.Owner.HasComponent() && @@ -118,7 +118,7 @@ namespace Content.Shared.Movement /// /// /// - public static bool IsAroundCollider(SharedBroadPhaseSystem broadPhaseSystem, ITransformComponent transform, IMobMoverComponent mover, IPhysBody collider) + public static bool IsAroundCollider(SharedBroadphaseSystem broadPhaseSystem, ITransformComponent transform, IMobMoverComponent mover, IPhysBody collider) { var enlargedAABB = collider.GetWorldAABB().Enlarged(mover.GrabRange); diff --git a/Content.Shared/Shuttles/PilotComponent.cs b/Content.Shared/Shuttles/PilotComponent.cs new file mode 100644 index 0000000000..2303c3a1dc --- /dev/null +++ b/Content.Shared/Shuttles/PilotComponent.cs @@ -0,0 +1,58 @@ +using System; +using Robust.Shared.GameObjects; +using Robust.Shared.GameStates; +using Robust.Shared.Log; +using Robust.Shared.Players; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; + +namespace Content.Shared.Shuttles +{ + /// + /// Stores what shuttle this entity is currently piloting. + /// + [RegisterComponent] + [NetworkedComponent()] + public sealed class PilotComponent : Component + { + public override string Name => "Pilot"; + [ViewVariables] public SharedShuttleConsoleComponent? Console { get; set; } + + public override void HandleComponentState(ComponentState? curState, ComponentState? nextState) + { + base.HandleComponentState(curState, nextState); + if (curState is not PilotComponentState state) return; + + if (state.Console == null) + { + Console = null; + return; + } + + if (!Owner.EntityManager.TryGetEntity(state.Console.Value, out var consoleEnt) || + !consoleEnt.TryGetComponent(out SharedShuttleConsoleComponent? shuttleConsoleComponent)) + { + Logger.Warning($"Unable to set Helmsman console to {state.Console.Value}"); + return; + } + + Console = shuttleConsoleComponent; + } + + public override ComponentState GetComponentState(ICommonSession player) + { + return new PilotComponentState(Console?.Owner.Uid); + } + + [Serializable, NetSerializable] + private sealed class PilotComponentState : ComponentState + { + public EntityUid? Console { get; } + + public PilotComponentState(EntityUid? uid) + { + Console = uid; + } + } + } +} diff --git a/Content.Shared/Shuttles/SharedShuttleComponent.cs b/Content.Shared/Shuttles/SharedShuttleComponent.cs new file mode 100644 index 0000000000..cc7ba7fe65 --- /dev/null +++ b/Content.Shared/Shuttles/SharedShuttleComponent.cs @@ -0,0 +1,28 @@ +using Robust.Shared.GameObjects; +using Robust.Shared.ViewVariables; + +namespace Content.Shared.Shuttles +{ + public abstract class SharedShuttleComponent : Component + { + public override string Name => "Shuttle"; + + [ViewVariables] + public virtual bool Enabled { get; set; } = true; + + /// + /// How much our linear impulse is multiplied by. + /// + [ViewVariables(VVAccess.ReadWrite)] + public float SpeedMultipler { get; set; } = 200.0f; + + [ViewVariables] + public ShuttleMode Mode { get; set; } = ShuttleMode.Docking; + } + + public enum ShuttleMode : byte + { + Docking, + Cruise, + } +} diff --git a/Content.Shared/Shuttles/SharedShuttleConsoleComponent.cs b/Content.Shared/Shuttles/SharedShuttleConsoleComponent.cs new file mode 100644 index 0000000000..13c1c4a211 --- /dev/null +++ b/Content.Shared/Shuttles/SharedShuttleConsoleComponent.cs @@ -0,0 +1,14 @@ +using Robust.Shared.GameObjects; +using Robust.Shared.GameStates; + +namespace Content.Shared.Shuttles +{ + /// + /// Interact with to start piloting a shuttle. + /// + [NetworkedComponent()] + public abstract class SharedShuttleConsoleComponent : Component + { + public override string Name => "ShuttleConsole"; + } +} diff --git a/Content.Shared/Shuttles/SharedShuttleConsoleSystem.cs b/Content.Shared/Shuttles/SharedShuttleConsoleSystem.cs new file mode 100644 index 0000000000..8e9070571c --- /dev/null +++ b/Content.Shared/Shuttles/SharedShuttleConsoleSystem.cs @@ -0,0 +1,20 @@ +using Content.Shared.Movement; +using Robust.Shared.GameObjects; + +namespace Content.Shared.Shuttles +{ + public abstract class SharedShuttleConsoleSystem : EntitySystem + { + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(HandleMovementBlock); + } + + private void HandleMovementBlock(EntityUid uid, PilotComponent component, MovementAttemptEvent args) + { + if (component.Console == null) return; + args.Cancel(); + } + } +} diff --git a/Content.Shared/Spawning/EntitySystemExtensions.cs b/Content.Shared/Spawning/EntitySystemExtensions.cs index a9b98eb8a0..6ec0226358 100644 --- a/Content.Shared/Spawning/EntitySystemExtensions.cs +++ b/Content.Shared/Spawning/EntitySystemExtensions.cs @@ -3,6 +3,7 @@ using Content.Shared.Physics; using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Physics; using Robust.Shared.Physics.Broadphase; namespace Content.Shared.Spawning @@ -15,9 +16,9 @@ namespace Content.Shared.Spawning EntityCoordinates coordinates, CollisionGroup collisionLayer, in Box2? box = null, - SharedBroadPhaseSystem? physicsManager = null) + SharedBroadphaseSystem? physicsManager = null) { - physicsManager ??= EntitySystem.Get(); + physicsManager ??= EntitySystem.Get(); var mapCoordinates = coordinates.ToMap(entityManager); return entityManager.SpawnIfUnobstructed(prototypeName, mapCoordinates, collisionLayer, box, physicsManager); @@ -29,10 +30,10 @@ namespace Content.Shared.Spawning MapCoordinates coordinates, CollisionGroup collisionLayer, in Box2? box = null, - SharedBroadPhaseSystem? collision = null) + SharedBroadphaseSystem? collision = null) { var boxOrDefault = box.GetValueOrDefault(Box2.UnitCentered); - collision ??= EntitySystem.Get(); + collision ??= EntitySystem.Get(); foreach (var body in collision.GetCollidingEntities(coordinates.MapId, in boxOrDefault)) { @@ -60,7 +61,7 @@ namespace Content.Shared.Spawning CollisionGroup collisionLayer, [NotNullWhen(true)] out IEntity? entity, Box2? box = null, - SharedBroadPhaseSystem? physicsManager = null) + SharedBroadphaseSystem? physicsManager = null) { entity = entityManager.SpawnIfUnobstructed(prototypeName, coordinates, collisionLayer, box, physicsManager); @@ -74,7 +75,7 @@ namespace Content.Shared.Spawning CollisionGroup collisionLayer, [NotNullWhen(true)] out IEntity? entity, in Box2? box = null, - SharedBroadPhaseSystem? physicsManager = null) + SharedBroadphaseSystem? physicsManager = null) { entity = entityManager.SpawnIfUnobstructed(prototypeName, coordinates, collisionLayer, box, physicsManager); diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs index cabfe81d1c..70cd566203 100644 --- a/Content.Shared/Throwing/ThrownItemSystem.cs +++ b/Content.Shared/Throwing/ThrownItemSystem.cs @@ -39,7 +39,8 @@ namespace Content.Shared.Throwing Logger.Error($"Tried to remove throwing fixture for {component.Owner} but none found?"); return; } - physicsComponent.RemoveFixture(fixture); + + Get().DestroyFixture(physicsComponent, fixture); } private void ThrowItem(EntityUid uid, ThrownItemComponent component, ThrownEvent args) @@ -54,8 +55,7 @@ namespace Content.Shared.Throwing } var shape = physicsComponent.Fixtures[0].Shape; - var fixture = new Fixture(physicsComponent, shape) {CollisionLayer = (int) CollisionGroup.ThrownItem, Hard = false, ID = ThrowingFixture}; - physicsComponent.AddFixture(fixture); + Get().CreateFixture(physicsComponent, new Fixture(physicsComponent, shape) {CollisionLayer = (int) CollisionGroup.ThrownItem, Hard = false, ID = ThrowingFixture}); } private void HandleCollision(EntityUid uid, ThrownItemComponent component, StartCollideEvent args) diff --git a/Resources/Locale/en-US/shuttles/console.ftl b/Resources/Locale/en-US/shuttles/console.ftl new file mode 100644 index 0000000000..dfd8b6734c --- /dev/null +++ b/Resources/Locale/en-US/shuttles/console.ftl @@ -0,0 +1,2 @@ +shuttle-pilot-start = Piloting ship +shuttle-pilot-end = Stopped piloting \ No newline at end of file diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index cd8bb69256..2c0fd2c5ac 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -1271,8 +1271,6 @@ entities: pos: 58.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 153 type: CableHV components: @@ -1281,8 +1279,6 @@ entities: pos: 58.5,-29.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 154 type: SignDirectionalEvac components: @@ -1997,8 +1993,7 @@ entities: - uid: 218 type: Recycler components: - - anchored: True - pos: -21.5,-13.5 + - pos: -21.5,-13.5 parent: 853 type: Transform - uid: 219 @@ -12342,6 +12337,290 @@ entities: - 0 - 0 type: GridAtmosphere + - linearDamping: 0.05 + fixtures: + - shape: !type:PolygonShape + vertices: + - 0,-16 + - 0,0 + - -16,0 + - -16,-16 + id: grid_chunk--1--1 + mask: [] + layer: [] + mass: 256 + - shape: !type:PolygonShape + vertices: + - 0,0 + - 0,16 + - -16,16 + - -16,0 + id: grid_chunk--1-0 + mask: [] + layer: [] + mass: 256 + - shape: !type:PolygonShape + vertices: + - 16,-16 + - 16,0 + - 0,0 + - 0,-16 + id: grid_chunk-0--1 + mask: [] + layer: [] + mass: 256 + - shape: !type:PolygonShape + vertices: + - 16,0 + - 16,16 + - 0,16 + - 0,0 + id: grid_chunk-0-0 + mask: [] + layer: [] + mass: 256 + - shape: !type:PolygonShape + vertices: + - 32,0 + - 32,16 + - 16,16 + - 16,0 + id: grid_chunk-1-0 + mask: [] + layer: [] + mass: 256 + - shape: !type:PolygonShape + vertices: + - 16,16 + - 16,32 + - 0,32 + - 0,16 + id: grid_chunk-0-1 + mask: [] + layer: [] + mass: 256 + - shape: !type:PolygonShape + vertices: + - -16,0 + - -16,16 + - -32,16 + - -32,0 + id: grid_chunk--2-0 + mask: [] + layer: [] + mass: 256 + - shape: !type:PolygonShape + vertices: + - 32,-16 + - 32,0 + - 16,0 + - 16,-16 + id: grid_chunk-1--1 + mask: [] + layer: [] + mass: 256 + - shape: !type:PolygonShape + vertices: + - 16,-32 + - 16,-16 + - 0,-16 + - 0,-32 + id: grid_chunk-0--2 + mask: [] + layer: [] + mass: 256 + - shape: !type:PolygonShape + vertices: + - 29,-27 + - 29,-16 + - 16,-16 + - 16,-27 + id: grid_chunk-1--2 + mask: [] + layer: [] + mass: 143 + - shape: !type:PolygonShape + vertices: + - 0,16 + - 0,32 + - -16,32 + - -16,16 + id: grid_chunk--1-1 + mask: [] + layer: [] + mass: 256 + - shape: !type:PolygonShape + vertices: + - -16,16 + - -16,27 + - -20,27 + - -20,16 + id: grid_chunk--2-1 + mask: [] + layer: [] + mass: 44 + - shape: !type:PolygonShape + vertices: + - 0,32 + - 0,34 + - -3,34 + - -3,32 + id: grid_chunk--1-2 + mask: [] + layer: [] + mass: 6 + - shape: !type:PolygonShape + vertices: + - 18,16 + - 18,17 + - 16,17 + - 16,16 + id: grid_chunk-1-1 + mask: [] + layer: [] + mass: 2 + - shape: !type:PolygonShape + vertices: + - 10,32 + - 10,34 + - 0,34 + - 0,32 + id: grid_chunk-0-2 + mask: [] + layer: [] + mass: 20 + - shape: !type:PolygonShape + vertices: + - 48,0 + - 48,16 + - 32,16 + - 32,0 + id: grid_chunk-2-0 + mask: [] + layer: [] + mass: 256 + - shape: !type:PolygonShape + vertices: + - 52,0 + - 52,15 + - 48,15 + - 48,0 + id: grid_chunk-3-0 + mask: [] + layer: [] + mass: 60 + - shape: !type:PolygonShape + vertices: + - 48,-16 + - 48,0 + - 32,0 + - 32,-16 + id: grid_chunk-2--1 + mask: [] + layer: [] + mass: 256 + - shape: !type:PolygonShape + vertices: + - 0,-31 + - 0,-16 + - -16,-16 + - -16,-31 + id: grid_chunk--1--2 + mask: [] + layer: [] + mass: 240 + - shape: !type:PolygonShape + vertices: + - -16,-28 + - -16,-16 + - -26,-16 + - -26,-28 + id: grid_chunk--2--2 + mask: [] + layer: [] + mass: 120 + - shape: !type:PolygonShape + vertices: + - -16,-16 + - -16,0 + - -32,0 + - -32,-16 + id: grid_chunk--2--1 + mask: [] + layer: [] + mass: 256 + - shape: !type:PolygonShape + vertices: + - -32,0 + - -32,16 + - -42,16 + - -42,0 + id: grid_chunk--3-0 + mask: [] + layer: [] + mass: 160 + - shape: !type:PolygonShape + vertices: + - -32,-13 + - -32,0 + - -40,0 + - -40,-13 + id: grid_chunk--3--1 + mask: [] + layer: [] + mass: 104 + - shape: !type:PolygonShape + vertices: + - 56,-16 + - 56,0 + - 48,0 + - 48,-16 + id: grid_chunk-3--1 + mask: [] + layer: [] + mass: 128 + - shape: !type:PolygonShape + vertices: + - 48,-32 + - 48,-16 + - 40,-16 + - 40,-32 + id: grid_chunk-2--2 + mask: [] + layer: [] + mass: 128 + - shape: !type:PolygonShape + vertices: + - 59,-32 + - 59,-16 + - 48,-16 + - 48,-32 + id: grid_chunk-3--2 + mask: [] + layer: [] + mass: 176 + - shape: !type:PolygonShape + vertices: + - 59,-34 + - 59,-32 + - 48,-32 + - 48,-34 + id: grid_chunk-3--3 + mask: [] + layer: [] + mass: 22 + - shape: !type:PolygonShape + vertices: + - 48,-34 + - 48,-32 + - 40,-32 + - 40,-34 + id: grid_chunk-2--3 + mask: [] + layer: [] + mass: 16 + bodyType: Dynamic + type: Physics - uid: 854 type: Catwalk components: @@ -12495,8 +12774,7 @@ entities: - uid: 873 type: Autolathe components: - - anchored: True - pos: 29.5,-2.5 + - pos: 29.5,-2.5 parent: 853 type: Transform - containers: @@ -12516,8 +12794,7 @@ entities: - uid: 875 type: Protolathe components: - - anchored: True - pos: 29.5,-1.5 + - pos: 29.5,-1.5 parent: 853 type: Transform - containers: @@ -12624,8 +12901,7 @@ entities: - uid: 889 type: GravityGenerator components: - - anchored: True - rot: 4.371139006309477E-08 rad + - rot: 4.371139006309477E-08 rad pos: 49.5,-4.5 parent: 853 type: Transform @@ -12678,8 +12954,7 @@ entities: - uid: 894 type: KitchenMicrowave components: - - anchored: True - rot: 4.371139006309477E-08 rad + - rot: 4.371139006309477E-08 rad pos: -14.5,-1.5 parent: 853 type: Transform @@ -13394,8 +13669,6 @@ entities: pos: 1.5,1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 995 type: Catwalk components: @@ -13420,8 +13693,6 @@ entities: pos: 0.5,2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 998 type: CableApcExtension components: @@ -13429,8 +13700,6 @@ entities: pos: 1.5,2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 999 type: WallSolid components: @@ -13565,8 +13834,6 @@ entities: pos: 22.5,-18.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1013 type: DisposalPipe components: @@ -13626,8 +13893,6 @@ entities: pos: -6.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1020 type: Catwalk components: @@ -13806,8 +14071,7 @@ entities: - uid: 1043 type: Autolathe components: - - anchored: True - pos: -5.5,-12.5 + - pos: -5.5,-12.5 parent: 853 type: Transform - containers: @@ -13819,8 +14083,7 @@ entities: - uid: 1044 type: Protolathe components: - - anchored: True - pos: -3.5,-12.5 + - pos: -3.5,-12.5 parent: 853 type: Transform - containers: @@ -14432,8 +14695,6 @@ entities: pos: -6.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1118 type: CableHV components: @@ -14441,8 +14702,6 @@ entities: pos: -4.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1119 type: Catwalk components: @@ -16715,8 +16974,6 @@ entities: pos: -32.5,1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1352 type: WallSolid components: @@ -17793,8 +18050,6 @@ entities: pos: -7.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1484 type: Window components: @@ -18195,8 +18450,6 @@ entities: pos: 58.5,-28.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1540 type: SignArmory components: @@ -18254,8 +18507,6 @@ entities: pos: 58.5,-32.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1547 type: CableHV components: @@ -18264,8 +18515,6 @@ entities: pos: 57.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1548 type: ReinforcedWindow components: @@ -19692,8 +19941,6 @@ entities: pos: 54.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1754 type: LowWall components: @@ -19729,8 +19976,6 @@ entities: pos: 58.5,-30.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1759 type: WallSolid components: @@ -19886,8 +20131,6 @@ entities: pos: 56.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1781 type: CableHV components: @@ -19896,8 +20139,6 @@ entities: pos: 58.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1782 type: SignDirectionalBridge components: @@ -19920,8 +20161,6 @@ entities: pos: 52.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1785 type: WallSolid components: @@ -20202,8 +20441,6 @@ entities: pos: 53.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1826 type: CableHV components: @@ -20212,8 +20449,6 @@ entities: pos: 55.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 1827 type: WallReinforced components: @@ -22041,8 +22276,6 @@ entities: pos: -7.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2086 type: WallSolid components: @@ -22064,8 +22297,6 @@ entities: pos: 1.5,6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2089 type: WallSolid components: @@ -24340,8 +24571,6 @@ entities: pos: -1.5,6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2411 type: ShotgunGladstone components: @@ -24387,8 +24616,6 @@ entities: pos: -3.5,6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2416 type: CableApcExtension components: @@ -24396,8 +24623,6 @@ entities: pos: -2.5,6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2417 type: WallSolid components: @@ -24419,8 +24644,6 @@ entities: pos: -4.5,6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2420 type: WallSolid components: @@ -25279,8 +25502,6 @@ entities: pos: -28.5,12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2529 type: CableApcExtension components: @@ -25361,8 +25582,6 @@ entities: pos: -25.5,9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2536 type: CableApcExtension components: @@ -25383,8 +25602,6 @@ entities: pos: -26.5,7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2538 type: CableApcExtension components: @@ -25525,8 +25742,6 @@ entities: pos: -28.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2550 type: CableApcExtension components: @@ -25535,8 +25750,6 @@ entities: pos: -17.5,9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2551 type: CableApcExtension components: @@ -25569,8 +25782,6 @@ entities: pos: -16.5,7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2554 type: SalternApc components: @@ -25601,8 +25812,6 @@ entities: pos: -17.5,15.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2557 type: CableApcExtension components: @@ -25827,8 +26036,6 @@ entities: pos: -7.5,24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2576 type: CableApcExtension components: @@ -25837,8 +26044,6 @@ entities: pos: -12.5,12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2577 type: CableApcExtension components: @@ -26159,8 +26364,6 @@ entities: pos: 0.5,6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2604 type: CableApcExtension components: @@ -26169,8 +26372,6 @@ entities: pos: 0.5,6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2605 type: CableApcExtension components: @@ -26179,8 +26380,6 @@ entities: pos: -0.5,6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2606 type: CableApcExtension components: @@ -26189,8 +26388,6 @@ entities: pos: -3.5,15.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2607 type: CableApcExtension components: @@ -26271,8 +26468,6 @@ entities: pos: -3.5,15.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2614 type: CableApcExtension components: @@ -26365,8 +26560,6 @@ entities: pos: -10.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2622 type: CableApcExtension components: @@ -26687,8 +26880,6 @@ entities: pos: 1.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2649 type: CableApcExtension components: @@ -26721,8 +26912,6 @@ entities: pos: -39.5,11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2652 type: CableApcExtension components: @@ -27199,8 +27388,6 @@ entities: pos: -18.5,9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2692 type: CableApcExtension components: @@ -27209,8 +27396,6 @@ entities: pos: -17.5,7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2693 type: CableApcExtension components: @@ -27219,8 +27404,6 @@ entities: pos: -18.5,7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2694 type: CableApcExtension components: @@ -27229,8 +27412,6 @@ entities: pos: -30.5,-3.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2695 type: CableApcExtension components: @@ -27263,8 +27444,6 @@ entities: pos: -30.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2698 type: CableApcExtension components: @@ -27429,8 +27608,6 @@ entities: pos: -30.5,-0.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2712 type: CableApcExtension components: @@ -27499,8 +27676,6 @@ entities: pos: -27.5,-0.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2718 type: CableApcExtension components: @@ -27540,8 +27715,6 @@ entities: pos: -32.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2722 type: CableApcExtension components: @@ -27622,8 +27795,6 @@ entities: pos: -32.5,0.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2729 type: CableApcExtension components: @@ -27632,8 +27803,6 @@ entities: pos: -32.5,1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2730 type: CableApcExtension components: @@ -27642,8 +27811,6 @@ entities: pos: -20.5,-12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2731 type: CableApcExtension components: @@ -27788,6 +27955,16 @@ entities: type: Sprite - canCollide: False type: Physics +- uid: 2743 + type: ComputerShuttle + components: + - pos: 2.5,32.5 + parent: 853 + type: Transform + - containers: + board: !type:Container + ents: [] + type: ContainerContainer - uid: 2744 type: CableApcExtension components: @@ -27964,8 +28141,6 @@ entities: pos: -18.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2759 type: CableApcExtension components: @@ -28118,8 +28293,6 @@ entities: pos: -22.5,1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2772 type: CableApcExtension components: @@ -28139,8 +28312,6 @@ entities: pos: -15.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2774 type: CableApcExtension components: @@ -28149,8 +28320,6 @@ entities: pos: -15.5,-5.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2775 type: CableApcExtension components: @@ -28159,8 +28328,6 @@ entities: pos: -15.5,-4.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2776 type: CableApcExtension components: @@ -28169,8 +28336,6 @@ entities: pos: -11.5,2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2777 type: CableApcExtension components: @@ -28227,8 +28392,6 @@ entities: pos: -11.5,-2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2782 type: CableApcExtension components: @@ -28751,8 +28914,6 @@ entities: pos: -5.5,-8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2826 type: CableApcExtension components: @@ -28881,8 +29042,6 @@ entities: pos: -5.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2837 type: CableApcExtension components: @@ -28891,8 +29050,6 @@ entities: pos: -4.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2838 type: CableApcExtension components: @@ -28901,8 +29058,6 @@ entities: pos: -4.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2839 type: CableApcExtension components: @@ -28911,8 +29066,6 @@ entities: pos: -3.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2840 type: CableApcExtension components: @@ -28921,8 +29074,6 @@ entities: pos: -2.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2841 type: CableApcExtension components: @@ -28931,8 +29082,6 @@ entities: pos: -1.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2842 type: CableApcExtension components: @@ -28941,8 +29090,6 @@ entities: pos: -0.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2843 type: CableApcExtension components: @@ -28951,8 +29098,6 @@ entities: pos: 0.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2844 type: CableApcExtension components: @@ -28961,8 +29106,6 @@ entities: pos: 0.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2845 type: CableApcExtension components: @@ -28971,8 +29114,6 @@ entities: pos: 0.5,-8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2846 type: CableApcExtension components: @@ -28981,8 +29122,6 @@ entities: pos: 0.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2847 type: CableApcExtension components: @@ -28991,8 +29130,6 @@ entities: pos: -0.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2848 type: CableApcExtension components: @@ -29001,8 +29138,6 @@ entities: pos: -1.5,-18.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2849 type: CableApcExtension components: @@ -29143,8 +29278,6 @@ entities: pos: -9.5,-21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2861 type: CableApcExtension components: @@ -29201,8 +29334,6 @@ entities: pos: -7.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2866 type: CableApcExtension components: @@ -29463,8 +29594,6 @@ entities: pos: 0.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2888 type: CableApcExtension components: @@ -29521,8 +29650,6 @@ entities: pos: -6.5,-12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2893 type: CableApcExtension components: @@ -29543,8 +29670,6 @@ entities: pos: -14.5,-16.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2895 type: CableApcExtension components: @@ -29721,8 +29846,6 @@ entities: pos: -1.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2910 type: CableApcExtension components: @@ -29731,8 +29854,6 @@ entities: pos: -0.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2911 type: CableApcExtension components: @@ -29741,8 +29862,6 @@ entities: pos: 0.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2912 type: CableApcExtension components: @@ -29751,8 +29870,6 @@ entities: pos: 7.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2913 type: CableApcExtension components: @@ -29773,8 +29890,6 @@ entities: pos: 7.5,-19.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2915 type: CableApcExtension components: @@ -29867,8 +29982,6 @@ entities: pos: 14.5,-19.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2923 type: CableApcExtension components: @@ -29937,8 +30050,6 @@ entities: pos: 6.5,-13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2929 type: CableApcExtension components: @@ -29995,8 +30106,6 @@ entities: pos: 11.5,-13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2934 type: CableApcExtension components: @@ -30053,8 +30162,6 @@ entities: pos: 25.5,-4.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2939 type: CableApcExtension components: @@ -30063,8 +30170,6 @@ entities: pos: 22.5,-2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2940 type: CableApcExtension components: @@ -30121,8 +30226,6 @@ entities: pos: 21.5,1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2945 type: CableApcExtension components: @@ -30395,8 +30498,6 @@ entities: pos: 18.5,-18.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2968 type: CableApcExtension components: @@ -30753,8 +30854,6 @@ entities: pos: 16.5,2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 2998 type: CableApcExtension components: @@ -31095,8 +31194,6 @@ entities: pos: 6.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3027 type: CableApcExtension components: @@ -31189,8 +31286,6 @@ entities: pos: 22.5,-3.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3035 type: CableApcExtension components: @@ -31199,8 +31294,6 @@ entities: pos: 31.5,1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3036 type: CableApcExtension components: @@ -31341,8 +31434,6 @@ entities: pos: 31.5,1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3048 type: CableApcExtension components: @@ -31543,8 +31634,6 @@ entities: pos: 43.5,10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3065 type: CableApcExtension components: @@ -32069,8 +32158,6 @@ entities: pos: 33.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3109 type: CableApcExtension components: @@ -32115,8 +32202,6 @@ entities: pos: 29.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3113 type: CableApcExtension components: @@ -32125,8 +32210,6 @@ entities: pos: 28.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3114 type: CableApcExtension components: @@ -32135,8 +32218,6 @@ entities: pos: 27.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3115 type: CableApcExtension components: @@ -32325,8 +32406,6 @@ entities: pos: 47.5,-1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3131 type: CableApcExtension components: @@ -32335,8 +32414,6 @@ entities: pos: 47.5,-2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3132 type: CableApcExtension components: @@ -32345,8 +32422,6 @@ entities: pos: 47.5,-3.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3133 type: CableApcExtension components: @@ -32355,8 +32430,6 @@ entities: pos: 48.5,-2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3134 type: CableApcExtension components: @@ -32365,8 +32438,6 @@ entities: pos: 49.5,-2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3135 type: CableApcExtension components: @@ -32375,8 +32446,6 @@ entities: pos: 50.5,-2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3136 type: CableApcExtension components: @@ -32385,8 +32454,6 @@ entities: pos: 51.5,-2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3137 type: CableApcExtension components: @@ -32395,8 +32462,6 @@ entities: pos: 51.5,-3.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3138 type: CableApcExtension components: @@ -32405,8 +32470,6 @@ entities: pos: 51.5,-4.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3139 type: CableApcExtension components: @@ -32463,8 +32526,6 @@ entities: pos: 28.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3144 type: CableApcExtension components: @@ -32473,8 +32534,6 @@ entities: pos: 28.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3145 type: CableApcExtension components: @@ -32531,8 +32590,6 @@ entities: pos: 28.5,9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3150 type: CableApcExtension components: @@ -32553,8 +32610,6 @@ entities: pos: 26.5,9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3152 type: CableApcExtension components: @@ -32599,8 +32654,6 @@ entities: pos: 27.5,8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3156 type: CableApcExtension components: @@ -32753,8 +32806,6 @@ entities: pos: 35.5,7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3169 type: CableApcExtension components: @@ -32811,8 +32862,6 @@ entities: pos: 24.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3174 type: CableApcExtension components: @@ -32857,8 +32906,6 @@ entities: pos: 58.5,-27.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3178 type: Window components: @@ -32908,8 +32955,6 @@ entities: pos: 58.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3183 type: CableHV components: @@ -32918,8 +32963,6 @@ entities: pos: 58.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3184 type: CableApcExtension components: @@ -33072,8 +33115,6 @@ entities: pos: 17.5,8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3197 type: CableApcExtension components: @@ -33106,8 +33147,6 @@ entities: pos: 12.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3200 type: CableApcExtension components: @@ -33224,8 +33263,6 @@ entities: pos: 11.5,10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3210 type: CableApcExtension components: @@ -33342,8 +33379,6 @@ entities: pos: 8.5,6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3220 type: CableApcExtension components: @@ -33352,8 +33387,6 @@ entities: pos: 12.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3221 type: CableApcExtension components: @@ -33362,8 +33395,6 @@ entities: pos: 12.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3222 type: CableApcExtension components: @@ -33372,8 +33403,6 @@ entities: pos: 11.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3223 type: CableApcExtension components: @@ -33382,8 +33411,6 @@ entities: pos: 10.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3224 type: CableApcExtension components: @@ -33428,8 +33455,6 @@ entities: pos: 6.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3228 type: CableApcExtension components: @@ -33438,8 +33463,6 @@ entities: pos: 12.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3229 type: CableApcExtension components: @@ -33520,8 +33543,6 @@ entities: pos: 9.5,22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3236 type: CableApcExtension components: @@ -33782,8 +33803,6 @@ entities: pos: 3.5,22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3258 type: CableApcExtension components: @@ -33816,8 +33835,6 @@ entities: pos: 9.5,27.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3261 type: CableApcExtension components: @@ -33982,8 +33999,6 @@ entities: pos: -2.5,27.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3275 type: CableApcExtension components: @@ -34318,8 +34333,6 @@ entities: pos: 42.5,0.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3304 type: CableHV components: @@ -34328,8 +34341,6 @@ entities: pos: 42.5,-0.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3305 type: CableHV components: @@ -34338,8 +34349,6 @@ entities: pos: 42.5,-1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3306 type: CableHV components: @@ -34348,8 +34357,6 @@ entities: pos: 42.5,-2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3307 type: CableHV components: @@ -34370,8 +34377,6 @@ entities: pos: 42.5,-4.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3309 type: CableHV components: @@ -34380,8 +34385,6 @@ entities: pos: 42.5,-4.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3310 type: CableHV components: @@ -34390,8 +34393,6 @@ entities: pos: 41.5,-4.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3311 type: CableHV components: @@ -34400,8 +34401,6 @@ entities: pos: 40.5,-4.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3312 type: CableHV components: @@ -34410,8 +34409,6 @@ entities: pos: 39.5,-4.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3313 type: CableHV components: @@ -34420,8 +34417,6 @@ entities: pos: 38.5,-4.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3314 type: CableHV components: @@ -34430,8 +34425,6 @@ entities: pos: 38.5,-5.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3315 type: CableHV components: @@ -34440,8 +34433,6 @@ entities: pos: 38.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3316 type: CableHV components: @@ -34450,8 +34441,6 @@ entities: pos: 38.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3317 type: CableHV components: @@ -34460,8 +34449,6 @@ entities: pos: 37.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3318 type: CableHV components: @@ -34470,8 +34457,6 @@ entities: pos: 36.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3319 type: CableHV components: @@ -34480,8 +34465,6 @@ entities: pos: 35.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3320 type: CableHV components: @@ -34490,8 +34473,6 @@ entities: pos: 34.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3321 type: CableHV components: @@ -34500,8 +34481,6 @@ entities: pos: 33.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3322 type: CableHV components: @@ -34510,8 +34489,6 @@ entities: pos: 32.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3323 type: CableHV components: @@ -34520,8 +34497,6 @@ entities: pos: 31.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3324 type: CableHV components: @@ -34530,8 +34505,6 @@ entities: pos: 30.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3325 type: CableHV components: @@ -34540,8 +34513,6 @@ entities: pos: 29.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3326 type: CableHV components: @@ -34550,8 +34521,6 @@ entities: pos: 28.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3327 type: CableHV components: @@ -34572,8 +34541,6 @@ entities: pos: 26.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3329 type: CableHV components: @@ -34582,8 +34549,6 @@ entities: pos: 26.5,-8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3330 type: CableHV components: @@ -34592,8 +34557,6 @@ entities: pos: 26.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3331 type: CableHV components: @@ -34602,8 +34565,6 @@ entities: pos: 26.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3332 type: CableHV components: @@ -34612,8 +34573,6 @@ entities: pos: 26.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3333 type: CableHV components: @@ -34622,8 +34581,6 @@ entities: pos: 26.5,-12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3334 type: CableHV components: @@ -34632,8 +34589,6 @@ entities: pos: 26.5,-13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3335 type: CableHV components: @@ -34642,8 +34597,6 @@ entities: pos: 26.5,-14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3336 type: CableHV components: @@ -34652,8 +34605,6 @@ entities: pos: 26.5,-15.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3337 type: CableHV components: @@ -34662,8 +34613,6 @@ entities: pos: 26.5,-16.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3338 type: CableHV components: @@ -34672,8 +34621,6 @@ entities: pos: 26.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3339 type: CableHV components: @@ -34682,8 +34629,6 @@ entities: pos: 25.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3340 type: CableHV components: @@ -34692,8 +34637,6 @@ entities: pos: 24.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3341 type: CableHV components: @@ -34702,8 +34645,6 @@ entities: pos: 23.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3342 type: CableHV components: @@ -34712,8 +34653,6 @@ entities: pos: 22.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3343 type: CableHV components: @@ -34722,8 +34661,6 @@ entities: pos: 21.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3344 type: CableHV components: @@ -34732,8 +34669,6 @@ entities: pos: 25.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3345 type: CableHV components: @@ -34742,8 +34677,6 @@ entities: pos: 24.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3346 type: CableHV components: @@ -34752,8 +34685,6 @@ entities: pos: 23.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3347 type: CableHV components: @@ -34762,8 +34693,6 @@ entities: pos: 22.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3348 type: CableHV components: @@ -34772,8 +34701,6 @@ entities: pos: 22.5,-18.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3349 type: CableHV components: @@ -34782,8 +34709,6 @@ entities: pos: 22.5,-19.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3350 type: CableHV components: @@ -34792,8 +34717,6 @@ entities: pos: 22.5,-20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3351 type: CableHV components: @@ -34802,8 +34725,6 @@ entities: pos: 22.5,-21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3352 type: CableHV components: @@ -34812,8 +34733,6 @@ entities: pos: 22.5,-22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3353 type: CableHV components: @@ -34822,8 +34741,6 @@ entities: pos: 22.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3354 type: CableHV components: @@ -34832,8 +34749,6 @@ entities: pos: 22.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3355 type: CableHV components: @@ -34842,8 +34757,6 @@ entities: pos: 22.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3356 type: CableHV components: @@ -34852,8 +34765,6 @@ entities: pos: 21.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3357 type: CableHV components: @@ -34862,8 +34773,6 @@ entities: pos: 20.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3358 type: CableHV components: @@ -34872,8 +34781,6 @@ entities: pos: 19.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3359 type: CableHV components: @@ -34882,8 +34789,6 @@ entities: pos: 18.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3360 type: CableHV components: @@ -34892,8 +34797,6 @@ entities: pos: 17.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3361 type: CableHV components: @@ -34902,8 +34805,6 @@ entities: pos: 16.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3362 type: CableHV components: @@ -34912,8 +34813,6 @@ entities: pos: 15.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3363 type: CableHV components: @@ -34922,8 +34821,6 @@ entities: pos: 14.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3364 type: CableHV components: @@ -34932,8 +34829,6 @@ entities: pos: 14.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3365 type: CableHV components: @@ -34942,8 +34837,6 @@ entities: pos: 14.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3366 type: CableHV components: @@ -34952,8 +34845,6 @@ entities: pos: 14.5,-22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3367 type: CableHV components: @@ -34962,8 +34853,6 @@ entities: pos: 14.5,-21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3368 type: CableHV components: @@ -34972,8 +34861,6 @@ entities: pos: 14.5,-20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3369 type: CableHV components: @@ -34982,8 +34869,6 @@ entities: pos: 13.5,-20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3370 type: CableHV components: @@ -34992,8 +34877,6 @@ entities: pos: 12.5,-20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3371 type: CableHV components: @@ -35002,8 +34885,6 @@ entities: pos: 11.5,-20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3372 type: CableHV components: @@ -35012,8 +34893,6 @@ entities: pos: 10.5,-20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3373 type: CableHV components: @@ -35022,8 +34901,6 @@ entities: pos: 9.5,-20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3374 type: CableHV components: @@ -35032,8 +34909,6 @@ entities: pos: 8.5,-20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3375 type: CableHV components: @@ -35042,8 +34917,6 @@ entities: pos: 7.5,-20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3376 type: CableHV components: @@ -35052,8 +34925,6 @@ entities: pos: 6.5,-20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3377 type: CableHV components: @@ -35102,8 +34973,6 @@ entities: pos: 14.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3382 type: CableMV components: @@ -35111,8 +34980,6 @@ entities: pos: 13.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3383 type: CableHV components: @@ -35145,8 +35012,6 @@ entities: pos: -0.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3386 type: CableHV components: @@ -35155,8 +35020,6 @@ entities: pos: 0.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3387 type: CableHV components: @@ -35165,8 +35028,6 @@ entities: pos: -0.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3388 type: CableHV components: @@ -35175,8 +35036,6 @@ entities: pos: -0.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3389 type: CableHV components: @@ -35185,8 +35044,6 @@ entities: pos: -0.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3390 type: CableHV components: @@ -35195,8 +35052,6 @@ entities: pos: -1.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3391 type: CableHV components: @@ -35205,8 +35060,6 @@ entities: pos: -2.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3392 type: CableHV components: @@ -35215,8 +35068,6 @@ entities: pos: -3.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3393 type: CableApcExtension components: @@ -35236,8 +35087,6 @@ entities: pos: -4.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3395 type: CableApcExtension components: @@ -35257,8 +35106,6 @@ entities: pos: -7.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3397 type: CableHV components: @@ -35267,8 +35114,6 @@ entities: pos: -8.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3398 type: CableHV components: @@ -35277,8 +35122,6 @@ entities: pos: -9.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3399 type: CableHV components: @@ -35287,8 +35130,6 @@ entities: pos: -10.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3400 type: CableHV components: @@ -35297,8 +35138,6 @@ entities: pos: -11.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3401 type: CableHV components: @@ -35307,8 +35146,6 @@ entities: pos: -11.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3402 type: CableHV components: @@ -35317,8 +35154,6 @@ entities: pos: -11.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3403 type: CableHV components: @@ -35327,8 +35162,6 @@ entities: pos: -11.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3404 type: CableHV components: @@ -35337,8 +35170,6 @@ entities: pos: -11.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3405 type: CableHV components: @@ -35347,8 +35178,6 @@ entities: pos: -11.5,-22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3406 type: CableHV components: @@ -35417,8 +35246,6 @@ entities: pos: -11.5,-16.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3412 type: CableHV components: @@ -35439,8 +35266,6 @@ entities: pos: -11.5,-14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3414 type: CableHV components: @@ -35449,8 +35274,6 @@ entities: pos: -10.5,-14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3415 type: CableHV components: @@ -35459,8 +35282,6 @@ entities: pos: -9.5,-14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3416 type: CableHV components: @@ -35469,8 +35290,6 @@ entities: pos: -9.5,-13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3417 type: CableHV components: @@ -35479,8 +35298,6 @@ entities: pos: -9.5,-12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3418 type: CableHV components: @@ -35489,8 +35306,6 @@ entities: pos: -9.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3419 type: CableHV components: @@ -35499,8 +35314,6 @@ entities: pos: -9.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3420 type: CableHV components: @@ -35509,8 +35322,6 @@ entities: pos: -8.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3421 type: CableHV components: @@ -35519,8 +35330,6 @@ entities: pos: -7.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3422 type: CableHV components: @@ -35529,8 +35338,6 @@ entities: pos: -6.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3423 type: CableHV components: @@ -35539,8 +35346,6 @@ entities: pos: -5.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3424 type: CableHV components: @@ -35549,8 +35354,6 @@ entities: pos: -4.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3425 type: CableHV components: @@ -35559,8 +35362,6 @@ entities: pos: -3.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3426 type: CableHV components: @@ -35569,8 +35370,6 @@ entities: pos: -2.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3427 type: CableHV components: @@ -35579,8 +35378,6 @@ entities: pos: -1.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3428 type: CableHV components: @@ -35589,8 +35386,6 @@ entities: pos: -0.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3429 type: CableHV components: @@ -35599,8 +35394,6 @@ entities: pos: 0.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3430 type: CableHV components: @@ -35609,8 +35402,6 @@ entities: pos: 0.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3431 type: CableHV components: @@ -35619,8 +35410,6 @@ entities: pos: 0.5,-8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3432 type: CableHV components: @@ -35629,8 +35418,6 @@ entities: pos: 0.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3433 type: CableHV components: @@ -35651,8 +35438,6 @@ entities: pos: -12.5,-14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3435 type: CableHV components: @@ -35661,8 +35446,6 @@ entities: pos: -13.5,-14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3436 type: CableHV components: @@ -35671,8 +35454,6 @@ entities: pos: -14.5,-14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3437 type: CableHV components: @@ -35681,8 +35462,6 @@ entities: pos: -15.5,-14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3438 type: CableHV components: @@ -35691,8 +35470,6 @@ entities: pos: -16.5,-14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3439 type: CableHV components: @@ -35701,8 +35478,6 @@ entities: pos: -17.5,-14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3440 type: CableHV components: @@ -35711,8 +35486,6 @@ entities: pos: -18.5,-14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3441 type: CableHV components: @@ -35721,8 +35494,6 @@ entities: pos: -18.5,-13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3442 type: CableHV components: @@ -35731,8 +35502,6 @@ entities: pos: -18.5,-12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3443 type: CableHV components: @@ -35741,8 +35510,6 @@ entities: pos: -18.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3444 type: CableHV components: @@ -35751,8 +35518,6 @@ entities: pos: -18.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3445 type: CableHV components: @@ -35761,8 +35526,6 @@ entities: pos: -19.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3446 type: CableHV components: @@ -35771,8 +35534,6 @@ entities: pos: -20.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3447 type: CableHV components: @@ -35781,8 +35542,6 @@ entities: pos: -21.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3448 type: CableHV components: @@ -35791,8 +35550,6 @@ entities: pos: -22.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3449 type: CableHV components: @@ -35801,8 +35558,6 @@ entities: pos: -23.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3450 type: CableHV components: @@ -35811,8 +35566,6 @@ entities: pos: -24.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3451 type: CableHV components: @@ -35821,8 +35574,6 @@ entities: pos: -25.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3452 type: CableHV components: @@ -35831,8 +35582,6 @@ entities: pos: -26.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3453 type: CableHV components: @@ -35841,8 +35590,6 @@ entities: pos: -27.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3454 type: CableHV components: @@ -35863,8 +35610,6 @@ entities: pos: -28.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3456 type: CableHV components: @@ -35873,8 +35618,6 @@ entities: pos: -29.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3457 type: CableHV components: @@ -35883,8 +35626,6 @@ entities: pos: -30.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3458 type: CableHV components: @@ -35893,8 +35634,6 @@ entities: pos: -31.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3459 type: CableHV components: @@ -35903,8 +35642,6 @@ entities: pos: -32.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3460 type: CableHV components: @@ -35913,8 +35650,6 @@ entities: pos: -33.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3461 type: CableHV components: @@ -35923,8 +35658,6 @@ entities: pos: -33.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3462 type: CableHV components: @@ -35933,8 +35666,6 @@ entities: pos: -33.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3463 type: CableHV components: @@ -35943,8 +35674,6 @@ entities: pos: -33.5,-8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3464 type: CableHV components: @@ -35953,8 +35682,6 @@ entities: pos: -33.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3465 type: CableHV components: @@ -35963,8 +35690,6 @@ entities: pos: -33.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3466 type: CableHV components: @@ -35973,8 +35698,6 @@ entities: pos: -33.5,-5.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3467 type: CableHV components: @@ -35983,8 +35706,6 @@ entities: pos: -33.5,-4.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3468 type: CableHV components: @@ -35993,8 +35714,6 @@ entities: pos: -33.5,-3.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3469 type: CableHV components: @@ -36003,8 +35722,6 @@ entities: pos: -33.5,-2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3470 type: CableHV components: @@ -36013,8 +35730,6 @@ entities: pos: -33.5,-1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3471 type: CableHV components: @@ -36023,8 +35738,6 @@ entities: pos: -33.5,-0.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3472 type: CableHV components: @@ -36033,8 +35746,6 @@ entities: pos: -33.5,0.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3473 type: CableHV components: @@ -36043,8 +35754,6 @@ entities: pos: -32.5,0.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3474 type: CableHV components: @@ -36053,8 +35762,6 @@ entities: pos: -32.5,1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3475 type: CableHV components: @@ -36111,8 +35818,6 @@ entities: pos: -32.5,6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3480 type: CableHV components: @@ -36121,8 +35826,6 @@ entities: pos: -32.5,7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3481 type: CableHV components: @@ -36131,8 +35834,6 @@ entities: pos: -32.5,8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3482 type: CableHV components: @@ -36141,8 +35842,6 @@ entities: pos: -32.5,9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3483 type: CableHV components: @@ -36151,8 +35850,6 @@ entities: pos: -32.5,10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3484 type: CableHV components: @@ -36161,8 +35858,6 @@ entities: pos: -32.5,11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3485 type: CableHV components: @@ -36171,8 +35866,6 @@ entities: pos: -32.5,12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3486 type: CableHV components: @@ -36181,8 +35874,6 @@ entities: pos: -32.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3487 type: CableHV components: @@ -36191,8 +35882,6 @@ entities: pos: -32.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3488 type: CableHV components: @@ -36201,8 +35890,6 @@ entities: pos: -32.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3489 type: CableHV components: @@ -36211,8 +35898,6 @@ entities: pos: -31.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3490 type: CableHV components: @@ -36221,8 +35906,6 @@ entities: pos: -30.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3491 type: CableHV components: @@ -36231,8 +35914,6 @@ entities: pos: -29.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3492 type: CableHV components: @@ -36241,8 +35922,6 @@ entities: pos: -28.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3493 type: CableHV components: @@ -36251,8 +35930,6 @@ entities: pos: -27.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3494 type: CableHV components: @@ -36261,8 +35938,6 @@ entities: pos: -26.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3495 type: CableHV components: @@ -36271,8 +35946,6 @@ entities: pos: -25.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3496 type: CableHV components: @@ -36281,8 +35954,6 @@ entities: pos: -24.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3497 type: CableHV components: @@ -36291,8 +35962,6 @@ entities: pos: -23.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3498 type: CableHV components: @@ -36301,8 +35970,6 @@ entities: pos: -22.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3499 type: CableHV components: @@ -36311,8 +35978,6 @@ entities: pos: -21.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3500 type: CableHV components: @@ -36321,8 +35986,6 @@ entities: pos: -20.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3501 type: CableHV components: @@ -36331,8 +35994,6 @@ entities: pos: -20.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3502 type: CableHV components: @@ -36341,8 +36002,6 @@ entities: pos: -19.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3503 type: CableHV components: @@ -36351,8 +36010,6 @@ entities: pos: -18.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3504 type: CableHV components: @@ -36361,8 +36018,6 @@ entities: pos: -18.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3505 type: CableHV components: @@ -36371,8 +36026,6 @@ entities: pos: -17.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3506 type: CableHV components: @@ -36381,8 +36034,6 @@ entities: pos: -17.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3507 type: CableHV components: @@ -36391,8 +36042,6 @@ entities: pos: -17.5,15.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3508 type: CableHV components: @@ -36401,8 +36050,6 @@ entities: pos: -18.5,16.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3509 type: CableHV components: @@ -36435,8 +36082,6 @@ entities: pos: -15.5,16.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3512 type: CableHV components: @@ -36445,8 +36090,6 @@ entities: pos: -18.5,17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3513 type: CableHV components: @@ -36455,8 +36098,6 @@ entities: pos: -18.5,18.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3514 type: CableHV components: @@ -36465,8 +36106,6 @@ entities: pos: -18.5,19.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3515 type: CableHV components: @@ -36475,8 +36114,6 @@ entities: pos: -18.5,20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3516 type: CableHV components: @@ -36485,8 +36122,6 @@ entities: pos: -18.5,21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3517 type: CableHV components: @@ -36495,8 +36130,6 @@ entities: pos: -18.5,22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3518 type: CableHV components: @@ -36505,8 +36138,6 @@ entities: pos: -18.5,23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3519 type: CableHV components: @@ -36515,8 +36146,6 @@ entities: pos: -18.5,24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3520 type: CableHV components: @@ -36525,8 +36154,6 @@ entities: pos: -18.5,25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3521 type: CableHV components: @@ -36535,8 +36162,6 @@ entities: pos: -17.5,25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3522 type: CableHV components: @@ -36545,8 +36170,6 @@ entities: pos: -16.5,25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3523 type: CableHV components: @@ -36555,8 +36178,6 @@ entities: pos: -15.5,25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3524 type: CableHV components: @@ -36565,8 +36186,6 @@ entities: pos: -14.5,25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3525 type: CableHV components: @@ -36575,8 +36194,6 @@ entities: pos: -13.5,25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3526 type: CableHV components: @@ -36585,8 +36202,6 @@ entities: pos: -12.5,25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3527 type: CableHV components: @@ -36595,8 +36210,6 @@ entities: pos: -11.5,25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3528 type: CableHV components: @@ -36605,8 +36218,6 @@ entities: pos: -10.5,25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3529 type: CableHV components: @@ -36615,8 +36226,6 @@ entities: pos: -9.5,25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3530 type: CableHV components: @@ -36625,8 +36234,6 @@ entities: pos: -8.5,25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3531 type: CableHV components: @@ -36635,8 +36242,6 @@ entities: pos: -7.5,25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3532 type: CableHV components: @@ -36645,8 +36250,6 @@ entities: pos: -7.5,24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3533 type: CableHV components: @@ -36655,8 +36258,6 @@ entities: pos: -6.5,24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3534 type: CableHV components: @@ -36665,8 +36266,6 @@ entities: pos: -5.5,24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3535 type: CableHV components: @@ -36675,8 +36274,6 @@ entities: pos: -4.5,24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3536 type: CableHV components: @@ -36685,8 +36282,6 @@ entities: pos: -4.5,24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3537 type: CableHV components: @@ -36695,8 +36290,6 @@ entities: pos: -4.5,23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3538 type: CableHV components: @@ -36705,8 +36298,6 @@ entities: pos: -4.5,22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3539 type: CableHV components: @@ -36715,8 +36306,6 @@ entities: pos: -4.5,21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3540 type: CableHV components: @@ -36725,8 +36314,6 @@ entities: pos: -4.5,21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3541 type: CableHV components: @@ -36735,8 +36322,6 @@ entities: pos: -3.5,21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3542 type: CableHV components: @@ -36745,8 +36330,6 @@ entities: pos: -2.5,21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3543 type: CableHV components: @@ -36755,8 +36338,6 @@ entities: pos: -1.5,21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3544 type: CableHV components: @@ -36765,8 +36346,6 @@ entities: pos: -0.5,21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3545 type: CableHV components: @@ -36775,8 +36354,6 @@ entities: pos: -0.5,20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3546 type: CableHV components: @@ -36929,8 +36506,6 @@ entities: pos: 12.5,20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3559 type: CableHV components: @@ -36975,8 +36550,6 @@ entities: pos: 12.5,24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3563 type: CableHV components: @@ -36985,8 +36558,6 @@ entities: pos: 11.5,24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3564 type: CableHV components: @@ -36995,8 +36566,6 @@ entities: pos: 12.5,20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3565 type: CableHV components: @@ -37005,8 +36574,6 @@ entities: pos: 12.5,19.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3566 type: CableHV components: @@ -37015,8 +36582,6 @@ entities: pos: 12.5,18.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3567 type: CableHV components: @@ -37025,8 +36590,6 @@ entities: pos: 12.5,17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3568 type: CableHV components: @@ -37035,8 +36598,6 @@ entities: pos: 12.5,16.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3569 type: CableHV components: @@ -37045,8 +36606,6 @@ entities: pos: 12.5,15.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3570 type: CableHV components: @@ -37055,8 +36614,6 @@ entities: pos: 12.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3571 type: CableHV components: @@ -37065,8 +36622,6 @@ entities: pos: 11.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3572 type: CableHV components: @@ -37075,8 +36630,6 @@ entities: pos: 10.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3573 type: CableHV components: @@ -37085,8 +36638,6 @@ entities: pos: 10.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3574 type: CableHV components: @@ -37095,8 +36646,6 @@ entities: pos: 10.5,12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3575 type: CableHV components: @@ -37117,8 +36666,6 @@ entities: pos: 11.5,11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3577 type: CableHV components: @@ -37279,8 +36826,6 @@ entities: pos: 25.5,11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3591 type: CableHV components: @@ -37325,8 +36870,6 @@ entities: pos: 27.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3595 type: CableHV components: @@ -37347,8 +36890,6 @@ entities: pos: 29.5,11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3597 type: CableHV components: @@ -37453,8 +36994,6 @@ entities: pos: 34.5,7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3606 type: CableHV components: @@ -37599,8 +37138,6 @@ entities: pos: -0.5,-22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3620 type: SalternSubstation components: @@ -37636,8 +37173,6 @@ entities: pos: 27.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3624 type: CableMV components: @@ -37646,8 +37181,6 @@ entities: pos: 28.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3625 type: CableMV components: @@ -37656,8 +37189,6 @@ entities: pos: 28.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3626 type: CableMV components: @@ -37666,8 +37197,6 @@ entities: pos: 26.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3627 type: CableMV components: @@ -37676,8 +37205,6 @@ entities: pos: 25.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3628 type: CableMV components: @@ -37698,8 +37225,6 @@ entities: pos: 24.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3630 type: CableMV components: @@ -37792,8 +37317,6 @@ entities: pos: 17.5,12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3638 type: CableMV components: @@ -37862,8 +37385,6 @@ entities: pos: 12.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3644 type: CableMV components: @@ -37872,8 +37393,6 @@ entities: pos: 11.5,24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3645 type: CableMV components: @@ -37894,8 +37413,6 @@ entities: pos: 10.5,24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3647 type: CableMV components: @@ -37916,8 +37433,6 @@ entities: pos: 9.5,22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3649 type: CableMV components: @@ -37974,8 +37489,6 @@ entities: pos: 9.5,27.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3654 type: CableMV components: @@ -38152,8 +37665,6 @@ entities: pos: -2.5,27.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3669 type: CableMV components: @@ -38162,8 +37673,6 @@ entities: pos: 42.5,-0.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3670 type: CableMV components: @@ -38292,8 +37801,6 @@ entities: pos: 48.5,-1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3681 type: CableMV components: @@ -38302,8 +37809,6 @@ entities: pos: 48.5,-2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3682 type: CableMV components: @@ -38312,8 +37817,6 @@ entities: pos: 47.5,-2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3683 type: CableMV components: @@ -38322,8 +37825,6 @@ entities: pos: 47.5,-1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3684 type: CableMV components: @@ -38332,8 +37833,6 @@ entities: pos: 41.5,-0.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3685 type: CableMV components: @@ -38390,8 +37889,6 @@ entities: pos: 36.5,-0.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3690 type: CableMV components: @@ -38472,8 +37969,6 @@ entities: pos: 31.5,1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3697 type: CableMV components: @@ -38578,8 +38073,6 @@ entities: pos: 43.5,10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3706 type: CableMV components: @@ -38588,8 +38081,6 @@ entities: pos: 21.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3707 type: CableMV components: @@ -38598,8 +38089,6 @@ entities: pos: 21.5,-8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3708 type: CableMV components: @@ -38668,8 +38157,6 @@ entities: pos: 22.5,-3.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3714 type: CableMV components: @@ -38678,8 +38165,6 @@ entities: pos: 20.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3715 type: CableMV components: @@ -38700,8 +38185,6 @@ entities: pos: 21.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3717 type: CableMV components: @@ -38938,8 +38421,6 @@ entities: pos: 7.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3737 type: CableMV components: @@ -39092,8 +38573,6 @@ entities: pos: 16.5,2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3750 type: CableMV components: @@ -39102,8 +38581,6 @@ entities: pos: -0.5,-22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3751 type: CableMV components: @@ -39112,8 +38589,6 @@ entities: pos: -0.5,-21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3752 type: CableMV components: @@ -39158,8 +38633,6 @@ entities: pos: -1.5,-18.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3756 type: CableMV components: @@ -39276,8 +38749,6 @@ entities: pos: -9.5,-21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3766 type: CableMV components: @@ -39382,8 +38853,6 @@ entities: pos: -14.5,-16.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3775 type: CableMV components: @@ -39404,8 +38873,6 @@ entities: pos: 0.5,-7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3777 type: CableMV components: @@ -39414,8 +38881,6 @@ entities: pos: 0.5,-8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3778 type: CableMV components: @@ -39508,8 +38973,6 @@ entities: pos: -5.5,-8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3786 type: CableMV components: @@ -39554,8 +39017,6 @@ entities: pos: -9.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3790 type: CableMV components: @@ -39564,8 +39025,6 @@ entities: pos: -9.5,-8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3791 type: CableMV components: @@ -39634,8 +39093,6 @@ entities: pos: -12.5,-5.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3797 type: CableMV components: @@ -39740,8 +39197,6 @@ entities: pos: -11.5,2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3806 type: CableMV components: @@ -39762,8 +39217,6 @@ entities: pos: -21.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3808 type: CableMV components: @@ -39784,8 +39237,6 @@ entities: pos: -20.5,-8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3810 type: CableMV components: @@ -39842,8 +39293,6 @@ entities: pos: -16.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3815 type: CableMV components: @@ -39900,8 +39349,6 @@ entities: pos: -21.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3820 type: CableMV components: @@ -39910,8 +39357,6 @@ entities: pos: -21.5,-12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3821 type: CableMV components: @@ -39920,8 +39365,6 @@ entities: pos: -20.5,-12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3822 type: CableMV components: @@ -39966,8 +39409,6 @@ entities: pos: -26.5,-8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3826 type: CableMV components: @@ -40024,8 +39465,6 @@ entities: pos: -29.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3831 type: CableMV components: @@ -40070,8 +39509,6 @@ entities: pos: -30.5,-3.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3835 type: CableMV components: @@ -40080,8 +39517,6 @@ entities: pos: -32.5,7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3836 type: CableMV components: @@ -40090,8 +39525,6 @@ entities: pos: -32.5,8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3837 type: CableMV components: @@ -40100,8 +39533,6 @@ entities: pos: -32.5,9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3838 type: CableMV components: @@ -40110,8 +39541,6 @@ entities: pos: -33.5,9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3839 type: CableMV components: @@ -40204,8 +39633,6 @@ entities: pos: -39.5,11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3847 type: CableMV components: @@ -40214,8 +39641,6 @@ entities: pos: -28.5,12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3848 type: CableMV components: @@ -40320,8 +39745,6 @@ entities: pos: -15.5,16.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3857 type: CableMV components: @@ -40402,8 +39825,6 @@ entities: pos: -12.5,12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3864 type: CableMV components: @@ -40424,8 +39845,6 @@ entities: pos: -10.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3866 type: CableMV components: @@ -40530,8 +39949,6 @@ entities: pos: -3.5,15.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3875 type: CableMV components: @@ -40540,8 +39957,6 @@ entities: pos: -15.5,16.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3876 type: CableMV components: @@ -41227,8 +40642,6 @@ entities: pos: 13.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3946 type: CableMV components: @@ -41236,8 +40649,6 @@ entities: pos: 13.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3947 type: CableApcExtension components: @@ -41521,8 +40932,6 @@ entities: pos: -26.5,7.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3976 type: CableApcExtension components: @@ -41531,8 +40940,6 @@ entities: pos: -26.5,6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3977 type: CableApcExtension components: @@ -41561,8 +40968,6 @@ entities: pos: -26.5,6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 3980 type: CableApcExtension components: @@ -42170,8 +41575,6 @@ entities: pos: -18.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4049 type: CableApcExtension components: @@ -42179,8 +41582,6 @@ entities: pos: -17.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4050 type: CableApcExtension components: @@ -42188,8 +41589,6 @@ entities: pos: -17.5,14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4051 type: CableHV components: @@ -42198,8 +41597,6 @@ entities: pos: -5.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4052 type: FirelockGlass components: @@ -42216,8 +41613,6 @@ entities: pos: -5.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4054 type: FirelockGlass components: @@ -42234,8 +41629,6 @@ entities: pos: -4.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4056 type: FirelockGlass components: @@ -42299,8 +41692,6 @@ entities: pos: -20.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4064 type: Firelock components: @@ -42328,8 +41719,6 @@ entities: pos: -32.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4067 type: Firelock components: @@ -42390,8 +41779,6 @@ entities: pos: -19.5,13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4074 type: CableApcExtension components: @@ -42399,8 +41786,6 @@ entities: pos: 0.5,6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4075 type: CableApcExtension components: @@ -42408,8 +41793,6 @@ entities: pos: -0.5,6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4076 type: WallSolid components: @@ -43309,8 +42692,7 @@ entities: - uid: 4182 type: KitchenReagentGrinder components: - - anchored: True - rot: 4.371139006309477E-08 rad + - rot: 4.371139006309477E-08 rad pos: -14.5,-0.5 parent: 853 type: Transform @@ -43327,8 +42709,6 @@ entities: pos: 26.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4184 type: CableApcExtension components: @@ -43808,8 +43188,7 @@ entities: - uid: 4247 type: KitchenMicrowave components: - - anchored: True - pos: -7.5,-28.5 + - pos: -7.5,-28.5 parent: 853 type: Transform - containers: @@ -45182,8 +44561,6 @@ entities: pos: 44.5,-12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4414 type: CableApcExtension components: @@ -45192,8 +44569,6 @@ entities: pos: 44.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4415 type: CableApcExtension components: @@ -45202,8 +44577,6 @@ entities: pos: 44.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4416 type: CableApcExtension components: @@ -45212,8 +44585,6 @@ entities: pos: 44.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4417 type: CableApcExtension components: @@ -45222,8 +44593,6 @@ entities: pos: 45.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4418 type: CableApcExtension components: @@ -45244,8 +44613,6 @@ entities: pos: 54.5,-12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4420 type: CableApcExtension components: @@ -45254,8 +44621,6 @@ entities: pos: 54.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4421 type: CableApcExtension components: @@ -45264,8 +44629,6 @@ entities: pos: 54.5,-10.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4422 type: CableApcExtension components: @@ -45274,8 +44637,6 @@ entities: pos: 54.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4423 type: CableApcExtension components: @@ -45284,8 +44645,6 @@ entities: pos: 53.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4424 type: CableApcExtension components: @@ -45306,8 +44665,6 @@ entities: pos: 51.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4426 type: CableApcExtension components: @@ -45316,8 +44673,6 @@ entities: pos: 47.5,-9.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4427 type: CableApcExtension components: @@ -45362,8 +44717,6 @@ entities: pos: 49.5,-8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4431 type: CableApcExtension components: @@ -45384,8 +44737,6 @@ entities: pos: 49.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4433 type: CableApcExtension components: @@ -45394,8 +44745,6 @@ entities: pos: 48.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4434 type: CableApcExtension components: @@ -45404,8 +44753,6 @@ entities: pos: 47.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4435 type: CableApcExtension components: @@ -45414,8 +44761,6 @@ entities: pos: 47.5,-5.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4436 type: CableApcExtension components: @@ -45424,8 +44769,6 @@ entities: pos: 47.5,-4.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4437 type: CableApcExtension components: @@ -45494,8 +44837,6 @@ entities: pos: 45.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4443 type: CableHV components: @@ -45528,8 +44869,6 @@ entities: pos: 46.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4446 type: CableHV components: @@ -45538,8 +44877,6 @@ entities: pos: 47.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4447 type: CableHV components: @@ -45608,8 +44945,6 @@ entities: pos: 51.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4453 type: CableHV components: @@ -45618,8 +44953,6 @@ entities: pos: 52.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4454 type: CableHV components: @@ -45628,8 +44961,6 @@ entities: pos: 53.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4455 type: CableHV components: @@ -45674,8 +45005,6 @@ entities: pos: 49.5,-8.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4459 type: CableHV components: @@ -45696,8 +45025,6 @@ entities: pos: 49.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4461 type: CableHV components: @@ -45706,8 +45033,6 @@ entities: pos: 48.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4462 type: CableHV components: @@ -45716,8 +45041,6 @@ entities: pos: 47.5,-6.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4463 type: CableHV components: @@ -45726,8 +45049,6 @@ entities: pos: 47.5,-5.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4464 type: CableHV components: @@ -45736,8 +45057,6 @@ entities: pos: 47.5,-4.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4465 type: CableHV components: @@ -45746,8 +45065,6 @@ entities: pos: 47.5,-3.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4466 type: CableHV components: @@ -45756,8 +45073,6 @@ entities: pos: 47.5,-2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4467 type: CableHV components: @@ -45766,8 +45081,6 @@ entities: pos: 48.5,-2.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4468 type: CableHV components: @@ -45776,8 +45089,6 @@ entities: pos: 48.5,-1.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4469 type: CableHV components: @@ -45997,8 +45308,6 @@ entities: pos: 45.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4489 type: CableMV components: @@ -46019,8 +45328,6 @@ entities: pos: 53.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4491 type: CableMV components: @@ -46029,8 +45336,6 @@ entities: pos: 52.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4492 type: CableMV components: @@ -46039,8 +45344,6 @@ entities: pos: 51.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4493 type: CableMV components: @@ -46049,8 +45352,6 @@ entities: pos: 51.5,-12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4494 type: CableMV components: @@ -46059,8 +45360,6 @@ entities: pos: 46.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4495 type: CableMV components: @@ -46069,8 +45368,6 @@ entities: pos: 47.5,-11.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4496 type: CableMV components: @@ -46079,8 +45376,6 @@ entities: pos: 47.5,-12.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4497 type: CableMV components: @@ -46089,8 +45384,6 @@ entities: pos: 47.5,-13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4498 type: CableMV components: @@ -46099,8 +45392,6 @@ entities: pos: 49.5,-13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4499 type: CableMV components: @@ -46109,8 +45400,6 @@ entities: pos: 48.5,-13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4500 type: CableMV components: @@ -46119,8 +45408,6 @@ entities: pos: 50.5,-13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4501 type: CableMV components: @@ -46129,8 +45416,6 @@ entities: pos: 51.5,-13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4502 type: CableMV components: @@ -46139,8 +45424,6 @@ entities: pos: 49.5,-14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4503 type: CableMV components: @@ -46149,8 +45432,6 @@ entities: pos: 49.5,-15.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4504 type: CableMV components: @@ -46159,8 +45440,6 @@ entities: pos: 49.5,-16.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4505 type: CableMV components: @@ -46169,8 +45448,6 @@ entities: pos: 49.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4506 type: CableMV components: @@ -46179,8 +45456,6 @@ entities: pos: 48.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4507 type: CableMV components: @@ -46189,8 +45464,6 @@ entities: pos: 47.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4508 type: CableMV components: @@ -46199,8 +45472,6 @@ entities: pos: 46.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4509 type: CableMV components: @@ -46209,8 +45480,6 @@ entities: pos: 45.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4510 type: CableMV components: @@ -46219,8 +45488,6 @@ entities: pos: 50.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4511 type: CableMV components: @@ -46229,8 +45496,6 @@ entities: pos: 51.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4512 type: CableMV components: @@ -46239,8 +45504,6 @@ entities: pos: 52.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4513 type: CableMV components: @@ -46249,8 +45512,6 @@ entities: pos: 53.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4514 type: CableMV components: @@ -46259,8 +45520,6 @@ entities: pos: 54.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4515 type: CableMV components: @@ -46269,8 +45528,6 @@ entities: pos: 55.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4516 type: CableMV components: @@ -46279,8 +45536,6 @@ entities: pos: 56.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4517 type: CableMV components: @@ -46289,8 +45544,6 @@ entities: pos: 56.5,-18.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4518 type: CableMV components: @@ -46299,8 +45552,6 @@ entities: pos: 56.5,-19.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4519 type: CableMV components: @@ -46309,8 +45560,6 @@ entities: pos: 56.5,-20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4520 type: CableMV components: @@ -46319,8 +45568,6 @@ entities: pos: 56.5,-21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4521 type: CableMV components: @@ -46329,8 +45576,6 @@ entities: pos: 56.5,-22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4522 type: CableMV components: @@ -46339,8 +45584,6 @@ entities: pos: 56.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4523 type: CableMV components: @@ -46349,8 +45592,6 @@ entities: pos: 56.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4524 type: CableMV components: @@ -46359,8 +45600,6 @@ entities: pos: 56.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4525 type: CableMV components: @@ -46369,8 +45608,6 @@ entities: pos: 56.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4526 type: CableMV components: @@ -46379,8 +45616,6 @@ entities: pos: 56.5,-27.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4527 type: CableMV components: @@ -46389,8 +45624,6 @@ entities: pos: 56.5,-28.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4528 type: CableMV components: @@ -46399,8 +45632,6 @@ entities: pos: 56.5,-29.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4529 type: CableMV components: @@ -46409,8 +45640,6 @@ entities: pos: 56.5,-30.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4530 type: CableMV components: @@ -46419,8 +45648,6 @@ entities: pos: 56.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4531 type: CableMV components: @@ -46429,8 +45656,6 @@ entities: pos: 55.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4532 type: CableMV components: @@ -46439,8 +45664,6 @@ entities: pos: 54.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4533 type: CableMV components: @@ -46449,8 +45672,6 @@ entities: pos: 53.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4534 type: CableMV components: @@ -46459,8 +45680,6 @@ entities: pos: 52.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4535 type: CableMV components: @@ -46469,8 +45688,6 @@ entities: pos: 51.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4536 type: CableMV components: @@ -46479,8 +45696,6 @@ entities: pos: 50.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4537 type: CableMV components: @@ -46489,8 +45704,6 @@ entities: pos: 49.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4538 type: CableMV components: @@ -46499,8 +45712,6 @@ entities: pos: 48.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4539 type: CableMV components: @@ -46509,8 +45720,6 @@ entities: pos: 47.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4540 type: CableMV components: @@ -46519,8 +45728,6 @@ entities: pos: 46.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4541 type: CableMV components: @@ -46529,8 +45736,6 @@ entities: pos: 45.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4542 type: CableMV components: @@ -46539,8 +45744,6 @@ entities: pos: 44.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4543 type: CableMV components: @@ -46549,8 +45752,6 @@ entities: pos: 43.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4544 type: CableMV components: @@ -46559,8 +45760,6 @@ entities: pos: 42.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4545 type: CableMV components: @@ -46569,8 +45768,6 @@ entities: pos: 42.5,-30.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4546 type: CableMV components: @@ -46579,8 +45776,6 @@ entities: pos: 42.5,-29.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4547 type: CableMV components: @@ -46589,8 +45784,6 @@ entities: pos: 42.5,-28.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4548 type: CableMV components: @@ -46599,8 +45792,6 @@ entities: pos: 42.5,-27.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4549 type: CableMV components: @@ -46609,8 +45800,6 @@ entities: pos: 42.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4550 type: CableMV components: @@ -46619,8 +45808,6 @@ entities: pos: 42.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4551 type: CableMV components: @@ -46629,8 +45816,6 @@ entities: pos: 42.5,-22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4552 type: CableMV components: @@ -46639,8 +45824,6 @@ entities: pos: 42.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4553 type: CableMV components: @@ -46649,8 +45832,6 @@ entities: pos: 42.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4554 type: CableMV components: @@ -46659,8 +45840,6 @@ entities: pos: 42.5,-21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4555 type: CableMV components: @@ -46669,8 +45848,6 @@ entities: pos: 42.5,-20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4556 type: CableMV components: @@ -46679,8 +45856,6 @@ entities: pos: 42.5,-19.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4557 type: CableMV components: @@ -46689,8 +45864,6 @@ entities: pos: 42.5,-18.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4558 type: CableMV components: @@ -46699,8 +45872,6 @@ entities: pos: 42.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4559 type: CableMV components: @@ -46709,8 +45880,6 @@ entities: pos: 43.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4560 type: CableMV components: @@ -46719,8 +45888,6 @@ entities: pos: 44.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4561 type: ContainmentFieldGenerator components: @@ -47265,8 +46432,6 @@ entities: pos: 46.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4628 type: CableHV components: @@ -47275,8 +46440,6 @@ entities: pos: 47.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4629 type: CableHV components: @@ -47285,8 +46448,6 @@ entities: pos: 48.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4630 type: CableHV components: @@ -47295,8 +46456,6 @@ entities: pos: 49.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4631 type: CableHV components: @@ -47305,8 +46464,6 @@ entities: pos: 50.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4632 type: CableHV components: @@ -47315,8 +46472,6 @@ entities: pos: 51.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4633 type: CableHV components: @@ -47325,8 +46480,6 @@ entities: pos: 52.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4634 type: CableHV components: @@ -47335,8 +46488,6 @@ entities: pos: 53.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4635 type: CableHV components: @@ -47345,8 +46496,6 @@ entities: pos: 45.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4636 type: CableHV components: @@ -47355,8 +46504,6 @@ entities: pos: 44.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4637 type: CableHV components: @@ -47365,8 +46512,6 @@ entities: pos: 43.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4638 type: CableHV components: @@ -47375,8 +46520,6 @@ entities: pos: 42.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4639 type: CableHV components: @@ -47385,8 +46528,6 @@ entities: pos: 54.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4640 type: CableHV components: @@ -47395,8 +46536,6 @@ entities: pos: 55.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4641 type: CableHV components: @@ -47405,8 +46544,6 @@ entities: pos: 56.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4642 type: CableHV components: @@ -47415,8 +46552,6 @@ entities: pos: 57.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4643 type: CableHV components: @@ -47425,8 +46560,6 @@ entities: pos: 58.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4644 type: CableHV components: @@ -47435,8 +46568,6 @@ entities: pos: 58.5,-18.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4645 type: CableHV components: @@ -47445,8 +46576,6 @@ entities: pos: 58.5,-19.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4646 type: CableHV components: @@ -47455,8 +46584,6 @@ entities: pos: 58.5,-20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4647 type: CableHV components: @@ -47465,8 +46592,6 @@ entities: pos: 58.5,-21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4648 type: CableHV components: @@ -47475,8 +46600,6 @@ entities: pos: 58.5,-22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4649 type: CableHV components: @@ -47485,8 +46608,6 @@ entities: pos: 57.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4650 type: CableHV components: @@ -47495,8 +46616,6 @@ entities: pos: 58.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4651 type: CableHV components: @@ -47505,8 +46624,6 @@ entities: pos: 58.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4652 type: CableHV components: @@ -47515,8 +46632,6 @@ entities: pos: 41.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4653 type: CableHV components: @@ -47525,8 +46640,6 @@ entities: pos: 40.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4654 type: CableHV components: @@ -47535,8 +46648,6 @@ entities: pos: 40.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4655 type: CableHV components: @@ -47545,8 +46656,6 @@ entities: pos: 40.5,-22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4656 type: CableHV components: @@ -47555,8 +46664,6 @@ entities: pos: 40.5,-21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4657 type: CableHV components: @@ -47565,8 +46672,6 @@ entities: pos: 40.5,-20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4658 type: CableHV components: @@ -47575,8 +46680,6 @@ entities: pos: 40.5,-19.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4659 type: CableHV components: @@ -47585,8 +46688,6 @@ entities: pos: 40.5,-18.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4660 type: CableHV components: @@ -47595,8 +46696,6 @@ entities: pos: 40.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4661 type: CableHV components: @@ -47605,8 +46704,6 @@ entities: pos: 41.5,-17.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4662 type: CableHV components: @@ -47615,8 +46712,6 @@ entities: pos: 42.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4663 type: CableHV components: @@ -47625,8 +46720,6 @@ entities: pos: 42.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4664 type: CableHV components: @@ -47635,8 +46728,6 @@ entities: pos: 42.5,-22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4665 type: CableHV components: @@ -47645,8 +46736,6 @@ entities: pos: 42.5,-21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4666 type: CableHV components: @@ -47655,8 +46744,6 @@ entities: pos: 42.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4667 type: CableHV components: @@ -47665,8 +46752,6 @@ entities: pos: 42.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4668 type: CableHV components: @@ -47675,8 +46760,6 @@ entities: pos: 42.5,-27.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4669 type: CableHV components: @@ -47685,8 +46768,6 @@ entities: pos: 56.5,-24.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4670 type: CableHV components: @@ -47695,8 +46776,6 @@ entities: pos: 56.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4671 type: CableHV components: @@ -47705,8 +46784,6 @@ entities: pos: 56.5,-22.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4672 type: CableHV components: @@ -47715,8 +46792,6 @@ entities: pos: 56.5,-21.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4673 type: CableHV components: @@ -47725,8 +46800,6 @@ entities: pos: 56.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4674 type: CableHV components: @@ -47735,8 +46808,6 @@ entities: pos: 56.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4675 type: CableHV components: @@ -47745,8 +46816,6 @@ entities: pos: 56.5,-27.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4676 type: CableHV components: @@ -47755,8 +46824,6 @@ entities: pos: 49.5,-16.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4677 type: CableHV components: @@ -47765,8 +46832,6 @@ entities: pos: 49.5,-15.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4678 type: CableHV components: @@ -47775,8 +46840,6 @@ entities: pos: 49.5,-14.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4679 type: CableHV components: @@ -47785,8 +46848,6 @@ entities: pos: 49.5,-13.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4680 type: Catwalk components: @@ -47811,8 +46872,6 @@ entities: pos: 49.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4683 type: CableHV components: @@ -47821,8 +46880,6 @@ entities: pos: 48.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4684 type: CableHV components: @@ -47831,8 +46888,6 @@ entities: pos: 47.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4685 type: CableHV components: @@ -47841,8 +46896,6 @@ entities: pos: 46.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4686 type: CableHV components: @@ -47851,8 +46904,6 @@ entities: pos: 50.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4687 type: CableHV components: @@ -47861,8 +46912,6 @@ entities: pos: 51.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4688 type: CableHV components: @@ -47871,8 +46920,6 @@ entities: pos: 52.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4689 type: CableHV components: @@ -47881,8 +46928,6 @@ entities: pos: 49.5,-32.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4690 type: CableHV components: @@ -47891,8 +46936,6 @@ entities: pos: 49.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4691 type: CableHV components: @@ -47901,8 +46944,6 @@ entities: pos: 48.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4692 type: CableHV components: @@ -47911,8 +46952,6 @@ entities: pos: 47.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4693 type: CableHV components: @@ -47921,8 +46960,6 @@ entities: pos: 46.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4694 type: CableHV components: @@ -47931,8 +46968,6 @@ entities: pos: 45.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4695 type: CableHV components: @@ -47941,8 +46976,6 @@ entities: pos: 44.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4696 type: CableHV components: @@ -47951,8 +46984,6 @@ entities: pos: 43.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4697 type: CableHV components: @@ -47961,8 +46992,6 @@ entities: pos: 42.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4698 type: CableHV components: @@ -47971,8 +47000,6 @@ entities: pos: 41.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4699 type: CableHV components: @@ -47981,8 +47008,6 @@ entities: pos: 40.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4700 type: CableHV components: @@ -47991,8 +47016,6 @@ entities: pos: 40.5,-32.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4701 type: CableHV components: @@ -48001,8 +47024,6 @@ entities: pos: 40.5,-31.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4702 type: CableHV components: @@ -48011,8 +47032,6 @@ entities: pos: 40.5,-30.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4703 type: CableHV components: @@ -48021,8 +47040,6 @@ entities: pos: 40.5,-29.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4704 type: CableHV components: @@ -48031,8 +47048,6 @@ entities: pos: 40.5,-28.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4705 type: CableHV components: @@ -48041,8 +47056,6 @@ entities: pos: 40.5,-27.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4706 type: CableHV components: @@ -48051,8 +47064,6 @@ entities: pos: 40.5,-26.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4707 type: CableHV components: @@ -48061,8 +47072,6 @@ entities: pos: 40.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4708 type: CableHV components: @@ -48071,8 +47080,6 @@ entities: pos: 50.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4709 type: CableHV components: @@ -48081,8 +47088,6 @@ entities: pos: 51.5,-33.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4710 type: LowWall components: @@ -48581,8 +47586,6 @@ entities: pos: 5.5,-25.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4772 type: CableApcExtension components: @@ -48668,8 +47671,6 @@ entities: pos: 5.5,-29.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4781 type: CableApcExtension components: @@ -48712,8 +47713,6 @@ entities: pos: 13.5,-23.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4785 type: CableApcExtension components: @@ -48830,8 +47829,6 @@ entities: pos: 12.5,-28.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4795 type: CableApcExtension components: @@ -48864,8 +47861,6 @@ entities: pos: 10.5,-29.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4798 type: CableApcExtension components: @@ -49689,8 +48684,6 @@ entities: pos: 12.5,20.5 parent: 853 type: Transform - - canCollide: False - type: Physics - uid: 4891 type: CableApcExtension components: @@ -49862,8 +48855,7 @@ entities: - uid: 4909 type: KitchenReagentGrinder components: - - anchored: True - pos: 18.5,1.5 + - pos: 18.5,1.5 parent: 853 type: Transform - containers: @@ -50228,4 +49220,11 @@ entities: - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer +- uid: 4960 + type: ChairPilotSeat + components: + - rot: 3.141592653589793 rad + pos: 2.5,31.5 + parent: 853 + type: Transform ... diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml index 7729cc82a7..a4fbd86d5c 100644 --- a/Resources/Prototypes/Alerts/alerts.yml +++ b/Resources/Prototypes/Alerts/alerts.yml @@ -136,7 +136,7 @@ alertType: PilotingShuttle category: Piloting onClick: !type:StopPiloting { } - icon: /Textures/Interface/Alerts/Buckle/buckled.png + icon: /Textures/Interface/Alerts/piloting.png name: Piloting Shuttle description: You are piloting a shuttle. Click the alert to stop. diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 05050eda89..cc7a12f952 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -8,6 +8,7 @@ components: - type: Tag tags: + - CanPilot - FootstepSound - type: Reactive reactions: @@ -253,6 +254,7 @@ - type: Sprite netsync: false drawdepth: Mobs + noRot: true # TODO BODY Turn these into individual body parts? layers: - map: ["enum.HumanoidVisualLayers.Chest"] diff --git a/Resources/Prototypes/Entities/Structures/Furniture/pilot_chair.yml b/Resources/Prototypes/Entities/Structures/Furniture/pilot_chair.yml deleted file mode 100644 index 798d2ae902..0000000000 --- a/Resources/Prototypes/Entities/Structures/Furniture/pilot_chair.yml +++ /dev/null @@ -1,33 +0,0 @@ -- type: entity - id: PilotSeatChair - parent: BaseStructure - name: pilot seat - description: The pilot seat of a prestigious battle cruiser. - components: - - type: Sprite - sprite: Structures/Furniture/furniture.rsi - state: shuttle_chair - - type: Physics - bodyType: Static - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.5,-0.25,0.5,0.25" - mask: - - Impassable - - VaultImpassable - - SmallImpassable - - type: InteractionOutline - - type: Damageable - resistances: metallicResistances - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - type: ShuttleController - - type: Strap - position: Stand diff --git a/Resources/Prototypes/Entities/Structures/Furniture/seats.yml b/Resources/Prototypes/Entities/Structures/Furniture/seats.yml index defc331e58..4965150328 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/seats.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/seats.yml @@ -199,3 +199,26 @@ MaterialWoodPlank: min: 1 max: 1 + +- type: entity + name: pilot seat + id: ChairPilotSeat + parent: SeatBase + description: The pilot seat of a prestigious ship. + components: + - type: Anchorable + - type: Rotatable + - type: Sprite + sprite: Structures/Furniture/furniture.rsi + state: shuttle_chair + netsync: false + - type: Physics + bodyType: Static + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.45, -0.45, 0.05, 0.45" + mask: + - Impassable + - VaultImpassable + - SmallImpassable diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 135741d319..456b1a2567 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -12,6 +12,17 @@ - type: entity parent: ComputerBase + id: ComputerShuttleBase + name: shuttle console + description: Used to pilot a shuttle. + abstract: true + components: + - type: ShuttleConsole + - type: ApcPowerReceiver + powerLoad: 200 + +- type: entity + parent: ComputerShuttleBase id: ComputerShuttle name: shuttle console description: Used to pilot a shuttle. @@ -23,7 +34,7 @@ screen: shuttle - type: entity - parent: ComputerBase + parent: ComputerShuttleBase id: ComputerShuttleSyndie name: syndicate shuttle console description: Used to pilot a syndicate shuttle. @@ -79,7 +90,7 @@ - key: enum.ResearchClientUiKey.Key type: ResearchClientBoundUserInterface - type: ApcPowerReceiver - load: 200 + powerLoad: 200 priority: Low - type: Computer board: ResearchComputerCircuitboard diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml index 671ca7cb34..1b33400a9f 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml @@ -8,6 +8,7 @@ - type: Sprite netsync: false sprite: Structures/Storage/closet.rsi + noRot: true layers: - state: generic - state: generic_door diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 2cb5cdc7b3..bf308e9261 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1,6 +1,9 @@ - type: Tag id: BotanySharp +- type: Tag + id: CanPilot + - type: Tag id: ConveyorAssembly diff --git a/Resources/Textures/Interface/Alerts/piloting.png b/Resources/Textures/Interface/Alerts/piloting.png new file mode 100644 index 0000000000000000000000000000000000000000..cd3dd9f8b3814009e905eb9ae9d1d4e1044479d9 GIT binary patch literal 255 zcmVPx#xk*GpR9J=WQ_BtnAqbY5kMaF%$p*002ovPDHLk FV1fc%Y=8g& literal 0 HcmV?d00001 From 5552088ab7eb8f0b799444b3538e60277b086324 Mon Sep 17 00:00:00 2001 From: metalgearsloth Date: Wed, 21 Jul 2021 21:15:37 +1000 Subject: [PATCH 32/99] Update submodule --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 18c32a0258..22297ef6d8 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 18c32a02585397e23693e5dbdfdce33ecb33e92f +Subproject commit 22297ef6d812aacfa45621525b563afe7fd10166 From dbaa7585cb94c2f1fd0beb0be1e83a8cbaf3f5b7 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 21 Jul 2021 07:16:15 -0400 Subject: [PATCH 33/99] Automatic changelog update --- Resources/Changelog/Changelog.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 56a1b9a4ce..8ce5d630e0 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1508,3 +1508,8 @@ Entries: - {message: Remove portals until someone does a better job coding it, type: Remove} id: 267 time: '2021-07-21T09:16:10.0000000+00:00' +- author: metalgearsloth + changes: + - {message: Add Station driving, type: Add} + id: 268 + time: '2021-07-21T11:15:12.0000000+00:00' From 8ee312f2d4b33d47b8feb1d8b4f3822fd5fd7906 Mon Sep 17 00:00:00 2001 From: Visne <39844191+Visne@users.noreply.github.com> Date: Wed, 21 Jul 2021 13:30:50 +0200 Subject: [PATCH 34/99] Adds integer scaling option (#4300) * Adds integer scaling option * RobustToolbox * Update option name and tooltip --- Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml | 3 +++ Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml.cs | 7 +++++++ Resources/Locale/en-US/escape-menu/ui/options-menu.ftl | 9 +++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml b/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml index 13ab7ecb0b..f8ae37134a 100644 --- a/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml +++ b/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml @@ -30,6 +30,9 @@ MinWidth="200" /> + diff --git a/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml.cs b/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml.cs index dc4b1f495f..db27898a79 100644 --- a/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml.cs +++ b/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml.cs @@ -73,6 +73,7 @@ namespace Content.Client.EscapeMenu.UI.Tabs UpdateViewportScale(); }; + IntegerScalingCheckBox.OnToggled += OnCheckBoxToggled; ViewportLowResCheckBox.OnToggled += OnCheckBoxToggled; ApplyButton.OnPressed += OnApplyButtonPressed; VSyncCheckBox.Pressed = _cfg.GetCVar(CVars.DisplayVSync); @@ -82,6 +83,7 @@ namespace Content.Client.EscapeMenu.UI.Tabs HudThemeOption.SelectId(_cfg.GetCVar(CCVars.HudTheme)); ViewportScaleSlider.Value = _cfg.GetCVar(CCVars.ViewportFixedScaleFactor); ViewportStretchCheckBox.Pressed = _cfg.GetCVar(CCVars.ViewportStretch); + IntegerScalingCheckBox.Pressed = _cfg.GetCVar(CCVars.ViewportSnapToleranceMargin) != 0; ViewportLowResCheckBox.Pressed = !_cfg.GetCVar(CCVars.ViewportScaleRender); UpdateViewportScale(); @@ -114,6 +116,8 @@ namespace Content.Client.EscapeMenu.UI.Tabs _cfg.SetCVar(CVars.DisplayUIScale, UIScaleOptions[UIScaleOption.SelectedId]); _cfg.SetCVar(CCVars.ViewportStretch, ViewportStretchCheckBox.Pressed); _cfg.SetCVar(CCVars.ViewportFixedScaleFactor, (int) ViewportScaleSlider.Value); + _cfg.SetCVar(CCVars.ViewportSnapToleranceMargin, + IntegerScalingCheckBox.Pressed ? CCVars.ViewportSnapToleranceMargin.DefaultValue : 0); _cfg.SetCVar(CCVars.ViewportScaleRender, !ViewportLowResCheckBox.Pressed); _cfg.SaveToFile(); UpdateApplyButton(); @@ -139,6 +143,7 @@ namespace Content.Client.EscapeMenu.UI.Tabs var isUIScaleSame = MathHelper.CloseTo(UIScaleOptions[UIScaleOption.SelectedId], ConfigUIScale); var isVPStretchSame = ViewportStretchCheckBox.Pressed == _cfg.GetCVar(CCVars.ViewportStretch); var isVPScaleSame = (int) ViewportScaleSlider.Value == _cfg.GetCVar(CCVars.ViewportFixedScaleFactor); + var isIntegerScalingSame = IntegerScalingCheckBox.Pressed == (_cfg.GetCVar(CCVars.ViewportSnapToleranceMargin) != 0); var isVPResSame = ViewportLowResCheckBox.Pressed == !_cfg.GetCVar(CCVars.ViewportScaleRender); ApplyButton.Disabled = isVSyncSame && @@ -147,6 +152,7 @@ namespace Content.Client.EscapeMenu.UI.Tabs isUIScaleSame && isVPStretchSame && isVPScaleSame && + isIntegerScalingSame && isVPResSame && isHudThemeSame; } @@ -217,6 +223,7 @@ namespace Content.Client.EscapeMenu.UI.Tabs private void UpdateViewportScale() { ViewportScaleBox.Visible = !ViewportStretchCheckBox.Pressed; + IntegerScalingCheckBox.Visible = ViewportStretchCheckBox.Pressed; ViewportScaleText.Text = Loc.GetString("ui-options-vp-scale", ("scale", ViewportScaleSlider.Value)); } } diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl index d14a01d830..6ee69cb997 100644 --- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl @@ -37,9 +37,14 @@ ui-options-hud-theme = HUD Theme: ui-options-hud-theme-default = Default ui-options-hud-theme-modernized = Modernized ui-options-hud-theme-classic = Classic -ui-options-vp-stretch = Stretch viewport to fit game window? +ui-options-vp-stretch = Stretch viewport to fit game window ui-options-vp-scale = Fixed viewport scale: x{ $scale } -ui-options-vp-low-res = Low-resolution viewport? +ui-options-vp-integer-scaling = Prefer integer scaling (might cause black bars/clipping) +ui-options-vp-integer-scaling-tooltip = If this option is enabled, the viewport will be scaled using an integer value + at specific resolutions. While this results in crisp textures, it also often + means that black bars appear at the top/bottom of the screen or that part + of the viewport is not visible. +ui-options-vp-low-res = Low-resolution viewport ## Controls menu From 951691bbd6a7f6449853444f10cce3dc58177d52 Mon Sep 17 00:00:00 2001 From: Visne <39844191+Visne@users.noreply.github.com> Date: Wed, 21 Jul 2021 13:31:00 +0200 Subject: [PATCH 35/99] Close examine tooltip when moving out of range (#4273) --- Content.Client/Examine/ExamineSystem.cs | 57 +++++++++++++++++-------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs index f3003cdd44..5d58fc47fd 100644 --- a/Content.Client/Examine/ExamineSystem.cs +++ b/Content.Client/Examine/ExamineSystem.cs @@ -8,6 +8,7 @@ using Robust.Client.GameObjects; using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; +using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Input.Binding; using Robust.Shared.IoC; @@ -15,6 +16,7 @@ using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Players; using Robust.Shared.Utility; +using static Content.Shared.Interaction.SharedInteractionSystem; using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Examine @@ -27,6 +29,8 @@ namespace Content.Client.Examine public const string StyleClassEntityTooltip = "entity-tooltip"; + private IEntity? _examinedEntity; + private IEntity? _playerEntity; private Popup? _examineTooltipOpen; private CancellationTokenSource? _requestCancelTokenSource; @@ -39,6 +43,24 @@ namespace Content.Client.Examine .Register(); } + public override void Update(float frameTime) + { + if (_examineTooltipOpen == null || !_examineTooltipOpen.Visible) return; + if (_examinedEntity == null || _playerEntity == null) return; + + Ignored predicate = entity => entity == _playerEntity || entity == _examinedEntity; + + if (_playerEntity.TryGetContainer(out var container)) + { + predicate += entity => entity == container.Owner; + } + + if (!InRangeUnOccluded(_playerEntity, _examinedEntity, ExamineRange, predicate)) + { + CloseTooltip(); + } + } + public override void Shutdown() { CommandBinds.Unregister(); @@ -47,51 +69,54 @@ namespace Content.Client.Examine private bool HandleExamine(ICommonSession? session, EntityCoordinates coords, EntityUid uid) { - if (!uid.IsValid() || !EntityManager.TryGetEntity(uid, out var examined)) + if (!uid.IsValid() || !EntityManager.TryGetEntity(uid, out _examinedEntity)) { return false; } - var playerEntity = _playerManager.LocalPlayer?.ControlledEntity; + _playerEntity = _playerManager.LocalPlayer?.ControlledEntity; - if (playerEntity == null || !CanExamine(playerEntity, examined)) + if (_playerEntity == null || !CanExamine(_playerEntity, _examinedEntity)) { return false; } - DoExamine(examined); + DoExamine(_examinedEntity); return true; } public async void DoExamine(IEntity entity) { - const float minWidth = 300; + // Close any examine tooltip that might already be opened CloseTooltip(); + const float minWidth = 300; var popupPos = _userInterfaceManager.MousePositionScaled; // Actually open the tooltip. - _examineTooltipOpen = new Popup { MaxWidth = 400}; + _examineTooltipOpen = new Popup { MaxWidth = 400 }; _userInterfaceManager.ModalRoot.AddChild(_examineTooltipOpen); var panel = new PanelContainer(); panel.AddStyleClass(StyleClassEntityTooltip); panel.ModulateSelfOverride = Color.LightGray.WithAlpha(0.90f); _examineTooltipOpen.AddChild(panel); - //panel.SetAnchorAndMarginPreset(Control.LayoutPreset.Wide); + var vBox = new BoxContainer { Orientation = LayoutOrientation.Vertical }; panel.AddChild(vBox); + var hBox = new BoxContainer { Orientation = LayoutOrientation.Horizontal, SeparationOverride = 5 }; vBox.AddChild(hBox); + if (entity.TryGetComponent(out ISpriteComponent? sprite)) { - hBox.AddChild(new SpriteView {Sprite = sprite, OverrideDirection = Direction.South}); + hBox.AddChild(new SpriteView { Sprite = sprite, OverrideDirection = Direction.South }); } hBox.AddChild(new Label @@ -112,7 +137,6 @@ namespace Content.Client.Examine } else { - // Ask server for extra examine info. RaiseNetworkEvent(new ExamineSystemMessages.RequestExamineInfoMessage(entity.Uid)); @@ -138,17 +162,16 @@ namespace Content.Client.Examine foreach (var msg in message.Tags.OfType()) { - if (!string.IsNullOrWhiteSpace(msg.Text)) - { - var richLabel = new RichTextLabel(); - richLabel.SetMessage(message); - vBox.AddChild(richLabel); - break; - } + if (string.IsNullOrWhiteSpace(msg.Text)) continue; + + var richLabel = new RichTextLabel(); + richLabel.SetMessage(message); + vBox.AddChild(richLabel); + break; } } - public void CloseTooltip() + private void CloseTooltip() { if (_examineTooltipOpen != null) { From 321f65c1b37d902922ab5d1efd41803c5e9234d8 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 21 Jul 2021 07:32:03 -0400 Subject: [PATCH 36/99] Automatic changelog update --- Resources/Changelog/Changelog.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 8ce5d630e0..a211c5c5b9 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1513,3 +1513,14 @@ Entries: - {message: Add Station driving, type: Add} id: 268 time: '2021-07-21T11:15:12.0000000+00:00' +- author: Visne + changes: + - {message: 'Added integer scaling option. Turn it off to get rid of black bars, + at the cost of less crisp scaling.', type: Add} + id: 269 + time: '2021-07-21T11:30:50.0000000+00:00' +- author: Visne + changes: + - {message: Examine tooltip now closes when moving out of range, type: Tweak} + id: 270 + time: '2021-07-21T11:31:00.0000000+00:00' From 590a6ce969ea8c5fb781c8942696af2ac2cf29df Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 21 Jul 2021 22:13:58 +1000 Subject: [PATCH 37/99] Slipping, now with 20% more ecs (#4310) * Slipping, now with 20% more ecs * vereview --- Content.Client/Slippery/SlipperySystem.cs | 9 ++ Content.Server/Slippery/SlipperySystem.cs | 18 +++ .../Slippery/SharedSlipperySystem.cs | 112 ++++++++++++++++++ Content.Shared/Slippery/SlipperyComponent.cs | 106 ++--------------- Content.Shared/Slippery/SlipperySystem.cs | 19 --- 5 files changed, 146 insertions(+), 118 deletions(-) create mode 100644 Content.Client/Slippery/SlipperySystem.cs create mode 100644 Content.Server/Slippery/SlipperySystem.cs create mode 100644 Content.Shared/Slippery/SharedSlipperySystem.cs delete mode 100644 Content.Shared/Slippery/SlipperySystem.cs diff --git a/Content.Client/Slippery/SlipperySystem.cs b/Content.Client/Slippery/SlipperySystem.cs new file mode 100644 index 0000000000..fcd2052e86 --- /dev/null +++ b/Content.Client/Slippery/SlipperySystem.cs @@ -0,0 +1,9 @@ +using Content.Shared.Slippery; + +namespace Content.Client.Slippery +{ + internal sealed class SlipperySystem : SharedSlipperySystem + { + protected override void PlaySound(SlipperyComponent component) {} + } +} diff --git a/Content.Server/Slippery/SlipperySystem.cs b/Content.Server/Slippery/SlipperySystem.cs new file mode 100644 index 0000000000..30cba0ccf8 --- /dev/null +++ b/Content.Server/Slippery/SlipperySystem.cs @@ -0,0 +1,18 @@ +using Content.Shared.Audio; +using Content.Shared.Slippery; +using Robust.Shared.Audio; +using Robust.Shared.Player; + +namespace Content.Server.Slippery +{ + internal sealed class SlipperySystem : SharedSlipperySystem + { + protected override void PlaySound(SlipperyComponent component) + { + if (!string.IsNullOrEmpty(component.SlipSound)) + { + SoundSystem.Play(Filter.Pvs(component.Owner), component.SlipSound, component.Owner, AudioHelpers.WithVariation(0.2f)); + } + } + } +} diff --git a/Content.Shared/Slippery/SharedSlipperySystem.cs b/Content.Shared/Slippery/SharedSlipperySystem.cs new file mode 100644 index 0000000000..cfa08a6a8b --- /dev/null +++ b/Content.Shared/Slippery/SharedSlipperySystem.cs @@ -0,0 +1,112 @@ +using System.Linq; +using Content.Shared.EffectBlocker; +using Content.Shared.Stunnable; +using JetBrains.Annotations; +using Robust.Shared.Containers; +using Robust.Shared.GameObjects; +using Robust.Shared.Physics; +using Robust.Shared.Physics.Dynamics; + +namespace Content.Shared.Slippery +{ + [UsedImplicitly] + public abstract class SharedSlipperySystem : EntitySystem + { + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(HandleCollide); + } + + private void HandleCollide(EntityUid uid, SlipperyComponent component, StartCollideEvent args) + { + component.Colliding.Add(args.OtherFixture.Body.Owner.Uid); + } + + /// + public override void Update(float frameTime) + { + foreach (var slipperyComp in ComponentManager.EntityQuery().ToArray()) + { + Update(slipperyComp); + } + } + + private bool TrySlip(SlipperyComponent component, IPhysBody ourBody, IPhysBody otherBody) + { + if (!component.Slippery + || component.Owner.IsInContainer() + || component.Slipped.Contains(otherBody.Owner.Uid) + || !otherBody.Owner.TryGetComponent(out SharedStunnableComponent? stun)) + { + return false; + } + + if (otherBody.LinearVelocity.Length < component.RequiredSlipSpeed || stun.KnockedDown) + { + return false; + } + + var percentage = otherBody.GetWorldAABB().IntersectPercentage(ourBody.GetWorldAABB()); + + if (percentage < component.IntersectPercentage) + { + return false; + } + + if (!EffectBlockerSystem.CanSlip(otherBody.Owner)) + { + return false; + } + + otherBody.LinearVelocity *= component.LaunchForwardsMultiplier; + + stun.Paralyze(5); + component.Slipped.Add(otherBody.Owner.Uid); + component.Dirty(); + + PlaySound(component); + + return true; + } + + // Until we get predicted slip sounds TM? + protected abstract void PlaySound(SlipperyComponent component); + + // TODO: Now that we have StartCollide and EndCollide this should just use that to track bodies intersecting. + private void Update(SlipperyComponent component) + { + if (!component.Slippery) + return; + + if (!ComponentManager.TryGetComponent(component.Owner.Uid, out PhysicsComponent? body)) + { + component.Colliding.Clear(); + return; + } + + foreach (var uid in component.Colliding.ToArray()) + { + if (!uid.IsValid() || !EntityManager.TryGetEntity(uid, out var entity)) + { + component.Colliding.Remove(uid); + component.Slipped.Remove(uid); + component.Dirty(); + continue; + } + + if (!entity.TryGetComponent(out PhysicsComponent? otherPhysics) || + !body.GetWorldAABB().Intersects(otherPhysics.GetWorldAABB())) + { + component.Colliding.Remove(uid); + component.Slipped.Remove(uid); + component.Dirty(); + continue; + } + + if (!component.Slipped.Contains(uid)) + TrySlip(component, body, otherPhysics); + } + } + } +} diff --git a/Content.Shared/Slippery/SlipperyComponent.cs b/Content.Shared/Slippery/SlipperyComponent.cs index 4b88fd53ab..e5d5de20ad 100644 --- a/Content.Shared/Slippery/SlipperyComponent.cs +++ b/Content.Shared/Slippery/SlipperyComponent.cs @@ -1,20 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Content.Shared.Audio; -using Content.Shared.EffectBlocker; -using Content.Shared.Module; -using Content.Shared.Stunnable; -using Robust.Shared.Audio; -using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; -using Robust.Shared.IoC; using Robust.Shared.Maths; -using Robust.Shared.Physics; -using Robust.Shared.Physics.Collision; -using Robust.Shared.Physics.Dynamics; -using Robust.Shared.Player; using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.Serialization.Manager.Attributes; @@ -24,11 +13,9 @@ namespace Content.Shared.Slippery { [RegisterComponent] [NetworkedComponent()] - public class SlipperyComponent : Component, IStartCollide + public sealed class SlipperyComponent : Component { - [Dependency] private IModuleManager _moduleManager = default!; - - public sealed override string Name => "Slippery"; + public override string Name => "Slippery"; private float _paralyzeTime = 3f; private float _intersectPercentage = 0.3f; @@ -40,12 +27,12 @@ namespace Content.Shared.Slippery /// /// List of entities that are currently colliding with the entity. /// - private readonly HashSet _colliding = new(); + public readonly HashSet Colliding = new(); /// /// The list of entities that have been slipped by this component, which shouldn't be slipped again. /// - private readonly HashSet _slipped = new(); + public readonly HashSet Slipped = new(); /// /// Path to the sound to be played when a mob slips. @@ -150,88 +137,9 @@ namespace Content.Shared.Slippery } } - private bool TrySlip(IPhysBody ourBody, IPhysBody otherBody) - { - if (!Slippery - || Owner.IsInContainer() - || _slipped.Contains(otherBody.Owner.Uid) - || !otherBody.Owner.TryGetComponent(out SharedStunnableComponent? stun)) - { - return false; - } - - if (otherBody.LinearVelocity.Length < RequiredSlipSpeed || stun.KnockedDown) - { - return false; - } - - var percentage = otherBody.GetWorldAABB().IntersectPercentage(ourBody.GetWorldAABB()); - - if (percentage < IntersectPercentage) - { - return false; - } - - if (!EffectBlockerSystem.CanSlip(otherBody.Owner)) - { - return false; - } - - otherBody.LinearVelocity *= LaunchForwardsMultiplier; - - stun.Paralyze(5); - _slipped.Add(otherBody.Owner.Uid); - Dirty(); - - if (!string.IsNullOrEmpty(SlipSound) && _moduleManager.IsServerModule) - { - SoundSystem.Play(Filter.Broadcast(), SlipSound, Owner, AudioHelpers.WithVariation(0.2f)); - } - - return true; - } - - void IStartCollide.CollideWith(Fixture _, Fixture otherFixture, in Manifold manifold) - { - _colliding.Add(otherFixture.Body.Owner.Uid); - } - - public void Update() - { - if (!Slippery) - return; - - var physics = Owner.GetComponent(); - - foreach (var uid in _colliding.ToArray()) - { - if (!uid.IsValid() || !Owner.EntityManager.EntityExists(uid)) - { - _colliding.Remove(uid); - _slipped.Remove(uid); - Dirty(); - continue; - } - - var entity = Owner.EntityManager.GetEntity(uid); - var otherPhysics = entity.GetComponent(); - - if (!physics.GetWorldAABB().Intersects(otherPhysics.GetWorldAABB())) - { - _colliding.Remove(uid); - _slipped.Remove(uid); - Dirty(); - continue; - } - - if (!_slipped.Contains(uid)) - TrySlip(physics, otherPhysics); - } - } - public override ComponentState GetComponentState(ICommonSession player) { - return new SlipperyComponentState(ParalyzeTime, IntersectPercentage, RequiredSlipSpeed, LaunchForwardsMultiplier, Slippery, SlipSound, _slipped.ToArray()); + return new SlipperyComponentState(ParalyzeTime, IntersectPercentage, RequiredSlipSpeed, LaunchForwardsMultiplier, Slippery, SlipSound, Slipped.ToArray()); } public override void HandleComponentState(ComponentState? curState, ComponentState? nextState) @@ -244,11 +152,11 @@ namespace Content.Shared.Slippery _requiredSlipSpeed = state.RequiredSlipSpeed; _launchForwardsMultiplier = state.LaunchForwardsMultiplier; _slipSound = state.SlipSound; - _slipped.Clear(); + Slipped.Clear(); foreach (var slipped in state.Slipped) { - _slipped.Add(slipped); + Slipped.Add(slipped); } } } diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs deleted file mode 100644 index 3ea6a60b01..0000000000 --- a/Content.Shared/Slippery/SlipperySystem.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Linq; -using JetBrains.Annotations; -using Robust.Shared.GameObjects; - -namespace Content.Shared.Slippery -{ - [UsedImplicitly] - public class SlipperySystem : EntitySystem - { - /// - public override void Update(float frameTime) - { - foreach (var slipperyComp in ComponentManager.EntityQuery().ToArray()) - { - slipperyComp.Update(); - } - } - } -} From d34f1d4b5402253b3df6744a93537f40c219cac4 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 21 Jul 2021 22:19:50 +1000 Subject: [PATCH 38/99] (mostly) ECS projectiles (#4317) * (mostly) ECS projectiles * a * Actual queue --- .../Components/ProjectileComponent.cs | 62 ++----------------- .../Projectiles/ProjectileSystem.cs | 55 +++++++++++++++- 2 files changed, 58 insertions(+), 59 deletions(-) diff --git a/Content.Server/Projectiles/Components/ProjectileComponent.cs b/Content.Server/Projectiles/Components/ProjectileComponent.cs index ef41b8b735..795cfb301b 100644 --- a/Content.Server/Projectiles/Components/ProjectileComponent.cs +++ b/Content.Server/Projectiles/Components/ProjectileComponent.cs @@ -1,13 +1,7 @@ using System.Collections.Generic; -using Content.Server.Camera; using Content.Shared.Damage; -using Content.Shared.Damage.Components; using Content.Shared.Projectiles; -using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.Physics.Collision; -using Robust.Shared.Physics.Dynamics; -using Robust.Shared.Player; using Robust.Shared.Players; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; @@ -16,9 +10,8 @@ namespace Content.Server.Projectiles.Components { [RegisterComponent] [ComponentReference(typeof(SharedProjectileComponent))] - public class ProjectileComponent : SharedProjectileComponent, IStartCollide + public class ProjectileComponent : SharedProjectileComponent { - [DataField("damages")] private Dictionary _damages = new(); [ViewVariables] @@ -32,12 +25,10 @@ namespace Content.Server.Projectiles.Components public bool DeleteOnCollide { get; } = true; // Get that juicy FPS hit sound - [DataField("soundHit")] - private string? _soundHit = default; - [DataField("soundHitSpecies")] - private string? _soundHitSpecies = default; + [DataField("soundHit")] public string? SoundHit = default; + [DataField("soundHitSpecies")] public string? SoundHitSpecies = default; - private bool _damagedEntity; + public bool DamagedEntity; public float TimeLeft { get; set; } = 10; @@ -51,51 +42,6 @@ namespace Content.Server.Projectiles.Components Dirty(); } - /// - /// Applies the damage when our projectile collides with its victim - /// - void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold) - { - // This is so entities that shouldn't get a collision are ignored. - if (!otherFixture.Hard || _damagedEntity) - { - return; - } - - var coordinates = otherFixture.Body.Owner.Transform.Coordinates; - var playerFilter = Filter.Pvs(coordinates); - if (otherFixture.Body.Owner.TryGetComponent(out IDamageableComponent? damage) && _soundHitSpecies != null) - { - SoundSystem.Play(playerFilter, _soundHitSpecies, coordinates); - } - else if (_soundHit != null) - { - SoundSystem.Play(playerFilter, _soundHit, coordinates); - } - - if (damage != null) - { - Owner.EntityManager.TryGetEntity(Shooter, out var shooter); - - foreach (var (damageType, amount) in _damages) - { - damage.ChangeDamage(damageType, amount, false, shooter); - } - - _damagedEntity = true; - } - - // Damaging it can delete it - if (!otherFixture.Body.Deleted && otherFixture.Body.Owner.TryGetComponent(out CameraRecoilComponent? recoilComponent)) - { - var direction = ourFixture.Body.LinearVelocity.Normalized; - recoilComponent.Kick(direction); - } - - if(DeleteOnCollide) - Owner.QueueDelete(); - } - public override ComponentState GetComponentState(ICommonSession player) { return new ProjectileComponentState(Shooter, IgnoreShooter); diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs index 78e492cde5..0324635748 100644 --- a/Content.Server/Projectiles/ProjectileSystem.cs +++ b/Content.Server/Projectiles/ProjectileSystem.cs @@ -1,17 +1,70 @@ +using Content.Server.Camera; using Content.Server.Projectiles.Components; +using Content.Shared.Damage.Components; using JetBrains.Annotations; +using Robust.Shared.Audio; using Robust.Shared.GameObjects; +using Robust.Shared.Physics.Dynamics; +using Robust.Shared.Player; namespace Content.Server.Projectiles { [UsedImplicitly] internal sealed class ProjectileSystem : EntitySystem { + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(HandleCollide); + } + + private void HandleCollide(EntityUid uid, ProjectileComponent component, StartCollideEvent args) + { + // This is so entities that shouldn't get a collision are ignored. + if (!args.OtherFixture.Hard || component.DamagedEntity) + { + return; + } + + var coordinates = args.OtherFixture.Body.Owner.Transform.Coordinates; + var playerFilter = Filter.Pvs(coordinates); + if (args.OtherFixture.Body.Owner.TryGetComponent(out IDamageableComponent? damage) && component.SoundHitSpecies != null) + { + SoundSystem.Play(playerFilter, component.SoundHitSpecies, coordinates); + } + else if (component.SoundHit != null) + { + SoundSystem.Play(playerFilter, component.SoundHit, coordinates); + } + + if (damage != null) + { + EntityManager.TryGetEntity(component.Shooter, out var shooter); + + foreach (var (damageType, amount) in component.Damages) + { + damage.ChangeDamage(damageType, amount, false, shooter); + } + + component.DamagedEntity = true; + } + + // Damaging it can delete it + if (!args.OtherFixture.Body.Deleted && args.OtherFixture.Body.Owner.TryGetComponent(out CameraRecoilComponent? recoilComponent)) + { + var direction = args.OurFixture.Body.LinearVelocity.Normalized; + recoilComponent.Kick(direction); + } + + if (component.DeleteOnCollide) + EntityManager.QueueDeleteEntity(uid); + } + public override void Update(float frameTime) { base.Update(frameTime); - foreach (var component in ComponentManager.EntityQuery(true)) + foreach (var component in ComponentManager.EntityQuery()) { component.TimeLeft -= frameTime; From 3775d329bdc0ab061bee46f8ffa4245eaea65270 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 21 Jul 2021 22:26:09 +1000 Subject: [PATCH 39/99] ECS vapors (#4308) * ECS vapors * tweak * Reviews * man my git must be laggin is yours laggin --- .../Chemistry/Components/VaporComponent.cs | 125 ++---------------- .../Chemistry/EntitySystems/VaporSystem.cs | 113 +++++++++++++++- .../Fluids/Components/SprayComponent.cs | 16 ++- 3 files changed, 127 insertions(+), 127 deletions(-) diff --git a/Content.Server/Chemistry/Components/VaporComponent.cs b/Content.Server/Chemistry/Components/VaporComponent.cs index f9b9197066..7eda0be87f 100644 --- a/Content.Server/Chemistry/Components/VaporComponent.cs +++ b/Content.Server/Chemistry/Components/VaporComponent.cs @@ -1,131 +1,24 @@ -using System.Linq; -using Content.Shared.Chemistry.Reagent; -using Content.Shared.Chemistry.Solution; -using Content.Shared.Physics; +using Content.Shared.Chemistry.Reagent; using Content.Shared.Vapor; using Robust.Shared.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Map; -using Robust.Shared.Maths; -using Robust.Shared.Physics.Collision; -using Robust.Shared.Physics.Dynamics; -using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; namespace Content.Server.Chemistry.Components { [RegisterComponent] - class VaporComponent : SharedVaporComponent, IStartCollide + internal sealed class VaporComponent : SharedVaporComponent { - public const float ReactTime = 0.125f; - - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [ViewVariables] [DataField("transferAmount")] - private ReagentUnit _transferAmount = ReagentUnit.New(0.5); + internal ReagentUnit TransferAmount = ReagentUnit.New(0.5); - private bool _reached; - private float _reactTimer; - private float _timer; - private EntityCoordinates _target; - private bool _running; - private float _aliveTime; - - protected override void Initialize() - { - base.Initialize(); - - Owner.EnsureComponentWarn(out SolutionContainerComponent _); - } - - public void Start(Vector2 dir, float speed, EntityCoordinates target, float aliveTime) - { - _running = true; - _target = target; - _aliveTime = aliveTime; - // Set Move - if (Owner.TryGetComponent(out PhysicsComponent? physics)) - { - physics.BodyStatus = BodyStatus.InAir; - physics.ApplyLinearImpulse(dir * speed); - } - } - - public void Update(float frameTime) - { - if (!Owner.TryGetComponent(out SolutionContainerComponent? contents)) - return; - - if (!_running) - return; - - _timer += frameTime; - _reactTimer += frameTime; - - if (_reactTimer >= ReactTime && Owner.Transform.GridID.IsValid()) - { - _reactTimer = 0; - var mapGrid = _mapManager.GetGrid(Owner.Transform.GridID); - - var tile = mapGrid.GetTileRef(Owner.Transform.Coordinates.ToVector2i(Owner.EntityManager, _mapManager)); - foreach (var reagentQuantity in contents.ReagentList.ToArray()) - { - if (reagentQuantity.Quantity == ReagentUnit.Zero) continue; - var reagent = _prototypeManager.Index(reagentQuantity.ReagentId); - contents.TryRemoveReagent(reagentQuantity.ReagentId, reagent.ReactionTile(tile, (reagentQuantity.Quantity / _transferAmount) * 0.25f)); - } - } - - // Check if we've reached our target. - if(!_reached && _target.TryDistance(Owner.EntityManager, Owner.Transform.Coordinates, out var distance) && distance <= 0.5f) - { - _reached = true; - } - - if (contents.CurrentVolume == 0 || _timer > _aliveTime) - { - // Delete this - Owner.Delete(); - } - } - - internal bool TryAddSolution(Solution solution) - { - if (solution.TotalVolume == 0) - { - return false; - } - - if (!Owner.TryGetComponent(out SolutionContainerComponent? contents)) - { - return false; - } - - var result = contents.TryAddSolution(solution); - - if (!result) - { - return false; - } - - return true; - } - - void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold) - { - if (!Owner.TryGetComponent(out SolutionContainerComponent? contents)) - return; - - contents.Solution.DoEntityReaction(otherFixture.Body.Owner, ReactionMethod.Touch); - - // Check for collision with a impassable object (e.g. wall) and stop - if ((otherFixture.CollisionLayer & (int) CollisionGroup.Impassable) != 0 && otherFixture.Hard) - { - Owner.QueueDelete(); - } - } + internal bool Reached; + internal float ReactTimer; + internal float Timer; + internal EntityCoordinates Target; + internal bool Active; + internal float AliveTime; } } diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs index 14203c5dbb..f5e21c4adc 100644 --- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs @@ -1,17 +1,122 @@ -using Content.Server.Chemistry.Components; +using System.Linq; +using Content.Server.Chemistry.Components; +using Content.Shared.Chemistry.Reagent; +using Content.Shared.Chemistry.Solution; +using Content.Shared.Physics; using JetBrains.Annotations; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Physics.Dynamics; +using Robust.Shared.Prototypes; namespace Content.Server.Chemistry.EntitySystems { [UsedImplicitly] - public class VaporSystem : EntitySystem + internal sealed class VaporSystem : EntitySystem { + [Dependency] private readonly IMapManager _mapManager = default!; + [Dependency] private readonly IPrototypeManager _protoManager = default!; + + private const float ReactTime = 0.125f; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(HandleCollide); + } + + private void HandleCollide(EntityUid uid, VaporComponent component, StartCollideEvent args) + { + if (!ComponentManager.TryGetComponent(uid, out SolutionContainerComponent? contents)) return; + + contents.Solution.DoEntityReaction(args.OtherFixture.Body.Owner, ReactionMethod.Touch); + + // Check for collision with a impassable object (e.g. wall) and stop + if ((args.OtherFixture.CollisionLayer & (int) CollisionGroup.Impassable) != 0 && args.OtherFixture.Hard) + { + EntityManager.QueueDeleteEntity(uid); + } + } + + public void Start(VaporComponent vapor, Vector2 dir, float speed, EntityCoordinates target, float aliveTime) + { + vapor.Active = true; + vapor.Target = target; + vapor.AliveTime = aliveTime; + // Set Move + if (vapor.Owner.TryGetComponent(out PhysicsComponent? physics)) + { + physics.BodyStatus = BodyStatus.InAir; + physics.ApplyLinearImpulse(dir * speed); + } + } + + internal bool TryAddSolution(VaporComponent vapor, Solution solution) + { + if (solution.TotalVolume == 0) + { + return false; + } + + if (!vapor.Owner.TryGetComponent(out SolutionContainerComponent? contents)) + { + return false; + } + + var result = contents.TryAddSolution(solution); + + if (!result) + { + return false; + } + + return true; + } + public override void Update(float frameTime) { - foreach (var vaporComp in ComponentManager.EntityQuery(true)) + foreach (var (vaporComp, solution) in ComponentManager.EntityQuery(true)) { - vaporComp.Update(frameTime); + Update(frameTime, vaporComp, solution); + } + } + + private void Update(float frameTime, VaporComponent vapor, SolutionContainerComponent contents) + { + if (!vapor.Active) + return; + + var entity = vapor.Owner; + + vapor.Timer += frameTime; + vapor.ReactTimer += frameTime; + + if (vapor.ReactTimer >= ReactTime && vapor.Owner.Transform.GridID.IsValid()) + { + vapor.ReactTimer = 0; + var mapGrid = _mapManager.GetGrid(entity.Transform.GridID); + + var tile = mapGrid.GetTileRef(entity.Transform.Coordinates.ToVector2i(EntityManager, _mapManager)); + foreach (var reagentQuantity in contents.ReagentList.ToArray()) + { + if (reagentQuantity.Quantity == ReagentUnit.Zero) continue; + var reagent = _protoManager.Index(reagentQuantity.ReagentId); + contents.TryRemoveReagent(reagentQuantity.ReagentId, reagent.ReactionTile(tile, (reagentQuantity.Quantity / vapor.TransferAmount) * 0.25f)); + } + } + + // Check if we've reached our target. + if(!vapor.Reached && vapor.Target.TryDistance(EntityManager, entity.Transform.Coordinates, out var distance) && distance <= 0.5f) + { + vapor.Reached = true; + } + + if (contents.CurrentVolume == 0 || vapor.Timer > vapor.AliveTime) + { + // Delete this + entity.QueueDelete(); } } } diff --git a/Content.Server/Fluids/Components/SprayComponent.cs b/Content.Server/Fluids/Components/SprayComponent.cs index 6b316e746e..e753ca818f 100644 --- a/Content.Server/Fluids/Components/SprayComponent.cs +++ b/Content.Server/Fluids/Components/SprayComponent.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using Content.Server.Chemistry.Components; +using Content.Server.Chemistry.EntitySystems; using Content.Shared.ActionBlocker; using Content.Shared.Audio; using Content.Shared.Chemistry.Reagent; @@ -8,7 +9,6 @@ using Content.Shared.Cooldown; using Content.Shared.DragDrop; using Content.Shared.Fluids; using Content.Shared.Interaction; -using Content.Shared.Interaction.Events; using Content.Shared.Notification.Managers; using Content.Shared.Vapor; using Robust.Server.GameObjects; @@ -26,12 +26,11 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Fluids.Components { [RegisterComponent] - class SprayComponent : SharedSprayComponent, IAfterInteract, IUse, IActivate, IDropped + internal sealed class SprayComponent : SharedSprayComponent, IAfterInteract, IUse, IActivate, IDropped { public const float SprayDistance = 3f; [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IServerEntityManager _serverEntityManager = default!; [DataField("transferAmount")] private ReagentUnit _transferAmount = ReagentUnit.New(10); @@ -117,7 +116,9 @@ namespace Content.Server.Fluids.Components return true; var playerPos = eventArgs.User.Transform.Coordinates; - if (eventArgs.ClickLocation.GetGridId(_serverEntityManager) != playerPos.GetGridId(_serverEntityManager)) + var entManager = Owner.EntityManager; + + if (eventArgs.ClickLocation.GetGridId(entManager) != playerPos.GetGridId(entManager)) return true; if (!Owner.TryGetComponent(out SolutionContainerComponent? contents)) @@ -149,7 +150,7 @@ namespace Content.Server.Fluids.Components if (solution.TotalVolume <= ReagentUnit.Zero) break; - var vapor = _serverEntityManager.SpawnEntity(_vaporPrototype, playerPos.Offset(distance < 1 ? quarter : threeQuarters)); + var vapor = entManager.SpawnEntity(_vaporPrototype, playerPos.Offset(distance < 1 ? quarter : threeQuarters)); vapor.Transform.LocalRotation = rotation; if (vapor.TryGetComponent(out AppearanceComponent? appearance)) // Vapor sprite should face down. @@ -161,9 +162,10 @@ namespace Content.Server.Fluids.Components // Add the solution to the vapor and actually send the thing var vaporComponent = vapor.GetComponent(); - vaporComponent.TryAddSolution(solution); + var vaporSystem = EntitySystem.Get(); + vaporSystem.TryAddSolution(vaporComponent, solution); - vaporComponent.Start(rotation.ToVec(), _sprayVelocity, target, _sprayAliveTime); + vaporSystem.Start(vaporComponent, rotation.ToVec(), _sprayVelocity, target, _sprayAliveTime); if (_impulse > 0f && eventArgs.User.TryGetComponent(out IPhysBody? body)) { From 39801372be48bbeb3782cd04e42ce252682bcdc7 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 21 Jul 2021 22:26:18 +1000 Subject: [PATCH 40/99] Remove IStartCollide from containment fields (#4318) * Remove IStartCollide from containment fields * Emitter namespace * vera reviews --- .../Components/ParticleProjectileComponent.cs | 24 ++-------- .../Components/ContainmentFieldComponent.cs | 15 +------ .../ContainmentFieldGeneratorComponent.cs | 12 +---- .../ContainmentFieldGeneratorSystem.cs | 45 ++++++++++++++++++- 4 files changed, 50 insertions(+), 46 deletions(-) diff --git a/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs index baf2ee7c02..b49a0f2b2a 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs @@ -12,30 +12,14 @@ using Robust.Shared.Timing; namespace Content.Server.ParticleAccelerator.Components { [RegisterComponent] - public class ParticleProjectileComponent : Component, IStartCollide + public class ParticleProjectileComponent : Component { public override string Name => "ParticleProjectile"; - private ParticleAcceleratorPowerState _state; - void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold) - { - if (otherFixture.Body.Owner.TryGetComponent(out var singularityGeneratorComponent)) - { - singularityGeneratorComponent.Power += _state switch - { - ParticleAcceleratorPowerState.Standby => 0, - ParticleAcceleratorPowerState.Level0 => 1, - ParticleAcceleratorPowerState.Level1 => 2, - ParticleAcceleratorPowerState.Level2 => 4, - ParticleAcceleratorPowerState.Level3 => 8, - _ => 0 - }; - Owner.Delete(); - } - } + public ParticleAcceleratorPowerState State; public void Fire(ParticleAcceleratorPowerState state, Angle angle, IEntity firer) { - _state = state; + State = state; if (!Owner.TryGetComponent(out var physicsComponent)) { @@ -56,7 +40,7 @@ namespace Content.Server.ParticleAccelerator.Components Logger.Error("ParticleProjectile tried firing, but it was spawned without a SinguloFoodComponent"); return; } - var multiplier = _state switch + var multiplier = State switch { ParticleAcceleratorPowerState.Standby => 0, ParticleAcceleratorPowerState.Level0 => 1, diff --git a/Content.Server/Singularity/Components/ContainmentFieldComponent.cs b/Content.Server/Singularity/Components/ContainmentFieldComponent.cs index 072bddfd6b..f40cce21c0 100644 --- a/Content.Server/Singularity/Components/ContainmentFieldComponent.cs +++ b/Content.Server/Singularity/Components/ContainmentFieldComponent.cs @@ -1,24 +1,11 @@ using Robust.Shared.GameObjects; -using Robust.Shared.Physics.Collision; -using Robust.Shared.Physics.Dynamics; namespace Content.Server.Singularity.Components { [RegisterComponent] - public class ContainmentFieldComponent : Component, IStartCollide + public class ContainmentFieldComponent : Component { public override string Name => "ContainmentField"; public ContainmentFieldConnection? Parent; - - void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold) - { - if (Parent == null) - { - Owner.QueueDelete(); - return; - } - - Parent.TryRepell(Owner, otherFixture.Body.Owner); - } } } diff --git a/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs b/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs index c0e21f9b5b..eb5f57d0ee 100644 --- a/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs +++ b/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs @@ -2,21 +2,18 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Shared.Physics; -using Content.Shared.Tag; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Physics; using Robust.Shared.Physics.Broadphase; -using Robust.Shared.Physics.Collision; -using Robust.Shared.Physics.Dynamics; using Robust.Shared.ViewVariables; namespace Content.Server.Singularity.Components { [RegisterComponent] - public class ContainmentFieldGeneratorComponent : Component, IStartCollide + public class ContainmentFieldGeneratorComponent : Component { public override string Name => "ContainmentFieldGenerator"; @@ -165,13 +162,6 @@ namespace Content.Server.Singularity.Components } } - void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold) - { - if (otherFixture.Body.Owner.HasTag("EmitterBolt")) { - ReceivePower(6); - } - } - public void UpdateConnectionLights() { if (_pointLightComponent != null) diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs index 89660d7548..d553d2e927 100644 --- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs @@ -1,5 +1,9 @@ -using Content.Server.Singularity.Components; +using Content.Server.ParticleAccelerator.Components; +using Content.Server.Singularity.Components; +using Content.Shared.Singularity.Components; +using Content.Shared.Tag; using Robust.Shared.GameObjects; +using Robust.Shared.Physics.Dynamics; namespace Content.Server.Singularity.EntitySystems { @@ -10,6 +14,45 @@ namespace Content.Server.Singularity.EntitySystems base.Initialize(); SubscribeLocalEvent(BodyTypeChanged); + SubscribeLocalEvent(HandleFieldCollide); + SubscribeLocalEvent(HandleGeneratorCollide); + SubscribeLocalEvent(HandleParticleCollide); + } + + private void HandleParticleCollide(EntityUid uid, ParticleProjectileComponent component, StartCollideEvent args) + { + if (args.OtherFixture.Body.Owner.TryGetComponent(out var singularityGeneratorComponent)) + { + singularityGeneratorComponent.Power += component.State switch + { + ParticleAcceleratorPowerState.Standby => 0, + ParticleAcceleratorPowerState.Level0 => 1, + ParticleAcceleratorPowerState.Level1 => 2, + ParticleAcceleratorPowerState.Level2 => 4, + ParticleAcceleratorPowerState.Level3 => 8, + _ => 0 + }; + + EntityManager.QueueDeleteEntity(uid); + } + } + + private void HandleGeneratorCollide(EntityUid uid, ContainmentFieldGeneratorComponent component, StartCollideEvent args) + { + if (args.OtherFixture.Body.Owner.HasTag("EmitterBolt")) { + component.ReceivePower(6); + } + } + + private void HandleFieldCollide(EntityUid uid, ContainmentFieldComponent component, StartCollideEvent args) + { + if (component.Parent == null) + { + EntityManager.QueueDeleteEntity(uid); + return; + } + + component.Parent.TryRepell(component.Owner, args.OtherFixture.Body.Owner); } private static void BodyTypeChanged( From a0a5dcdfde53e6ed2986172c9e6b04d43fc7cecc Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Wed, 21 Jul 2021 15:15:02 +0200 Subject: [PATCH 41/99] Clean up vote XAML a bit. Remove deprecated UI things from it, give vote popup a MinWidth. --- Content.Client/Voting/UI/VoteCallMenu.xaml | 38 ++++++++-------------- Content.Client/Voting/UI/VotePopup.xaml | 23 +++++-------- 2 files changed, 22 insertions(+), 39 deletions(-) diff --git a/Content.Client/Voting/UI/VoteCallMenu.xaml b/Content.Client/Voting/UI/VoteCallMenu.xaml index 98478b1439..5ff1015dbb 100644 --- a/Content.Client/Voting/UI/VoteCallMenu.xaml +++ b/Content.Client/Voting/UI/VoteCallMenu.xaml @@ -4,36 +4,24 @@ MouseFilter="Stop" MinSize="350 150"> - - - - - - + + - - - - - - - - + + + + + + - -