Хирургия (попытка 2) #65
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
* 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]>
* 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>
…hes" This reverts commit de95d85.
* Added some experimental lag fixes to surgery. Might have crashes * Fix * migrate and add comments to shit * fix --------- Co-authored-by: gluesniffler <[email protected]>
…ate#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]>
* 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
* 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 * Fix Severing parts --------- Co-authored-by: gluesniffler <[email protected]> Roudenn: Rxup/space-station-14#911
* 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
github-actions
bot
added
Status: Needs Review
Changes: Sprites
Changes: Localization
* 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]>
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]>
|
Прошёл все тесты СЮДА! |
trest100
suggested changes
Nov 21, 2024
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
FireNameFN
previously requested changes
Nov 22, 2024
|
Гитхаб пипец лагает, так что ищите сами, где ещё там неймспейсы не проставлены. |
Reverted only formats though, being saved moves everythin to appropriate folders, and nice and clean This reverts commit e66b04b.
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
AwareFoxy
dismissed
FireNameFN’s stale review
Не менять неймспейсы, я не хочу каждый апстрим решать ещё пару сотен конфликтов из за этой хуйни
|
Это один маленький шаг для разработчика и огромный шаг для вс- нам пизда от визденов. |
|
Невозможно... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Описание PR
Полностью переделана система ранений, добавлена хирургия, сложные манипуляции с частями тела и органами, а также понятное отображение всего процесса для игроков.
Взято с Shitmed PR, спасибо большое @gluesniffler !
Спасибо большое Shitmed Port PR @Roudenn !
Почему / Баланс
"Хирургия через неделю"
Технические детали
Привет хирургия и привет апстрим конфликты!
Все известные баги были исправлены и добавлено кучу новых механик 2024-11-17:
Нет простого способа увидеть, что именно нарушено внутри тела пациента (отсутствующие органы, повреждённые кости и т. д.).Сломанные органы не повлияют на работоспособность/эффективность.Ссылки на источники: Rxup/space-station-14#873
Медиа
surgery.ss14.2024-11-17.2.mp4
Требования
Критические изменения
Точно ничего хорошего.
Список изменений
🆑