Destroy Pass III

This commit is contained in:
Fox-McCloud
2015-07-08 03:39:52 -04:00
parent 737eb44b04
commit 0e8619a202
9 changed files with 23 additions and 43 deletions
+1 -1
View File
@@ -33,4 +33,4 @@
smoke.set_up(R, rand(1, 2), 0, vent, 0, silent = 1)
playsound(vent.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.start(3)
R.delete() //GC the reagents
qdel(R)
+1 -1
View File
@@ -41,7 +41,7 @@
if(AC.reagents && AC.BB.reagents)
var/datum/reagents/casting_reagents = AC.reagents
casting_reagents.trans_to(AC.BB, casting_reagents.total_volume) //For chemical darts/bullets
casting_reagents.delete()
qdel(casting_reagents)
in_chamber = AC.BB //Load projectile into chamber.
AC.BB.loc = src //Set projectile loc to gun.
AC.update_icon()
+7 -12
View File
@@ -601,12 +601,6 @@ datum
//world << "reagent data set ([reagent_id])"
D.data = new_data
delete()
for(var/datum/reagent/R in reagent_list)
R.holder = null
if(my_atom)
my_atom.reagents = null
copy_data(var/datum/reagent/current_reagent)
if (!current_reagent || !current_reagent.data) return null
if (!istype(current_reagent.data, /list)) return current_reagent.data
@@ -636,10 +630,11 @@ atom/proc/create_reagents(var/max_vol)
reagents.my_atom = src
/datum/reagents/Destroy()
for(var/datum/reagent/reagent in reagent_list)
qdel(reagent)
if(my_atom)
my_atom = null
processing_objects.Remove(src)
for(var/datum/reagent/R in reagent_list)
qdel(R)
reagent_list.Cut()
reagent_list = null
if(my_atom && my_atom.reagents == src)
my_atom.reagents = null
return ..()
+1 -4
View File
@@ -3235,8 +3235,5 @@ datum
/datum/reagent/Destroy()
if(holder)
holder.reagent_list -= src
holder = null
holder = null
return ..()
@@ -27,10 +27,6 @@
R.my_atom = src
processing_objects.Add(src)
/obj/item/weapon/reagent_containers/Destroy()
processing_objects.Remove(src)
return ..()
/obj/item/weapon/reagent_containers/process()
if(reagents)
reagents.reagent_on_tick()