DrSmugleaf
|
4a8ed41e3a
|
Fix namespaces and optimize imports (#1651)
* Fix namespaces and optimize imports
* Cleanup fixes
* Merge conflict fixes
* Merge conflict fixes
* Merge conflict fixes
|
2020-08-13 14:40:27 +02:00 |
|
Acruid
|
ea94f4a182
|
Moved interaction interfaces from Server to Shared.
|
2020-07-18 22:51:56 -07:00 |
|
Hugal31
|
a5051c549b
|
Use TheName macro and GrammarComponent (#1396)
|
2020-07-17 10:44:32 +02:00 |
|
chairbender
|
b35333d366
|
Click Drag Functionality + Refactor Interaction Interfaces (#1125)
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
|
2020-07-06 23:27:03 +02:00 |
|
py01
|
23cc6b1d4e
|
Power Rework (#863)
Co-authored-by: py01 <pyronetics01@gmail.com>
|
2020-06-28 17:23:26 +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 |
|
Clyybber
|
1ad9a10050
|
Fix #274 (#927)
|
2020-05-23 17:23:25 +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 |
|
chairbender
|
6a4d78cfac
|
Add interaction checks to all interactions (#923)
|
2020-05-23 11:27:31 +02:00 |
|
zumorica
|
06d2cc74ed
|
Refactor a bunch of stuff.
|
2020-05-19 14:17:48 +02:00 |
|
zumorica
|
06c7030514
|
Some work
|
2020-05-17 12:58:54 +02:00 |
|
zumorica
|
b1db8d1e7a
|
Add WelderComponent back
|
2020-05-11 15:26:07 +02:00 |
|
Jackson Lewis
|
1f0c72dd28
|
Gravity (#841)
|
2020-05-02 16:02:52 +02:00 |
|