From afea64252bf1840b7cbd7ed978ba3db94b8ef544 Mon Sep 17 00:00:00 2001
From: Nim <128169402+Nimfar11@users.noreply.github.com>
Date: Thu, 27 Mar 2025 16:37:11 +0200
Subject: [PATCH] Wrench sprite and fix mask (#1075)

* wrench

* stored

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
---
 .../Objects/Weapons/Melee/Tools/wrench.yml    |  10 ++++----
 .../_CP14/Loadouts/Jobs/general.yml           |   1 +
 .../_CP14/Objects/Tools/wrench.rsi/icon.png   | Bin 0 -> 526 bytes
 .../Objects/Tools/wrench.rsi/inhand-left.png  | Bin 0 -> 410 bytes
 .../Objects/Tools/wrench.rsi/inhand-right.png | Bin 0 -> 415 bytes
 .../_CP14/Objects/Tools/wrench.rsi/meta.json  |  22 ++++++++++++++++++
 6 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 Resources/Textures/_CP14/Objects/Tools/wrench.rsi/icon.png
 create mode 100644 Resources/Textures/_CP14/Objects/Tools/wrench.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_CP14/Objects/Tools/wrench.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_CP14/Objects/Tools/wrench.rsi/meta.json

diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml
index 8fdcb228a7..1e76c34af2 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml
@@ -13,13 +13,11 @@
     tags:
     - Wrench
   - type: Sprite
-    sprite: Objects/Tools/wrench.rsi #TODO
+    sprite: _CP14/Objects/Tools/wrench.rsi
     state: icon
   - type: Item
-    sprite: Objects/Tools/wrench.rsi #TODO
-    storedSprite:
-      sprite: Objects/Tools/wrench.rsi #TODO
-      state: storage
+    sprite: _CP14/Objects/Tools/wrench.rsi
+    storedRotation: 45
   - type: MeleeWeapon
     wideAnimationRotation: 135
     attackRate: 1.5
@@ -33,4 +31,4 @@
       - Anchoring
     useSound:
       path: /Audio/Items/ratchet.ogg
-      
\ No newline at end of file
+      
diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
index 30e4fe033b..aec528696e 100644
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
@@ -149,6 +149,7 @@
   - CP14ClothingMaskSinner
   - CP14ClothingMaskSteelMask
   - CP14ClothingMaskNeckerchief
+  - CP14ClothingMaskBoneHornedMask
   - CP14ClothingMaskMime
 
 - type: loadout
diff --git a/Resources/Textures/_CP14/Objects/Tools/wrench.rsi/icon.png b/Resources/Textures/_CP14/Objects/Tools/wrench.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..10fac07bce6c3bc9174d39cb08bd18ecdae9c87e
GIT binary patch
literal 526
zcmV+p0`dKcP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$$Vo&&R9J=Wl(BBYFc5}+SA7B|RtiHbM3*WH^c9jP04WREnGz%(09d-W3sU<8
z&eYC<#mW>#W&ok8Lz#F5cW502)T9uivg8}%i|^Cj`GAs=k|XGK2U4TD>~#n7A_DD>
zA;*(P`Tp@)xX4vj(ssv?0AQL1Va&s5IK}H5L$gIultik)Phzw?hIAbprfCo!_!teR
zh(b}AM5;i&)<6^rn5F@Z>e6*=ECnac79~9JV+mEI!Ud9vEUOQV>Jk84$BtuWvnSMR
zjdSv+3nUW(K&4W}?M+i^RF{=XH7SZ-caVE9N!H<b@(9K}S+6zFY*9p^h?4?96bh_2
zD;%CbzdU5#d$d4OBKfUeYk&tnEUQmk$A+qkX&P}%6pEunjy6@OQuDyaQt-Y1HL6Sf
z?mn&%0Jx5wnd4-EcE^ZYl6HAAM!lA_*vvif8@t^W>&+@o^jpkg?hzjNV9eW_jY0&L
zf|K2D3&y;7QT-K{#mNGPWbFaV>XXIXBU!_E@(d_6s!Pl20{|HFu$X(f?#f+(rQl>X
zdjf#H=l5>{3e{t^s!t_%3lwSzspWLI8~)<@Tmj(wX<ihK>N0N&N=iz;0Qknx>j-z|
Q-v9sr07*qoM6N<$f;-RXK>z>%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Tools/wrench.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/wrench.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c2c5583f43a7cbf8d747021200ede54d3a29f77
GIT binary patch
literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$R7pfZRCt{2+C6T<KoExEk0^&gf<7&^T~I<}iWE6Qq?{l*0-PWcM@W$ZH&9YQ
z?bdxF<rbT2f@4Ji+q+9p-lw6$voro_=92&b0000$Xhl)FbDyE=I#!{gDBXIq)q1my
zRq`ag&;{m;rIV!9Dp!9n)a%Rh$u*NSbCR^*<-yMB{Ryy!pC0df(xLGtP2Ao+xR3WY
z&1RV-X}`;TAM=a1$yV>Q)b6g;8@C~b)Tw}d(AJx6r^cnj0H>3&Mx&eHjhohm?ERF~
z_}%_VQIsxb<DJ<6s)M*hS8e~;9}K_!0ssI2000000Q^hy#nRcX@7#_BGJ@>lY+V*}
z%UfrGjAQkK9;`Zu>0~TP!8gB60~t~7jP3o6&%{SPkddUB^Rcb=&i6LizB5Uhxh~g?
z7LxL@P4*ecFn{YY`GxO5#>EL0$Y>pqh>bu7007>70t4}z{Ouuw9RL6T07*qoM6N<$
Eg0oS;pa1{>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Tools/wrench.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/wrench.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe48c72399007f93b1d03d10d980aec4cbf3fbc2
GIT binary patch
literal 415
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zBRyRlLn`LH
zy=CZk*g=5xLjDxzh)vbEu9QtQ%AC{Gq^wZLWZ_iAv_z({Nhx!Z5$l!PyZo2jNz%CB
zlAZD<;o2JUf7x$bwrw@GE;D8p5Cnt2@yDh-s^+zGsoE5=j)fuZGUu_!uV1{5{x{8Q
zf%*3DMOJbK^Tin&j<@el5T5w7mEpkc*UJpsCjNc=^rt3MgN5hQ5}P^yufO8ZRNU3c
zpyGF_IA?yW$b>ZGBd0E$jb3lQ!u!Z}rj5dev;7zpX1s4TT$)o}&2W|X&6bM4VJo(M
z&++KdJbH3jrs)gAknq_2p2=H^RFn{a>sCOUn%L>78Ivz>JtjBv{X)*&o4LPSZqBKF
zkk9X%aW%L6cN}xLxP651!tR&J8He(=nDLtOI876u^t5$HjeTv&9QU`=uWUXQ)X?Ac
z<K=~x{=Utdg}5s-4$Ty3SF_^xxbpA<i=bd&z&*w??HNxPZ@;(=3~>feS3j3^P6<r_
D%3iR^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Tools/wrench.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/wrench.rsi/meta.json
new file mode 100644
index 0000000000..73bd8613e1
--- /dev/null
+++ b/Resources/Textures/_CP14/Objects/Tools/wrench.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "All right reserved",
+  "copyright": "Created by Jaraten (Github), icon by trushnikov_daniel (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}