From 93ad90968b99c735e01123270e11e5402ece9040 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Wed, 26 Jul 2023 21:02:23 +0100 Subject: [PATCH 1/6] lowers boltshot damage to fit the halved-magnum values --- code/modules/halo/weapons/forerunner/ammo.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/halo/weapons/forerunner/ammo.dm b/code/modules/halo/weapons/forerunner/ammo.dm index 50fb1042c3c91..d540e8cfec8e2 100644 --- a/code/modules/halo/weapons/forerunner/ammo.dm +++ b/code/modules/halo/weapons/forerunner/ammo.dm @@ -38,8 +38,8 @@ 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 /obj/item/projectile/bullet/pellet/shotgun/boltshot name = "hardlight shrapnel" @@ -58,7 +58,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" From bd45688f621d22f0b37ca4915444b7eeef45bc93 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Wed, 26 Jul 2023 21:02:36 +0100 Subject: [PATCH 2/6] suppressor dispersion and fire rate tweaks --- code/modules/halo/weapons/forerunner/rifles.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/halo/weapons/forerunner/rifles.dm b/code/modules/halo/weapons/forerunner/rifles.dm index 8f1c4d6ef1fc5..6ec069981f7b4 100644 --- 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() From c1159704e9ba61baf1a6049bfa14e32144a73097 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Wed, 26 Jul 2023 21:12:27 +0100 Subject: [PATCH 3/6] sentinel beam to cov ordering --- code/modules/halo/Forerunner/sentinel.dm | 2 +- code/modules/halo/covenant/supply/covholyweapons.dm | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/halo/Forerunner/sentinel.dm b/code/modules/halo/Forerunner/sentinel.dm index 17faa6094292e..5afbc00727cb8 100644 --- 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/supply/covholyweapons.dm b/code/modules/halo/covenant/supply/covholyweapons.dm index ddeba16b4e8ec..68b6d18ef78eb 100644 --- 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 From 1d3637caaf5ac1092c98f83366fb7938496aed09 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Wed, 26 Jul 2023 21:25:25 +0100 Subject: [PATCH 4/6] ammo gimmick --- code/modules/halo/weapons/forerunner/ammo.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/halo/weapons/forerunner/ammo.dm b/code/modules/halo/weapons/forerunner/ammo.dm index d540e8cfec8e2..32bf5116e1132 100644 --- a/code/modules/halo/weapons/forerunner/ammo.dm +++ b/code/modules/halo/weapons/forerunner/ammo.dm @@ -40,6 +40,7 @@ fire_sound = 'code/modules/halo/sounds/boltshot_fire.ogg' damage = 25 armor_penetration = 15 + penetrating = 1 /obj/item/projectile/bullet/pellet/shotgun/boltshot name = "hardlight shrapnel" From 1232b7cdcce7bc45d38066c04e5a69831d4fac48 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Wed, 26 Jul 2023 22:04:18 +0100 Subject: [PATCH 5/6] gauntlet tweak --- .../halo/covenant/species/tvoan/skirmisher_gauntlets.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/halo/covenant/species/tvoan/skirmisher_gauntlets.dm b/code/modules/halo/covenant/species/tvoan/skirmisher_gauntlets.dm index f9ad627a1cd19..cade5e0c5b3b7 100644 --- 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" From fa1126dd9dd2a6404d292401d64286186cbd589d Mon Sep 17 00:00:00 2001 From: X0-11 Date: Wed, 26 Jul 2023 22:09:18 +0100 Subject: [PATCH 6/6] DMR wall and cover pen --- code/modules/halo/weapons/ammo_7-62mm.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/halo/weapons/ammo_7-62mm.dm b/code/modules/halo/weapons/ammo_7-62mm.dm index fa41166ed76dd..587fd2516436d 100644 --- 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