Merge resolution.

This commit is contained in:
Zuhayr
2015-05-10 18:33:06 +09:30
777 changed files with 22019 additions and 21336 deletions

View File

@@ -47,7 +47,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
owned_core = core
if(!owned_core)
del(src)
qdel(src)
//create the gimmicky things to handle field collisions
var/obj/effect/rust_particle_catcher/catcher
@@ -118,7 +118,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
/obj/effect/rust_em_field/process()
//make sure the field generator is still intact
if(!owned_core)
del(src)
qdel(src)
//handle radiation
if(!radiator)
@@ -427,10 +427,10 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
AddParticles(reactant, reactants_reacting_pool[reactant])
//world << "retained: [reactant], [reactants_reacting_pool[reactant]]"
/obj/effect/rust_em_field/Del()
/obj/effect/rust_em_field/Destroy()
//radiate everything in one giant burst
for(var/obj/effect/rust_particle_catcher/catcher in particle_catchers)
del (catcher)
qdel (catcher)
RadiateAll()
processing_objects.Remove(src)

View File

@@ -268,7 +268,7 @@ max volume of phoron storeable by the field = the total volume of a number of ti
//todo: safety checks for field status
if(owned_field)
icon_state = "core0"
del(owned_field)
qdel(owned_field)
luminosity = 0
use_power = 1

View File

@@ -76,7 +76,7 @@
if(do_after(user, 10))
has_electronics &= 1
user << "You place the port control board inside the frame."
del(W)
qdel(W)
return
else if (istype(W, /obj/item/weapon/weldingtool) && opened && !has_electronics)
@@ -93,7 +93,7 @@
"\red [src] has been cut away from the wall by [user.name].",\
"You detached the port frame.",\
"\red You hear welding.")
del(src)
qdel(src)
return
..()

View File

@@ -25,7 +25,7 @@ var/const/max_assembly_amount = 300
/obj/machinery/rust_fuel_compressor/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/rcd_ammo))
compressed_matter += 10
del(W)
qdel(W)
return
..()
@@ -93,7 +93,7 @@ var/const/max_assembly_amount = 300
break
//world << "\blue [reagent]: new_assembly_quantities[reagent]<br>"
if(fail)
del(F)
qdel(F)
compressed_matter = old_matter
usr << "\red \icon[src] [src] flashes red: \'Out of matter.\'"
else

View File

@@ -102,7 +102,7 @@
if(do_after(user, 10))
has_electronics &= 1
user << "You place the circuitboard inside the frame."
del(W)
qdel(W)
return
else if (istype(W, /obj/item/weapon/weldingtool) && opened && !has_electronics)
@@ -119,7 +119,7 @@
"\red [src] has been cut away from the wall by [user.name].",\
"You detached the compressor frame.",\
"\red You hear welding.")
del(src)
qdel(src)
return
..()

View File

@@ -15,7 +15,7 @@
else
time_alive -= 0.1
if(time_alive < 0)
del(src)
qdel(src)
//radiate mobs nearby here
//

View File

@@ -14,11 +14,11 @@
for(var/obj/machinery/rust/em_field/field in range(6))
parent = field
if(!parent)
del(src)*/
qdel(src)*/
/obj/effect/rust_particle_catcher/process()
if(!parent)
del(src)
qdel(src)
/obj/effect/rust_particle_catcher/proc/SetSize(var/newsize)
name = "collector [newsize]"