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.

Sign up for GitHub

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

Jump to bottom

surgery real #19098

Closed
wants to merge 210 commits into from
Closed

surgery real #19098

wants to merge 210 commits into from

Conversation

deltanedas
Copy link
Contributor

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

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog
🆑

  • add: Added fun!
  • remove: Removed fun!
  • tweak: Changed fun!
  • fix: Fixed fun!

Jezithyr and others added 30 commits November 5, 2022 01:51
@Jezithyr
started work on wound prototypes
6b0677a
@Jezithyr
implemented wound application and stacking
7f57303
@Jezithyr
implemented SKIN and created Bones!
bb6d320
@Jezithyr
implemented bone typing
d095766
@Jezithyr
fixing a stupid with damage specifier
3579d26
@Jezithyr
fixing some serialization fuckups and implementing per part damage caps
170ac18
@Jezithyr
updating
bdf11c4
@Jezithyr
interm commit
854b176
@Jezithyr
Merge remote-tracking branch 'upstream/master' into refactor/wounds
a4ba814
@Jezithyr
implemented wound table caching, updated wound tables to use severity
f8cf84f
@Jezithyr
Implemented Wounding :D
c983122
@Jezithyr
added listener for damage
31e290c
@Jezithyr
Merge branch 'master' into refactor/wounds
cbea569
@Jezithyr
Interm test
8d19e70
@DrSmugleaf
Fix errors
eb97064
@Jezithyr
Moved woundPools out of damagetype to their own prototype
7629390
@Jezithyr
Unfuck Csproj
ced971e
@Jezithyr
Converted to new trauma-damage based system
2db4d1e
@Jezithyr
Merge branch 'refactor/wounds'
6db19b3
@DrSmugleaf
Merge branch 'master' of https://github.com/space-wizards/space-stati…
6bbcccb 
…on-14 into refactor/wounds
@DrSmugleaf
Use methods from merge
8476dd5
@DrSmugleaf
Cleanup
5bd8295
@DrSmugleaf
Cleanup
c0e8821
@DrSmugleaf
Default to traumaType if no penTraumaType
5bb7447
@DrSmugleaf
Remove infected
02a7376
@DrSmugleaf
Cleanup
1a215cf
@DrSmugleaf
Add health damage and integrity damage
d87d7d7
@DrSmugleaf
Merge branch 'master' of https://github.com/space-wizards/space-stati…
37962b9 
…on-14 into refactor/wounds
@DrSmugleaf
Fix sandbox error
070a1c4
@DrSmugleaf
Add test injury crack
24df4b7
Jezithyr and others added 12 commits April 25, 2023 03:25
@Jezithyr
started consciousness rewrite to use modifier stacks
0303967
@Jezithyr
Finished Consciousness rewrite. A lot simpler (Less math \o/)
465e703
@Jezithyr
Added support for modifier categories. (to allow more than 1 modifier…
87a95b1 
… from the same owner)
@Jezithyr
Merge pull request #2 from deltanedas/patch-3
b708fe0 
add null checks to server droppart
@metalgearsloth
Merge remote-tracking branch 'upstream/master' into refactor/wounds
21d33ef 
# 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
@metalgearsloth
weh
424469a
@metalgearsloth
consciousness
b33e635
update
39e57c6
a
5981555
@metalgearsloth
Merge remote-tracking branch 'upstream/master' into refactor/wounds
e55524a 
# 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
@metalgearsloth
weh
f7b389e
merge wounds
f78ece5
@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Aug 13, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design labels Aug 13, 2023
@deltanedas
Copy link
Contributor Author

ok i think it is very fucked but whatever

@github-actions
Copy link
Contributor

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

Resources/Textures/Objects/Specific/Medical/Surgery/drapes.rsi

State Old New Status
drapes Added
inhand-left Added
inhand-right Added

@misandrie
Copy link
Contributor

depends on #13917

pulls the entire pr into his own

based...

@lzk228
Copy link
Contributor

lzk228 commented Aug 13, 2023

god almighty...

@lzk228
Copy link
Contributor

lzk228 commented Aug 13, 2023

real pro

@deltanedas
Copy link
Contributor Author

yeah idk i think i fucked it but whatever

@deltanedas
Copy link
Contributor Author

time to wait 7 months, diff master, pr a single commit with 5k lines

@deltanedas deltanedas closed this Aug 13, 2023
@lzk228
Copy link
Contributor

lzk228 commented Aug 13, 2023

real noob :trollface:

@kxvvv
Copy link
Contributor

kxvvv commented Aug 13, 2023

nt

@deltanedas
Copy link
Contributor Author

nt - nanotrasen

@Morb0
Copy link
Contributor

Morb0 commented Aug 13, 2023

:trollface:

@Jezithyr
Copy link
Contributor

@deltanedas is it ok if I bring these changes into the new medical refactor branch?

@deltanedas
Copy link
Contributor Author

deltanedas commented Aug 21, 2023 •
edited
Loading

go ahead but have fun with the spookier conflicts :trollface:

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)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@metalgearsloth metalgearsloth Awaiting requested review from metalgearsloth metalgearsloth will be requested when the pull request is marked ready for review metalgearsloth is a code owner

@Jezithyr Jezithyr Awaiting requested review from Jezithyr Jezithyr will be requested when the pull request is marked ready for review Jezithyr is a code owner

@EmoGarbage404 EmoGarbage404 Awaiting requested review from EmoGarbage404 EmoGarbage404 will be requested when the pull request is marked ready for review EmoGarbage404 is a code owner

@DrSmugleaf DrSmugleaf Awaiting requested review from DrSmugleaf DrSmugleaf will be requested when the pull request is marked ready for review DrSmugleaf is a code owner

@Chief-Engineer Chief-Engineer Awaiting requested review from Chief-Engineer Chief-Engineer will be requested when the pull request is marked ready for review Chief-Engineer is a code owner

Assignees
No one assigned
Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Merge Conflict This PR currently has conflicts that need to be addressed.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@deltanedas @misandrie @lzk228 @kxvvv @Morb0 @Jezithyr @DrSmugleaf @metalgearsloth