From ba36acca6a323eed6a488bafd65d15f29ab1f665 Mon Sep 17 00:00:00 2001
From: Slava0135 <40753025+Slava0135@users.noreply.github.com>
Date: Fri, 5 May 2023 15:48:38 +0300
Subject: [PATCH] Fix fire extinguisher (#16113)

---
 Content.Server/Fluids/Components/SprayComponent.cs            | 1 -
 .../Prototypes/Entities/Objects/Misc/fire_extinguisher.yml    | 4 +---
 .../Prototypes/Entities/Objects/Specific/Janitorial/spray.yml | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Content.Server/Fluids/Components/SprayComponent.cs b/Content.Server/Fluids/Components/SprayComponent.cs
index 0c2848de06..d0afe31f46 100644
--- a/Content.Server/Fluids/Components/SprayComponent.cs
+++ b/Content.Server/Fluids/Components/SprayComponent.cs
@@ -1,5 +1,4 @@
 using Content.Server.Fluids.EntitySystems;
-using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index 9918e03592..9166aba3bb 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -24,6 +24,7 @@
     solution: spray
   - type: DrainableSolution
     solution: spray
+  - type: SolutionTransfer
   - type: ItemCooldown
   - type: Spray
     spraySound:
@@ -32,9 +33,6 @@
     vaporAmount: 3
     vaporSpread: 90
     sprayVelocity: 2.0
-    sprayTimeAlive: 1.5
-    transferAmount: 5
-    impulse: 50.0
   - type: FireExtinguisher
     hasSafety: true
   - type: MeleeWeapon
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
index 6850a4585a..f0c7562533 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -51,7 +51,6 @@
   - type: Spray
     sprayedPrototype: BigVapor
     sprayVelocity: 5
-    sprayAliveTime: 5
     spraySound:
       path: /Audio/Effects/spray2.ogg