From 778c93489da48a6782b581bc8de2b0a9fc4a303e Mon Sep 17 00:00:00 2001
From: BIGZi0348 <svalker0348@gmail.com>
Date: Thu, 26 Dec 2024 21:48:44 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B8=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BC=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Objects/Tools/tools.yml          | 20 ++++++++++---------
 .../Entities/Objects/Tools/seniors_tools.yml  | 20 +++++++++++++++++++
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 3a6f430fe3..d785d1190c 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -129,9 +129,10 @@
     state: icon
   - type: Item
     sprite: Objects/Tools/wrench.rsi
-    storedSprite:
-      sprite: Objects/Tools/wrench.rsi
-      state: storage
+    storedRotation: -44 # WD
+    # storedSprite: # WD removed
+    #   sprite: Objects/Tools/wrench.rsi
+    #   state: storage
   - type: MeleeWeapon
     wideAnimationRotation: 135
     attackRate: 1.5
@@ -177,9 +178,10 @@
   - type: Item
     sprite: Objects/Tools/crowbar.rsi
     size: Small
-    storedSprite:
-      sprite: Objects/Tools/crowbar.rsi
-      state: storage
+    storedRotation: -63 # WD
+    # storedSprite: # WD removed
+    #   sprite: Objects/Tools/crowbar.rsi
+    #   state: storage
   - type: MeleeWeapon
     wideAnimationRotation: -135
     damage:
@@ -213,9 +215,9 @@
     state: red-icon
   - type: Item
     heldPrefix: red
-    storedSprite:
-      sprite: Objects/Tools/crowbar.rsi
-      state: red-storage
+    # storedSprite: # WD removed
+    #   sprite: Objects/Tools/crowbar.rsi
+    #   state: red-storage
 
 - type: entity
   name: multitool
diff --git a/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml b/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml
index 40f6ee17f2..d4a505c9cd 100644
--- a/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml
@@ -16,6 +16,9 @@
       sprite: White/Objects/Tools/impcrowbar.rsi
     - type: Item
       sprite: White/Objects/Tools/impcrowbar.rsi
+      size: Small
+      storedSprite: null
+      storedRotation: -63
 
 - type: entity
   parent: Wrench
@@ -30,6 +33,9 @@
       sprite: White/Objects/Tools/impwrench.rsi
     - type: Item
       sprite: White/Objects/Tools/impwrench.rsi
+      size: Small
+      storedSprite: null
+      storedRotation: -44
     - type: MeleeWeapon
       attackRate: 1.5
       damage:
@@ -55,6 +61,7 @@
       state: icon
     - type: Item
       sprite: White/Objects/Tools/impscrewdriver.rsi
+      storedRotation: -90
     - type: UseDelay
     - type: MeleeWeapon
       attackRate: 1
@@ -72,6 +79,12 @@
     - type: PhysicalComposition
       materialComposition:
         Steel: 100
+    - type: EmitSoundOnPickup
+      sound:
+        path: /Audio/White/Items/handling/screwdriver_pickup.ogg
+    - type: EmitSoundOnDrop
+      sound:
+        path: /Audio/Items/screwdriver_drop.ogg
 
 - type: entity
   parent: BaseItem
@@ -83,6 +96,7 @@
       price: 500
     - type: Item
       sprite: White/Objects/Tools/impwirecutter.rsi
+      storedRotation: -90
     - type: Sprite
       sprite: White/Objects/Tools/impwirecutter.rsi
       state: icon
@@ -110,6 +124,12 @@
     - type: PhysicalComposition
       materialComposition:
         Steel: 100
+    - type: EmitSoundOnPickup
+      sound:
+        path: /Audio/White/Items/handling/wirecutter_pickup.ogg
+    - type: EmitSoundOnDrop
+      sound:
+        path: /Audio/Items/wirecutter_drop.ogg
 
 - type: entity
   parent: BaseWelder