Merge pull request #3415 from X0-11/suppressor-tweak

Promethean weapon balance pass
HaloSpaceStation · Jul 27, 2023 · a213988 · a213988
2 parents 67c0662 + fa1126d
commit a213988
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/code/modules/halo/Forerunner/sentinel.dm b/code/modules/halo/Forerunner/sentinel.dm
@@ -54,7 +54,7 @@
 /obj/item/weapon/gun/energy/laser/sentinel_beam/detached
 	burst = 10
 	recharge_time = 1
-	max_shots = 75
+	max_shots = 150
 
 
 // AI pathing landmark

diff --git a/code/modules/halo/covenant/species/tvoan/skirmisher_gauntlets.dm b/code/modules/halo/covenant/species/tvoan/skirmisher_gauntlets.dm
@@ -63,8 +63,8 @@
 	name = "T\'Vaoan Champion shield gauntlets"
 	item_state = "championshield"
 	icon_state = "championglove"
-	shieldstrength = 60
-	totalshields = 60
+	shieldstrength = 40
+	totalshields = 40
 
 /obj/item/clothing/gloves/skirmisher_shield_gauntlets/unsc
 	name = "T\'Vaoan Separatist shield gauntlets"

diff --git a/code/modules/halo/covenant/supply/covholyweapons.dm b/code/modules/halo/covenant/supply/covholyweapons.dm
@@ -27,6 +27,12 @@
 	cost = 800
 	containername = "\improper Sanctified Binary Rifle crate"
 
+/decl/hierarchy/supply_pack/covenant_holy_weapons/sentinelbeam
+	name = "Anointed Sentinel Beam"
+	contains = list(/obj/item/weapon/gun/energy/laser/sentinel_beam/detached)
+	cost = 600
+	containername = "\improper Anointed Sentinel Beam crate"
+
 /* EXPLOSIVES */
 
 /decl/hierarchy/supply_pack/covenant_holy_weapons/splintergrenade

diff --git a/code/modules/halo/weapons/ammo_7-62mm.dm b/code/modules/halo/weapons/ammo_7-62mm.dm
@@ -52,6 +52,7 @@
 /obj/item/projectile/bullet/m120
 	damage = 35
 	armor_penetration = 40
+	penetrating = 1
 	shield_damage = 5
 	tracer_type = /obj/effect/projectile/dmr_trail
 	tracer_delay_time = 0.5 SECONDS

diff --git a/code/modules/halo/weapons/forerunner/ammo.dm b/code/modules/halo/weapons/forerunner/ammo.dm
@@ -38,8 +38,9 @@
 	icon = 'code/modules/halo/weapons/icons/forerunner_sprites.dmi'
 	icon_state = "boolet"
 	fire_sound = 'code/modules/halo/sounds/boltshot_fire.ogg'
-	damage = 30
-	armor_penetration = 30
+	damage = 25
+	armor_penetration = 15
+	penetrating = 1
 
 /obj/item/projectile/bullet/pellet/shotgun/boltshot
 	name = "hardlight shrapnel"
@@ -58,7 +59,7 @@
 	caliber = "hardlightBinaryrifle"
 	mag_type = MAGAZINE
 	ammo_type = /obj/item/ammo_casing/binaryrifle
-	max_ammo = 4
+	max_ammo = 2
 
 /obj/item/ammo_casing/binaryrifle
 	name = "hardlight cell"

diff --git a/code/modules/halo/weapons/forerunner/rifles.dm b/code/modules/halo/weapons/forerunner/rifles.dm
@@ -18,9 +18,9 @@
 
 	fire_delay = 8
 	burst = 6
-	burst_delay = 1.6
+	burst_delay = 1.7
 	one_hand_penalty = -1
-	dispersion = list(0.0,0.2,0.3,0.5,0.73,0.8)
+	dispersion = list(0.1,0.2,0.3,0.5,0.73,0.8)
 	w_class = ITEM_SIZE_LARGE
 
 	item_icons = list(
@@ -29,8 +29,8 @@
 		)
 
 	firemodes = list(\
-	list(mode_name="short bursts", burst=6, dispersion=list(0.0,0.2,0.3,0.5,0.73,0.8)),
-	list(mode_name="extended bursts", burst=12, dispersion=list(0.1,0.2,0.3,0.6, 0.8, 0.9, 0.9, 0.9, 0.9, 1.0))
+	list(mode_name="short bursts", burst=6, dispersion=list(0.1,0.2,0.3,0.5,0.73,0.8)),
+	list(mode_name="extended bursts", burst=12, dispersion=list(0.2,0.3,0.3,0.5, 0.8, 0.8, 0.9, 0.9, 0.9, 1.0))
 	)
 
 /obj/item/weapon/gun/projectile/suppressor/can_use_when_prone()