Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Promethean weapon balance pass #3415

Merged
merged 6 commits into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/halo/Forerunner/sentinel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions code/modules/halo/covenant/supply/covholyweapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions code/modules/halo/weapons/ammo_7-62mm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions code/modules/halo/weapons/forerunner/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions code/modules/halo/weapons/forerunner/rifles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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()
Expand Down
Loading