From d43e566e10ad4effa14f29eb903d28fc9c3a3994 Mon Sep 17 00:00:00 2001 From: spaghetti Date: Wed, 4 Dec 2024 08:26:07 +0300 Subject: [PATCH 1/7] integrity and armor nerf --- code/modules/vehicles/armored/_multitile.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/vehicles/armored/_multitile.dm b/code/modules/vehicles/armored/_multitile.dm index 9ce8a6a24e0..186840b1ca1 100644 --- a/code/modules/vehicles/armored/_multitile.dm +++ b/code/modules/vehicles/armored/_multitile.dm @@ -16,8 +16,8 @@ light_pixel_y= 32 pixel_x = -56 pixel_y = -48 - max_integrity = 900 - soft_armor = list(MELEE = 50, BULLET = 99 , LASER = 99, ENERGY = 60, BOMB = 60, BIO = 60, FIRE = 50, ACID = 50) + max_integrity = 600 + soft_armor = list(MELEE = 40, BULLET = 99 , LASER = 99, ENERGY = 60, BOMB = 60, BIO = 60, FIRE = 50, ACID = 40) hard_armor = list(MELEE = 0, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) permitted_mods = list(/obj/item/tank_module/overdrive, /obj/item/tank_module/ability/zoom) permitted_weapons = list(/obj/item/armored_weapon, /obj/item/armored_weapon/ltaap, /obj/item/armored_weapon/secondary_weapon, /obj/item/armored_weapon/secondary_flamer) From 158693c8000c649b03973f0abc6e44d1c2790879 Mon Sep 17 00:00:00 2001 From: spaghetti Date: Wed, 4 Dec 2024 08:27:24 +0300 Subject: [PATCH 2/7] restricted rotation --- code/modules/vehicles/armored/__armored.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/vehicles/armored/__armored.dm b/code/modules/vehicles/armored/__armored.dm index eea9bddae48..9898c18b0d6 100644 --- a/code/modules/vehicles/armored/__armored.dm +++ b/code/modules/vehicles/armored/__armored.dm @@ -605,6 +605,11 @@ /obj/vehicle/sealed/armored/proc/swivel_turret(atom/A, new_weapon_dir) if(!new_weapon_dir) new_weapon_dir = angle_to_cardinal_dir(Get_Angle(get_turf(src), get_turf(A))) + var/list/leftright = LeftAndRightOfDir(turret_overlay.dir) + var/left = leftright[1] - 1 + var/right = leftright[2] + 1 + if(!(left == (new_weapon_dir-1)) && !(right == (new_weapon_dir+1))) + return FALSE if(turret_overlay.dir == new_weapon_dir) return FALSE if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_TANK_SWIVEL)) //Slight cooldown to avoid spam From 21c325bd83cac6e5023d3037982121c5262477a9 Mon Sep 17 00:00:00 2001 From: spaghetti Date: Wed, 4 Dec 2024 08:27:34 +0300 Subject: [PATCH 3/7] ammo nerf --- code/modules/projectiles/ammo_datums/rocket.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/ammo_datums/rocket.dm b/code/modules/projectiles/ammo_datums/rocket.dm index cf7bff58d2b..bc09c495e3a 100644 --- a/code/modules/projectiles/ammo_datums/rocket.dm +++ b/code/modules/projectiles/ammo_datums/rocket.dm @@ -76,14 +76,14 @@ hud_state = "bigshell_he" /datum/ammo/rocket/ltb/drop_nade(turf/T) - cell_explosion(T, 320, 70) + cell_explosion(T, 160, 70) /datum/ammo/bullet/tank_apfds name = "8.8cm APFDS round" icon_state = "apfds" hud_state = "bigshell_apfds" flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SNIPER|AMMO_PASS_THROUGH_TURF|AMMO_PASS_THROUGH_MOVABLE - damage = 300 + damage = 150 penetration = 75 shell_speed = 4 accurate_range = 24 From 40a74ec386e61a1ca0766e23c17a7770e955f0c4 Mon Sep 17 00:00:00 2001 From: spaghetti Date: Wed, 4 Dec 2024 08:48:55 +0300 Subject: [PATCH 4/7] fire windup --- code/modules/vehicles/armored/armored_weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/armored/armored_weapons.dm b/code/modules/vehicles/armored/armored_weapons.dm index 0ddf9a0a171..0373c03d144 100644 --- a/code/modules/vehicles/armored/armored_weapons.dm +++ b/code/modules/vehicles/armored/armored_weapons.dm @@ -32,7 +32,7 @@ ///windup sound played during windup var/windup_sound ///windup delay for this object - var/windup_delay = 0 + var/windup_delay = 5 ///scatter of this weapon. in degrees and modified by arm this is attached to var/variance = 0 /// since mech guns only get one firemode this is for all types of shots From 1edb23ebb842eb5d6ad4a92f9d4c8f96a0b98788 Mon Sep 17 00:00:00 2001 From: spaghetti <48985748+definitelynotspaghetti@users.noreply.github.com> Date: Wed, 4 Dec 2024 12:45:28 +0300 Subject: [PATCH 5/7] integrity Signed-off-by: spaghetti <48985748+definitelynotspaghetti@users.noreply.github.com> --- code/modules/vehicles/armored/_multitile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/armored/_multitile.dm b/code/modules/vehicles/armored/_multitile.dm index 186840b1ca1..c94fae0855f 100644 --- a/code/modules/vehicles/armored/_multitile.dm +++ b/code/modules/vehicles/armored/_multitile.dm @@ -16,7 +16,7 @@ light_pixel_y= 32 pixel_x = -56 pixel_y = -48 - max_integrity = 600 + max_integrity = 700 soft_armor = list(MELEE = 40, BULLET = 99 , LASER = 99, ENERGY = 60, BOMB = 60, BIO = 60, FIRE = 50, ACID = 40) hard_armor = list(MELEE = 0, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) permitted_mods = list(/obj/item/tank_module/overdrive, /obj/item/tank_module/ability/zoom) From 999edc13c772de6bba6c0e345add8d28b17c6c09 Mon Sep 17 00:00:00 2001 From: spaghetti <48985748+definitelynotspaghetti@users.noreply.github.com> Date: Wed, 4 Dec 2024 12:54:20 +0300 Subject: [PATCH 6/7] ammo Signed-off-by: spaghetti <48985748+definitelynotspaghetti@users.noreply.github.com> --- code/modules/projectiles/ammo_datums/rocket.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/ammo_datums/rocket.dm b/code/modules/projectiles/ammo_datums/rocket.dm index bc09c495e3a..cf7bff58d2b 100644 --- a/code/modules/projectiles/ammo_datums/rocket.dm +++ b/code/modules/projectiles/ammo_datums/rocket.dm @@ -76,14 +76,14 @@ hud_state = "bigshell_he" /datum/ammo/rocket/ltb/drop_nade(turf/T) - cell_explosion(T, 160, 70) + cell_explosion(T, 320, 70) /datum/ammo/bullet/tank_apfds name = "8.8cm APFDS round" icon_state = "apfds" hud_state = "bigshell_apfds" flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SNIPER|AMMO_PASS_THROUGH_TURF|AMMO_PASS_THROUGH_MOVABLE - damage = 150 + damage = 300 penetration = 75 shell_speed = 4 accurate_range = 24 From b339f52f1a9256081f18881a18a3f3baca4ba0af Mon Sep 17 00:00:00 2001 From: spaghetti Date: Sat, 14 Dec 2024 22:07:07 +0300 Subject: [PATCH 7/7] Update __armored.dm --- code/modules/vehicles/armored/__armored.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/armored/__armored.dm b/code/modules/vehicles/armored/__armored.dm index 9898c18b0d6..9a0a4566b72 100644 --- a/code/modules/vehicles/armored/__armored.dm +++ b/code/modules/vehicles/armored/__armored.dm @@ -608,7 +608,7 @@ var/list/leftright = LeftAndRightOfDir(turret_overlay.dir) var/left = leftright[1] - 1 var/right = leftright[2] + 1 - if(!(left == (new_weapon_dir-1)) && !(right == (new_weapon_dir+1))) + if(left != (new_weapon_dir - 1) && right != (new_weapon_dir + 1)) return FALSE if(turret_overlay.dir == new_weapon_dir) return FALSE