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.
This commit is contained in:
Werner
2019-11-16 18:36:13 +01:00
committed by GitHub
parent 128ca2235b
commit af16a489a6
1123 changed files with 27193 additions and 27175 deletions

View File

@@ -769,7 +769,7 @@
seed_name = "banana"
display_name = "banana tree"
chems = list("banana" = list(10,10))
trash_type = /obj/item/weapon/bananapeel
trash_type = /obj/item/bananapeel
kitchen_tag = "banana"
/datum/seed/banana/setup_traits()
@@ -792,7 +792,7 @@
display_name = "ears of corn"
chems = list("nutriment" = list(1,10), "cornoil" = list(1,10))
kitchen_tag = "corn"
trash_type = /obj/item/weapon/corncob
trash_type = /obj/item/corncob
/datum/seed/corn/setup_traits()
..()