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

Blood Fillers #172

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Blood Fillers #172

wants to merge 8 commits into from

Conversation

Pspritechologist
Copy link
Member

@Pspritechologist Pspritechologist commented Jun 14, 2023

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

  • Pretty much all the functionality.
  • A few sprites.
  • Audio effects.

Changelog

🆑

  • add: Adds tools for Medical to refill all that valuable blood people drop so often.

@github-actions 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
@github-actions
Copy link

github-actions bot commented Jun 14, 2023

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

Resources/Textures/Objects/Specific/Chemistry/syringe.rsi

State Old New Status
1-inhand-left Modified
1-inhand-right Modified
2-inhand-left Modified
2-inhand-right Modified
3-inhand-left Modified
3-inhand-right Modified
4-inhand-left Modified
4-inhand-right Modified
syringe1 Modified
syringe2 Modified
syringe3 Modified
syringe4 Modified
syringe_base0 Modified
syringe_base1 Modified
syringe_base2 Modified
syringe_base3 Modified
syringe_base4 Modified

Resources/Textures/SimpleStation14/Structures/Storage/tanks.rsi

State Old New Status
bloodtankblood Added
bloodtankslime Added

Edit: diff updated after f1b3725

Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

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

guh

@DEATHB4DEFEAT DEATHB4DEFEAT added Priority: 2-High Needs to be resolved as soon as possible Size: Small For small issues/PRs labels Jun 16, 2023
@Simple-Station Simple-Station deleted a comment from DEATHB4DEFEAT Jun 18, 2023
# 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 <77995199+DEATHB4DEFEAT@users.noreply.github.com>
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Aug 24, 2023
@github-actions
Copy link

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants