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
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
bd8acc5b6b
Fix food & do-after bugs ( #5716 )
2021-12-06 23:19:26 -07:00
DrSmugleaf
af4eb3c7cd
Fix more errors, client and server now build
2021-12-06 14:00:39 +01:00
DrSmugleaf
2a3b7d809d
Fix 3000 errors
2021-12-05 18:09:01 +01:00
Leon Friedrich
bfff21ea73
Add IngestionBlocker component ( #5692 )
2021-12-04 11:56:27 -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
a5b57c8e10
Inline Transform
2021-12-03 14:20:34 +01:00
Vera Aguilera Puerto
69b270017b
Inline TryGetComponent completely, for real
2021-12-03 14:17:01 +01:00
Vera Aguilera Puerto
5e177ae734
Inline EntityManager
2021-12-03 11:18:05 +01:00
Leon Friedrich
a9c3153a55
Make masks & some helmets block eating/drinkling ( #5656 )
2021-12-02 15:51:05 +01:00
mirrorcult
ccf01d7431
Remove LungBehavior and replace with LungComponent/System ( #5630 )
2021-11-30 18:25:02 -07:00
FoLoKe
6f455346b2
Fixes mouse self-eating ( #5622 )
2021-11-30 21:45:33 +11:00
Leon Friedrich
d0c5d72d47
Forcefeed DoAfters, again. ( #5582 )
2021-11-29 14:27:15 +11:00
FoLoKe
e94bd5698d
Fixes EatVerb interaction range ( #5505 )
2021-11-25 13:16:56 +11:00
FoLoKe
24aca21eb6
Moved Food and Utensil to ECS ( #5380 )
...
* Food and Utensil to ECS, Made utensil less restrictive, no more soup eating with a knife...
* AltVerb "can eat" check
* removed HasFlag calls
* AltActionVerb -> InteractionVerb
* "required utensil" filed
2021-11-21 00:35:09 -07:00
