Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hardsuits now block defibulators #2251

Conversation

beck-thompson
Copy link
Contributor

@beck-thompson beck-thompson commented Nov 21, 2024

About the PR

Title! Defibs now are blocked by hardsuits.

Why / Balance

I asked in the discord, majority of people seemed to want it. It makes sense and will make medical have to think about defibbing fully armored security.

Also, requires:
space-wizards/space-station-14#31147
To be merged before it works! (I'll also add comments and localization stuff when that happens as I want it fully merged before doing testing and stuff)

Media

todo

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Changelog

🆑

  • add: Hardsuits now block defibrillators

@beck-thompson beck-thompson requested review from a team as code owners November 21, 2024 05:09
@beck-thompson beck-thompson marked this pull request as draft November 21, 2024 05:10
@github-actions github-actions bot added S: Needs Review Changes: YML Changes any yml files Changes: C# Changes any cs files labels Nov 21, 2024
@BlitzTheSquishy
Copy link
Contributor

Gonna need to make sure that softsuits, (Prisoner, Emergancy, Basic, Clown, Mime, Syndicate) dont, and yes clown and mime are softsuits, not hardsuits (despite their name)

@Lyndomen
Copy link
Contributor

💯💯

@beck-thompson
Copy link
Contributor Author

Gonna need to make sure that softsuits, (Prisoner, Emergancy, Basic, Clown, Mime, Syndicate) dont, and yes clown and mime are softsuits, not hardsuits (despite their name)

Sounds good, when the required PR actually gets merged I'll do more testing to make sure it works on the right things and stuff

@BlitzTheSquishy
Copy link
Contributor

BlitzTheSquishy commented Nov 21, 2024

Gonna need to make sure that softsuits, (Prisoner, Emergancy, Basic, Clown, Mime, Syndicate) dont, and yes clown and mime are softsuits, not hardsuits (despite their name)

Sounds good, when the required PR actually gets merged I'll do more testing to make sure it works on the right things and stuff

Also currently where that's placed- it looks like EVERY outer slot item will block defib (would include vox tank harnesses i believe)

also you should be testing it BEFORE it gets merged

@beck-thompson
Copy link
Contributor Author

also you should be testing it BEFORE it gets merged

How? I mean I guess I could like chery pick the required PR ahead of time but I personally don't think that's worth the effort. I mostly made this early so people could give their opinions. If people don't want it, then I wont bother putting the work in finding all the weird hardsuit edge cases

@BlitzTheSquishy
Copy link
Contributor

also you should be testing it BEFORE it gets merged

How? I mean I guess I could like chery pick the required PR ahead of time but I personally don't think that's worth the effort. I mostly made this early so people could give their opinions. If people don't want it, then I wont bother putting the work in finding all the weird hardsuit edge cases

pull the merge to your dev or make a dev enviro on wizden (which its already merged) and test there, cause we use similar stuff so


namespace Content.Shared.DeltaV.BlockDefibrillator;

[RegisterComponent, NetworkedComponent]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

access

{

[DataField]
public string OnBlockPopupMessage = "The defibrillator cannot find a pulse through the armor!";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

locid + localization


public sealed class BlockDefibrillatorSystem : EntitySystem
{
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just _popup

@@ -146,6 +146,7 @@
flatReductions:
Heat: 10 # the average lightbulb only does around four damage!
slots: OUTERCLOTHING
- type: BlockDefibrillator // Delta-V
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pro


namespace Content.Shared.DeltaV.BlockDefibrillator;

[RegisterComponent, NetworkedComponent]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add comments

@@ -146,6 +146,7 @@
flatReductions:
Heat: 10 # the average lightbulb only does around four damage!
slots: OUTERCLOTHING
- type: BlockDefibrillator // Delta-V
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remember to double check all the weird edge cases for hardsuits. There are a lot :(

@beck-thompson
Copy link
Contributor Author

This isn't too hard to fix but I have more interesting things I'd rather work on! Anyone feel free to copy / re-open this (The code isn't very good so I wouldn't recommend it but whatever 😆)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants