mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 12:29:46 +01:00
Code Cleanup: Destroy() fixes part 1 + Misc Fixes (#1933)
In this PR: Destroy() fixes backported from PR #1783. JaniPDA fixes & improvements. Chickens no longer consume their own eggs. Language adding in setup is now 100% more sane. Chemical dispensers now actually check that the user is still alive before renaming. Ghosts are now marked as non-simulated atoms. Non-simulated atoms no longer trigger proximity listeners. Vendors no longer accept synthetic tools as stocking options. Fixes #812. Fixes #1877, Fixes #1929. Fixes #1930. Fixes #1152, Fixes #1917. Fixes #1902. Fixes #1165.
This commit is contained in:
@@ -28,6 +28,7 @@ var/list/organ_cache = list()
|
||||
var/emp_coeff = 1 //coefficient for damages taken by EMP, if the organ is robotic.
|
||||
|
||||
/obj/item/organ/Destroy()
|
||||
processing_objects -= src
|
||||
if(!owner)
|
||||
return ..()
|
||||
|
||||
@@ -44,6 +45,9 @@ var/list/organ_cache = list()
|
||||
if(src in owner.contents)
|
||||
owner.contents -= src
|
||||
|
||||
owner = null
|
||||
QDEL_NULL(dna)
|
||||
|
||||
return ..()
|
||||
|
||||
/obj/item/organ/proc/update_health()
|
||||
|
||||
Reference in New Issue
Block a user