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 |
|
Pieter-Jan Briers
|
1cb1bd5a8f
|
Randomize wirecutter and screwdriver colors.
|
2020-05-23 02:14:11 +02:00 |
|
zumorica
|
6ae5e36a18
|
Merge branch 'master' into 2020-04-28-tool-component
|
2020-05-11 12:24:43 +02:00 |
|
Pieter-Jan Briers
|
cdf4127a86
|
Fix lathe recipe texture references.
Closes #860
|
2020-05-02 16:09:46 +02:00 |
|
zumorica
|
ff5549a0d1
|
Finish refactoring tools. Add multitools. (as in multiple tools in one)
|
2020-04-29 13:48:32 +02:00 |
|
Pieter-Jan Briers
|
a5de12e4cf
|
Inhands for multitool and screwdriver
Also makes power debug tool its own thing.
|
2020-04-25 13:55:16 +02:00 |
|
Swept
|
66c327805f
|
Added a bunch more textures (#356)
|
2019-09-24 22:15:26 +02:00 |
|