From 603f3985ae2f5f910915d6a13c63df3e2c432f22 Mon Sep 17 00:00:00 2001 From: Kirshbia Date: Fri, 16 Feb 2024 17:42:58 -0500 Subject: [PATCH 01/13] APC buffs --- code/datums/ammo/bullet/tank.dm | 4 ++-- .../modules/vehicles/hardpoints/hardpoint_ammo/cupola_ammo.dm | 2 +- .../vehicles/hardpoints/hardpoint_ammo/dualcannon_ammo.dm | 2 +- code/modules/vehicles/hardpoints/primary/dual_cannon.dm | 4 ++-- code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm | 4 ++-- code/modules/vehicles/hardpoints/wheels/apc_wheels.dm | 4 ++-- code/modules/vehicles/multitile/multitile.dm | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/datums/ammo/bullet/tank.dm b/code/datums/ammo/bullet/tank.dm index 70a953c6e2..dfa48deca6 100644 --- a/code/datums/ammo/bullet/tank.dm +++ b/code/datums/ammo/bullet/tank.dm @@ -45,9 +45,9 @@ accuracy = HIT_ACCURACY_TIER_8 scatter = 0 - damage = 50 + damage = 200 damage_var_high = PROJECTILE_VARIANCE_TIER_8 - penetration = ARMOR_PENETRATION_TIER_3 + penetration = ARMOR_PENETRATION_TIER_8 accurate_range = 10 max_range = 12 shell_speed = AMMO_SPEED_TIER_5 diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/cupola_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/cupola_ammo.dm index cadb760bd6..e67faa07d7 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/cupola_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/cupola_ammo.dm @@ -6,7 +6,7 @@ icon_state = "cupola_1" w_class = SIZE_LARGE default_ammo = /datum/ammo/bullet/smartgun - max_rounds = 500 + max_rounds = 1000 gun_type = /obj/item/hardpoint/secondary/m56cupola /obj/item/ammo_magazine/hardpoint/m56_cupola/update_icon() diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/dualcannon_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/dualcannon_ammo.dm index ca7985ad5f..f9e11b78fd 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/dualcannon_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/dualcannon_ammo.dm @@ -5,7 +5,7 @@ icon_state = "ace_autocannon" w_class = SIZE_LARGE default_ammo = /datum/ammo/bullet/tank/dualcannon - max_rounds = 60 + max_rounds = 100 gun_type = /obj/item/hardpoint/primary/dualcannon /obj/item/ammo_magazine/hardpoint/boyars_dualcannon/update_icon() diff --git a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm index b76e6ad5cf..7b3ccf9464 100644 --- a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm +++ b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm @@ -9,9 +9,9 @@ disp_icon_state = "dualcannon" activation_sounds = list('sound/weapons/vehicles/dual_autocannon_fire.ogg') - damage_multiplier = 0.2 + damage_multiplier = 0 - health = 500 + health = 2000 firing_arc = 60 origins = list(0, -2) diff --git a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm index f80a1e81af..915ef33947 100644 --- a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm +++ b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm @@ -10,7 +10,7 @@ damage_multiplier = 0.11 - health = 350 + health = 2000 firing_arc = 120 origins = list(0, -2) @@ -31,7 +31,7 @@ "8" = list(-62, -26) ) - scatter = 4 + scatter = 1 gun_firemode = GUN_FIREMODE_AUTOMATIC gun_firemode_list = list( GUN_FIREMODE_AUTOMATIC, diff --git a/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm b/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm index 62c5e430c7..72f85b78d3 100644 --- a/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm +++ b/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm @@ -3,13 +3,13 @@ desc = "Integral to the movement of the APC." icon = 'icons/obj/vehicles/hardpoints/apc.dmi' - damage_multiplier = 0.15 + damage_multiplier = 0.00 icon_state = "tires" disp_icon = "apc" disp_icon_state = "wheels" - health = 500 + health = 2000 move_delay = VEHICLE_SPEED_SUPERFAST move_max_momentum = 2 diff --git a/code/modules/vehicles/multitile/multitile.dm b/code/modules/vehicles/multitile/multitile.dm index d86555d5b0..6a25d72e46 100644 --- a/code/modules/vehicles/multitile/multitile.dm +++ b/code/modules/vehicles/multitile/multitile.dm @@ -9,7 +9,7 @@ name = "multitile vehicle" desc = "Get inside to operate the vehicle." - health = 1000 + health = 3000 //How big the vehicle is in pixels, defined facing SOUTH, which is the byond default (i.e. a 3x3 vehicle is going to be 96x96) ~Cakey bound_width = 32 From 720f7f7611476f88581c1ea7a0494ae2e7df2c4f Mon Sep 17 00:00:00 2001 From: Kirshbia <129012736+Kirshbia@users.noreply.github.com> Date: Sat, 17 Feb 2024 11:53:21 -0500 Subject: [PATCH 02/13] Update apc_wheels.dm --- code/modules/vehicles/hardpoints/wheels/apc_wheels.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm b/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm index 72f85b78d3..fb4eab5fbd 100644 --- a/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm +++ b/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm @@ -3,7 +3,7 @@ desc = "Integral to the movement of the APC." icon = 'icons/obj/vehicles/hardpoints/apc.dmi' - damage_multiplier = 0.00 + damage_multiplier = 0.10 icon_state = "tires" disp_icon = "apc" From 310992127ff1498c2639c5595f937db132227e95 Mon Sep 17 00:00:00 2001 From: Kirshbia <129012736+Kirshbia@users.noreply.github.com> Date: Sat, 17 Feb 2024 11:54:19 -0500 Subject: [PATCH 03/13] Update apc_wheels.dm --- code/modules/vehicles/hardpoints/wheels/apc_wheels.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm b/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm index fb4eab5fbd..2d69c781f9 100644 --- a/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm +++ b/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm @@ -9,7 +9,7 @@ disp_icon = "apc" disp_icon_state = "wheels" - health = 2000 + health = 1500 move_delay = VEHICLE_SPEED_SUPERFAST move_max_momentum = 2 From fa8da5c783f23508290445024ba80c24774ad80e Mon Sep 17 00:00:00 2001 From: Kirshbia <129012736+Kirshbia@users.noreply.github.com> Date: Sat, 17 Feb 2024 22:43:06 -0500 Subject: [PATCH 04/13] Update tank.dm --- code/datums/ammo/bullet/tank.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ammo/bullet/tank.dm b/code/datums/ammo/bullet/tank.dm index dfa48deca6..ff6f57caee 100644 --- a/code/datums/ammo/bullet/tank.dm +++ b/code/datums/ammo/bullet/tank.dm @@ -47,7 +47,7 @@ scatter = 0 damage = 200 damage_var_high = PROJECTILE_VARIANCE_TIER_8 - penetration = ARMOR_PENETRATION_TIER_8 + penetration = ARMOR_PENETRATION_TIER_7 accurate_range = 10 max_range = 12 shell_speed = AMMO_SPEED_TIER_5 From c328157b91b931fcea9875565500f16745d8a79a Mon Sep 17 00:00:00 2001 From: Kirshbia <129012736+Kirshbia@users.noreply.github.com> Date: Sat, 17 Feb 2024 22:43:42 -0500 Subject: [PATCH 05/13] Update dualcannon_ammo.dm --- .../vehicles/hardpoints/hardpoint_ammo/dualcannon_ammo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/dualcannon_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/dualcannon_ammo.dm index f9e11b78fd..bbb091112e 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/dualcannon_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/dualcannon_ammo.dm @@ -5,7 +5,7 @@ icon_state = "ace_autocannon" w_class = SIZE_LARGE default_ammo = /datum/ammo/bullet/tank/dualcannon - max_rounds = 100 + max_rounds = 80 gun_type = /obj/item/hardpoint/primary/dualcannon /obj/item/ammo_magazine/hardpoint/boyars_dualcannon/update_icon() From 951589dad298f134081ce1c8130aab531a5ecff9 Mon Sep 17 00:00:00 2001 From: Kirshbia <129012736+Kirshbia@users.noreply.github.com> Date: Sat, 17 Feb 2024 22:44:45 -0500 Subject: [PATCH 06/13] Update apc_wheels.dm --- code/modules/vehicles/hardpoints/wheels/apc_wheels.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm b/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm index 2d69c781f9..0060f78344 100644 --- a/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm +++ b/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm @@ -3,7 +3,7 @@ desc = "Integral to the movement of the APC." icon = 'icons/obj/vehicles/hardpoints/apc.dmi' - damage_multiplier = 0.10 + damage_multiplier = 0.20 icon_state = "tires" disp_icon = "apc" From c689e7d7e0c24f8c9c1d5d3a207acadbf889d6b9 Mon Sep 17 00:00:00 2001 From: Kirshbia <129012736+Kirshbia@users.noreply.github.com> Date: Sat, 17 Feb 2024 22:45:16 -0500 Subject: [PATCH 07/13] Update dual_cannon.dm --- code/modules/vehicles/hardpoints/primary/dual_cannon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm index 7b3ccf9464..7b9cae2554 100644 --- a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm +++ b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm @@ -9,7 +9,7 @@ disp_icon_state = "dualcannon" activation_sounds = list('sound/weapons/vehicles/dual_autocannon_fire.ogg') - damage_multiplier = 0 + damage_multiplier = .15 health = 2000 firing_arc = 60 From 842e6c6f4a1cba15d93c08d14cce37c03cf3a381 Mon Sep 17 00:00:00 2001 From: Kirshbia <129012736+Kirshbia@users.noreply.github.com> Date: Sat, 17 Feb 2024 23:37:46 -0500 Subject: [PATCH 08/13] Update frontal_cannon.dm --- code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm index 915ef33947..9e663af704 100644 --- a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm +++ b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm @@ -8,7 +8,7 @@ disp_icon_state = "frontalcannon" activation_sounds = list('sound/weapons/gun_smartgun1.ogg', 'sound/weapons/gun_smartgun2.ogg', 'sound/weapons/gun_smartgun3.ogg') - damage_multiplier = 0.11 + damage_multiplier = 0.15 health = 2000 firing_arc = 120 From 948da72ce8097accc1c8d9fa6f826d6941fc738f Mon Sep 17 00:00:00 2001 From: Kirshbia <129012736+Kirshbia@users.noreply.github.com> Date: Sat, 17 Feb 2024 23:38:48 -0500 Subject: [PATCH 09/13] Update dual_cannon.dm --- code/modules/vehicles/hardpoints/primary/dual_cannon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm index 7b9cae2554..d241199f61 100644 --- a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm +++ b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm @@ -11,7 +11,7 @@ damage_multiplier = .15 - health = 2000 + health = 1500 firing_arc = 60 origins = list(0, -2) From d66477e0f0dc113c3d914c362e9b134fb908da18 Mon Sep 17 00:00:00 2001 From: Kirshbia <129012736+Kirshbia@users.noreply.github.com> Date: Sun, 18 Feb 2024 11:50:15 -0500 Subject: [PATCH 10/13] Update dual_cannon.dm --- code/modules/vehicles/hardpoints/primary/dual_cannon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm index d241199f61..db5790c258 100644 --- a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm +++ b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm @@ -9,7 +9,7 @@ disp_icon_state = "dualcannon" activation_sounds = list('sound/weapons/vehicles/dual_autocannon_fire.ogg') - damage_multiplier = .15 + damage_multiplier = 0.15 health = 1500 firing_arc = 60 From 7b109bf8e59116a014b6907b6e2670de92336237 Mon Sep 17 00:00:00 2001 From: Kirshbia Date: Sun, 18 Feb 2024 18:40:24 -0500 Subject: [PATCH 11/13] Hm --- code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm index 915ef33947..f7feeecfe9 100644 --- a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm +++ b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm @@ -8,7 +8,7 @@ disp_icon_state = "frontalcannon" activation_sounds = list('sound/weapons/gun_smartgun1.ogg', 'sound/weapons/gun_smartgun2.ogg', 'sound/weapons/gun_smartgun3.ogg') - damage_multiplier = 0.11 + damage_multiplier = 0.20 health = 2000 firing_arc = 120 From 394dec6c27ee94e1ac8c3a49943784fd073c6ddf Mon Sep 17 00:00:00 2001 From: Kirshbia Date: Sun, 18 Feb 2024 18:51:29 -0500 Subject: [PATCH 12/13] Flare launcher and APC armor adjustment --- code/modules/vehicles/apc/apc.dm | 2 +- .../vehicles/hardpoints/hardpoint_ammo/flare_launcher_ammo.dm | 2 +- code/modules/vehicles/hardpoints/support/flare.dm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/vehicles/apc/apc.dm b/code/modules/vehicles/apc/apc.dm index a2fa7d5c1f..98de810c22 100644 --- a/code/modules/vehicles/apc/apc.dm +++ b/code/modules/vehicles/apc/apc.dm @@ -64,7 +64,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) dmg_multipliers = list( "all" = 1, "acid" = 1.6, - "slash" = 0.8, + "slash" = 1.8, "bullet" = 0.6, "explosive" = 0.7, "blunt" = 0.7, diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/flare_launcher_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/flare_launcher_ammo.dm index e2113716e0..7d1877d91a 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/flare_launcher_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/flare_launcher_ammo.dm @@ -5,7 +5,7 @@ icon_state = "slauncher_1" w_class = SIZE_LARGE default_ammo = /datum/ammo/flare - max_rounds = 10 + max_rounds = 90 gun_type = /obj/item/hardpoint/support/flare_launcher /obj/item/ammo_magazine/hardpoint/flare_launcher/update_icon() diff --git a/code/modules/vehicles/hardpoints/support/flare.dm b/code/modules/vehicles/hardpoints/support/flare.dm index 186b6bbaf5..7e82fe0d64 100644 --- a/code/modules/vehicles/hardpoints/support/flare.dm +++ b/code/modules/vehicles/hardpoints/support/flare.dm @@ -8,11 +8,11 @@ disp_icon_state = "flare_launcher" activation_sounds = list('sound/weapons/gun_m92_attachable.ogg') - damage_multiplier = 0.1 + damage_multiplier = 0.15 activatable = TRUE - health = 500 + health = 1500 firing_arc = 120 origins = list(0, -2) From 46cdc3220fb4daa45821ebf28db6d5723b5cb419 Mon Sep 17 00:00:00 2001 From: Kirshbia Date: Sun, 18 Feb 2024 21:38:39 -0500 Subject: [PATCH 13/13] Increase to Re-re cannon frontal rate Lower damage from the boyars (Still a strong anti-armor gun.) --- code/datums/ammo/bullet/tank.dm | 2 +- code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/ammo/bullet/tank.dm b/code/datums/ammo/bullet/tank.dm index ff6f57caee..c3bd085d47 100644 --- a/code/datums/ammo/bullet/tank.dm +++ b/code/datums/ammo/bullet/tank.dm @@ -45,7 +45,7 @@ accuracy = HIT_ACCURACY_TIER_8 scatter = 0 - damage = 200 + damage = 150 damage_var_high = PROJECTILE_VARIANCE_TIER_8 penetration = ARMOR_PENETRATION_TIER_7 accurate_range = 10 diff --git a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm index 9e663af704..073e54e855 100644 --- a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm +++ b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm @@ -36,7 +36,7 @@ gun_firemode_list = list( GUN_FIREMODE_AUTOMATIC, ) - fire_delay = 0.3 SECONDS + fire_delay = 0.1 SECONDS /obj/item/hardpoint/secondary/frontalcannon/set_bullet_traits() ..()