Defibrillator refactor and add defib prediction #30044

TokenStyle · 2024-07-14T19:58:01Z

About the PR

Refactored defibrillator's code and made it predictive according to issue #28051
I've set cvar net.fakelagmin 0.4 to fake lags, defibs predictions works great.

Why / Balance

More smooth experience using defibrillator overall.

Technical details

Changed defibs code, make prediction. And my thoughts:
A lot of possibilities to make predictive and refactor to PowerCellSystem, gauges doAfter, and med overall, but it would take a lot of work and I'm too lazy to do it.

Media

New video defib predictive defib predictive 2025-07-25

defib.predictive3.2025-07-25.mp4

Old defib predictive 2024-07-15
https://github.com/user-attachments/assets/44a49300-5ec5-49ff-86d5-dbaa15b8acff

I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Defibrillator refactor and made it predictive, add defibs code in Content.Shared, Content.Client.

Changelog

no 🆑 no fun

Content.Shared/Medical/DefibrillatorComponent.cs

deltanedas

lgtm

github-actions · 2024-07-19T05:01:03Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

TokenStyle · 2024-07-20T12:38:25Z

fixed merge conflict, passed tests

ShadowCommander

Thanks for the PR.

I tested the functionality and it was not doing the Electrocution animation. This is because the server code is not calling the shared code for Zap.

Content.Shared/Medical/DefibrillatorComponent.cs

Content.Server/Medical/DefibrillatorSystem.cs

move electrocution to server side, cuz only there it works

TokenStyle · 2024-07-25T18:19:40Z

I tested the functionality and it was not doing the Electrocution animation. This is because the server code is not calling the shared code for Zap.

fixed. I moved ElectrocutionSystem to server side, cuz method TryDoElectrocution have to be called only in server side, and there's nice comment to remind // only done serverside

metalgearsloth

Are any of the fields even networked?

github-actions · 2024-11-25T12:55:35Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

K-Dynamic · 2025-02-22T12:38:12Z

Month has been passed

Unfortunately you'll start mention people on Discord or on github to get attention, the PR backlog has only increased.

Can you sort the merge conflicts and @ sloth

TokenStyle · 2025-07-25T18:18:12Z

defib.predictive3.2025-07-25.mp4

Upstreamed and made video

FairlySadPanda · 2025-09-10T18:30:12Z

Tested, works fine when integrated with latest master.

Content.Client/Medical/DefibrillatorSystem.cs

Content.Shared/Medical/SharedDefibrillatorSystem.cs

VerinSenpai · 2025-09-18T19:35:20Z

Did somebody say prediction 👺

VerinSenpai · 2025-09-18T19:35:59Z

Sorry I just wanted to use the new tag, you can ignore me.

TokenStyle · 2025-09-19T12:10:54Z

well, everything is works and tested locally, ci tests are passed

slarticodefast

Sorry for the long wait on this, I've been busy recently. While testing I found another issue.

slarticodefast · 2025-10-12T14:27:55Z

Content.Server/Medical/DefibrillatorSystem.cs

-            BreakOnMove = !component.AllowDoAfterMovement
-        });
-    }
+        base.Zap(uid, target, user, component);


This causes mispredicts with TargetBeforeDefibrillatorZapsEvent being cancelled or changing the target, since that will be applied on the client but the server here proceeds ignoring it.

github-actions · 2025-10-19T19:26:30Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

TokenStyle added 4 commits July 14, 2024 23:58

defibrillator system move into shared

968f5a0

defib predictive audio PVS and client popups with Dirty

2579fcd

defib remove unused

111cf38

defib remove unused

9b6293b

TokenStyle requested a review from Jezithyr as a code owner July 14, 2024 19:58

github-actions bot added the S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. label Jul 14, 2024

deltanedas suggested changes Jul 14, 2024

View reviewed changes

Content.Shared/Medical/DefibrillatorComponent.cs Outdated Show resolved Hide resolved

remove unnecessary ReadWrite thats enabled by default

b8e049d

TokenStyle requested a review from deltanedas July 15, 2024 17:44

deltanedas approved these changes Jul 15, 2024

View reviewed changes

github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Jul 19, 2024

Merge branch 'master' into defib-move-from-server-to-shared

689dc06

github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Jul 20, 2024

add comment, let pass checks

e3ae4a5

ShadowCommander requested changes Jul 21, 2024

View reviewed changes

Content.Shared/Medical/DefibrillatorComponent.cs Outdated Show resolved Hide resolved

Content.Server/Medical/DefibrillatorSystem.cs Outdated Show resolved Hide resolved

metalgearsloth added S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. labels Jul 21, 2024

TokenStyle added 3 commits July 25, 2024 21:23

remove unused vv readwrite and move AutoPausedField

8d27f68

forgot shared zap execution

5994d26

make electrocution work

8ac90b9

move electrocution to server side, cuz only there it works

Merge branch 'master' into defib-move-from-server-to-shared

7ddedcf

TokenStyle requested a review from ShadowCommander July 26, 2024 13:52

github-actions bot added S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. and removed S: Awaiting Changes Status: Changes are required before another review can happen labels Jul 26, 2024

TokenStyle requested a review from deltanedas August 8, 2024 10:21

Merge branch 'master' into defib-move-from-server-to-shared

d760a03

metalgearsloth requested changes Aug 8, 2024

View reviewed changes

eoineoineoin added T: Refactor Type: Refactor of notable amount of codebase D2: Medium Difficulty: A good amount of codebase knowledge required. A: Medical Area: Medical department, including Chemistry labels Nov 18, 2024

github-actions bot added the Merge Conflict label Nov 25, 2024

beck-thompson mentioned this pull request Dec 19, 2024

movement speed modifier needs predicting #28057

Open

TokenStyle added 2 commits July 25, 2025 18:03

Merge branch 'master' into defib-move-from-server-to-shared

cc88d82

Merge branch 'master' into defib-move-from-server-to-shared

19daf91

github-actions bot added size/M Denotes a PR that changes 100-999 lines. and removed S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted labels Jul 25, 2025

defib prediction upstream

d46ea90

TokenStyle added 2 commits July 26, 2025 15:13

defib no need dirty when don't do component change

a0b2653

defib not turned on popup should happens only on client

e74d0ee

Merge branch 'master' into defib-move-from-server-to-shared

742a740

slarticodefast requested changes Sep 18, 2025

View reviewed changes

Content.Client/Medical/DefibrillatorSystem.cs Outdated Show resolved Hide resolved

Content.Shared/Medical/SharedDefibrillatorSystem.cs Outdated Show resolved Hide resolved

Content.Shared/Medical/SharedDefibrillatorSystem.cs Outdated Show resolved Hide resolved

PJBot added S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. labels Sep 18, 2025

slarticodefast self-assigned this Sep 18, 2025

TokenStyle added 2 commits September 18, 2025 23:57

code review

819f93d

fix client popup for disabled defibrillator

713e264

VerinSenpai added the T: Prediction Type: Moving code to Content.Shared and making it predicted. label Sep 18, 2025

slarticodefast requested changes Oct 12, 2025

View reviewed changes

github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Oct 19, 2025

Defibrillator refactor and add defib prediction #30044

Are you sure you want to change the base?

Defibrillator refactor and add defib prediction #30044

Uh oh!

Conversation

TokenStyle commented Jul 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

About the PR

Why / Balance

Technical details

Media

Breaking changes

Uh oh!

Uh oh!

deltanedas left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jul 19, 2024

Uh oh!

TokenStyle commented Jul 20, 2024

Uh oh!

ShadowCommander left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

TokenStyle commented Jul 25, 2024

Uh oh!

metalgearsloth left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Nov 25, 2024

Uh oh!

K-Dynamic commented Feb 22, 2025

Uh oh!

TokenStyle commented Jul 25, 2025

Uh oh!

FairlySadPanda commented Sep 10, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

VerinSenpai commented Sep 18, 2025

Uh oh!

VerinSenpai commented Sep 18, 2025

Uh oh!

TokenStyle commented Sep 19, 2025

Uh oh!

slarticodefast left a comment

Choose a reason for hiding this comment

Uh oh!

slarticodefast Oct 12, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Oct 19, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

TokenStyle commented Jul 14, 2024 •

edited

Loading

ShadowCommander left a comment •

edited

Loading