]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Hyposprays Draw from Jugs (#25544)
authorPlykiya <58439124+Plykiya@users.noreply.github.com>
Sat, 30 Mar 2024 03:59:16 +0000 (20:59 -0700)
committerGitHub <noreply@github.com>
Sat, 30 Mar 2024 03:59:16 +0000 (14:59 +1100)
commitf192d7901fedd134c38a6cab38731f8e93994492
tree998a77d12e12c434ff9cc330299aa1bd872fe32e
parent3fc02edd4ea10d914f280e367c49238ec6126f02
Hyposprays Draw from Jugs (#25544)

* Hyposprays Draw from Jugs

* Fix last onlyMobs usage in yml

* Some Suggested Changes

* Remove unnecessary datafield name declarations

* Remove unnecessary dirtying of component

* Same line parentheses

* Added client-side HypospraySystem

* Cache UI values and only updates if values change

* empty line

* Update label

* Label change

* Reimplement ReactionMixerSystem

* Remove DataField from Hypospray Toggle Mode

* Change ToggleMode from enum to Bool OnlyAffectsMobs

* Add DataField required back since it's required for replays...?

* update EligibleEntity and uses of it

* Add user argument back

* Adds newline

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Guard for dirty entity

* Adds summary tag

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
16 files changed:
Content.Client/Chemistry/Components/HyposprayComponent.cs [deleted file]
Content.Client/Chemistry/EntitySystems/HypospraySystem.cs [new file with mode: 0644]
Content.Client/Chemistry/EntitySystems/InjectorSystem.cs
Content.Client/Chemistry/UI/HyposprayStatusControl.cs
Content.Server/Body/Components/BloodstreamComponent.cs
Content.Server/Chemistry/Components/HyposprayComponent.cs [deleted file]
Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs [deleted file]
Content.Server/Chemistry/EntitySystems/ChemistrySystemHypospray.cs [deleted file]
Content.Server/Chemistry/EntitySystems/HypospraySystem.cs [new file with mode: 0644]
Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs [moved from Content.Server/Chemistry/EntitySystems/ChemistrySystemMixer.cs with 76% similarity]
Content.Shared/Chemistry/Components/HyposprayComponent.cs [new file with mode: 0644]
Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs [deleted file]
Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs [new file with mode: 0644]
Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
Resources/Locale/en-US/chemistry/components/hypospray-component.ftl
Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml