diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 6c65076cb0..a91d8bbbae 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -123,7 +123,10 @@ components: - type: Sprite sprite: Objects/Tools/multitool.rsi - state: multitool + layers: + - state: icon + - state: green-unlit + shader: unshaded - type: Clothing size: 10 sprite: Objects/Tools/multitool.rsi diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/green-inhand-left.png b/Resources/Textures/Objects/Tools/multitool.rsi/green-inhand-left.png new file mode 100644 index 0000000000..7bad24cbcf Binary files /dev/null and b/Resources/Textures/Objects/Tools/multitool.rsi/green-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/green-inhand-right.png b/Resources/Textures/Objects/Tools/multitool.rsi/green-inhand-right.png new file mode 100644 index 0000000000..a7f84f65f5 Binary files /dev/null and b/Resources/Textures/Objects/Tools/multitool.rsi/green-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png new file mode 100644 index 0000000000..fccc17e919 Binary files /dev/null and b/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/icon.png b/Resources/Textures/Objects/Tools/multitool.rsi/icon.png new file mode 100644 index 0000000000..6e16a3f7eb Binary files /dev/null and b/Resources/Textures/Objects/Tools/multitool.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json b/Resources/Textures/Objects/Tools/multitool.rsi/meta.json index 2b499a45c1..8de591c17e 100644 --- a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/multitool.rsi/meta.json @@ -1,72 +1,63 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/94f27c7b25bbde39c1412e24fb32bf6470fcc394", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "green-unlit", + "directions": 1 + }, + { + "name": "yellow-unlit", + "directions": 1 + }, + { + "name": "red-unlit", + "directions": 1 + }, { "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 + }, + { + "name": "green-inhand-left", + "directions": 4 + }, + { + "name": "green-inhand-right", + "directions": 4 + }, + { + "name": "yellow-inhand-left", + "directions": 4 + }, + { + "name": "yellow-inhand-right", + "directions": 4 + }, + { + "name": "red-inhand-left", + "directions": 4 + }, + { + "name": "red-inhand-right", + "directions": 4 }, { "name": "equipped-BELT", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "multitool", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/multitool.png b/Resources/Textures/Objects/Tools/multitool.rsi/multitool.png deleted file mode 100644 index 0a89791312..0000000000 Binary files a/Resources/Textures/Objects/Tools/multitool.rsi/multitool.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/red-inhand-left.png b/Resources/Textures/Objects/Tools/multitool.rsi/red-inhand-left.png new file mode 100644 index 0000000000..6273a48953 Binary files /dev/null and b/Resources/Textures/Objects/Tools/multitool.rsi/red-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/red-inhand-right.png b/Resources/Textures/Objects/Tools/multitool.rsi/red-inhand-right.png new file mode 100644 index 0000000000..91f633ea38 Binary files /dev/null and b/Resources/Textures/Objects/Tools/multitool.rsi/red-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png new file mode 100644 index 0000000000..a141fec4bf Binary files /dev/null and b/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/yellow-inhand-left.png b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-inhand-left.png new file mode 100644 index 0000000000..62c6be8d20 Binary files /dev/null and b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/yellow-inhand-right.png b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-inhand-right.png new file mode 100644 index 0000000000..66334a3b62 Binary files /dev/null and b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png new file mode 100644 index 0000000000..f890dbd413 Binary files /dev/null and b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png differ