Surgery and Wounds (kinda) port from Delta-V #1272

honeyed-lemons · 2025-01-08T23:58:31Z

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

@deltanedas

* 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???

@deltanedas

* allow cloning living people * fix client --------- Co-authored-by: deltanedas <@deltanedas:kde.org>

@deltanedas

* 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

@deltanedas

Co-authored-by: deltanedas <@deltanedas:kde.org>

@deltanedas

Co-authored-by: deltanedas <@deltanedas:kde.org>

@deltanedas

Co-authored-by: deltanedas <@deltanedas:kde.org>

…F THEM

@deltanedas

Co-authored-by: deltanedas <@deltanedas:kde.org>

@deltanedas

) 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

…ssues

* 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

Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs

Content.Shared/_Impstation/Body/Components/AttachItemToHandComponent.cs

# 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

@deltanedas

* 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)

honeyed-lemons · 2025-01-21T19:33:03Z

Not ready for review, just need the checks HAHA

Lyndomen · 2025-01-23T16:17:27Z

Resources/Prototypes/_Impstation/Body/Parts/thaven.yml

@@ -4,6 +4,10 @@
  name: "thaven body part"
  abstract: true
  components:
+  - type: Icon # Shitmed Change


type: Sprite maybe

Lyndomen · 2025-01-23T16:17:43Z

Resources/Prototypes/_Impstation/Body/Parts/apid.yml

 - type: entity
  id: PartApid
  parent: [BaseItem, BasePart]
  name: "apid body part"
  abstract: true
  components:
+  - type: Icon # Shitmed Change


type sprite

Lyndomen · 2025-01-23T16:18:06Z

Resources/Prototypes/_Impstation/Body/Parts/gray.yml

@@ -6,12 +6,16 @@
  name: "gray body part"
  abstract: true
  components:
+  - type: Icon # Shitmed Change


sprite ops?

Lyndomen · 2025-01-23T16:18:16Z

Resources/Prototypes/_Impstation/Body/Parts/gastropoid.yml

-  - type: Tag
-    tags:
-      - Trash
+  - type: Icon # Shitmed Change


Lyndomen · 2025-01-23T16:20:59Z

Resources/Prototypes/_Impstation/Body/Parts/decapoid.yml

@@ -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


no icon in this rsi folder afaik

* surgery 2 * Update chemist.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chemist.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chief_medical_officer.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update medical_doctor.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update paramedic.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update surgeon.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update surgery_steps.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update belts.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * limbs * comment ops * Update Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml Co-authored-by: Radezolid <snappednexus@gmail.com> Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml Co-authored-by: Radezolid <snappednexus@gmail.com> Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chemist.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chemist.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chief_medical_officer.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update surgeon.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * maybe ops Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * whitespace Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * ples Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update base.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update vox.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update vulpkanin.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update rodentia.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chief_medical_officer.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --------- Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Co-authored-by: Radezolid <snappednexus@gmail.com> (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)

… parts

gluesniffler and others added 30 commits January 8, 2025 17:31

SHITMED REAL

4da9a78

pr 2

d3e8777

commit 3

5beb83c

they did surgery on a fish (impstation#889)

bde47e7

* 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>

SO MANY COMMITS

ec2288b

Hotfix for broken organ transplants (impstation#933)

414dda2

* 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 (impstation#932)

bb07a29

* allow cloning living people * fix client --------- Co-authored-by: deltanedas <@deltanedas:kde.org>

fix borg limbs and make borg legs good (impstation#916)

5cf6698

* fix borg limbs * 25% speed boost * add container automatically i hope --------- Co-authored-by: deltanedas <@deltanedas:kde.org>

Shitmed Surgery Popups (EE Port) (impstation#918)

10a6051

feat(shitmed): add surgery popups

shitmed is killign me

741fb31

Minor Shitmed Bugfixes (impstation#971)

30ded5d

* 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

fix surgerytarget check (impstation#972)

b71c8a0

Co-authored-by: deltanedas <@deltanedas:kde.org>

surgery changes for autodoc (impstation#969)

943a201

Co-authored-by: deltanedas <@deltanedas:kde.org>

make any sharp item a ghetto surgery tool (impstation#990)

c48e8c6

Co-authored-by: deltanedas <@deltanedas:kde.org>

I LOVE COMMITS I LOVE THEM I LOVE THEM SO MUCH I LOVE DOING SO MANY O…

667dfcd

…F THEM

add autodoc (impstation#970)

ba07c74

Co-authored-by: deltanedas <@deltanedas:kde.org>

HI

38e0b9a

Fix operating table test fail (impstation#1041)

ae63e54

Dying

da8b419

Hi

7406577

fix

cdbaf36

RAH

0827618

FIX

90e5af3

give borgs targeting

8f6fcf5

make mousetraps damage your feet

a2fb689

make limbs gib at 200 pierce

64af2a3

fix pierce not severing

e988787

remove funny thing

d30557a

hopefully fix the laying down mispredicts

6b2a9ec

evil surgery damage and change stuff to work for it

3c715a2

honeyed-lemons and others added 15 commits January 9, 2025 14:42

Move laying down CCVAR

479f0d6

revert cloning working on alive people

a876053

make limb severing bleed instead of bloodloss damage (space-wizards#2668

6c2916c

) Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 17d0861596adcdc875f7e6960d6b94136bea9ca4)

Remove gastropod legs and feet, and adjusts code to account for it!

fc48025

Decapoid lung fix, gastropod damage fix

b87cdd2

Decapoid hand refactor!

9709194

Merge branch 'master' into shitmed-dv

8aaf91f

# Conflicts: # Resources/Prototypes/_Impstation/Body/Parts/gastropoid.yml # Resources/Prototypes/_Impstation/Body/Prototypes/gastropoid.yml # Resources/Prototypes/_Impstation/Entities/Mobs/Species/gastropoid.yml

Fix gastropod damage stuff

539008c

Add tank harnesses to medical fabricator

79ff1c5

Tank harnesses and surgical gowns can be worn during surgery

bb49ecc

Changeling changes. Absorbing removes all organs and now only deals 1…

ad4907f

…00 genetic damage

Moves attachitemtohand stuff and fixes lots of tiny tiny itty bitty i…

8728afd

…ssues

Replace ForcedSleep with Anesthesia for surgery (space-wizards#2684)

a67f34f

* Replace ForcedSleeping with Anesthesia for surgery checks * Add Anesthesia to NO2, Nocturine, and ChloralHydrate (cherry picked from commit 056c98c054e11c377195c39d859604d32559f009)

Make chloral hydrate better suited for use as anesthesia (space-wizar…

7761cd4

…ds#2685) (cherry picked from commit 4e175ea8eed5578a2b54e14888166abfb06af9ce)

Fix namespace

a1651c4

mqole added NEWMED one week! PR limbo A PR that's waiting on other issues / dev stuff to get fixed before we merge labels Jan 13, 2025

MilonPL reviewed Jan 16, 2025

View reviewed changes

honeyed-lemons and others added 3 commits January 21, 2025 12:57

Github yaml linter save me...

4c0b0fd

honeyed-lemons marked this pull request as ready for review January 21, 2025 19:32

honeyed-lemons marked this pull request as draft January 21, 2025 19:37

AttachItemToHand refactor

26d3e1e

Lyndomen reviewed Jan 23, 2025

View reviewed changes

honeyed-lemons and others added 4 commits January 23, 2025 12:24

FIXED IT FIXED IT I FIXED IT I DID IT

fa7eb12

update goblin to use new stuff, give apids insect blood in their body…

7f8c872

… parts

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Surgery and Wounds (kinda) port from Delta-V #1272

Surgery and Wounds (kinda) port from Delta-V #1272

honeyed-lemons commented Jan 8, 2025 •

edited

Loading

honeyed-lemons commented Jan 21, 2025

Lyndomen Jan 23, 2025

Lyndomen Jan 23, 2025

Lyndomen Jan 23, 2025

Lyndomen Jan 23, 2025

Lyndomen Jan 23, 2025

Surgery and Wounds (kinda) port from Delta-V #1272

Are you sure you want to change the base?

Surgery and Wounds (kinda) port from Delta-V #1272

Conversation

honeyed-lemons commented Jan 8, 2025 • edited Loading

honeyed-lemons commented Jan 21, 2025

Lyndomen Jan 23, 2025

Choose a reason for hiding this comment

Lyndomen Jan 23, 2025

Choose a reason for hiding this comment

Lyndomen Jan 23, 2025

Choose a reason for hiding this comment

Lyndomen Jan 23, 2025

Choose a reason for hiding this comment

Lyndomen Jan 23, 2025

Choose a reason for hiding this comment

honeyed-lemons commented Jan 8, 2025 •

edited

Loading