Removes Weapons (#7415)

* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.

code/modules/lock/key.dm

@@ -1,4 +1,4 @@
-/obj/item/weapon/key
+/obj/item/key
 	name = "key"
 	desc = "Used to unlock things."
 	icon = 'icons/obj/items.dmi'
@@ -6,20 +6,20 @@
 	w_class = 1
 	var/key_data = ""
 
-/obj/item/weapon/key/New(var/newloc,var/data)
+/obj/item/key/New(var/newloc,var/data)
 	if(data)
 		key_data = data
 	..(newloc)
 
-/obj/item/weapon/key/proc/get_data(var/mob/user)
+/obj/item/key/proc/get_data(var/mob/user)
 	return key_data
 
-/obj/item/weapon/key/soap
+/obj/item/key/soap
 	name = "soap key"
 	desc = "a fragile key made using a bar of soap."
 	var/uses = 0
 
-/obj/item/weapon/key/soap/get_data(var/mob/user)
+/obj/item/key/soap/get_data(var/mob/user)
 	uses--
 	if(uses <= 0)
 		user.drop_from_inventory(src,user)

code/modules/lock/lock.dm

@@ -50,8 +50,8 @@
 	return length(lock_data)
 
 /datum/lock/proc/get_key_data(var/key = "", var/mob/user)
-	if(istype(key,/obj/item/weapon/key))
-		var/obj/item/weapon/key/K = key
+	if(istype(key,/obj/item/key))
+		var/obj/item/key/K = key
 		return K.get_data(user)
 	if(istext(key))
 		return key

code/modules/lock/lock_construct.dm

@@ -1,4 +1,4 @@
-/obj/item/weapon/material/lock_construct
+/obj/item/material/lock_construct
 	name = "lock"
 	desc = "A crude but useful lock and bolt."
 	icon = 'icons/obj/storage.dmi'
@@ -6,15 +6,15 @@
 	w_class = 1
 	var/lock_data
 
-/obj/item/weapon/material/lock_construct/New()
+/obj/item/material/lock_construct/New()
 	..()
 	force = 0
 	throwforce = 0
 	lock_data = generateRandomString(round(material.integrity/50))
 
-/obj/item/weapon/material/lock_construct/attackby(var/obj/item/I, var/mob/user)
-	if(istype(I,/obj/item/weapon/key))
-		var/obj/item/weapon/key/K = I
+/obj/item/material/lock_construct/attackby(var/obj/item/I, var/mob/user)
+	if(istype(I,/obj/item/key))
+		var/obj/item/key/K = I
 		if(!K.key_data)
 			to_chat(user, "<span class='notice'>You fashion \the [I] to unlock \the [src]</span>")
 			K.key_data = lock_data
@@ -23,7 +23,7 @@
 		return
 	..()
 
-/obj/item/weapon/material/lock_construct/proc/create_lock(var/atom/target, var/mob/user)
+/obj/item/material/lock_construct/proc/create_lock(var/atom/target, var/mob/user)
 	. = new /datum/lock(target,lock_data)
 	user.drop_from_inventory(src,user)
 	user.visible_message("<span class='notice'>\The [user] attaches \the [src] to \the [target].</span>")