Merge pull request #3429 from X0-11/unsc-cargo-weapons

Boltshot tweaks
HaloSpaceStation · Aug 2, 2023 · 6092c6e · 6092c6e
2 parents dbd45e1 + fe4ccc1
commit 6092c6e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/code/modules/halo/weapons/forerunner/ammo.dm b/code/modules/halo/weapons/forerunner/ammo.dm
@@ -47,9 +47,7 @@
 	icon = 'code/modules/halo/weapons/icons/forerunner_sprites.dmi'
 	icon_state = "boltshot_ammo"
 	fire_sound = 'code/modules/halo/sounds/boltshot_sg_fire.ogg'
-	damage = 25
-	pellets = 8
-	range_step = 1
+	penetrating = 1
 
 /obj/item/ammo_magazine/binaryrifle
 	name = "Z-750 SASR magazine"

diff --git a/code/modules/halo/weapons/forerunner/pistols.dm b/code/modules/halo/weapons/forerunner/pistols.dm
@@ -38,7 +38,7 @@
 	else
 		if(istype(ammo_magazine,/obj/item/ammo_magazine/boltshot_sg))
 			icon_state = "boltshot_shotgun"
-			fire_delay = initial(fire_delay) + 4
+			fire_delay = initial(fire_delay) + 6
 		else
 			icon_state = "boltshot"
 			fire_delay = initial(fire_delay)

diff --git a/code/modules/halo/weapons/forerunner/rifles.dm b/code/modules/halo/weapons/forerunner/rifles.dm
@@ -16,7 +16,7 @@
 	handle_casings = CASELESS
 	magazine_type = /obj/item/ammo_magazine/suppressor
 
-	fire_delay = 8
+	fire_delay = 10
 	burst = 6
 	burst_delay = 1.7
 	one_hand_penalty = -1