]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Puddle Code Slipping Cleanup (#35845)
authorPrincess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Sun, 20 Apr 2025 21:27:12 +0000 (14:27 -0700)
committerGitHub <noreply@github.com>
Sun, 20 Apr 2025 21:27:12 +0000 (17:27 -0400)
commit251cfbd8bef6b3eba66d322baeed0a9de2892dc7
treeb090ad4bf729b123bdd3c39dae5cc9499eea9f49
parentc2857c52471f0560a83126baa7bf8ae49f8d6aad
Puddle Code Slipping Cleanup (#35845)

* Init Commit

* windows yelling at me to update commit

* working commit, need prediciton and more dehardcoding

* Project 0 warnings

* Working Commit (Near Final)

* ryder got confused commit

* I love Merge Conflicts :)

* Working commit, no prediction

* Forgot the yaml changes

* Comments and typos

* Apparently while the reduced launch mult of lube was initialized it was never used so I revered back to default

* Fixed an incorrect divisor

* bit of cleanup

* Prediciton fixed, and puddles now affect all entities

* FORGOT TO RENAME A VERY IMPORTANT VARIABLE OOPS

* Really big I forgor moment

* Even bigger I forgor moment

* four more merge conflicts to fix four more oopsies

* fixed actual divide by zero moment and also im very dumb

* Even bigger I forgor moment

* four more merge conflicts to fix four more oopsies

* fixed actual divide by zero moment and also im very dumb

* Fix all test fails

* code cleanup

* Webedit whitespace

* Code cleaup

* whitespace webedit

* whitespace webedit

* whitespace webedit

* whitespace removal

* Comments and cleanup

* Re-Added 20 warnings as per Ork's request

* Cleanups

* Spacing fix

* bugfixes and cleanup

* Small bugfix

* Actually dirty the slipComp for real

* Added Friction field to Reagent Prototype per design discussion

* Sliding system is kill
27 files changed:
Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs [deleted file]
Content.Server/Chemistry/TileReactions/SpillTileReaction.cs [deleted file]
Content.Server/Fluids/EntitySystems/PuddleSystem.cs
Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
Content.Shared/Fluids/Components/PuddleComponent.cs
Content.Shared/Slippery/SlidingSystem.cs
Content.Shared/Slippery/SlipperyComponent.cs
Content.Shared/Slippery/SlipperySystem.cs
Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
Resources/Prototypes/Entities/Effects/puddle.yml
Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
Resources/Prototypes/Entities/Objects/Fun/dice.yml
Resources/Prototypes/Entities/Objects/Fun/error.yml
Resources/Prototypes/Entities/Objects/Fun/toys.yml
Resources/Prototypes/Entities/Objects/Materials/shards.yml
Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
Resources/Prototypes/Reagents/biological.yml
Resources/Prototypes/Reagents/chemicals.yml
Resources/Prototypes/Reagents/cleaning.yml
Resources/Prototypes/Reagents/fun.yml
Resources/Prototypes/Reagents/pyrotechnic.yml
Resources/Prototypes/Reagents/toxins.yml