-
Notifications
You must be signed in to change notification settings - Fork 48
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
Blood Fillers #172
Draft
Pspritechologist
wants to merge
8
commits into
master
Choose a base branch
from
BloodFiller
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Blood Fillers #172
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…to inject blood into people. Lots of work to be done.
github-actions
bot
added
Changes: C#
Changes any cs files
Changes: Localization
Changes any ftl files
Changes: Sprite
Changes any png or json in an rsi
Changes: YML
Changes any yml files
labels
Jun 14, 2023
RSI Diff Bot; head commit f1b3725 merging into 0e78e36 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi
Resources/Textures/SimpleStation14/Structures/Storage/tanks.rsi
|
DEATHB4DEFEAT
requested changes
Jun 16, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
guh
Content.Server/SimpleStation14/BloodstreamFiller/Systems/BloodstreamFillerSystem.cs
Outdated
Show resolved
Hide resolved
Content.Server/SimpleStation14/BloodstreamFiller/Systems/BloodstreamFillerSystem.cs
Outdated
Show resolved
Hide resolved
Content.Server/SimpleStation14/BloodstreamFiller/Systems/BloodstreamFillerSystem.cs
Outdated
Show resolved
Hide resolved
Content.Server/SimpleStation14/BloodstreamFiller/Systems/BloodstreamFillerSystem.cs
Outdated
Show resolved
Hide resolved
Content.Server/SimpleStation14/BloodstreamFiller/Components/BloodstreamFillerComponent.cs
Outdated
Show resolved
Hide resolved
Content.Server/SimpleStation14/BloodstreamFiller/Components/BloodstreamFillerComponent.cs
Show resolved
Hide resolved
Content.Server/SimpleStation14/BloodstreamFiller/Components/BloodstreamFillerComponent.cs
Outdated
Show resolved
Hide resolved
DEATHB4DEFEAT
added
Priority: 2-High
Needs to be resolved as soon as possible
Size: Small
For small issues/PRs
labels
Jun 16, 2023
…into BloodFiller
13 tasks
# Description Adds the slime tank and blood tank orders to cargo for 2.5k each
Pspritechologist
added a commit
that referenced
this pull request
Jul 27, 2023
# Description Adds IPCs! Everyone's favourite Positronic species finally available to be played in Space Station 14! # TODO - [x] Make the basis of the SiliconCharge system - [x] Make a working IPC species - [x] Improve upon Borg - [x] Add chargers and charging systems - [x] Localize all strings - [ ] ~~Make a hud/shader effect for power drain~~ - [ ] ~~Make sure IPCs can be refilled (blood transfusions)~~ Seperate pr #172 - [x] Make sure IPCs can't become zombies/suffer from many other biological issues (will likely need testing) - [x] Make chargers take machine parts for upgrading - [ ] ~~Make Silicon batteries upgradable(?)~~ Gonna probably just wait on bodysystem. - [x] Ensure death, crit, and revival work as intended - [x] Fix skin color being weird - [x] Make sure BatteryDrinker is clean Ready to merge? # Changelog :cl: - add: Added IPC to the game as a new species! Your favourite robot people are finally around to suffer like the rest of us. Be sure to stop by Engineering for a charge! --------- Co-authored-by: DEATHB4DEFEAT <[email protected]>
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
Labels
Changes: C#
Changes any cs files
Changes: Localization
Changes any ftl files
Changes: Sprite
Changes any png or json in an rsi
Changes: YML
Changes any yml files
Priority: 2-High
Needs to be resolved as soon as possible
Size: Small
For small issues/PRs
Status: Merge Conflict
FIX YOUR PR AAAGH
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adds tools for filling people with their respective bloodtype, for better or for worse.
Also adds tanks for getting the blood from, and resprites syringes.
TODO
Changelog
🆑