Merge branch 'master' into tg-Organ-port

2019-10-01 06:17:58 +01:00
parent 2f0e5d8091 0301683ae1
commit 89f3a01bc0
129 changed files with 1946 additions and 829 deletions
@@ -39,6 +39,14 @@
 /obj/item/projectile/beam/weak
 	damage = 15

+/obj/item/projectile/beam/weak/minigun
+	damage = 12.5
+	armour_penetration = 40
+
+/obj/item/projectile/beam/weak/minigun/Initialize()
+	.=..()
+	speed = pick(0.7,0.75,0.8,0.85,0.9,0.95,1,1.05,1.1,1.15)
+
 /obj/item/projectile/beam/weak/penetrator
 	armour_penetration = 50