From a5de12e4cfc4dba892563b9f4d5cc7896ac5b297 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sat, 25 Apr 2020 13:55:16 +0200 Subject: [PATCH] Inhands for multitool and screwdriver Also makes power debug tool its own thing. --- .../Prototypes/Entities/Items/power_debug.yml | 18 ++++++++++++++ Resources/Prototypes/Entities/Items/tools.yml | 22 ++++++++++++++---- .../Tools/multitool.rsi/inhand-left.png | Bin 0 -> 242 bytes .../Tools/multitool.rsi/inhand-right.png | Bin 0 -> 250 bytes .../Objects/Tools/multitool.rsi/meta.json | 1 + .../Tools/{ => multitool.rsi}/multitool.png | Bin .../Tools/screwdriver.rsi/inhand-left.png | Bin 0 -> 157 bytes .../Tools/screwdriver.rsi/inhand-right.png | Bin 0 -> 163 bytes .../Objects/Tools/screwdriver.rsi/meta.json | 1 + .../{ => screwdriver.rsi}/screwdriver.png | Bin 10 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/Entities/Items/power_debug.yml create mode 100644 Resources/Textures/Objects/Tools/multitool.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/multitool.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/multitool.rsi/meta.json rename Resources/Textures/Objects/Tools/{ => multitool.rsi}/multitool.png (100%) create mode 100644 Resources/Textures/Objects/Tools/screwdriver.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/screwdriver.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json rename Resources/Textures/Objects/Tools/{ => screwdriver.rsi}/screwdriver.png (100%) diff --git a/Resources/Prototypes/Entities/Items/power_debug.yml b/Resources/Prototypes/Entities/Items/power_debug.yml new file mode 100644 index 0000000000..5539563c1a --- /dev/null +++ b/Resources/Prototypes/Entities/Items/power_debug.yml @@ -0,0 +1,18 @@ +- type: entity + name: Power Debug Tool + parent: BaseItem + id: PowerDebug + description: An advanced tool to copy, store, and send electrical pulses and signals through wires and machines + components: + - type: Sprite + sprite: Objects/Tools/multitool.rsi + state: multitool + + - type: Icon + sprite: Objects/Tools/multitool.rsi + state: multitool + + - type: Item + sprite: Objects/Tools/multitool.rsi + + - type: PowerDebugTool diff --git a/Resources/Prototypes/Entities/Items/tools.yml b/Resources/Prototypes/Entities/Items/tools.yml index b3e18ca422..78726f8f28 100644 --- a/Resources/Prototypes/Entities/Items/tools.yml +++ b/Resources/Prototypes/Entities/Items/tools.yml @@ -20,9 +20,16 @@ components: - type: Screwdriver - type: Sprite - texture: Objects/Tools/screwdriver.png + sprite: Objects/Tools/screwdriver.rsi + state: screwdriver + - type: Icon - texture: Objects/Tools/screwdriver.png + sprite: Objects/Tools/screwdriver.rsi + state: screwdriver + + - type: Item + sprite: Objects/Tools/screwdriver.rsi + - type: ItemCooldown - type: MeleeWeapon @@ -95,7 +102,12 @@ components: - type: Multitool - type: Sprite - texture: Objects/Tools/multitool.png + sprite: Objects/Tools/multitool.rsi + state: multitool + - type: Icon - texture: Objects/Tools/multitool.png - - type: PowerDebugTool + sprite: Objects/Tools/multitool.rsi + state: multitool + + - type: Item + sprite: Objects/Tools/multitool.rsi diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/multitool.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6ea2c1414ae68d3554dbc92f99da295ac0667c41 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=J3U<-Ln`LHy|t0I#ek>vp@x^U z<6*uI(TvQ9Bc|FF`_3E?d8tu*)${tjqmA8P>X~gU`|j)&0BQt+IV;qJJHsX`3i+Cb zrrJ1}-Yk%t_W9FiA(ur@_uMFu^PMgb%^Lq%Vq50=Q#Y2`#(aKZa?v+r^3+YUJW4DX zCuS^NQ#uEVtmXh0vh$kO!uU2Yy~P~V6a=YN>;FXk*MJARc=w?efEoH?%Y+qvd$@? F2>=#3J6Qk# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json new file mode 100644 index 0000000000..8cc3c98bcc --- /dev/null +++ b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json @@ -0,0 +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]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/screwdriver.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png similarity index 100% rename from Resources/Textures/Objects/Tools/screwdriver.png rename to Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png