diff --git a/code/datums/ammo/bullet/tank.dm b/code/datums/ammo/bullet/tank.dm index 70a953c6e2..c3bd085d47 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 = 150 damage_var_high = PROJECTILE_VARIANCE_TIER_8 - penetration = ARMOR_PENETRATION_TIER_3 + penetration = ARMOR_PENETRATION_TIER_7 accurate_range = 10 max_range = 12 shell_speed = AMMO_SPEED_TIER_5 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/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..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 = 60 + max_rounds = 80 gun_type = /obj/item/hardpoint/primary/dualcannon /obj/item/ammo_magazine/hardpoint/boyars_dualcannon/update_icon() 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/primary/dual_cannon.dm b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm index b76e6ad5cf..db5790c258 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.15 - health = 500 + health = 1500 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..073e54e855 100644 --- a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm +++ b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm @@ -8,9 +8,9 @@ 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 = 350 + health = 2000 firing_arc = 120 origins = list(0, -2) @@ -31,12 +31,12 @@ "8" = list(-62, -26) ) - scatter = 4 + scatter = 1 gun_firemode = GUN_FIREMODE_AUTOMATIC 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() ..() 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) diff --git a/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm b/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm index 62c5e430c7..0060f78344 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.20 icon_state = "tires" disp_icon = "apc" disp_icon_state = "wheels" - health = 500 + health = 1500 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