Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

2019-10-01 00:05:44 -05:00
parent f14272e445 0301683ae1
commit 117e5a409d
61 changed files with 846 additions and 415 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