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
@@ -1 +1 @@
|
||||
{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "screwdriver", "directions": 1, "delays": [[1.0]]}]}
|
||||
{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "screwdriver", "directions": 1, "delays": [[1.0]]}, {"name": "screwdriver-map", "directions": 1, "delays": [[1.0]]}, {"name": "screwdriver-screwybits", "directions": 1, "delays": [[1.0]]}]}
|
||||
|
After Width: | Height: | Size: 178 B |
|
After Width: | Height: | Size: 133 B |
|
Before Width: | Height: | Size: 177 B After Width: | Height: | Size: 151 B |
|
Before Width: | Height: | Size: 216 B |
|
After Width: | Height: | Size: 172 B |
BIN
Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png
Normal file
|
After Width: | Height: | Size: 213 B |
BIN
Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png
Normal file
|
After Width: | Height: | Size: 156 B |
BIN
Resources/Textures/Objects/Tools/wirecutters.rsi/inhand-left.png
Normal file
|
After Width: | Height: | Size: 197 B |
|
After Width: | Height: | Size: 190 B |
@@ -0,0 +1 @@
|
||||
{"version":1,"size":{"x":32,"y":32},"states":[{"name":"cutters","directions":1,"delays":[[1.0]]},{"name":"cutters-cutty-thingy","directions":1,"delays":[[1.0]]},{"name":"cutters-map","directions":1,"delays":[[1.0]]},{"name":"inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]}]}
|
||||