Vera Aguilera Puerto 3f79e3754f Merge branch 'master' into 2021-12-03-remove-IEntity-komm-süsser-todd ... # Conflicts: # Content.Client/Crayon/CrayonDecalVisualizer.cs # Content.Client/Tabletop/TabletopSystem.cs # Content.IntegrationTests/Tests/InventoryHelpersTest.cs # Content.Server/AI/EntitySystems/AiSystem.cs # Content.Server/AI/Utility/AiLogic/UtilityAI.cs # Content.Server/AME/AMENodeGroup.cs # Content.Server/Administration/AdminVerbSystem.cs # Content.Server/Body/Systems/RespiratorSystem.cs # Content.Server/Chemistry/Components/InjectorComponent.cs # Content.Server/Chemistry/TileReactions/CleanTileReaction.cs # Content.Server/Chemistry/TileReactions/SpillTileReaction.cs # Content.Server/Crayon/CrayonComponent.cs # Content.Server/Doors/Components/ServerDoorComponent.cs # Content.Server/Explosion/EntitySystems/TriggerSystem.cs # Content.Server/Fluids/Components/MopComponent.cs # Content.Server/Fluids/Components/SpillExtensions.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.cs # Content.Server/Instruments/InstrumentSystem.cs # Content.Server/Nutrition/EntitySystems/DrinkSystem.cs # Content.Server/Nutrition/EntitySystems/FoodSystem.cs # Content.Server/PneumaticCannon/PneumaticCannonSystem.cs # Content.Server/Storage/Components/EntityStorageComponent.cs # Content.Server/Storage/Components/StorageFillComponent.cs # Content.Server/Stunnable/StunbatonSystem.cs # Content.Server/Throwing/ThrowHelper.cs # Content.Server/Weapon/Ranged/Barrels/BarrelSystem.cs # Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs # Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs # Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs # Content.Shared/Damage/Components/DamageableComponent.cs # Content.Shared/Damage/Systems/DamageableSystem.cs # Content.Shared/MobState/Components/MobStateComponent.cs # Content.Shared/Slippery/SharedSlipperySystem.cs		2021-12-07 17:48:49 +01:00
..
Commands	Goes in-game now	2021-12-06 15:34:46 +01:00
Logs	Fix 3000 errors	2021-12-05 18:09:01 +01:00
Managers	includes deadmined admins in adminsystem playerlist updates	2021-11-10 18:09:22 +01:00
UI	Fix 3000 errors	2021-12-05 18:09:01 +01:00
AdminCommandAttribute.cs	Console Unify API Changes (#3059)	2021-02-01 16:49:43 -08:00
AdminPermsChangedEventArgs.cs	Massive Namespace Cleanup (#3120)	2021-02-11 01:13:03 -08:00
AdminRank.cs	Remove redundant #nullable enable (#4275)	2021-07-16 17:37:09 -07:00
AdminSystem.cs	Goes in-game now	2021-12-06 15:34:46 +01:00
AdminVerbSystem.cs	Merge branch 'master' into 2021-12-03-remove-IEntity-komm-süsser-todd	2021-12-07 17:48:49 +01:00
AnyCommandAttribute.cs	Console Unify API Changes (#3059)	2021-02-01 16:49:43 -08:00
BwoinkSystem.cs	AHelp tweaks - colored names for admins, window name (#5335)	2021-11-14 12:21:18 -07:00
PlayerLocator.cs	Use HWIDs for bans.	2021-03-22 01:32:09 +01:00