cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moves nanomanager.close_uis(src) into datum/proc/Destroy() instead of /obj/Destroy() now that NanoUI supports datums.

Browse Source
This commit is contained in:
PsiOmegaDelta
2015-09-08 08:32:09 +02:00
parent 92e510b2e0
commit 23a3433e67
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/Processes/garbage.dm
View File

@@ -136,7 +136,7 @@ world/loop_checks = 0
return ..()+"([garbage_collector.destroyed.len]/[garbage_collector.dels]/[garbage_collector.hard_dels])" return ..()+"([garbage_collector.destroyed.len]/[garbage_collector.dels]/[garbage_collector.hard_dels])"
// Tests if an atom has been deleted. // Tests if an atom has been deleted.
/proc/deleted(atom/A) /proc/deleted(atom/A)
return !A || !isnull(A.gcDestroyed) return !A || !isnull(A.gcDestroyed)
// Should be treated as a replacement for the 'del' keyword. // Should be treated as a replacement for the 'del' keyword.
@@ -187,6 +187,7 @@ world/loop_checks = 0
// This should be overridden to remove all references pointing to the object being destroyed. // This should be overridden to remove all references pointing to the object being destroyed.
// Return true if the the GC controller should allow the object to continue existing. (Useful if pooling objects.) // Return true if the the GC controller should allow the object to continue existing. (Useful if pooling objects.)
/datum/proc/Destroy() /datum/proc/Destroy()
nanomanager.close_uis(src)
tag = null tag = null
return return

1
code/game/objects/objs.dm
View File

@@ -17,7 +17,6 @@
/obj/Destroy() /obj/Destroy()
processing_objects -= src processing_objects -= src
nanomanager.close_uis(src)
return ..() return ..()
/obj/Topic(href, href_list, var/datum/topic_state/state = default_state) /obj/Topic(href, href_list, var/datum/topic_state/state = default_state)