]> git.smokeofanarchy.ru Git - space-station-14.git/commit
More DoAfter Changes (#14609)
authorLeon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Mon, 3 Apr 2023 01:13:48 +0000 (13:13 +1200)
committerGitHub <noreply@github.com>
Mon, 3 Apr 2023 01:13:48 +0000 (21:13 -0400)
commit19277a22761e5ef2026ab49743e5a6c34b0cf3b6
tree794c2deade1be83fd2a5dfd71cf77cfad194a200
parent9e66fac80586db7fdbf1691bd98cda52091f71c3
More DoAfter Changes (#14609)

* DoAfters

* Compact Clone()

* Fix mice and cuffables

* Try generalize attempt events

* moves climbabledoafter event to shared, fixes issue with climbable target

* Fix merge (cuffing)

* Make all events netserializable

* handful of doafter events moved

* moves the rest of the events to their respective shared folders

* Changes all mentions of server doafter to shared

* stop stripping cancellation

* fix merge errors

* draw paused doafters

* handle unpausing

* missing netserializable ref

* removes break on stun reference

* removes cuffing state reference

* Fix tools

* Fix door prying.

* Fix construction

* Fix dumping

* Fix wielding assert

* fix rev

* Fix test

* more test fixes

---------

Co-authored-by: keronshb <keronshb@live.com>
170 files changed:
Content.Client/Cuffs/CuffableSystem.cs
Content.Client/DoAfter/DoAfterOverlay.cs
Content.Client/DoAfter/DoAfterSystem.cs
Content.Client/Medical/Cryogenics/CryoPodSystem.cs
Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs
Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs
Content.Server/AirlockPainter/AirlockPainterSystem.cs
Content.Server/Alert/Click/RemoveEnsnare.cs
Content.Server/Animals/Components/UdderComponent.cs
Content.Server/Animals/Systems/UdderSystem.cs
Content.Server/Anomaly/AnomalySystem.Scanner.cs
Content.Server/Anomaly/AnomalySystem.cs
Content.Server/Body/Systems/InternalsSystem.cs
Content.Server/Botany/Systems/BotanySwabSystem.cs
Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs
Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs
Content.Server/Climbing/ClimbSystem.cs
Content.Server/Construction/AnchorableSystem.cs
Content.Server/Construction/Components/ConstructionComponent.cs
Content.Server/Construction/Components/WelderRefinableComponent.cs
Content.Server/Construction/ConstructionSystem.Initial.cs
Content.Server/Construction/ConstructionSystem.Interactions.cs
Content.Server/Construction/ConstructionSystem.cs
Content.Server/Construction/PartExchangerSystem.cs
Content.Server/Construction/RefiningSystem.cs
Content.Server/Cuffs/CuffableSystem.cs
Content.Server/Disease/DiseaseDiagnosisSystem.cs
Content.Server/Disease/DiseaseSystem.cs
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
Content.Server/DoAfter/DoAfterSystem.cs
Content.Server/Doors/Systems/DoorSystem.cs
Content.Server/Dragon/DragonSystem.cs
Content.Server/Engineering/Components/DisassembleOnAltVerbComponent.cs
Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs
Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
Content.Server/Ensnaring/EnsnareableSystem.cs
Content.Server/Fluids/EntitySystems/MoppingSystem.cs
Content.Server/Fluids/EntitySystems/SpillableSystem.cs
Content.Server/Forensics/Systems/ForensicPadSystem.cs
Content.Server/Forensics/Systems/ForensicScannerSystem.cs
Content.Server/Gatherable/Components/GatheringToolComponent.cs
Content.Server/Gatherable/GatherableSystem.cs
Content.Server/Guardian/GuardianCreatorComponent.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/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/Components/HealingComponent.cs
Content.Server/Medical/CryoPodSystem.cs
Content.Server/Medical/HealingSystem.cs
Content.Server/Medical/HealthAnalyzerSystem.cs
Content.Server/Medical/Stethoscope/StethoscopeSystem.cs
Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs
Content.Server/Nuke/NukeSystem.cs
Content.Server/Nutrition/Components/DrinkComponent.cs
Content.Server/Nutrition/Components/FoodComponent.cs
Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
Content.Server/Nutrition/EntitySystems/FoodSystem.cs
Content.Server/Power/EntitySystems/ApcSystem.cs
Content.Server/Power/EntitySystems/CableSystem.cs
Content.Server/RCD/Components/RCDComponent.cs
Content.Server/RCD/Systems/RCDSystem.cs
Content.Server/Repairable/RepairableSystem.cs
Content.Server/Resist/CanEscapeInventoryComponent.cs
Content.Server/Resist/EscapeInventorySystem.cs
Content.Server/Resist/ResistLockerComponent.cs
Content.Server/Resist/ResistLockerSystem.cs
Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
Content.Server/Revenant/EntitySystems/RevenantSystem.cs
Content.Server/Sticky/Systems/StickySystem.cs
Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
Content.Server/Storage/EntitySystems/DumpableSystem.cs
Content.Server/Storage/EntitySystems/StorageSystem.cs
Content.Server/Strip/StrippableSystem.cs
Content.Server/Teleportation/HandTeleporterSystem.cs
Content.Server/Toilet/ToiletSystem.cs
Content.Server/Tools/Components/LatticeCuttingComponent.cs
Content.Server/Tools/Components/TilePryingComponent.cs
Content.Server/Tools/Components/WeldableComponent.cs
Content.Server/Tools/Systems/WeldableSystem.cs
Content.Server/Tools/ToolSystem.LatticeCutting.cs
Content.Server/Tools/ToolSystem.TilePrying.cs
Content.Server/Tools/ToolSystem.Welder.cs
Content.Server/VendingMachines/Restock/VendingMachineRestockSystem.cs
Content.Server/VendingMachines/VendingMachineSystem.cs
Content.Server/Wieldable/WieldableSystem.cs
Content.Server/Wires/WiresSystem.cs
Content.Shared/ActionBlocker/ActionBlockerSystem.cs
Content.Shared/AirlockPainter/AirlockPainterEvents.cs
Content.Shared/Anomaly/ScannerDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Chemistry/Components/SharedInjectorComponent.cs
Content.Shared/Climbing/SharedClimbSystem.cs
Content.Shared/Clothing/Components/ToggleableClothingComponent.cs
Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
Content.Shared/Construction/EntitySystems/SharedAnchorableSystem.cs
Content.Shared/Construction/Events.cs [new file with mode: 0644]
Content.Shared/Construction/SharedConstructionSystem.cs
Content.Shared/Cuffs/Components/CuffableComponent.cs
Content.Shared/Cuffs/Components/HandcuffComponent.cs
Content.Shared/Cuffs/SharedCuffableSystem.cs
Content.Shared/Disease/Events/VaccineDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Disposal/SharedDisposalUnitSystem.cs
Content.Shared/DoAfter/ActiveDoAfterComponent.cs
Content.Shared/DoAfter/DoAfter.cs
Content.Shared/DoAfter/DoAfterArgs.cs [new file with mode: 0644]
Content.Shared/DoAfter/DoAfterComponent.cs
Content.Shared/DoAfter/DoAfterEvent.cs [new file with mode: 0644]
Content.Shared/DoAfter/DoAfterEventArgs.cs [deleted file]
Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs [new file with mode: 0644]
Content.Shared/DoAfter/SharedDoAfterSystem.cs
Content.Shared/Doors/Components/DoorComponent.cs
Content.Shared/Doors/Systems/SharedDoorSystem.cs
Content.Shared/Dragon/DragonDevourDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Ensnaring/SharedEnsnareableSystem.cs
Content.Shared/Exchanger/ExchangerDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Fluids/Events.cs [new file with mode: 0644]
Content.Shared/Forensics/Events.cs [new file with mode: 0644]
Content.Shared/Gatherable/GatherableDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Guardian/GuardianCreatorDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Implants/Components/ImplanterComponent.cs
Content.Shared/Implants/SharedImplanterSystem.cs
Content.Shared/Interaction/SharedInteractionSystem.cs
Content.Shared/Internals/InternalsDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
Content.Shared/Kitchen/SharpDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Light/PoweredLightDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Magic/SpellbookDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
Content.Shared/Mech/Equipment/Components/MechEquipmentComponent.cs
Content.Shared/Medical/Cryogenics/SharedCryoPodComponent.cs
Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
Content.Shared/Medical/HealingDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Medical/ReclaimerDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Medical/StethoscopeDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/MedicalScanner/SharedHealthAnalyzerComponent.cs
Content.Shared/Nuke/SharedNuke.cs
Content.Shared/Nutrition/Events.cs [new file with mode: 0644]
Content.Shared/Power/ApcToolFinishedEvent.cs [new file with mode: 0644]
Content.Shared/Radio/Components/EncryptionKeyHolderComponent.cs
Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
Content.Shared/Repairable/SharedRepairableSystem.cs [new file with mode: 0644]
Content.Shared/Resist/EscapeInventoryEvent.cs [new file with mode: 0644]
Content.Shared/Resist/ResistLockerDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Revenant/SharedRevenant.cs
Content.Shared/Spillable/SpillDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Sticky/StickyDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Storage/Components/DumpableComponent.cs
Content.Shared/Storage/EntitySystems/BluespaceLockerDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Storage/Events.cs [new file with mode: 0644]
Content.Shared/Swab/SwabEvents.cs [new file with mode: 0644]
Content.Shared/Teleportation/Components/HandTeleporterComponent.cs
Content.Shared/Toilet/ToiletComponent.cs
Content.Shared/Tools/Components/ToolComponent.cs
Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
Content.Shared/Tools/Systems/SharedToolSystem.cs [new file with mode: 0644]
Content.Shared/Tools/Systems/WeldFinishedEvent.cs [new file with mode: 0644]
Content.Shared/Udder/MilkingDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
Content.Shared/Wieldable/WieldableDoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Wires/Events.cs [new file with mode: 0644]
Content.Shared/Wires/SharedWiresComponent.cs
Content.Shared/Wires/WiresPanelComponent.cs