-
-
Notifications
You must be signed in to change notification settings - Fork 87
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 and Wounds (kinda) port from Delta-V #1272
base: master
Are you sure you want to change the base?
Conversation
* add breathing immunity and organ status effects * they did surgery on a fish * fix error for installing parts on non-humanoids --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* full fucking send * ope forgot to remove the EE scripts * fix test * fix shitcode fail * DELTA THAT VALUE IS NULLABLE * whoopsie daysie * fixed???
* allow cloning living people * fix client --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* fix borg limbs * 25% speed boost * add container automatically i hope --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
feat(shitmed): add surgery popups
* full fucking send * ope forgot to remove the EE scripts * fix test * fix shitcode fail * DELTA THAT VALUE IS NULLABLE * whoopsie daysie * fixed??? * chat is this real * bugfixes * more bugfixes * goobmed
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
) Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 17d0861596adcdc875f7e6960d6b94136bea9ca4)
# Conflicts: # Resources/Prototypes/_Impstation/Body/Parts/gastropoid.yml # Resources/Prototypes/_Impstation/Body/Prototypes/gastropoid.yml # Resources/Prototypes/_Impstation/Entities/Mobs/Species/gastropoid.yml
…00 genetic damage
* Replace ForcedSleeping with Anesthesia for surgery checks * Add Anesthesia to NO2, Nocturine, and ChloralHydrate (cherry picked from commit 056c98c054e11c377195c39d859604d32559f009)
…ds#2685) (cherry picked from commit 4e175ea8eed5578a2b54e14888166abfb06af9ce)
Content.Shared/_Impstation/Body/Components/SharedAttachItemToHandSystem.cs
Outdated
Show resolved
Hide resolved
Content.Shared/_Impstation/Body/Components/SharedAttachItemToHandSystem.cs
Outdated
Show resolved
Hide resolved
Content.Shared/_Impstation/Body/Components/SharedAttachItemToHandSystem.cs
Outdated
Show resolved
Hide resolved
Content.Shared/_Impstation/Body/Components/SharedAttachItemToHandSystem.cs
Outdated
Show resolved
Hide resolved
Content.Shared/_Impstation/Body/Components/AttachItemToHandComponent.cs
Outdated
Show resolved
Hide resolved
# Conflicts: # Content.Shared/_Goobstation/Standing/SharedLayingDownSystem.cs # Content.Shared/_Impstation/CCVar/ImpCCVars.cs # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/_DV/status_effects.yml # Resources/Prototypes/_Goobstation/tags.yml # Resources/Prototypes/_Impstation/Body/Prototypes/thaven.yml # Resources/Prototypes/_Impstation/Entities/Mobs/Species/gastropoid.yml
* automatically pick body part appearance from species * automatically pick body part appearance from species when attaching * make setting organs and children on parts yml work * giant body part refactor * refactor deltav species body parts * ??? * ??? --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 71932a3f1c8b2c902d69bcbc54e4b1d8316bba79)
Not ready for review, just need the checks HAHA |
@@ -4,6 +4,10 @@ | |||
name: "thaven body part" | |||
abstract: true | |||
components: | |||
- type: Icon # Shitmed Change |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- type: Sprite maybe
- type: entity | ||
id: PartApid | ||
parent: [BaseItem, BasePart] | ||
name: "apid body part" | ||
abstract: true | ||
components: | ||
- type: Icon # Shitmed Change |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
type sprite
@@ -6,12 +6,16 @@ | |||
name: "gray body part" | |||
abstract: true | |||
components: | |||
- type: Icon # Shitmed Change |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sprite ops?
- type: Tag | ||
tags: | ||
- Trash | ||
- type: Icon # Shitmed Change |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sprite
@@ -6,6 +6,10 @@ | |||
components: | |||
- type: Sprite | |||
sprite: _Impstation/Mobs/Species/Decapoid/parts.rsi | |||
- type: Icon # Shitmed Change | |||
sprite: _Impstation/Mobs/Species/Decapoid/parts.rsi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no icon in this rsi folder afaik
* surgery 2 * Update chemist.yml Signed-off-by: Lyndomen <[email protected]> * Update chemist.yml Signed-off-by: Lyndomen <[email protected]> * Update chief_medical_officer.yml Signed-off-by: Lyndomen <[email protected]> * Update medical_doctor.yml Signed-off-by: Lyndomen <[email protected]> * Update paramedic.yml Signed-off-by: Lyndomen <[email protected]> * Update surgeon.yml Signed-off-by: Lyndomen <[email protected]> * Update surgery_steps.yml Signed-off-by: Lyndomen <[email protected]> * Update belts.yml Signed-off-by: Lyndomen <[email protected]> * limbs * comment ops * Update Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml Co-authored-by: Radezolid <[email protected]> Signed-off-by: Lyndomen <[email protected]> * Update Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml Co-authored-by: Radezolid <[email protected]> Signed-off-by: Lyndomen <[email protected]> * Update chemist.yml Signed-off-by: Lyndomen <[email protected]> * Update chemist.yml Signed-off-by: Lyndomen <[email protected]> * Update chief_medical_officer.yml Signed-off-by: Lyndomen <[email protected]> * Update surgeon.yml Signed-off-by: Lyndomen <[email protected]> * maybe ops Signed-off-by: Lyndomen <[email protected]> * whitespace Signed-off-by: Lyndomen <[email protected]> * ples Signed-off-by: Lyndomen <[email protected]> * Update base.yml Signed-off-by: Lyndomen <[email protected]> * Update vox.yml Signed-off-by: Lyndomen <[email protected]> * Update vulpkanin.yml Signed-off-by: Lyndomen <[email protected]> * Update rodentia.yml Signed-off-by: Lyndomen <[email protected]> * Update chief_medical_officer.yml Signed-off-by: Lyndomen <[email protected]> --------- Signed-off-by: Lyndomen <[email protected]> Co-authored-by: Radezolid <[email protected]> (cherry picked from commit 426b2295907d838e104c65823a93ecfd784ed9b5)
* add hemoxadone and cyanoxadone * bloodloss in not a real word i guess * require heating for both recipes * require cold temps for hemoxadone blood restoration * remove aberrant spaces (cherry picked from commit 36604e9d76f9c2638d0c2368dda6deae9bbb7783)
Ports #2542 (and other surgery prs) from Delta-V which was ported from goob. This is a REALLY big change, and requires lots of testing, and we need to wait to see how delta-v handles surgery further before considering merging this. This pr is made purely for others to review code, and detect bugs (and also play around)
We will not merge this until we have discussed this with everyone, and looked into how Delta-V is doing with it. This PR is made purely for documentation and testing