zumorica 3029e31e4a Merge branch 'master' into 2020-04-28-tool-component ... # Conflicts: # Content.Server/GameObjects/Components/AnchorableComponent.cs # Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs # Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs # Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs # Content.Server/GameObjects/Components/WiresComponent.cs # Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs # Resources/Prototypes/Entities/Items/tools.yml		2020-05-23 12:02:34 +02:00
..
ConstructionComponent.cs	Merge branch 'master' into 2020-04-28-tool-component	2020-05-23 12:02:34 +02:00
ConstructorComponent.cs	Add interaction checks to all interactions (#923)	2020-05-23 11:27:31 +02:00