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

Add painkillers and antidepressant pills + canisters #2260

Merged

Conversation

Radezolid
Copy link
Contributor

About the PR

Adds pills of the medicines added on #1243.

Why / Balance

I plan to use some of them for round start for the psychologist + convenience for future loadout changes in case of chronic pain or depressive characters.

Technical details

Added a YAML.

Media

Nope.

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

None.

Changelog
No CL.

@Radezolid Radezolid requested a review from a team as a code owner November 22, 2024 01:49
@github-actions github-actions bot added S: Needs Review Changes: YML Changes any yml files labels Nov 22, 2024
@deltanedas
Copy link
Member

mapped gamer stun pills throw em in a grinder then inject

@Radezolid
Copy link
Contributor Author

They aren't mapped... yet. But i do intend on giving a pill canister to the psych for traitor usage.

@Avalon-Proto
Copy link
Contributor

They aren't mapped... yet. But i do intend on giving a pill canister to the psych for traitor usage.

What's this I hear. Handing the pysch a traitor item of mislabeled pills hm?

Copy link
Contributor

@MilonPL MilonPL left a comment

Choose a reason for hiding this comment

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

@Radezolid Radezolid requested a review from MilonPL November 23, 2024 00:58
@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Nov 24, 2024
Copy link
Contributor

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

@github-actions github-actions bot added the size/L 256-1023 lines label Nov 24, 2024
@Radezolid Radezolid requested review from a team and IamVelcroboy as code owners November 24, 2024 16:04
@github-actions github-actions bot added Changes: Map Changes: UI Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Documentation Changes any xml or md files Changes: Sprite Changes any png or json in an rsi Changes: Audio Changes any audio files and removed S: Merge Conflict Fix your PR! labels Nov 24, 2024
@Radezolid
Copy link
Contributor Author

wait oh god i fumbled the merge from master.

@Radezolid Radezolid marked this pull request as draft November 24, 2024 16:05
Copy link
Contributor

RSI Diff Bot; head commit af70edb merging into 3a0ec3d
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
prisoner-inhand-left Modified
prisoner-inhand-right Modified
trinkets-equipped-INNERCLOTHING Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
prisoner-equipped-INNERCLOTHING Modified
prisoner-icon Modified
prisoner-inhand-left Modified
trinkets-equipped-INNERCLOTHING Modified
trinkets-icon Modified
trinkets-inhand-left Modified
trinkets-inhand-right Modified

Resources/Textures/DeltaV/Objects/Misc/books.rsi

State Old New Status
icon_kiss Removed

Resources/Textures/DeltaV/Structures/Power/Generation/solar_panel.rsi

State Old New Status
random_solar Removed

Resources/Textures/Interface/Actions/actions_borg.rsi

State Old New Status
select-type Removed

Resources/Textures/Interface/Alerts/walking.rsi

State Old New Status
walking Removed

Resources/Textures/Objects/Consumable/Food/meat.rsi

State Old New Status
anomalymeat-cooked Removed
anomalymeat Removed

Resources/Textures/Objects/Magic/magicactions.rsi

State Old New Status
jaunt Removed

Resources/Textures/Objects/Power/portable_recharger.rsi

State Old New Status
charging-equipped-BACKPACK Removed
charging-unlit Removed
charging Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi

State Old New Status
base Removed
beanbag Removed
flare Removed
incendiary Removed
lethal Removed
mag-1 Removed

@github-actions github-actions bot added size/M 64-255 lines and removed size/L 256-1023 lines labels Nov 24, 2024
@Radezolid Radezolid marked this pull request as ready for review November 24, 2024 16:20
@Radezolid Radezolid requested a review from MilonPL November 26, 2024 11:51
@MilonPL MilonPL enabled auto-merge (squash) November 28, 2024 20:12
@MilonPL MilonPL merged commit c084a4f into DeltaV-Station:master Nov 28, 2024
14 checks passed
@Radezolid Radezolid deleted the Painkiller-antidepressant-pills branch November 28, 2024 21:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any audio files Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes: Sprite Changes any png or json in an rsi Changes: UI Changes: YML Changes any yml files S: Needs Review size/M 64-255 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants