cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-04 14:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1528 + hard delete for admins (#1534)

Browse Source
This commit is contained in:
skull132
2017-01-12 16:19:17 +02:00
committed by GitHub
parent 0b5fdba52d
commit 9ae619d02e
3 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
code/modules/admin/verbs/randomverbs.dm
View File

@@ -591,15 +591,24 @@ Traitors and the like can also be revived with the previous role mostly intact.
src << "Only administrators may use this command."
return
if (alert(src, "Are you sure you want to delete:\n[O]\nat ([O.x], [O.y], [O.z])?", "Confirmation", "Yes", "No") == "Yes")
if (istype(O, /mob/dead/observer))
var/mob/dead/observer/M = O
if (M.client && alert(src, "They are still connected. Are you sure, they will loose connection.", "Confirmation", "Yes", "No") != "Yes")
return
log_admin("[key_name(usr)] deleted [O] at ([O.x],[O.y],[O.z])")
message_admins("[key_name_admin(usr)] deleted [O] at ([O.x],[O.y],[O.z])", 1)
feedback_add_details("admin_verb","DEL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
var/action = alert(src, "Are you sure you want to delete:\n[O]\nat ([O.x], [O.y], [O.z])?", "Confirmation", "Yes", "No", "Hard Delete")
if (action == "No")
return
if (istype(O, /mob/dead/observer))
var/mob/dead/observer/M = O
if (M.client && alert(src, "They are still connected. Are you sure, they will loose connection.", "Confirmation", "Yes", "No") != "Yes")
return
log_admin("[key_name(usr)] deleted [O] at ([O.x],[O.y],[O.z])")
message_admins("[key_name_admin(usr)] deleted [O] at ([O.x],[O.y],[O.z])", 1)
feedback_add_details("admin_verb","DEL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
if (action == "Yes")
qdel(O)
else
// This is naughty, but sometimes necessary.
del(O)
/client/proc/cmd_admin_list_open_jobs()
set category = "Admin"

13
code/modules/admin/view_variables/topic.dm
View File

@@ -173,7 +173,8 @@
if(action_type == "Cancel" || !action_type)
return
if(alert("Are you really sure you want to delete all objects of type [O.type]?",,"Yes","No") != "Yes")
var/del_action = alert("Are you really sure you want to delete all objects of type [O.type]?",,"Yes","No", "Hard Delete")
if(del_action == "No")
return
if(alert("Second confirmation required. Delete?",,"Yes","No") != "Yes")
@@ -186,7 +187,10 @@
for(var/obj/Obj in world)
if(Obj.type == O_type)
i++
qdel(Obj)
if (del_action == "Hard Delete")
del(Obj)
else
qdel(Obj)
if(!i)
usr << "No objects of this type exist"
return
@@ -197,7 +201,10 @@
for(var/obj/Obj in world)
if(istype(Obj,O_type))
i++
qdel(Obj)
if (del_action == "Hard Delete")
del(Obj)
else
qdel(Obj)
if(!i)
usr << "No objects of this type exist"
return