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

pain system + addictions + traits #2192

Merged
merged 7 commits into from
Nov 20, 2024

Conversation

MilonPL
Copy link
Member

@MilonPL MilonPL commented Nov 13, 2024

About the PR

adds the pain system
currently can be only picked with the chronic pain trait
adds chromatic aberration to your screen + popups
has two status effects InPain and SuppressPain to interact with it
adds the Addicted trait that gives you the Addicted component
minor changes to the addiction system to make it less shit (i burned it so hard)
makes substances use the proper systems now, addictine kill
completely mangles CD's files but I'm sure they won't mind (this is dual licensed under MIT anyways)

Why / Balance

roleplay

Technical details

massive shitcode
i lost any idea of what i'm doing 17 hours ago

Media

image
image
image

Requirements

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

Breaking changes

Changelog

🆑

  • add: Added Chronic pain and Addicted traits.
  • tweak: Reworked the addictions system.

@github-actions github-actions bot added Changes: YML Changes any yml files Changes: C# Changes any cs files Changes: Shaders Changes any swsl shaders labels Nov 13, 2024
@HTMLSystem
Copy link
Contributor

This seems really cool!! I love the idea of a chronic pain trait! Question though: Is the chromatic aberration constant or only when the pain flares up?

@MilonPL
Copy link
Member Author

MilonPL commented Nov 13, 2024

This seems really cool!! I love the idea of a chronic pain trait! Question though: Is the chromatic aberration constant or only when the pain flares up?

Goes away when you're on painkillers (perhaps it should be the other way around? dunno)

@HTMLSystem
Copy link
Contributor

Nah, i think it going away while on pain killers would be good. Either way I'm excited for this :)!!

@github-actions github-actions bot added the Changes: Localization Changes any ftl files label Nov 14, 2024
@MilonPL MilonPL changed the title pain system pain system + addictions + traits Nov 14, 2024
@MilonPL MilonPL marked this pull request as ready for review November 14, 2024 11:12
@MilonPL MilonPL requested review from IamVelcroboy and a team as code owners November 14, 2024 11:12
@MilonPL
Copy link
Member Author

MilonPL commented Nov 14, 2024

@deltanedas you're going to love this one
i was high, drunk and/or sleep deprived while coding all this, and i have no idea how or why half of it works

@alterae
Copy link
Contributor

alterae commented Nov 19, 2024

massively, massively, MASSIVELY in favor of this to a degree that I cannot properly express

Content.Server/DeltaV/Pain/PainSystem.cs Outdated Show resolved Hide resolved
Content.Shared/DeltaV/Pain/SharedPainSystem.cs Outdated Show resolved Hide resolved
Content.Shared/DeltaV/Pain/SharedPainSystem.cs Outdated Show resolved Hide resolved
Resources/Prototypes/Reagents/narcotics.yml Show resolved Hide resolved
Resources/Prototypes/_CD/Reagents/medicine.yml Outdated Show resolved Hide resolved
Resources/Prototypes/_CD/Reagents/medicine.yml Outdated Show resolved Hide resolved
@deltanedas deltanedas merged commit f1c859a into DeltaV-Station:master Nov 20, 2024
11 checks passed
@MilonPL MilonPL deleted the pain-(literally) branch November 20, 2024 01:03
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: Localization Changes any ftl files Changes: Shaders Changes any swsl shaders Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants