Updates the atom_pool, now datum_pool, to handle any datum object.

Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
This commit is contained in:
PsiOmega
2015-04-17 20:32:28 +02:00
parent a3fb012332
commit 1ae0ad6d92
579 changed files with 6034 additions and 6004 deletions

View File

@@ -17,7 +17,7 @@
..()
update_nearby_tiles(need_rebuild=1)
/obj/machinery/shield/Del()
/obj/machinery/shield/Destroy()
opacity = 0
density = 0
update_nearby_tiles()
@@ -41,7 +41,7 @@
if (src.health <= 0)
visible_message("\blue The [src] dissipates!")
del(src)
qdel(src)
return
opacity = 1
@@ -54,7 +54,7 @@
if(src.health <= 0)
visible_message("\blue The [src] dissipates!")
del(src)
qdel(src)
return
opacity = 1
@@ -66,7 +66,7 @@
..()
if(health <=0)
visible_message("\blue The [src] dissipates!")
del(src)
qdel(src)
return
opacity = 1
spawn(20) if(src) opacity = 0
@@ -75,25 +75,25 @@
switch(severity)
if(1.0)
if (prob(75))
del(src)
qdel(src)
if(2.0)
if (prob(50))
del(src)
qdel(src)
if(3.0)
if (prob(25))
del(src)
qdel(src)
return
/obj/machinery/shield/emp_act(severity)
switch(severity)
if(1)
del(src)
qdel(src)
if(2)
if(prob(50))
del(src)
qdel(src)
/obj/machinery/shield/blob_act()
del(src)
qdel(src)
/obj/machinery/shield/hitby(AM as mob|obj)
@@ -115,7 +115,7 @@
//Handle the destruction of the shield
if (src.health <= 0)
visible_message("\blue The [src] dissipates!")
del(src)
qdel(src)
return
//The shield becomes dense to absorb the blow.. purely asthetic.
@@ -149,7 +149,7 @@
use_power = 0
idle_power_usage = 0
/obj/machinery/shieldgen/Del()
/obj/machinery/shieldgen/Destroy()
collapse_shields()
..()
@@ -187,7 +187,7 @@
/obj/machinery/shieldgen/proc/collapse_shields()
for(var/obj/machinery/shield/shield_tile in deployed_shields)
del(shield_tile)
qdel(shield_tile)
/obj/machinery/shieldgen/power_change()
..()
@@ -204,7 +204,7 @@
if(malfunction)
if(deployed_shields.len && prob(5))
del(pick(deployed_shields))
qdel(pick(deployed_shields))
else
if (check_delay <= 0)
create_shields()
@@ -227,7 +227,7 @@
if(health <= 0)
spawn(0)
explosion(get_turf(src.loc), 0, 0, 1, 0, 0, 0)
del(src)
qdel(src)
update_icon()
return

View File

@@ -17,7 +17,7 @@
..()
update_nearby_tiles()
/obj/effect/energy_field/Del()
/obj/effect/energy_field/Destroy()
update_nearby_tiles()
..()

View File

@@ -199,14 +199,14 @@
T2 = T
if(locate(/obj/machinery/shieldwall) in T)
F = (locate(/obj/machinery/shieldwall) in T)
del(F)
qdel(F)
if(locate(/obj/machinery/shieldwallgen) in T)
G = (locate(/obj/machinery/shieldwallgen) in T)
if(!G.active)
break
/obj/machinery/shieldwallgen/Del()
/obj/machinery/shieldwallgen/Destroy()
src.cleanup(1)
src.cleanup(2)
src.cleanup(4)
@@ -252,9 +252,9 @@
else
B.storedpower -= generate_power_usage
else
del(src) //need at least two generator posts
qdel(src) //need at least two generator posts
/obj/machinery/shieldwall/Del()
/obj/machinery/shieldwall/Destroy()
update_nearby_tiles()
..()
@@ -265,11 +265,11 @@
/obj/machinery/shieldwall/process()
if(needs_power)
if(isnull(gen_primary)||isnull(gen_secondary))
del(src)
qdel(src)
return
if(!(gen_primary.active)||!(gen_secondary.active))
del(src)
qdel(src)
return
if(prob(50))

View File

@@ -208,7 +208,7 @@
for(var/turf/O in covered_turfs)
var/obj/effect/energy_field/E = new(O)
field.Add(E)
del covered_turfs
qdel(covered_turfs)
for(var/mob/M in view(5,src))
M << "\icon[src] You hear heavy droning start up."