Line ending conflict resolution.

code/game/objects/items/weapons/storage/belt.dm

@@ -14,7 +14,7 @@
 	icon_state = "utilitybelt"
 	item_state = "utility"
 	can_hold = list(
-		"/obj/item/weapon/combitool",
+		//"/obj/item/weapon/combitool",
 		"/obj/item/weapon/crowbar",
 		"/obj/item/weapon/screwdriver",
 		"/obj/item/weapon/weldingtool",

code/game/objects/items/weapons/tools.dm

@@ -473,7 +473,7 @@
 	else
 		return ..()
 
-/obj/item/weapon/combitool
+/*/obj/item/weapon/combitool
 	name = "combi-tool"
 	desc = "It even has one of those nubbins for doing the thingy."
 	icon = 'icons/obj/items.dmi'
@@ -513,11 +513,15 @@
 	return 1
 
 /obj/item/weapon/combitool/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	if(!M.Adjacent(user))
+		return 0
 	var/obj/item/tool = tools[current_tool]
 	if(!tool) return 0
 	return (tool ? tool.attack(M,user) : 0)
 
 /obj/item/weapon/combitool/afterattack(var/atom/target, var/mob/living/user, proximity, params)
+	if(!proximity)
+		return 0
 	var/obj/item/tool = tools[current_tool]
 	if(!tool) return 0
 	tool.loc = user
@@ -525,4 +529,4 @@
 	if(!resolved && tool && target)
 		tool.afterattack(target,user,1)
 	if(tool)
-		tool.loc = src
+		tool.loc = src*/