From 941631b664fddb5afaef989960183fefe83cb521 Mon Sep 17 00:00:00 2001
From: supersayu <supersayu@gmail.com>
Date: Thu, 18 Jul 2013 23:22:32 -0400
Subject: [PATCH] Removes the spacevine-attack code

---
 code/game/objects/structures/tables_racks.dm | 28 +++-----------------
 code/game/turfs/simulated/floor.dm           |  5 ----
 code/modules/admin/verbs/debug.dm            |  5 ++--
 3 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index e95addd3d4a..3801eafcd69 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -309,11 +309,6 @@
 			del(src)
 		return
 
-	var/obj/effect/spacevine/vine = locate() in loc
-	if(vine) // don't drop things on tables when trying to attack spacevines
-		vine.attackby(W,user)
-		return
-
 	if(isrobot(user))
 		return
 
@@ -330,7 +325,7 @@
 		return
 
 	user.drop_item(src)
-	return
+	return 1
 
 
 /*
@@ -368,11 +363,6 @@
 		del(src)
 		return
 
-	var/obj/effect/spacevine/vine = locate() in loc
-	if(vine) // don't drop things on tables when trying to attack spacevines
-		vine.attackby(W,user)
-		return
-
 	if(isrobot(user))
 		return
 	if(istype(W, /obj/item/weapon/melee/energy/blade))
@@ -389,7 +379,7 @@
 
 	user.drop_item(src)
 	//if(W && W.loc)	W.loc = src.loc
-	return
+	return 1
 
 
 /*
@@ -420,11 +410,6 @@
 		del(W)
 		return
 
-	var/obj/effect/spacevine/vine = locate() in loc
-	if(vine) // don't drop things on tables when trying to attack spacevines
-		vine.attackby(W,user)
-		return
-
 	if (istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
 		if(WT.remove_fuel(0, user))
@@ -475,7 +460,7 @@
 
 	user.drop_item(src)
 	//if(W && W.loc)	W.loc = src.loc
-	return
+	return 1
 
 
 /*
@@ -539,16 +524,11 @@
 		del(src)
 		return
 
-	var/obj/effect/spacevine/vine = locate() in loc
-	if(vine) // don't drop things on racks when trying to attack spacevines
-		vine.attackby(W,user)
-		return
-
 	if(isrobot(user))
 		return
 	user.drop_item()
 	if(W && W.loc)	W.loc = src.loc
-	return
+	return 1
 
 /obj/structure/rack/meteorhit(obj/O as obj)
 	del(src)
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 12cfc6cff89..d2498752e81 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -531,8 +531,3 @@ turf/simulated/floor/proc/update_icon()
 					broken = 0
 				else
 					user << "\blue You need more welding fuel to complete this task."
-	if(istype(C,/obj/item/weapon/scythe))
-		var/obj/effect/spacevine/vine = locate() in src
-		if(vine)
-			vine.attackby(C,user)
-			return
\ No newline at end of file
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 6cc3438fba4..60957386fcd 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -442,7 +442,8 @@ var/global/list/g_fancy_list_of_safe_types = null
 		var/mob/living/carbon/human/H = M
 		var/obj/item/worn = H.wear_id
 		var/obj/item/weapon/card/id/id = null
-		if(worn) id = worn.GetID()
+		if(worn)
+			id = worn.GetID()
 		if(id)
 			id.icon_state = "gold"
 			id.access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access()
@@ -463,7 +464,7 @@ var/global/list/g_fancy_list_of_safe_types = null
 					worn.update_icon()
 			else
 				H.equip_to_slot(id,slot_wear_id)
-				// otherwise leave it on the floor
+
 	else
 		alert("Invalid mob")
 	feedback_add_details("admin_verb","GFA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!