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.

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

[FIX] mitocholide fix #27103

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b7d4f03
Slight Pump Up nerf
ErdGinalD May 23, 2024
4e47b49
Merge remote-tracking branch 'upstream/master'
ErdGinalD May 28, 2024
99f72ed
Merge remote-tracking branch 'upstream/master'
ErdGinalD May 29, 2024
69f7330
Merge remote-tracking branch 'upstream/master'
ErdGinalD May 31, 2024
85702c6
Merge remote-tracking branch 'upstream/master'
ErdGinalD Jun 3, 2024
924647d
Merge remote-tracking branch 'upstream/master'
ErdGinalD Jun 6, 2024
2c8457c
FIX: Now you can observe blob overmind
ErdGinalD Jul 29, 2024
db9ad95
Deleting unnecessary armor from explorer gear
ErdGinalD Jul 30, 2024
c6b7beb
Merge branch 'master' of https://github.com/ErdGinalD/Off-para
ErdGinalD Jul 30, 2024
18e26f1
Revert "Deleting unnecessary armor from explorer gear"
ErdGinalD Jul 30, 2024
618c7d1
Revert "Merge branch 'master' of https://github.com/ErdGinalD/Off-para"
ErdGinalD Jul 30, 2024
3d804c7
Merge remote-tracking branch 'upstream/master'
ErdGinalD Aug 9, 2024
799f138
Merge remote-tracking branch 'upstream/master'
ErdGinalD Aug 17, 2024
8670a59
Merge remote-tracking branch 'upstream/master'
ErdGinalD Sep 5, 2024
02fc40a
Merge remote-tracking branch 'upstream/master'
ErdGinalD Sep 10, 2024
340979f
Merge remote-tracking branch 'upstream/master'
ErdGinalD Sep 12, 2024
cd9f9a2
Merge remote-tracking branch 'upstream/master'
ErdGinalD Sep 17, 2024
a031785
Merge remote-tracking branch 'upstream/master'
ErdGinalD Sep 18, 2024
f40e1d8
Merge remote-tracking branch 'upstream/master'
ErdGinalD Sep 19, 2024
109a233
Merge remote-tracking branch 'upstream/master'
ErdGinalD Sep 24, 2024
8b2f4d9
Update config.toml
ErdGinalD Sep 24, 2024
67d721a
Merge remote-tracking branch 'upstream/master'
ErdGinalD Sep 27, 2024
3d4f10a
Merge remote-tracking branch 'upstream/master'
ErdGinalD Sep 30, 2024
92b3b5d
Merge remote-tracking branch 'upstream/master'
ErdGinalD Oct 4, 2024
3f11846
Merge remote-tracking branch 'upstream/master'
ErdGinalD Oct 10, 2024
82e57bf
Merge remote-tracking branch 'upstream/master'
ErdGinalD Oct 11, 2024
0969880
Merge remote-tracking branch 'upstream/master'
ErdGinalD Oct 14, 2024
2f86553
FIX for Mithocolidde
ErdGinalD Oct 14, 2024
934dcb6
Update config.toml
ErdGinalD Oct 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions code/modules/surgery/organs/organ_external.dm
Original file line number Diff line number Diff line change
Expand Up @@ -386,16 +386,18 @@ This function completely restores a damaged organ to perfect condition.
surgeryize()
if(is_robotic()) //Robotic organs stay robotic.
status = ORGAN_ROBOT
else if(HAS_TRAIT(owner, TRAIT_I_WANT_BRAINS))
else if(owner && HAS_TRAIT(owner, TRAIT_I_WANT_BRAINS))
status = ORGAN_DEAD
else
status = 0
germ_level = 0
perma_injury = 0
brute_dam = 0
burn_dam = 0
if(!HAS_TRAIT(owner, TRAIT_I_WANT_BRAINS)) // zombies's wounds don't close. Because thats cool.
open = ORGAN_CLOSED //Closing all wounds.
if(owner && !HAS_TRAIT(owner, TRAIT_I_WANT_BRAINS)) // zombies's wounds don't close. Because thats cool.
open = ORGAN_CLOSED
else
open = ORGAN_CLOSED //Closing all wounds for detached limbs.
ErdGinalD marked this conversation as resolved.
Show resolved Hide resolved

// handle internal organs
for(var/obj/item/organ/internal/current_organ in internal_organs)
Expand Down