]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Bartending+: Shaking and Stirring (#29243)
authorVerm <32827189+Vermidia@users.noreply.github.com>
Sun, 7 Jul 2024 14:21:53 +0000 (09:21 -0500)
committerGitHub <noreply@github.com>
Sun, 7 Jul 2024 14:21:53 +0000 (00:21 +1000)
commit13b84870ecc079301c1e619a90e3a18e9113ec32
tree3e22b9a150823188468d99fb54b42932541194aa
parent71b7dddb59e880ba156191396f74035d7b5977aa
Bartending+: Shaking and Stirring (#29243)

* Shaking and Stirring

* Remove shake message

* Switch if order a bit

* Add doafter supprot for reactionmixer

* Fix nullability

* Timespan zero

* Forgot to remove loc string

* Reorganize usings

* Remove unneeded usings, fix b52 needing to be shaken
Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs
Content.Shared/Chemistry/Reaction/ReactionMixerComponent.cs
Resources/Locale/en-US/chemistry/components/mixing-component.ftl
Resources/Prototypes/Chemistry/mixing_types.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
Resources/Prototypes/Entities/Objects/Misc/utensils.yml
Resources/Prototypes/Recipes/Reactions/drinks.yml