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
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
CheffieGithub
requested review from
Tarmunora,
Sord213 and
flrsh
as code owners
August 20, 2023 00:55
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
bot
added
the
size/XL
Denotes a PR that changes 500-999 lines, ignoring generated files.
label
Aug 20, 2023
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
Tarmunora
added
the
S-Testmerged
[Dev Only] Testmerged for extended testing (applied by bot)
label
Aug 20, 2023
This was referenced Aug 20, 2023
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
!merge_upstream |
Merging upstream failed: |
github-actions
bot
removed
the
S-Merge-Conflict
Applied and removed when a PR has or no longer has a merge conflict
label
Aug 22, 2023
This was referenced Aug 23, 2023
Closed
This was referenced Aug 25, 2023
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
bot
removed
the
S-Merge-Conflict
Applied and removed when a PR has or no longer has a merge conflict
label
Aug 26, 2023
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.
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.
About the PR
blood.dmi
has have been moved toobj/decals/blood/
along with martian and flock blood in their own files.gibs have been moved out of
blood.dmi
intoobj/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
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