diff --git a/code/controllers/subsystem/server_maintenance.dm b/code/controllers/subsystem/server_maintenance.dm index 70c03b7591d3..ee368c4c429f 100644 --- a/code/controllers/subsystem/server_maintenance.dm +++ b/code/controllers/subsystem/server_maintenance.dm @@ -17,7 +17,7 @@ var/datum/subsystem/server_maint/SSserver if(!istype(C.mob, /mob/dead)) log_access("AFK: [key_name(C)]") C << "You have been inactive for more than 10 minutes and have been disconnected." - del(C) + qdel(C) if(config.sql_enabled) sql_poll_players() diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 9c69cce7fbee..f66ca37c4668 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -55,7 +55,7 @@ /obj/effect/mine/kickmine/mineEffect(mob/victim) if(isliving(victim) && victim.client) victim << "You have been kicked FOR NO REISIN!" - del(victim.client) + qdel(victim.client) /obj/effect/mine/gas diff --git a/code/modules/admin/DB_ban/functions.dm b/code/modules/admin/DB_ban/functions.dm index 02f585a502ff..c86200ba19f8 100644 --- a/code/modules/admin/DB_ban/functions.dm +++ b/code/modules/admin/DB_ban/functions.dm @@ -132,7 +132,7 @@ if(kickbannedckey) if(banned_mob && banned_mob.client && banned_mob.client.ckey == banckey) - del(banned_mob.client) + qdel(banned_mob.client) /datum/admins/proc/DB_ban_unban(ckey, bantype, job = "") diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 844fcd3a1c65..22b243bc1efd 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -779,7 +779,7 @@ var/global/BSACooldown = 0 if(message) C << message kicked_client_names.Add("[C.ckey]") - del(C) + qdel(C) return kicked_client_names //returns 1 to let the dragdrop code know we are trapping this event diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 610ee769dc39..d8dc6cc0f8b4 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1054,7 +1054,7 @@ log_admin("[key_name(usr)] kicked [key_name(M)].") message_admins("[key_name_admin(usr)] kicked [key_name_admin(M)].") //M.client = null - del(M.client) + qdel(M.client) //Player Notes else if(href_list["addnote"]) @@ -1137,7 +1137,7 @@ log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") - del(M.client) + qdel(M.client) //qdel(M) // See no reason why to delete mob. Important stuff can be lost. And ban can be lifted before round ends. if("No") var/reason = input(usr,"Please State Reason.","Reason") as message @@ -1162,7 +1162,7 @@ feedback_inc("ban_perma",1) DB_ban_record(BANTYPE_PERMA, M, -1, reason) - del(M.client) + qdel(M.client) //qdel(M) if("Cancel") return diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 5993129892b6..e33a37dcf808 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -156,7 +156,7 @@ var/next_external_rsc = 0 if (holder) src << "Because you are an admin, you are being allowed to walk past this limitation, But it is still STRONGLY suggested you upgrade" else - del(src) + qdel(src) return 0 else if (byond_version < config.client_warn_version) //We have words for this client. src << "Your version of byond may be getting out of date:" @@ -168,11 +168,11 @@ var/next_external_rsc = 0 if (connection == "web") if (!config.allowwebclient) src << "Web client is disabled" - del(src) + qdel(src) return 0 if (config.webclientmembersonly && !IsByondMember()) src << "Sorry, but the web client is restricted to byond members only." - del(src) + qdel(src) return 0 if( (world.address == address || !address) && !host ) @@ -194,7 +194,7 @@ var/next_external_rsc = 0 log_access("Failed Login: [key] - New account attempting to connect during panic bunker") message_admins("Failed Login: [key] - New account attempting to connect during panic bunker") src << "Sorry but the server is currently not accepting connections from never before seen players." - del(src) + qdel(src) return 0 if (config.notify_new_player_age >= 0) @@ -259,6 +259,8 @@ var/next_external_rsc = 0 clients -= src return ..() +/client/Destroy() + return QDEL_HINT_HARDDEL_NOW /client/proc/set_client_age_from_db() if (IsGuestKey(src.key)) @@ -352,7 +354,7 @@ var/next_external_rsc = 0 log_access("Failed Login: [key] [computer_id] [address] - CID randomizer confirmed (oldcid: [oldcid])") - del(src) + qdel(src) return TRUE else if (cidcheck_failedckeys[ckey]) @@ -381,7 +383,7 @@ var/next_external_rsc = 0 //teeheehee (in case the above method doesn't work, its not 100% reliable.) src << "
Network connection shutting down due to read error.
" - del(src) + qdel(src) return TRUE /client/proc/note_randomizer_user()