zumorica
|
3cf2948f82
|
Fix remnants of IAfterAttack
|
2020-05-24 13:47:13 +02:00 |
|
zumorica
|
934e69d6e3
|
Merge branch 'master' into 2020-04-28-tool-component
# Conflicts:
# Content.Server/GameObjects/Components/AnchorableComponent.cs
# Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs
# Content.Server/GameObjects/Components/Doors/AirlockComponent.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
|
2020-05-23 18:00:28 +02:00 |
|
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 |
|
zumorica
|
06d2cc74ed
|
Refactor a bunch of stuff.
|
2020-05-19 14:17:48 +02:00 |
|
zumorica
|
ff5549a0d1
|
Finish refactoring tools. Add multitools. (as in multiple tools in one)
|
2020-04-29 13:48:32 +02:00 |
|