mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
Merge pull request #1480 from Fox-McCloud/qdel-the-dels
The Great Del() Cull of 2015
This commit is contained in:
@@ -192,7 +192,7 @@ var/obj/machinery/blackbox_recorder/blackbox
|
||||
/obj/machinery/blackbox_recorder/New()
|
||||
if(blackbox)
|
||||
if(istype(blackbox,/obj/machinery/blackbox_recorder))
|
||||
del(src)
|
||||
qdel(src)
|
||||
blackbox = src
|
||||
|
||||
/obj/machinery/blackbox_recorder/Destroy()
|
||||
|
||||
@@ -62,7 +62,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
|
||||
check_tech = new T()
|
||||
if(check_tech.id == ID)
|
||||
return_name = check_tech.name
|
||||
del(check_tech)
|
||||
qdel(check_tech)
|
||||
check_tech = null
|
||||
break
|
||||
|
||||
@@ -96,7 +96,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
|
||||
temp_reagent = new R()
|
||||
if(temp_reagent.id == ID)
|
||||
return_name = temp_reagent.name
|
||||
del(temp_reagent)
|
||||
qdel(temp_reagent)
|
||||
temp_reagent = null
|
||||
break
|
||||
return return_name
|
||||
@@ -595,7 +595,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
|
||||
var/choice = alert("R&D Console Database Reset", "Are you sure you want to reset the R&D console's database? Data lost cannot be recovered.", "Continue", "Cancel")
|
||||
if(choice == "Continue")
|
||||
screen = 0.0
|
||||
del(files)
|
||||
qdel(files)
|
||||
files = new /datum/research(src)
|
||||
spawn(20)
|
||||
screen = 1.6
|
||||
|
||||
@@ -59,7 +59,7 @@ datum/genesequence
|
||||
visible_message("\red \icon[src] [src] can not extract any more genetic data from new fossils.")
|
||||
if(4)
|
||||
src.visible_message("\blue \icon[src] [user] inserts [W] into [src], the fossil is consumed as [src] extracts genetic data from it.")
|
||||
del(W)
|
||||
qdel(W)
|
||||
updateDialog()
|
||||
else if (istype(W, /obj/item/weapon/storage))
|
||||
var/obj/item/weapon/storage/S = W
|
||||
@@ -76,7 +76,7 @@ datum/genesequence
|
||||
if(SCANFOSSIL_RETVAL_SUCCESS)
|
||||
numaccepted += 1
|
||||
S.remove_from_storage(F, src) //This will move the item to this item's contents
|
||||
del(F)
|
||||
qdel(F)
|
||||
updateDialog()
|
||||
var/outmsg = "\blue You empty all the fossils from [S] into [src]."
|
||||
if(numaccepted)
|
||||
|
||||
@@ -156,7 +156,7 @@
|
||||
//see if we can clear out an old effect
|
||||
//delete it when the ids match to account for duplicate ids having different effects
|
||||
if(inserted_battery.battery_effect && inserted_battery.stored_charge <= 0)
|
||||
del(inserted_battery.battery_effect)
|
||||
qdel(inserted_battery.battery_effect)
|
||||
|
||||
//
|
||||
var/datum/artifact_effect/source_effect
|
||||
|
||||
@@ -309,7 +309,7 @@
|
||||
M.weakened = min(M.weakened, 3)
|
||||
|
||||
src.visible_message("\blue \icon[src] [src] deactivates with a gentle shudder.")
|
||||
del(suspension_field)
|
||||
qdel(suspension_field)
|
||||
icon_state = "suspension2"
|
||||
|
||||
/obj/machinery/suspension_gen/Destroy()
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
/obj/item/device/core_sampler/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
|
||||
if(istype(W,/obj/item/weapon/evidencebag))
|
||||
if(num_stored_bags < 10)
|
||||
del(W)
|
||||
qdel(W)
|
||||
num_stored_bags += 1
|
||||
user << "\blue You insert the [W] into the core sampler."
|
||||
else
|
||||
|
||||
@@ -118,11 +118,11 @@
|
||||
if(index <= positive_locations.len)
|
||||
var/datum/depth_scan/D = positive_locations[index]
|
||||
positive_locations.Remove(D)
|
||||
del(D)
|
||||
qdel(D)
|
||||
else
|
||||
//GC will hopefully pick them up before too long
|
||||
positive_locations = list()
|
||||
del(current)
|
||||
qdel(current)
|
||||
else if(href_list["close"])
|
||||
usr.unset_machine()
|
||||
usr << browse(null, "window=depth_scanner")
|
||||
|
||||
Reference in New Issue
Block a user