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 |
|
metalgearsloth
|
16e1bed678
|
Random IoCManager.Resolve<IEntityManager> removals moment
|
2021-12-07 23:48:34 +11:00 |
|
metalgearsloth
|
8af335097f
|
More (IComponent) shenanigans and also some contaminated IoCManager.Resolve<IEntityManager>() very long yes calls
|
2021-12-07 22:22:34 +11:00 |
|
Leon Friedrich
|
c33d06c544
|
lung fix (#5697)
|
2021-12-04 01:11:48 -07:00 |
|
Vera Aguilera Puerto
|
f386b57148
|
Inline OwnerUid
|
2021-12-03 16:30:34 +01:00 |
|
Vera Aguilera Puerto
|
5cd42c9ad6
|
Inline UID
|
2021-12-03 15:53:09 +01:00 |
|
Vera Aguilera Puerto
|
69b270017b
|
Inline TryGetComponent completely, for real
|
2021-12-03 14:17:01 +01:00 |
|
mirrorcult
|
ccf01d7431
|
Remove LungBehavior and replace with LungComponent/System (#5630)
|
2021-11-30 18:25:02 -07:00 |
|