]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Spray nozzle can suck puddles into tank directly! (#30600)
authorFildrance <fildrance@gmail.com>
Mon, 26 May 2025 03:36:16 +0000 (06:36 +0300)
committerGitHub <noreply@github.com>
Mon, 26 May 2025 03:36:16 +0000 (23:36 -0400)
commit291ccfbe23506679e44345ee1dab0070e14da47e
treeadb4f37c89d354e7d8a132a15e67880bbe0b9d43
parentd1370de758c2a46e5a54e3884460fd2c69a913ab
Spray nozzle can suck puddles into tank directly! (#30600)

* feat: now vacuum cleaner can suck solutions from floor

* refactor using AbsorbentSystem instead of separate vacuum cleaner

* refactor: remove unused vacuum cleaner files

* refactor: renamed ConnectedContainerComponent to SlotBasedConnectedContainerComponent (and system)

* fix: fix invalid comp name

* fix: no more spray nozzle messaging about water inside bottles etc.

* refactor: minor refactor in SlotBasedConnectedContainerSystem and adjustments after merge

* refactor: cleanups

* refactor: renaming

* refactor: update to use _puddleSystem.GetAbsorbentReagents

* refactor: changed interactions with SlotBasedConnectedContainerSystem into events

* refactor: new sound and action delay adjusted to sound (amount tweaked a bit accordingly, almost)

* refactor: added networking for SlotBasedConnectedContainerComponent

* fix attribution for vacuum-cleaner-fast.ogg

* trying to fix multi-license for mix sound file

* remove empty line

* refactor: remove trailing whitespace

* by ref struct, brother

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
14 files changed:
Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs
Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
Content.Shared/Chemistry/Components/SlotBasedConnectedContainerComponent.cs [new file with mode: 0644]
Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
Content.Shared/Containers/SlotBasedConnectedContainerSystem.cs [new file with mode: 0644]
Content.Shared/Fluids/AbsorbentComponent.cs
Content.Shared/Weapons/Ranged/Components/AmmoProviderComponent.cs
Content.Shared/Weapons/Ranged/Components/ClothingSlotAmmoProviderComponent.cs
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
Resources/Audio/Effects/Fluids/attributions.yml
Resources/Audio/Effects/Fluids/vacuum-cleaner-fast.ogg [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml