Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again

Major Gun Refactor
This commit is contained in:
Fox McCloud
2016-06-08 22:49:10 -04:00
146 changed files with 4531 additions and 4316 deletions
+1 -1
View File
@@ -99,7 +99,7 @@
/datum/manufacture/taser
name = "Advanced Taser"
item = /obj/item/weapon/gun/energy/advtaser
item = /obj/item/weapon/gun/energy/gun/advtaser
cost1 = /obj/item/weapon/ore/iron
cname1 = "Iron"
amount1 = 15