-
Notifications
You must be signed in to change notification settings - Fork 3.4k
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
surgery real #19098
surgery real #19098
Conversation
… from the same owner)
add null checks to server droppart
# Conflicts: # Content.Server/Body/Components/StomachComponent.cs # Content.Server/Disease/Cures/DiseaseReagentCure.cs # Content.Server/Disease/Effects/DiseaseAdjustReagent.cs # Content.Server/Medical/Bloodstream/Systems/BloodstreamSystem.cs # Content.Server/Medical/HealingSystem.cs # Content.Server/Weapons/Melee/MeleeWeaponSystem.cs # Resources/Prototypes/Entities/Objects/Materials/materials.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
# Conflicts: # Content.Server/Chemistry/ReagentEffects/ChemCleanBoodstream.cs # Content.Server/Medical/Bloodstream/Components/BloodstreamComponent.cs # Content.Server/Medical/Components/HealingComponent.cs # Content.Server/Weapons/Melee/MeleeWeaponSystem.cs # Pow3r/Program.UI.cs # Resources/Prototypes/Body/Parts/human.yml # Resources/Prototypes/Entities/Objects/Materials/materials.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
ok i think it is very fucked but whatever |
based... |
god almighty... |
real pro |
yeah idk i think i fucked it but whatever |
time to wait 7 months, diff master, pr a single commit with 5k lines |
real noob |
nt |
nt - nanotrasen |
@deltanedas is it ok if I bring these changes into the new medical refactor branch? |
go ahead but have fun with the spookier conflicts also i was gonna do it but yeah: remove surgery effects and move it all into step behaviour its way better and less bug prone (finishing surgery but cauterizing should just leave an open incision not ignore the surgery) |
About the PR
this pull request has merge conflicts
only has organ harvesting/transplanting and amputating/restoring limbs
depends on #13917 to be finished and merged and new surgeries to be added in response
Media
Changelog
🆑