cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a runtime with organ Destroy() called with nonhuman owner.

Browse Source
This commit is contained in:
Zuhayr
2015-06-22 22:03:24 +09:30
parent 15c123dc54
commit aa2e25928d
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/modules/organs/organ.dm
View File

@@ -28,18 +28,16 @@ var/list/organ_cache = list()
if(!owner) if(!owner)
return ..() return ..()
if((owner.internal_organs) && (src in owner.internal_organs)) if(istype(owner, /mob/living/carbon))
owner.internal_organs -= src if((owner.internal_organs) && (src in owner.internal_organs))
owner.internal_organs -= src
if((owner.internal_organs_by_name) && (src in owner.internal_organs_by_name)) if(istype(owner, /mob/living/carbon/human))
owner.internal_organs_by_name -= src if((owner.internal_organs_by_name) && (src in owner.internal_organs_by_name))
owner.internal_organs_by_name -= src
if((owner.organs) && (src in owner.organs)) if((owner.organs) && (src in owner.organs))
owner.organs -= src owner.organs -= src
if((owner.organs_by_name) && (src in owner.organs_by_name))
if((owner.organs_by_name) && (src in owner.organs_by_name)) owner.organs_by_name -= src
owner.organs_by_name -= src
if(src in owner.contents) if(src in owner.contents)
owner.contents -= src owner.contents -= src