mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Switches around turf/datum garbage handling (my fault..). Adds null check for zone rebuilds.
This commit is contained in:
@@ -102,7 +102,7 @@
|
||||
//This happens when windows move or are constructed. We need to rebuild.
|
||||
if((previously_open & d) && istype(unsim, /turf/simulated))
|
||||
var/turf/simulated/sim = unsim
|
||||
if(sim.zone == zone)
|
||||
if(zone && sim.zone == zone)
|
||||
zone.rebuild()
|
||||
return
|
||||
|
||||
|
||||
@@ -85,10 +85,10 @@ var/datum/controller/process/garbage_collector/garbage_collector
|
||||
A.finalize_qdel()
|
||||
|
||||
/datum/proc/finalize_qdel()
|
||||
del(src)
|
||||
garbage_collector.AddTrash(src)
|
||||
|
||||
/turf/finalize_qdel()
|
||||
garbage_collector.AddTrash(src)
|
||||
del(src)
|
||||
|
||||
// Default implementation of clean-up code.
|
||||
// This should be overridden to remove all references pointing to the object being destroyed.
|
||||
|
||||
@@ -84,3 +84,12 @@
|
||||
"<span class='notice'>You hear metal clanking.</span>")
|
||||
add_fingerprint(user)
|
||||
return M
|
||||
|
||||
//Cleanup
|
||||
/obj/Destroy()
|
||||
. = ..()
|
||||
unbuckle_mob()
|
||||
|
||||
/obj/Del()
|
||||
. = ..()
|
||||
unbuckle_mob()
|
||||
|
||||
@@ -40,7 +40,6 @@
|
||||
/obj/singularity_act()
|
||||
ex_act(1)
|
||||
if(src)
|
||||
spawn(0)
|
||||
qdel(src)
|
||||
return 2
|
||||
|
||||
@@ -72,6 +71,7 @@
|
||||
return
|
||||
|
||||
/obj/machinery/power/supermatter/shard/singularity_act()
|
||||
src.loc = null
|
||||
qdel(src)
|
||||
return 5000
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
SetUniversalState(/datum/universal_state/supermatter_cascade)
|
||||
log_admin("New super singularity made by eating a SM crystal [prints]. Last touched by [src.fingerprintslast].")
|
||||
message_admins("New super singularity made by eating a SM crystal [prints]. Last touched by [src.fingerprintslast].")
|
||||
spawn(0)
|
||||
src.loc = null
|
||||
qdel(src)
|
||||
return 50000
|
||||
|
||||
|
||||
Reference in New Issue
Block a user