From 0d1ad7c1a7ba8b04f539bf2c551b71c06da6dd08 Mon Sep 17 00:00:00 2001
From: Ansari <Gc2mak@yahoo.com.hk>
Date: Mon, 21 May 2018 16:26:50 +0800
Subject: [PATCH 1/2] Add confirmation prompt to possess object

---
 code/modules/admin/verbs/possess.dm | 33 ++++++++++++++++-------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm
index 54d39d5a5fa..e02ce72cd97 100644
--- a/code/modules/admin/verbs/possess.dm
+++ b/code/modules/admin/verbs/possess.dm
@@ -9,22 +9,25 @@
 
 	var/turf/T = get_turf(O)
 
-	if(T)
-		log_admin("[key_name(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])")
-		message_admins("[key_name_admin(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])", 1)
-	else
-		log_admin("[key_name(usr)] has possessed [O] ([O.type]) at an unknown location")
-		message_admins("[key_name_admin(usr)] has possessed [O] ([O.type]) at an unknown location", 1)
+	var/confirm = alert("Are you sure you want to possess [O]?", "Confirm posession", "Yes", "No")
 
-	if(!usr.control_object) //If you're not already possessing something...
-		usr.name_archive = usr.real_name
+	if(confirm == "Yes")
+		if(T)
+			log_admin("[key_name(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])")
+			message_admins("[key_name_admin(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])", 1)
+		else
+			log_admin("[key_name(usr)] has possessed [O] ([O.type]) at an unknown location")
+			message_admins("[key_name_admin(usr)] has possessed [O] ([O.type]) at an unknown location", 1)
 
-	usr.loc = O
-	usr.real_name = O.name
-	usr.name = O.name
-	usr.client.eye = O
-	usr.control_object = O
-	feedback_add_details("admin_verb","PO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+		if(!usr.control_object) //If you're not already possessing something...
+			usr.name_archive = usr.real_name
+
+		usr.loc = O
+		usr.real_name = O.name
+		usr.name = O.name
+		usr.client.eye = O
+		usr.control_object = O
+		feedback_add_details("admin_verb","PO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /proc/release(obj/O as obj in world)
 	set name = "Release Obj"
@@ -42,4 +45,4 @@
 	usr.loc = O.loc // Appear where the object you were controlling is -- TLE
 	usr.client.eye = usr
 	usr.control_object = null
-	feedback_add_details("admin_verb","RO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
\ No newline at end of file
+	feedback_add_details("admin_verb","RO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

From f381b7516c9ef1353ff6005587e8533a7b4a678c Mon Sep 17 00:00:00 2001
From: Ansari <Gc2mak@yahoo.com.hk>
Date: Sat, 26 May 2018 09:09:41 +0800
Subject: [PATCH 2/2] Early return.

---
 code/modules/admin/verbs/possess.dm | 31 +++++++++++++++--------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm
index e02ce72cd97..5cf4c34ffe2 100644
--- a/code/modules/admin/verbs/possess.dm
+++ b/code/modules/admin/verbs/possess.dm
@@ -11,23 +11,24 @@
 
 	var/confirm = alert("Are you sure you want to possess [O]?", "Confirm posession", "Yes", "No")
 
-	if(confirm == "Yes")
-		if(T)
-			log_admin("[key_name(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])")
-			message_admins("[key_name_admin(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])", 1)
-		else
-			log_admin("[key_name(usr)] has possessed [O] ([O.type]) at an unknown location")
-			message_admins("[key_name_admin(usr)] has possessed [O] ([O.type]) at an unknown location", 1)
+	if(confirm != "Yes")
+		return
+	if(T)
+		log_admin("[key_name(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])")
+		message_admins("[key_name_admin(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])", 1)
+	else
+		log_admin("[key_name(usr)] has possessed [O] ([O.type]) at an unknown location")
+		message_admins("[key_name_admin(usr)] has possessed [O] ([O.type]) at an unknown location", 1)
 
-		if(!usr.control_object) //If you're not already possessing something...
-			usr.name_archive = usr.real_name
+	if(!usr.control_object) //If you're not already possessing something...
+		usr.name_archive = usr.real_name
 
-		usr.loc = O
-		usr.real_name = O.name
-		usr.name = O.name
-		usr.client.eye = O
-		usr.control_object = O
-		feedback_add_details("admin_verb","PO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	usr.loc = O
+	usr.real_name = O.name
+	usr.name = O.name
+	usr.client.eye = O
+	usr.control_object = O
+	feedback_add_details("admin_verb","PO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /proc/release(obj/O as obj in world)
 	set name = "Release Obj"