Skip to content

Commit

Permalink
Changes a lot of del() to qdel()
Browse files Browse the repository at this point in the history
  • Loading branch information
Firecage committed Aug 16, 2015
1 parent 70b21a0 commit dfae1e0
Show file tree
Hide file tree
Showing 45 changed files with 91 additions and 91 deletions.
2 changes: 1 addition & 1 deletion code/LINDA/LINDA_turf_tile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
var/atmos_supeconductivity = 0

/turf/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air
del(giver)
qdel(giver)
return 0

/turf/return_air()
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/hud/action.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
if(button)
if(T.client)
T.client.screen -= button
del(button)
qdel(button)
T.actions.Remove(src)
T.update_action_buttons()
owner = null
Expand Down
8 changes: 4 additions & 4 deletions code/controllers/configuration.dm
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
probabilities[M.config_tag] = M.probability
if(M.votable)
votable_modes += M.config_tag
del(M)
qdel(M)
votable_modes += "secret"

/datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist
Expand Down Expand Up @@ -567,7 +567,7 @@
var/datum/game_mode/M = new T()
if(M.config_tag && M.config_tag == mode_name)
return M
del(M)
qdel(M)
return new /datum/game_mode/extended()

/datum/configuration/proc/get_runnable_modes()
Expand All @@ -576,10 +576,10 @@
var/datum/game_mode/M = new T()
//world << "DEBUG: [T], tag=[M.config_tag], prob=[probabilities[M.config_tag]]"
if(!(M.config_tag in modes))
del(M)
qdel(M)
continue
if(probabilities[M.config_tag]<=0)
del(M)
qdel(M)
continue
if(M.can_start())
runnable_modes[M] = probabilities[M.config_tag]
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/radio.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var/datum/subsystem/radio/radio_controller
frequency.remove_listener(device)

if(frequency.devices.len == 0)
del(frequency)
qdel(frequency)
frequencies -= f_text

return 1
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/server_maintenance.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
if(!istype(C.mob, /mob/dead))
log_access("AFK: [key_name(C)]")
C << "<span class='danger'>You have been inactive for more than 10 minutes and have been disconnected.</span>"
del(C)
qdel(C)

if(config.sql_enabled)
sql_poll_players()
Expand Down
8 changes: 4 additions & 4 deletions code/controllers/subsystem/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ var/datum/subsystem/ticker/ticker
mode = config.pick_mode(master_mode)
if(!mode.can_start())
world << "<B>Unable to start [mode.name].</B> Not enough players, [mode.required_players] players and [mode.required_enemies] eligible antagonists needed. Reverting to pre-game lobby."
del(mode)
qdel(mode)
SSjob.ResetOccupations()
return 0

Expand All @@ -148,7 +148,7 @@ var/datum/subsystem/ticker/ticker

if(!Debug2)
if(!can_continue)
del(mode)
qdel(mode)
world << "<B>Error setting up [master_mode].</B> Reverting to pre-game lobby."
SSjob.ResetOccupations()
return 0
Expand Down Expand Up @@ -289,8 +289,8 @@ var/datum/subsystem/ticker/ticker
flick("station_intact",cinematic)
world << sound('sound/ambience/signal.ogg')
sleep(100)
if(cinematic) del(cinematic)
if(temp_buckle) del(temp_buckle)
if(cinematic) qdel(cinematic)
if(temp_buckle) qdel(temp_buckle)
return //Faster exit, since nothing happened
else //Station nuked (nuke,explosion,summary)
flick("intro_nuke",cinematic)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/ai_laws.dm
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
src.ion += law

/datum/ai_laws/proc/clear_inherent_laws()
del(src.inherent)
qdel(src.inherent)
src.inherent = list()

/datum/ai_laws/proc/add_supplied_law(number, law)
Expand Down
4 changes: 2 additions & 2 deletions code/datums/diseases/_disease.dm
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
for(var/datum/disease/D in affected_mob.viruses)
if(D != src)
if(IsSame(D))
del(D)
qdel(D)

if(holder == affected_mob)
if(affected_mob.stat != DEAD)
Expand All @@ -156,7 +156,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
if(!(type in affected_mob.resistances))
affected_mob.resistances += type
remove_virus()
del(src)
qdel(src)


/datum/disease/New()
Expand Down
2 changes: 1 addition & 1 deletion code/datums/diseases/advance/advance.dm
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ var/list/advance_cures = list(
if(resistance && !(id in affected_mob.resistances))
affected_mob.resistances[id] = id
remove_virus()
del(src) //delete the datum to stop it processing
qdel(src) //delete the datum to stop it processing

// Returns the advance disease with a different reference memory.
/datum/disease/advance/Copy(process = 0)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/gas_mixture.dm
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ What are the archived variables for?
trace_gases += corresponding
corresponding.moles += trace_gas.moles

// del(giver)
// qdel(giver)
return 1

/datum/gas_mixture/remove(amount)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var/list/modules = list( // global associative list
var/mneed = mods.inmodlist(type) // find if this type has modules defined

if(!mneed) // not found in module list?
del(src) // delete self, thus ending proc
qdel(src) // delete self, thus ending proc

var/needed = mods.getbitmask(type) // get a bitmask for the number of modules in this object
status = needed
Expand Down
2 changes: 1 addition & 1 deletion code/game/area/areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@
else
qdel(AM)
if(istype(T, /turf/simulated))
del(T)
qdel(T)
/*for(var/atom/movable/bug in src) // If someone (or something) is somehow still in the shuttle's docking area...
if(ismob(bug))
Expand Down
2 changes: 1 addition & 1 deletion code/game/atoms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
return

/atom/proc/assume_air(datum/gas_mixture/giver)
del(giver)
qdel(giver)
return null

/atom/proc/remove_air(amount)
Expand Down
10 changes: 5 additions & 5 deletions code/game/gamemodes/cult/runes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1002,8 +1002,8 @@ var/list/sacrificed = list()
usr.say("Uln Shogg Hafh[pick("'","`")]drn!")
user << "\red You quietly prick your finger and make a pact with the geometer of blood to acquire more power."
user.take_overall_damage(rand(5,20))
del(user.head)
del(user.wear_suit)
qdel(user.head)
qdel(user.wear_suit)
user.equip_to_slot_or_del(new /obj/item/clothing/head/magus(user), slot_head)
user.equip_to_slot_or_del(new /obj/item/clothing/suit/magusred(user), slot_wear_suit)
user.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes)
Expand All @@ -1020,8 +1020,8 @@ var/list/sacrificed = list()
user.put_in_hands(new /obj/item/weapon/gun/magic/wand/resurrection(user))
if (armorworn == "traveler" || armorworn == "marauder")
usr.say("Tharanak n[pick("'","`")]ghft!")
del(user.head)
del(user.wear_suit)
qdel(user.head)
qdel(user.wear_suit)
user.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/cult(user), slot_head)
user.equip_to_slot_or_del(new /obj/item/clothing/suit/space/cult(user), slot_wear_suit)
user.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes)
Expand All @@ -1033,7 +1033,7 @@ var/list/sacrificed = list()
if (armorworn == "marauder")
user.spellremove(user)
user.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/creature/cult(user)
del(src)
qdel(src)
return

///Summon Shell: Summons a construct shell if there's four plasteel sheets on top of the rune
Expand Down
2 changes: 1 addition & 1 deletion code/game/gamemodes/game_mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
if(G.reroll_friendly)
usable_modes += G
else
del(G)
qdel(G)

if(!usable_modes)
message_admins("Convert_roundtype failed due to no valid modes to convert to. Please report this error to the Coders.")
Expand Down
4 changes: 2 additions & 2 deletions code/game/gamemodes/wizard/spellbook.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
if(initial(S.name) == initial(aspell.name))
spell_levels = aspell.spell_level
user.mind.spell_list.Remove(aspell)
del(S)
qdel(S)
return cost * (spell_levels+1)
return -1
/datum/spellbook_entry/proc/GetInfo()
Expand Down Expand Up @@ -419,7 +419,7 @@
entries |= E
categories |= E.category
else
del(E)
qdel(E)
tab = categories[1]

/obj/item/weapon/spellbook/New()
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@
continue

else if(prob(1))
del(R)
qdel(R)
continue

..(severity)
Expand Down
12 changes: 6 additions & 6 deletions code/game/machinery/computer/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ What a mess.*/
if("Purge All Records")
investigate_log("[usr.name] ([usr.key]) has purged all the security records.", "records")
for(var/datum/data/record/R in data_core.security)
del(R)
qdel(R)
data_core.security.Cut()
temp = "All Security records deleted."

Expand Down Expand Up @@ -667,22 +667,22 @@ What a mess.*/
investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", "records")
if(active2)
data_core.security -= active2
del(active2)
qdel(active2)

if("Delete Record (ALL) Execute")
if(active1)
investigate_log("[usr.name] ([usr.key]) has deleted all records for [active1.fields["name"]].", "records")
for(var/datum/data/record/R in data_core.medical)
if((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
data_core.medical -= R
del(R)
qdel(R)
break
data_core.general -= active1
del(active1)
qdel(active1)

if(active2)
data_core.security -= active2
del(active2)
qdel(active2)
else
temp = "This function does not appear to be working at the moment. Our apologies."

Expand Down Expand Up @@ -734,7 +734,7 @@ What a mess.*/
continue

else if(prob(1))
del(R)
qdel(R)
continue

..(severity)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
if(master)
master.post_signal(signal, comm_line)
else
del(signal)
qdel(signal)

/datum/computer/file/embedded_program/proc/receive_user_command(command)

Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/magnet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@
// N, S, E, W are directional
// C is center
// R is random (in magnetic field's bounds)
del(signal)
qdel(signal)
break // break the loop if the character located is invalid

signal.data["command"] = nextmove
Expand Down
6 changes: 3 additions & 3 deletions code/game/machinery/overview.dm
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@
HI.Insert(I, frame=1, delay = 5)
HI.Insert(J, frame=2, delay = 5)

del(I)
del(J)
qdel(I)
qdel(J)
H.icon = HI
H.layer = 25
usr.mapobjs += H
Expand Down Expand Up @@ -294,7 +294,7 @@
var/icon/I = imap[i+1]

H.icon = I
del(I)
qdel(I)
H.layer = 25
usr.mapobjs += H

Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/suit_storage_unit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -393,12 +393,12 @@
for(var/obj/item/ITEM in src)
ITEM.clean_blood()
if(istype(STORAGE, /obj/item/weapon/reagent_containers/food))
del(STORAGE)
qdel(STORAGE)
else //It was supercycling, destroy everything
src.HELMET = null
src.SUIT = null
src.MASK = null
del(STORAGE)
qdel(STORAGE)
visible_message("<font color='red'>With a loud whining noise, the Suit Storage Unit's door grinds open. Puffs of ashen smoke come out of its chamber.</font>", 3)
src.isbroken = 1
src.isopen = 1
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/telecomms/computers/logbrowser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
temp = "<font color = #336699>- DELETED ENTRY: [D.name] -</font color>"

SelectedServer.log_entries.Remove(D)
del(D)
qdel(D)

else
temp = "<font color = #D70B00>- FAILED: NO SELECTED MACHINE -</font color>"
Expand Down
6 changes: 3 additions & 3 deletions code/game/mecha/mecha.dm
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
loc.assume_air(cabin_air)
air_update_turf()
else
del(cabin_air)
qdel(cabin_air)
cabin_air = null
qdel(spark_system)
spark_system = null
Expand Down Expand Up @@ -240,7 +240,7 @@
loc.assume_air(leaked_gas)
air_update_turf()
else
del(leaked_gas)
qdel(leaked_gas)

if(internal_damage & MECHA_INT_SHORT_CIRCUIT)
if(get_charge())
Expand Down Expand Up @@ -276,7 +276,7 @@
if(t_air)
t_air.merge(removed)
else //just delete the cabin gas, we're in space or some shit
del(removed)
qdel(removed)

if(occupant)
if(cell)
Expand Down
6 changes: 3 additions & 3 deletions code/game/mecha/mecha_construction_paths.dm
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
const_holder.icon = 'icons/mecha/mech_construction.dmi'
const_holder.icon_state = "gygax0"
const_holder.density = 1
del(src)
qdel(src)
return


Expand Down Expand Up @@ -579,7 +579,7 @@
const_holder.icon = 'icons/mecha/mech_construction.dmi'
const_holder.icon_state = "fireripley0"
const_holder.density = 1
del(src)
qdel(src)
return


Expand Down Expand Up @@ -801,7 +801,7 @@
var/obj/item/mecha_parts/chassis/const_holder = holder
const_holder.construct = new /datum/construction/mecha/honker(const_holder)
const_holder.density = 1
del(src)
qdel(src)
return


Expand Down
Loading

0 comments on commit dfae1e0

Please sign in to comment.