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

Improvements to blood and gibs #15449

Merged
merged 30 commits into from Aug 26, 2023
Merged

Conversation

CheffieGithub
Copy link
Contributor

@CheffieGithub CheffieGithub commented Aug 20, 2023

About the PR

blood.dmi has have been moved to obj/decals/blood/ along with martian and flock blood in their own files.
gibs have been moved out of blood.dmi into obj/decals/gibs/ along with martian, robot and flock gibs in their own files.

All of the blood in blood.dmi has been made greyscale and the unused icons have been removed. This means that coloured blood will correctly show on these icons.

Updated luminol overlay application.

Added a new atom forensics varible forensics_blood_color, solely for applying colour to the human blood overlays at the minute.

Improved /mob/living/carbon/human/EnteredFluid by allowing tracking and blood application for hemolymph and changeling blood.

Reduced proc calls when splashing blood onto humans, these procs will only update the specific clothing covered instead of all.

Improvements and fixes to /atom/proc/add_blood.

Replace varedited mystery meat with a randomised grody subtype with similar icons and names due to needing to change the icon anyway.

I looked for all the references for applying blood and icons but its possible I may have missed something so im adding a disclaimer to the changelog.

fixes #7207
fixes #6347

image

Known issue is with muantraces with offsets for things, as an optimisation I directly called update_X() proc when adding blood but these need to handle not having offsets handed in or have the blood parts taken out into their proc.

Why's this needed?

Pali wanted the icons to be made white, other changes were to let the colours work properly and for my sanity while working with blood code. Should be better to find blood and gibs related DMIs in future.

Changelog

(u)Cheffie
(*)Hemochromia, Colorful Reagent and some Mutantraces now correctly change the colour of created blood decals and overlays when bleeding. paint the halls! reagent pools of blood are uneffected.
(+)Internal changes to icons may possibly lead to some missing or white gib / blood icons, report these if you see them!

@boring-cyborg boring-cyborg bot added A-Mapping A mapping change C-Sprites Automatically applied on any .dmi or icons folder change labels Aug 20, 2023
@github-actions github-actions bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Aug 20, 2023
@CheffieGithub CheffieGithub added A-Internal Deals with major internal, generally non-player facing code - e.g. types C-Code-Quality Cleans up code, refactors things to be more readable or intuitive labels Aug 20, 2023
@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Aug 22, 2023
@pali6
Copy link
Member

pali6 commented Aug 22, 2023

!merge_upstream

@github-actions
Copy link
Contributor

@Sord213 Sord213 removed their request for review August 22, 2023 17:25
@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Aug 25, 2023
@github-actions github-actions bot removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Aug 26, 2023
@Tarmunora Tarmunora merged commit 252d017 into goonstation:master Aug 26, 2023
22 checks passed
github-actions bot pushed a commit that referenced this pull request Aug 26, 2023
@Nebulacrity
Copy link
Contributor

Holy shit, nice! Been waiting for this for quite some time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Internal Deals with major internal, generally non-player facing code - e.g. types A-Mapping A mapping change C-Bug A bug that impacts usage of a feature C-Code-Quality Cleans up code, refactors things to be more readable or intuitive C-Sprites Automatically applied on any .dmi or icons folder change S-Testmerged [Dev Only] Testmerged for extended testing (applied by bot) size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
6 participants