From b684517f25a5e9192ce8e1eb08988bbbf84e16ee Mon Sep 17 00:00:00 2001
From: Ady4ik <stalcraftexbo@yandex.ru>
Date: Sun, 1 Sep 2024 22:42:56 +0300
Subject: [PATCH] Add more love to Dexler

---
 .../SharedSolutionContainerSystem.cs          |  8 ++--
 .../Entities/Objects/Tools/spraynozzle.yml    | 43 -------------------
 .../Prototypes/SS220/Tools/spraynozzle.yml    | 31 +++++++++++++
 3 files changed, 35 insertions(+), 47 deletions(-)
 delete mode 100644 Resources/Prototypes/Entities/Objects/Tools/spraynozzle.yml
 create mode 100644 Resources/Prototypes/SS220/Tools/spraynozzle.yml

diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index 311df5f5ad5f95..513f2e16ffda57 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -86,7 +86,7 @@ public override void Initialize()
         SubscribeLocalEvent<ExaminableSolutionComponent, ExaminedEvent>(OnExamineSolution);
         SubscribeLocalEvent<ExaminableSolutionComponent, GetVerbsEvent<ExamineVerb>>(OnSolutionExaminableVerb);
         SubscribeLocalEvent<SolutionContainerManagerComponent, MapInitEvent>(OnMapInit);
-        //SubscribeLocalEvent<ClothingSlotSolutionProviderComponent, TakeSolutionEvent>(OnGetSolution);
+        SubscribeLocalEvent<ClothingSlotSolutionProviderComponent, TakeSolutionEvent>(OnGetSolution);
 
         if (NetManager.IsServer)
         {
@@ -1224,12 +1224,12 @@ public FixedPoint2 ClampReagentAmountByConcentration(
     }
 
     // SS220 Refactor nuzzle begin
-    private void OnGetSolution(EntityUid uid, TakeSolutionEvent takeSolutionEvent)
+    private void OnGetSolution(Entity<SolutionProviderComponent> entity, ref TakeSolutionEvent takeSolutionEvent)
     {
-        if (!TryGetSolution(uid, ClothingSlotSolutionProviderComponent.ContainmentSolutionName, out var soln, out var solution))
+        if (!TryGetSolution(entity, ClothingSlotSolutionProviderComponent.ContainmentSolutionName, out var entsoln, out var solution))
             return;
 
-        SplitSolution(uid, FixedPoint2.Value, FixedPoint2.New(takeSolutionEvent.SolutionAmount));
+        var splitSolution = SplitSolution(entsoln, new FixedPoint2(10f));
     }
     // SS220 Refactor nuzzle end
 }
diff --git a/Resources/Prototypes/Entities/Objects/Tools/spraynozzle.yml b/Resources/Prototypes/Entities/Objects/Tools/spraynozzle.yml
deleted file mode 100644
index 66b03f5acc07c1..00000000000000
--- a/Resources/Prototypes/Entities/Objects/Tools/spraynozzle.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-- type: entity
-  id: SprayNozzle
-  parent: BaseItem
-  name: spray nozzle
-  description: A high-powered spray nozzle used in conjunction with a backpack-mounted water tank.
-  components:
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Basic/spraynozzle.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Weapons/Guns/Basic/spraynozzle.rsi
-    size: Normal
-  # SS220 Nozzle fix begin
-  #- type: Gun
-  #  cameraRecoilScalar: 0 #no recoil
-  #  fireRate: 4
-  #  selectedMode: FullAuto
-  #  availableModes:
-  #  - FullAuto
-  #  soundGunshot:
-  #    path: /Audio/Weapons/Guns/Gunshots/water_spray.ogg
-  - type: UseDelay
-  - type: Spray
-    transferAmount: 15
-    sprayedPrototype: BigVapor
-    sprayVelocity: 4
-    sprayDistance: 6
-    spraySound:
-      path: /Audio/Effects/spray2.ogg
-  - type: Drink
-    solution: spray
-    ignoreEmpty: true
-    useSound:
-      path: /Audio/Effects/spray3.ogg
-    transferAmount: 10
-  - type: SolutionItemStatus
-    solution: spray
-  - type: Appearance
-  - type: ClothingSlotSolutionProvider
-    solutionRequiredSlot: BACK
-    solutionProviderWhitelist:
-      tags:
-      - NozzleBackTank
diff --git a/Resources/Prototypes/SS220/Tools/spraynozzle.yml b/Resources/Prototypes/SS220/Tools/spraynozzle.yml
new file mode 100644
index 00000000000000..94a5da06f3c5cb
--- /dev/null
+++ b/Resources/Prototypes/SS220/Tools/spraynozzle.yml
@@ -0,0 +1,31 @@
+- type: entity
+  id: SprayNozzle
+  parent: BaseItem
+  name: spray nozzle
+  description: A high-powered spray nozzle used in conjunction with a backpack-mounted water tank.
+  components:
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/SS220/Effects/Drop/pistol.ogg ##new sound_drop effect, add MIXnikita
+      params:
+        volume: 2
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Basic/spraynozzle.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Weapons/Guns/Basic/spraynozzle.rsi
+    size: Normal
+  - type: Gun
+    cameraRecoilScalar: 0 #no recoil
+    fireRate: 4
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/water_spray.ogg
+  - type: Appearance
+  - type: ClothingSlotAmmoProvider
+    targetSlot: BACK
+    providerWhitelist:
+      tags:
+      - NozzleBackTank