From 0bdfe07823ae396bfac1de3971f1c0d15266a3d3 Mon Sep 17 00:00:00 2001 From: ILikeToGammon <75219020+ILikeToGammon@users.noreply.github.com> Date: Mon, 2 Dec 2024 21:56:58 +0000 Subject: [PATCH 1/2] Changes Gau and Mini Rockets --- code/modules/cm_marines/dropship_ammo.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index 137279da21c..11f8d451bfb 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -137,6 +137,7 @@ name = "\improper 25mm multipurpose ammunition crate" icon_state = "30mm_crate" desc = "A 400rnd reinforced crate of Armor Piercing High Explosive and Incendiary 25mm ammunition for use with the GAU-113 rotary autocannon. Best used against light structures, personnel in the open, or thinskin vehicles. Entirely ineffective against heavier armor." + travelling_time = 50 equipment_type = /obj/structure/dropship_equipment/weapon/heavygun ammo_count = 400 max_ammo_count = 400 @@ -144,10 +145,10 @@ ammo_used_per_firing = 40 point_cost = 275 fire_mission_delay = 2 - var/bullet_spread_range = 3 //how far from the real impact turf can bullets land + var/bullet_spread_range = 2 //how far from the real impact turf can bullets land var/shrapnel_type = /datum/ammo/bullet/shrapnel/gau //For siming 30mm bullet impacts. - var/directhit_damage = 105 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs. - var/penetration = 10 //AP value pretty much + var/directhit_damage = 150 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs. + var/penetration = 15 //AP value pretty much /obj/structure/ship_ammo/heavygun/get_examine_text(mob/user) . = ..() @@ -199,11 +200,11 @@ ammo_count = 400 max_ammo_count = 400 ammo_used_per_firing = 40 - bullet_spread_range = 4 + bullet_spread_range = 3 point_cost = 325 fire_mission_delay = 2 shrapnel_type = /datum/ammo/bullet/shrapnel/gau/at - directhit_damage = 80 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs. + directhit_damage = 100 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs. penetration = 40 //AP value pretty much //laser battery @@ -391,7 +392,7 @@ ammo_count = 6 max_ammo_count = 6 ammo_name = "minirocket" - travelling_time = 80 //faster than 30mm cannon, slower than real rockets + travelling_time = 40 //faster than 30mm cannon, slower than real rockets transferable_ammo = TRUE point_cost = 300 fire_mission_delay = 3 //high cooldown From 74043dab85584989493f4117081c386c2db6e310 Mon Sep 17 00:00:00 2001 From: ILikeToGammon <75219020+ILikeToGammon@users.noreply.github.com> Date: Fri, 6 Dec 2024 03:30:04 +0000 Subject: [PATCH 2/2] Tank Hardpoints Tweaks --- code/datums/ammo/bullet/tank.dm | 2 +- code/datums/ammo/rocket.dm | 4 ++-- code/modules/vehicles/hardpoints/armor/ballistic.dm | 4 ++-- code/modules/vehicles/hardpoints/primary/autocannon.dm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/datums/ammo/bullet/tank.dm b/code/datums/ammo/bullet/tank.dm index 4c9c2a29b8e..ab6d0ecd6eb 100644 --- a/code/datums/ammo/bullet/tank.dm +++ b/code/datums/ammo/bullet/tank.dm @@ -87,7 +87,7 @@ accuracy_var_low = PROJECTILE_VARIANCE_TIER_8 accuracy_var_high = PROJECTILE_VARIANCE_TIER_8 accurate_range = 12 - damage = 40 + damage = 125 penetration = ARMOR_PENETRATION_TIER_6 damage_armor_punch = 1 diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm index 3238c9ac485..5ebcacc8acd 100644 --- a/code/datums/ammo/rocket.dm +++ b/code/datums/ammo/rocket.dm @@ -59,7 +59,7 @@ accuracy_var_low = PROJECTILE_VARIANCE_TIER_9 accurate_range = 6 max_range = 6 - damage = 10 + damage = 200 penetration= ARMOR_PENETRATION_TIER_10 @@ -163,7 +163,7 @@ accuracy = HIT_ACCURACY_TIER_3 accurate_range = 32 max_range = 32 - damage = 200 + damage = 300 shell_speed = AMMO_SPEED_TIER_3 /datum/ammo/rocket/ltb/on_hit_mob(mob/mob, obj/projectile/projectile) diff --git a/code/modules/vehicles/hardpoints/armor/ballistic.dm b/code/modules/vehicles/hardpoints/armor/ballistic.dm index 55f0f6bc4e6..ed557116d7e 100644 --- a/code/modules/vehicles/hardpoints/armor/ballistic.dm +++ b/code/modules/vehicles/hardpoints/armor/ballistic.dm @@ -7,7 +7,7 @@ disp_icon_state = "ballistic_armor" type_multipliers = list( - "bullet" = 0.67, - "slash" = 0.67, + "bullet" = 0.87, + "slash" = 0.87, "all" = 0.9 ) diff --git a/code/modules/vehicles/hardpoints/primary/autocannon.dm b/code/modules/vehicles/hardpoints/primary/autocannon.dm index e7c07c6d58a..812a7f9ac66 100644 --- a/code/modules/vehicles/hardpoints/primary/autocannon.dm +++ b/code/modules/vehicles/hardpoints/primary/autocannon.dm @@ -25,7 +25,7 @@ gun_firemode_list = list( GUN_FIREMODE_AUTOMATIC, ) - fire_delay = 0.7 SECONDS + fire_delay = 0.5 SECONDS /obj/item/hardpoint/primary/autocannon/set_bullet_traits() ..()