tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fire extinguisher (#16113)

Browse Source
This commit is contained in:
Slava0135
2023-05-05 15:48:38 +03:00
committed by GitHub
parent 3fda81c8d3
commit ba36acca6a
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Server/Fluids/Components/SprayComponent.cs
View File

@@ -1,5 +1,4 @@
using Content.Server.Fluids.EntitySystems; using Content.Server.Fluids.EntitySystems;
using Content.Shared.FixedPoint;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;

4
Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
View File

@@ -24,6 +24,7 @@
solution: spray solution: spray
- type: DrainableSolution - type: DrainableSolution
solution: spray solution: spray
- type: SolutionTransfer
- type: ItemCooldown - type: ItemCooldown
- type: Spray - type: Spray
spraySound: spraySound:
@@ -32,9 +33,6 @@
vaporAmount: 3 vaporAmount: 3
vaporSpread: 90 vaporSpread: 90
sprayVelocity: 2.0 sprayVelocity: 2.0
sprayTimeAlive: 1.5
transferAmount: 5
impulse: 50.0
- type: FireExtinguisher - type: FireExtinguisher
hasSafety: true hasSafety: true
- type: MeleeWeapon - type: MeleeWeapon

1
Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
View File

@@ -51,7 +51,6 @@
- type: Spray - type: Spray
sprayedPrototype: BigVapor sprayedPrototype: BigVapor
sprayVelocity: 5 sprayVelocity: 5
sprayAliveTime: 5
spraySound: spraySound:
path: /Audio/Effects/spray2.ogg path: /Audio/Effects/spray2.ogg