]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Simplify DoAfterArgs behavior for movement and distance checks (#25226)
authornikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Tue, 19 Mar 2024 10:09:00 +0000 (12:09 +0200)
committerGitHub <noreply@github.com>
Tue, 19 Mar 2024 10:09:00 +0000 (21:09 +1100)
commit362d56981fd7654f6ebec36f16cc8fabdd04b6a7
tree7f25e389b106fbd226d2cecf87f72c3598918580
parent06b3f273ea8468eecea9c225cfbf54d17ea8c9c2
Simplify DoAfterArgs behavior for movement and distance checks (#25226)

* Merge BreakOnWeightlessMove and BreakOnMove. Provide different theshold for weightless movement.

* Adjust WeightlessMovementThresholds. Put a thing I forgot to put in the doafterargs.

* Make DoAfterArgs only use OnMove to determine whether to check for
movement and MoveThreshold to determine the threshold regardless of
weightlessness. Gave DistanceThreshold a default value which will always
be checked now.

* Fix issue introduced by merge.

* Use interaction system for determining whether a distance is within range

* Fix incorrect doafter args introduced by previous merge.
Forgor to commit these.

* Exorcise ghost.

The execution system should have been deleted when I merged previously.
For a reason I cannot comprehend it came back, but only the execution
system.

* Exorcise ghost Pt. 2

* Allow for movement check to be overriden in zero g and adjust doafter args where needed.

You can now override checking for movement in zero g with the BreakOnWeightlessMove bool. By default it will check.
The following doafters were made to ignore the movement check in zero g:
- Healing yourself with healing items,
- Removing embedded projectiles,
- Using tools like welders and crowbars

* Adjust distance for cuffing/uncuffing to work. Make injections not break on weightless movement.

* Fix evil incorrect and uneeded comments
75 files changed:
Content.Server/Access/Systems/AccessOverriderSystem.cs
Content.Server/Animals/Systems/UdderSystem.cs
Content.Server/Body/Systems/InternalsSystem.cs
Content.Server/Botany/Systems/BotanySwabSystem.cs
Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
Content.Server/Communications/CommsHackerSystem.cs
Content.Server/Construction/ConstructionSystem.Initial.cs
Content.Server/Construction/ConstructionSystem.Interactions.cs
Content.Server/Construction/PartExchangerSystem.cs
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs
Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
Content.Server/Fluids/EntitySystems/DrainSystem.cs
Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
Content.Server/Forensics/Systems/ForensicPadSystem.cs
Content.Server/Forensics/Systems/ForensicScannerSystem.cs
Content.Server/Forensics/Systems/ForensicsSystem.cs
Content.Server/Guardian/GuardianSystem.cs
Content.Server/Implants/ImplanterSystem.cs
Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
Content.Server/Kitchen/EntitySystems/SharpSystem.cs
Content.Server/Light/EntitySystems/PoweredLightSystem.cs
Content.Server/Magic/MagicSystem.cs
Content.Server/MagicMirror/MagicMirrorSystem.cs
Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
Content.Server/Mech/Systems/MechEquipmentSystem.cs
Content.Server/Mech/Systems/MechSystem.cs
Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
Content.Server/Medical/CryoPodSystem.cs
Content.Server/Medical/DefibrillatorSystem.cs
Content.Server/Medical/HealingSystem.cs
Content.Server/Medical/HealthAnalyzerSystem.cs
Content.Server/Medical/Stethoscope/StethoscopeSystem.cs
Content.Server/Ninja/Systems/BatteryDrainerSystem.cs
Content.Server/Nuke/NukeSystem.cs
Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
Content.Server/Nutrition/EntitySystems/FoodSystem.cs
Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
Content.Server/Power/Generator/PortableGeneratorSystem.cs
Content.Server/Resist/EscapeInventorySystem.cs
Content.Server/Resist/ResistLockerSystem.cs
Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
Content.Server/SprayPainter/SprayPainterSystem.cs
Content.Server/Sticky/Systems/StickySystem.cs
Content.Server/Strip/StrippableSystem.cs
Content.Server/Teleportation/HandTeleporterSystem.cs
Content.Server/Wires/WiresSystem.cs
Content.Shared/Burial/BurialSystem.cs
Content.Shared/Climbing/Systems/BonkSystem.cs
Content.Shared/Climbing/Systems/ClimbSystem.cs
Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
Content.Shared/Cuffs/SharedCuffableSystem.cs
Content.Shared/Devour/SharedDevourSystem.cs
Content.Shared/DoAfter/DoAfter.cs
Content.Shared/DoAfter/DoAfterArgs.cs
Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
Content.Shared/DoAfter/SharedDoAfterSystem.cs
Content.Shared/Inventory/InventorySystem.Equip.cs
Content.Shared/Lock/LockSystem.cs
Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
Content.Shared/Projectiles/SharedProjectileSystem.cs
Content.Shared/Prying/Systems/PryingSystem.cs
Content.Shared/RCD/Systems/RCDSystem.cs
Content.Shared/RatKing/SharedRatKingSystem.cs
Content.Shared/Research/Systems/SharedResearchStealerSystem.cs
Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
Content.Shared/Sericulture/SericultureSystem.cs
Content.Shared/Species/Systems/ReformSystem.cs
Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
Content.Shared/Storage/EntitySystems/DumpableSystem.cs
Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
Content.Shared/Tools/Systems/SharedToolSystem.cs
Content.Shared/VendingMachines/SharedVendingMachineSystem.Restock.cs
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs