From 18fd5a6e4121f020b0467fbd90365fc6b86f342e Mon Sep 17 00:00:00 2001 From: Swept Date: Tue, 5 Jan 2021 10:32:37 +0000 Subject: [PATCH] Fixes multitool sprite. (#2921) * Sprites * YAML --- .../Entities/Objects/Tools/tools.yml | 5 +- .../Tools/multitool.rsi/green-inhand-left.png | Bin 0 -> 209 bytes .../multitool.rsi/green-inhand-right.png | Bin 0 -> 221 bytes .../Tools/multitool.rsi/green-unlit.png | Bin 0 -> 123 bytes .../Objects/Tools/multitool.rsi/icon.png | Bin 0 -> 359 bytes .../Objects/Tools/multitool.rsi/meta.json | 99 ++++++++---------- .../Objects/Tools/multitool.rsi/multitool.png | Bin 197 -> 0 bytes .../Tools/multitool.rsi/red-inhand-left.png | Bin 0 -> 195 bytes .../Tools/multitool.rsi/red-inhand-right.png | Bin 0 -> 204 bytes .../Objects/Tools/multitool.rsi/red-unlit.png | Bin 0 -> 117 bytes .../multitool.rsi/yellow-inhand-left.png | Bin 0 -> 196 bytes .../multitool.rsi/yellow-inhand-right.png | Bin 0 -> 205 bytes .../Tools/multitool.rsi/yellow-unlit.png | Bin 0 -> 121 bytes 13 files changed, 49 insertions(+), 55 deletions(-) create mode 100644 Resources/Textures/Objects/Tools/multitool.rsi/green-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/multitool.rsi/green-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png create mode 100644 Resources/Textures/Objects/Tools/multitool.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Tools/multitool.rsi/multitool.png create mode 100644 Resources/Textures/Objects/Tools/multitool.rsi/red-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/multitool.rsi/red-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png create mode 100644 Resources/Textures/Objects/Tools/multitool.rsi/yellow-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/multitool.rsi/yellow-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png 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 0000000000000000000000000000000000000000..7bad24cbcf94fa4e7af90bab23de9462c3d404e3 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Gdx`!Ln`LHy|t0|kOL2E0Qbd! z3mce|SfixGJkN5?)HgP8wK}CBK2amksl~5u{rBrH-<;zE>SL&T@}b7(a6#v~+qzt5 zcC9%-XW#w&YtvHK|337(rswucyR|1z{5q2vR92ArJ-zstMO^Y}%?ziX{t?!`Al(d4 zr-sK>KAn1fOU%@%cSY;&@vS+VRrdJCm$yK<1M#j$r0@~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a7f84f65f5562c4ba72a4b1c2a5dded9c2960226 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=OFUg1Ln`LHy=lmG$U(s2qT;QH z8x?IG;TyJoRJsQRIhH;ugPcO=FC?+zx6$RZnD>kdR1h0Id z*coIwVB^O33=^l^VPMEnfs29oAaR;IKwf?(BPb!>xB+zp6oB~m@84u_a5%uoz(9wB zh+2Sb2WV(OvSN0DK9~ma$pI9F!0ZLf8B!A>!8EymA_u@M2hrpLva=y5(Q$C3GvsD~ zcn276+#t`Kp;-`tvf|B~=_oZHA`6a!Q7{UI5@29p003vgZzB!p@Xi1L002ovPDHLk FV1lB@i^Tu{ literal 0 HcmV?d00001 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 0a89791312e3228b0b8b5876f21350a432196450..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iW*8>L*EL^A_osizy>G0u$ zMMDDvP$WJk=EMnghW}N9m-AK~N!J7_W-JNv3ubV5b|VeQ3G#Gt4AGdFoUlMDA;e8s zAkfeu^nui?9<2wD9(Ao!-fN@G;JTnFjgzr)Rp<()rgu;KG?;pH_15zIV7+rC;O@Z} qQ=WJ^xVpP**Ds(Ih*f3iTyAFDemm@ZwB4cMz&Js+gn)78&qol`;+0JIxWwEzGB literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..91f633ea38fb3f1fd282da3853a439800c777a74 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=lRaG=Ln`LHy}6O|uz>*Ug~KN` zgTe~DWM4fG#pTx literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a141fec4bf9b5deaf39c994e771dbe07e8da5698 GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz8&4Okwu`UYN$olMW~C&q#- OVDNPHb6Mw<&;$S$oha}C literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..62c6be8d208ff2e00dfb17e224df082870ac1b40 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=-JULvAr*7p-ZJDmY{0`B5LmTX zXRrUeiN@(CA_5FeE^NHPd-TQLoBt%dXNv%pGyL&*Hfg5!n%8T!H{8ws9(``xU43ou z`>*#E$eb_JU{C%u*LZ%|!F#XfpX;fuKQcAep!L&ygIm5JoeWQ>hR0Ptooc?-OiSBZ r`_CO&iL>%K9@!%7U zdkVhq9^39&6uxl-PtFX1gXfaM6Cc{%@VfAR!(A4j76$gEdp=F6tSd8}_U7!nH}=MJ zZ1it`+qrn>&ie9|RqsuB_itYJ{>4+Vl=N@!-k$wp(DL`W{>746;;)tpgLE@A?6%F? zKmGTP!k&m}yIgao_f`LhD=)fw)%V*6pzIwDrF~9|OeW5+_g@B5?dj_0vd$@?2>{+@ BS!ngI0)z4*}Q$iB}kKQRu literal 0 HcmV?d00001