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
DrSmugleaf
215cae5655
Fix more errors
2021-12-06 00:52:58 +01:00
Wrexbe
b9dd3be061
More Changes
2021-12-05 10:56:17 -08:00
DrSmugleaf
2a3b7d809d
Fix 3000 errors
2021-12-05 18:09:01 +01:00
Flipp Syder
863a85cef6
adds toggles for accessreaders ( #5696 )
2021-12-04 01:01:37 -08:00
Vera Aguilera Puerto
5cd42c9ad6
Inline UID
2021-12-03 15:53:09 +01:00
Vera Aguilera Puerto
b835bea086
Inline GetComponent
2021-12-03 11:55:25 +01:00
Alex Evgrashin
a3f16295ea
Move Access to ECS ( #4826 )
...
* Moved access to ecs
* Fixed tests
* Moved test to integration
* Better IoC
* Moved preset ID card
* Moved id card to ECS
* Moved access component to ECS
* Fixed pda access
* Final touches
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2021-10-22 13:31:07 +11:00
