Fix fire extinguisher (#16113)

diff --git a/Content.Server/Fluids/Components/SprayComponent.cs b/Content.Server/Fluids/Components/SprayComponent.cs
index 0c2848de0632ed055f5967ce4bd1b3698d4cd24e..d0afe31f466bf9d930d43c83d1715d28612e64f5 100644 (file)
--- 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 9918e03592ca7237524ea53ab393b986fad78b5a..9166aba3bb138e4207e7a2b89da57c13cf063cae 100644 (file)
--- 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 6850a4585a42d8a41489f89959c37a24e098bffd..f0c756253330a0096664e51507b851976e82f34d 100644 (file)
--- 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