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.

Sign up for GitHub

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

Jump to bottom

give hyposprays a swappable bottle for reagents #154

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

give hyposprays a swappable bottle for reagents #154

wants to merge 3 commits into from

Conversation

ashkitten
Copy link

@ashkitten ashkitten commented May 25, 2023 •
edited
Loading

Description

hyposprays now come with a bottle inside, which must be removed from the hypospray to transfer reagents to and from it

as a bonus, this lets you quickly swap reagent bottles, or empty the hypospray without injecting it

i've only done the conversion for the regular cmo hypospray, and the system still properly supports hyposprays without swappable containers just fine

TODO

[ ] use this system for medipens
[ ] sprites
[ ] find out why tags aren't updating on client

Media

Changelog

🆑

  • tweak: Hyposprays now draw their solution from a bottle.

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Status: Needs Review Someone please review this Changes: Map Changes any yml file in the Maps directories Changes: UI Changes any XAML files and removed Changes: YML Changes any yml files labels May 25, 2023
@DEATHB4DEFEAT
Copy link
Member

53a07a7

I think wizards den recently added nix files to the repo

@DEATHB4DEFEAT DEATHB4DEFEAT mentioned this pull request Jun 5, 2023
Closed
@DEATHB4DEFEAT DEATHB4DEFEAT added Priority: 3-Medium Needs to be resolved at some point Holy Shit labels Jun 5, 2023
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 9, 2023
@github-actions
Copy link

github-actions bot commented Jun 9, 2023

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Pspritechologist Pspritechologist Awaiting requested review from Pspritechologist Pspritechologist is a code owner

@DEATHB4DEFEAT DEATHB4DEFEAT Awaiting requested review from DEATHB4DEFEAT DEATHB4DEFEAT is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: UI Changes any XAML files Holy Shit Priority: 3-Medium Needs to be resolved at some point Status: Merge Conflict FIX YOUR PR AAAGH Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ashkitten @DEATHB4DEFEAT