From 88098da3c72a7be1087befbba55c59292f4803d9 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Tue, 15 Jul 2014 08:47:43 -0400
Subject: [PATCH] Object verb removal crew

---
 code/game/objects/items/devices/PDA/PDA.dm    |  4 ++--
 code/game/objects/structures.dm               |  4 ++--
 code/game/objects/structures/tables_racks.dm  |  2 +-
 code/game/verbs/atom_verbs.dm                 |  4 ++--
 code/modules/admin/verbs/possess.dm           | 14 +++-----------
 code/modules/mob/living/carbon/human/human.dm |  4 ++--
 code/modules/mob/mob.dm                       |  3 ++-
 7 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 430ccad1b9b..7cf23bd80cb 100755
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -939,7 +939,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 
 /obj/item/device/pda/verb/verb_remove_id()
-	set category = "Object"
+	set category = null
 	set name = "Remove id"
 	set src in usr
 
@@ -956,7 +956,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 
 /obj/item/device/pda/verb/verb_remove_pen()
-	set category = "Object"
+	set category = null
 	set name = "Remove pen"
 	set src in usr
 
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 1c4cdbb8fdd..9388d486a90 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -35,12 +35,12 @@
 
 	set name = "Climb structure"
 	set desc = "Climbs onto a structure."
-	set category = "Object"
+	set category = null
 	set src in oview(1)
 
 	do_climb(usr)
 
-/obj/structure/MouseDrop(atom/over_object)
+/obj/structure/MouseDrop_T(atom/over_object)
 
 	var/mob/living/H = over_object
 	if(!istype(H)) return ..()
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index bc72892d6e4..8aff2138920 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -424,7 +424,7 @@
 /obj/structure/table/verb/do_flip()
 	set name = "Flip table"
 	set desc = "Flips a non-reinforced table"
-	set category = "Object"
+	set category = null
 	set src in oview(1)
 
 	if (!can_touch(usr) || ismouse(usr))
diff --git a/code/game/verbs/atom_verbs.dm b/code/game/verbs/atom_verbs.dm
index bac2d2b5f39..7ba0c5c5ede 100644
--- a/code/game/verbs/atom_verbs.dm
+++ b/code/game/verbs/atom_verbs.dm
@@ -1,6 +1,6 @@
 /atom/movable/verb/pull()
 	set name = "Pull"
-	set category = "Object"
+	set category = null
 	set src in oview(1)
 
 	if(Adjacent(usr))
@@ -9,7 +9,7 @@
 
 /atom/verb/point()
 	set name = "Point To"
-	set category = "Object"
+	set category = null
 	set src in oview()
 	var/atom/this = src//detach proc from src
 	src = null
diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm
index de69f149d7d..e2e004f215c 100644
--- a/code/modules/admin/verbs/possess.dm
+++ b/code/modules/admin/verbs/possess.dm
@@ -1,6 +1,6 @@
 /proc/possess(obj/O as obj in world)
 	set name = "Possess Obj"
-	set category = "Object"
+	set category = null
 
 	if(istype(O,/obj/machinery/singularity))
 		if(config.forbid_singulo_possession)
@@ -28,7 +28,7 @@
 
 /proc/release(obj/O as obj in world)
 	set name = "Release Obj"
-	set category = "Object"
+	set category = null
 	//usr.loc = get_turf(usr)
 
 	if(usr.control_object && usr.name_archive) //if you have a name archived and if you are actually relassing an object
@@ -42,12 +42,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!
-
-/proc/givetestverbs(mob/M as mob in mob_list)
-	set desc = "Give this guy possess/release verbs"
-	set category = "Debug"
-	set name = "Give Possessing Verbs"
-	M.verbs += /proc/possess
-	M.verbs += /proc/release
-	feedback_add_details("admin_verb","GPV") //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!
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 0488056f0e8..20fa659e9c3 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -198,7 +198,7 @@
 		var/eta_status = emergency_shuttle.get_status_panel_eta()
 		if(eta_status)
 			stat(null, eta_status)
-	
+
 	if (client.statpanel == "Status")
 		if (internal)
 			if (!internal.air_contents)
@@ -1346,7 +1346,7 @@
 					src.adjustToxLoss(rand(1,3))
 
 /mob/living/carbon/human/verb/check_pulse()
-	set category = "Object"
+	set category = null
 	set name = "Check pulse"
 	set desc = "Approximately count somebody's pulse. Requires you to stand still at least 6 seconds."
 	set src in view(1)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index d7bc9a058aa..730436499bc 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -468,9 +468,10 @@ var/list/slot_equipment_priority = list( \
 				return L.container
 	return
 
+
 /mob/verb/mode()
 	set name = "Activate Held Object"
-	set category = "Object"
+	set category = null
 	set src = usr
 
 	if(istype(loc,/obj/mecha)) return