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

[Port] Surgery Update V: The Phantom Gib #919

Merged
merged 6 commits into from
Nov 17, 2024
Merged

[Port] Surgery Update V: The Phantom Gib #919

merged 6 commits into from
Nov 17, 2024

Conversation

Roudenn
Copy link
Collaborator

@Roudenn Roudenn commented Nov 16, 2024 •
edited
Loading

Большой порт 5-ти коммитов с основного ПРа на хирургию.
Изменяется много кода связанного с нанесением урона и прицеливанием по конечностям.
Рекомендуется провести тестирование!

Изменения

🆑 Mocho

  • tweak: Обновлён интерфейс для прицеливания по частям тела, а также теперь можно прицеливаться на ладони и ступни гуманоидов.
  • tweak: Теперь для лечения части тела медикаментами по ней необходимо прицелиться.
  • tweak: Части тела могут быть полностью разрушены при достаточном количестве ушибов или порезов.
  • fix: Исправлены проблемы с лагами интерфейса хирургии.

@gluesniffler @Roudenn
Megasquached Surgery Updates
ee599b6 
Megasquached Surgery Updates

Quick patch to see if tests shut up

Please do not cherrypick this one yet.

Refactored body parts to use damageablecomponent

newmed health analyzer real, also refactors and some bugfixes
@Roudenn Roudenn requested a review from Rxup as a code owner November 16, 2024 07:14
@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 Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation labels Nov 16, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 16, 2024 •
edited
Loading

RSI Diff Bot; head commit 50ba51d merging into 4e00804
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Interface/Targeting/Status/leftarm.rsi

State Old New Status
leftarm_0 Modified
leftarm_1 Modified
leftarm_2 Modified
leftarm_3 Modified
leftarm_4 Modified
leftarm_5 Modified
leftarm_6 Modified
leftarm_7 Modified
leftarm_8 Modified

Resources/Textures/Interface/Targeting/Status/leftleg.rsi

State Old New Status
leftleg_0 Modified
leftleg_1 Modified
leftleg_2 Modified
leftleg_3 Modified
leftleg_4 Modified
leftleg_5 Modified
leftleg_6 Modified
leftleg_7 Modified
leftleg_8 Modified

Resources/Textures/Interface/Targeting/Status/rightarm.rsi

State Old New Status
rightarm_0 Modified
rightarm_1 Modified
rightarm_2 Modified
rightarm_3 Modified
rightarm_4 Modified
rightarm_5 Modified
rightarm_6 Modified
rightarm_7 Modified
rightarm_8 Modified

Resources/Textures/Interface/Targeting/Status/rightleg.rsi

State Old New Status
rightleg_0 Modified
rightleg_1 Modified
rightleg_2 Modified
rightleg_3 Modified
rightleg_4 Modified
rightleg_5 Modified
rightleg_6 Modified
rightleg_7 Modified
rightleg_8 Modified

Resources/Textures/Interface/Targeting/Status/torso.rsi

State Old New Status
torso_0 Modified
torso_1 Modified
torso_2 Modified
torso_3 Modified
torso_4 Modified
torso_5 Modified
torso_6 Modified
torso_7 Modified
torso_8 Modified

Resources/Textures/Interface/Targeting/Status/groin.rsi

State Old New Status
groin_0 Added
groin_1 Added
groin_2 Added
groin_3 Added
groin_4 Added
groin_5 Added
groin_6 Added
groin_7 Added
groin_8 Added

Resources/Textures/Interface/Targeting/Status/leftfoot.rsi

State Old New Status
leftfoot_0 Added
leftfoot_1 Added
leftfoot_2 Added
leftfoot_3 Added
leftfoot_4 Added
leftfoot_5 Added
leftfoot_6 Added
leftfoot_7 Added
leftfoot_8 Added

Resources/Textures/Interface/Targeting/Status/lefthand.rsi

State Old New Status
lefthand_0 Added
lefthand_1 Added
lefthand_2 Added
lefthand_3 Added
lefthand_4 Added
lefthand_5 Added
lefthand_6 Added
lefthand_7 Added
lefthand_8 Added

Resources/Textures/Interface/Targeting/Status/rightfoot.rsi

State Old New Status
rightfoot_0 Added
rightfoot_1 Added
rightfoot_2 Added
rightfoot_3 Added
rightfoot_4 Added
rightfoot_5 Added
rightfoot_6 Added
rightfoot_7 Added
rightfoot_8 Added

Resources/Textures/Interface/Targeting/Status/righthand.rsi

State Old New Status
righthand_0 Added
righthand_1 Added
righthand_2 Added
righthand_3 Added
righthand_4 Added
righthand_5 Added
righthand_6 Added
righthand_7 Added
righthand_8 Added

Edit: diff updated after 50ba51d

@Roudenn Roudenn marked this pull request as draft November 16, 2024 07:59
@Roudenn
Copy link
Collaborator Author

Roudenn commented Nov 16, 2024

тут всё сломано что пиздец

@CrimeMoot
Copy link
Contributor

ААА КЛИК ХАНТЕР, ЦЕЛИТЬСЯ ПО МЕЛКИМ ЧАСТЯМ ТЕЛА.

@CrimeMoot
Copy link
Contributor

ПРОКЛЯТЬЕ 220

@Roudenn Roudenn marked this pull request as ready for review November 16, 2024 11:36
@Roudenn
Copy link
Collaborator Author

Roudenn commented Nov 16, 2024

ээээ ну короче с костылями оно должно работать

@Roudenn Roudenn changed the title [Port] Surgery Update: Part V [Port] Surgery Update V: The Phantom Gib Nov 16, 2024
@Rxup Rxup merged commit 5a6825b into Rxup:master Nov 17, 2024
11 checks passed
TokenStyle pushed a commit to TokenStyle/space-station-14-next that referenced this pull request Nov 17, 2024
@Roudenn @gluesniffler
@Rxup @TokenStyle
[Port] Surgery Update V: The Phantom Gib (space-syndicate#919)
3e977be 
* Megasquached Surgery Updates

Megasquached Surgery Updates

Quick patch to see if tests shut up

Refactored body parts to use damageablecomponent

newmed health analyzer real, also refactors and some bugfixes

* added solidus's comments, pending removal of namespace thingies for this repo, also fixed some healing thingies

* fixes?

* fix gib torso

* fix prototypes

* oops

---------

Co-authored-by: gluesniffler <[email protected]>
Co-authored-by: Zack Backmen <[email protected]>
Roudenn: Rxup/space-station-14#919
AwareFoxy added a commit to space-syndicate/space-station-14-next that referenced this pull request Nov 22, 2024
@TokenStyle @gluesniffler
@Roudenn @Rxup @FoxxoTrystan @goet @SaphireLattice @angelofallars @trest100 @AwareFoxy
Хирургия (попытка 2) (#65)
fdb6e27 
* The ShitMed

* Fixes

fix locale

* Delete redudant systems

* fix components

* fix error, update system

* Update BodyPartComponent.cs

* fix max health, fix test legs

* fix test

* Port fixes from EE (space-syndicate#875)

* [Fix] Healing Fixes (space-syndicate#874)

* Targeting & Healing Fixes

* Update Content.Server/Medical/HealingSystem.cs

Co-authored-by: gluesniffler <[email protected]>

* Fix Vital Damage

* Update BodyPartComponent.cs

* fix

---------

Co-authored-by: gluesniffler <[email protected]>

* [Port] Surgery fixes: Part 2 (space-syndicate#876)

* Fix a ton of shitmed

Fixed a buncho crap

* Guidebook

* Russian Locale

* fix

* hotfix added Rxup/space-station-14@e92f013

---------

Co-authored-by: gluesniffler <[email protected]>
Co-authored-by: Zack Backmen <[email protected]>
Co-authored-by: Token <github.com/TokenStyle>

* remove backmen ccvar

* Body doll in the Health Analyzer menu (space-syndicate#877)

* fixes and fix guidebook paths (space-syndicate#887)

* fixes

* Added some experimental lag fixes to surgery. Might have crashes

* russian locale

* Revert "Added some experimental lag fixes to surgery. Might have crashes"

This reverts commit de95d85.

* [Port] Surgery fixes: Part 3 (space-syndicate#892)

* Added some experimental lag fixes to surgery. Might have crashes

* Fix

* migrate and add comments to shit

* fix

---------

Co-authored-by: gluesniffler <[email protected]>

* [Tweak] Rework BodyPartComponent to use DamageSpecifier (space-syndicate#890)

* Rework BodyPart to use DamageSpecifier

* Fix that shit

* Update Content.Shared/Backmen/Surgery/Body/SharedBodySystem.Integrity.cs

Co-authored-by: gluesniffler <[email protected]>

* Uh?

* Update HealthAnalyzerWindow.xaml.cs

* balanced a buncho crap

---------

Co-authored-by: gluesniffler <[email protected]>

* [Port] Surgery fixes: Part 4 (space-syndicate#909)

* defelinization almost real

* fix?

* Corvax next fix that surgery doesn't work with fatal error

---------

Co-authored-by: gluesniffler <[email protected]>
Roudenn: Rxup/space-station-14#909

* [Fix] surgery emergency fix

* Fixed mechanics of attaching body parts to Body. (now taken from prototypes, not generated at random)

---------

Co-authored-by: gluesniffler <[email protected]>
KayzelW: Rxup/space-station-14#912

* [Balance] Surgery healing tweaks (space-syndicate#911)

* Balance surgery

* Fix Severing parts

---------

Co-authored-by: gluesniffler <[email protected]>
Roudenn: Rxup/space-station-14#911

* [Port] Surgery Update V: The Phantom Gib (space-syndicate#919)

* Megasquached Surgery Updates

Megasquached Surgery Updates

Quick patch to see if tests shut up

Refactored body parts to use damageablecomponent

newmed health analyzer real, also refactors and some bugfixes

* added solidus's comments, pending removal of namespace thingies for this repo, also fixed some healing thingies

* fixes?

* fix gib torso

* fix prototypes

* oops

---------

Co-authored-by: gluesniffler <[email protected]>
Co-authored-by: Zack Backmen <[email protected]>
Roudenn: Rxup/space-station-14#919

* let me pass tests

* let me pass test pls

* let me pass test pls

* let me pass tests

* chief medical officer pass tests

* no felinid ears no fun pass tests

* [Port] Surgery Fixes: Popup Walker (space-syndicate#923)

* Megasquached Surgery Updates

Megasquached Surgery Updates

Quick patch to see if tests shut up

Please do not cherrypick this one yet.

Refactored body parts to use damageablecomponent

newmed health analyzer real, also refactors and some bugfixes

* added solidus's comments, pending removal of namespace thingies for this repo, also fixed some healing thingies

* fixes?

* fix gib torso

* fix prototypes

* oops

* Shitmed Update 1 (space-syndicate#1240)

First in a series of PRs to introduce bugfixes and updates to Shitmed,
this will generally feature PRs from Goobstation or Backmen as well
since they are actively helping me maintain the code.

Usual Shoutouts:
Deltanedas: Goob-Station/Goob-Station#882

---

:cl: Mocho, Deltanedas
- add: You can now perform surgery as a monke. Rejoice.
- add: You can perform surgery on a lot of animals now, I missed a lot
of them so just ask if you want any particular critter to get it.
- tweak: Entities now perish after 60 seconds of losing their heart
and/or brain.
- fix: Entities properly take asphyxiation damage after losing their
brain.
- fix: Torsos being gibbable, which would break surgery or just about
anything.
- fix: Items not being removed from their respective slots if the parts
were gibbed rather than dropped.
- fix: Animal organs not being usable properly in surgeries
- fix: Cyborg limbs are now usable as pseudo-peg arm/legs.

---------

Signed-off-by: gluesniffler <[email protected]>
Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: goet <[email protected]>
Co-authored-by: Saphire Lattice <[email protected]>
Co-authored-by: Roudenn <[email protected]>

* Shitmed Surgery Popups (space-syndicate#1241)

Adds popups for surgery steps in Shitmed that every player within PVS
range can see. This allows other players to see if the correct procedure
is being performed. This PR also includes locale text for the new
procedures and steps in space-syndicate#1240.

**Remove Brain / Insert Brain**

https://github.com/user-attachments/assets/ac20afa1-df74-48ab-b1d5-2e9a273dfba2

<details><summary>See more</summary>

**Amputate Right Arm**

https://github.com/user-attachments/assets/17f78683-6d3b-44ee-aea3-bb6987844fdc

**Attach Right Arm**

https://github.com/user-attachments/assets/584d4da2-d8b0-4c82-a323-26636e7fa4b8

</details>

:cl: Skubman
- add: Surgery step descriptions (like making an incision,
removing/attaching limbs and organs) are now shown as popups to everyone
in range upon the start of the step. This makes it clear which surgical
procedure is being done and to which body part. No more stealthy
brain-stealing in front of everyone!

* fix the things + locale

---------

Signed-off-by: gluesniffler <[email protected]>
Co-authored-by: gluesniffler <[email protected]>
Co-authored-by: Zack Backmen <[email protected]>
Co-authored-by: gluesniffler <[email protected]>
Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: goet <[email protected]>
Co-authored-by: Saphire Lattice <[email protected]>
Co-authored-by: Skubman <[email protected]>

* [PORT]Health Analyzer update (space-syndicate#925)

Add amazing Health analyzer UI.
Rxup/space-station-14#925

* Update HealthAnalyzerSystem.cs

* Update medical-scanner-component.ftl

* Update HealthAnalyzerWindow.xaml.cs

* Update health-analyzer-component.ftl

* fix

---------

Co-authored-by: trest100 <[email protected]>

* let me pass tests

* remove shadowkin let tests pass

* first commit

* Revert "first commit" formatting changes

Reverted only formats though, being saved moves everythin to appropriate folders, and nice and clean
This reverts commit e66b04b.

* add corvax next comments for changes for easier upstreams

Be aware though, that everything that related to BodySystem, OrganComponent, DamageSystem etc was changed completely

- add comments _CorvaxNext
- moved .ftl files and cvars to appropriate Corvax Next folders
- removed unnecessary felinids and silicon_base

* namespaces changes for everythin

* Revert "namespaces changes for everythin"

This reverts commit 221ee3e.

* [Fix] Surgery Hotfix: Head and Limbs dissapears

---------

Signed-off-by: gluesniffler <[email protected]>
Co-authored-by: gluesniffler <[email protected]>
Co-authored-by: Roudenn <[email protected]>
Co-authored-by: Zack Backmen <[email protected]>
Co-authored-by: Rouden <[email protected]>
Co-authored-by: gluesniffler <[email protected]>
Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: goet <[email protected]>
Co-authored-by: Saphire Lattice <[email protected]>
Co-authored-by: Skubman <[email protected]>
Co-authored-by: Trest <[email protected]>
Co-authored-by: AwareFoxy <[email protected]>
Co-authored-by: AwareFoxy <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Rxup Rxup Awaiting requested review from Rxup Rxup is a code owner

Assignees
No one assigned
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation 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
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Roudenn @CrimeMoot @Rxup @gluesniffler