cmss13-devs · morrowwolf · Mar 11, 2024 · Feb 16, 2024 · Feb 17, 2024 · Feb 17, 2024
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/code/datums/ammo/bullet/tank.dm b/code/datums/ammo/bullet/tank.dm
@@ -13,7 +13,7 @@
 
 	accuracy = HIT_ACCURACY_TIER_8
 	scatter = 0
-	damage = 60
+	damage = 175
 	damage_var_high = PROJECTILE_VARIANCE_TIER_8
 	penetration = ARMOR_PENETRATION_TIER_6
 	accurate_range = 32

diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm
@@ -152,7 +152,7 @@
 	accuracy = HIT_ACCURACY_TIER_3
 	accurate_range = 32
 	max_range = 32
-	damage = 25
+	damage = 125
 	shell_speed = AMMO_SPEED_TIER_3
 
 /datum/ammo/rocket/ltb/on_hit_mob(mob/M, obj/projectile/P)

diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/ltb_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/ltb_ammo.dm
@@ -5,7 +5,7 @@
 	icon_state = "ltbcannon_4"
 	w_class = SIZE_LARGE //Heavy fucker
 	default_ammo = /datum/ammo/rocket/ltb
-	max_rounds = 4
+	max_rounds = 6
 	gun_type = /obj/item/hardpoint/primary/cannon
 
 /obj/item/ammo_magazine/hardpoint/ltb_cannon/update_icon()

diff --git a/code/modules/vehicles/hardpoints/primary/autocannon.dm b/code/modules/vehicles/hardpoints/primary/autocannon.dm
@@ -7,7 +7,7 @@
 	disp_icon_state = "ace_autocannon"
 	activation_sounds = list('sound/weapons/vehicles/autocannon_fire.ogg')
 
-	health = 500
+	health = 2000
 	firing_arc = 60
 
 	origins = list(0, -3)

diff --git a/code/modules/vehicles/hardpoints/primary/flamer.dm b/code/modules/vehicles/hardpoints/primary/flamer.dm
@@ -7,7 +7,7 @@
 	disp_icon_state = "drgn_flamer"
 	activation_sounds = list('sound/weapons/vehicles/flamethrower.ogg')
 
-	health = 400
+	health = 2000
 	firing_arc = 90
 
 	origins = list(0, -3)

diff --git a/code/modules/vehicles/hardpoints/primary/ltb.dm b/code/modules/vehicles/hardpoints/primary/ltb.dm
@@ -7,7 +7,7 @@
 	disp_icon_state = "ltb_cannon"
 	activation_sounds = list('sound/weapons/vehicles/cannon_fire1.ogg', 'sound/weapons/vehicles/cannon_fire2.ogg')
 
-	health = 500
+	health = 1500
 	firing_arc = 60
 
 	origins = list(0, -3)
@@ -29,5 +29,5 @@
 		"8" = list(-89, -4)
 	)
 
-	scatter = 2
-	fire_delay = 20.0 SECONDS
+	scatter = 0
+	fire_delay = 15.0 SECONDS
diff --git a/code/modules/vehicles/hardpoints/primary/minigun.dm b/code/modules/vehicles/hardpoints/primary/minigun.dm
@@ -6,7 +6,7 @@
 	disp_icon = "tank"
 	disp_icon_state = "ltaaap_minigun"
 
-	health = 350
+	health = 2500
 	firing_arc = 90
 
 	origins = list(0, -3)
@@ -28,12 +28,12 @@
 		"8" = list(-77, 0)
 	)
 
-	scatter = 7
+	scatter = 2
 	gun_firemode = GUN_FIREMODE_AUTOMATIC
 	gun_firemode_list = list(
 		GUN_FIREMODE_AUTOMATIC,
 	)
-	fire_delay = 0.8 SECONDS //base fire rate, modified by stage_delay_mult
+	fire_delay = 0.2 SECONDS //base fire rate, modified by stage_delay_mult
 
 	activation_sounds = list('sound/weapons/gun_minigun.ogg')
 	/// Active firing time to reach max spin_stage.

diff --git a/code/modules/vehicles/hardpoints/secondary/cupola.dm b/code/modules/vehicles/hardpoints/secondary/cupola.dm
@@ -7,7 +7,7 @@
 	disp_icon_state = "m56cupola"
 	activation_sounds = list('sound/weapons/gun_smartgun1.ogg', 'sound/weapons/gun_smartgun2.ogg', 'sound/weapons/gun_smartgun3.ogg', 'sound/weapons/gun_smartgun4.ogg')
 
-	health = 350
+	health = 2000
 	firing_arc = 120
 
 	origins = list(0, -2)
@@ -27,9 +27,9 @@
 	gun_firemode_list = list(
 		GUN_FIREMODE_BURSTFIRE,
 	)
-	burst_amount = 3
+	burst_amount = 5
 	burst_delay = 0.3 SECONDS
-	extra_delay = 0.6 SECONDS
+	extra_delay = 0.2 SECONDS
 
 /obj/item/hardpoint/secondary/m56cupola/set_bullet_traits()
 	..()

diff --git a/code/modules/vehicles/hardpoints/secondary/flamer.dm b/code/modules/vehicles/hardpoints/secondary/flamer.dm
@@ -7,7 +7,7 @@
 	disp_icon_state = "flamer"
 	activation_sounds = list('sound/weapons/vehicles/flamethrower.ogg')
 
-	health = 300
+	health = 2000
 	firing_arc = 120
 
 	origins = list(0, -2)
@@ -26,8 +26,8 @@
 		"8" = list(-3, 18)
 	)
 
-	scatter = 6
-	fire_delay = 3.0 SECONDS
+	scatter = 2
+	fire_delay = 1.5 SECONDS
 
 /obj/item/hardpoint/secondary/small_flamer/handle_fire(atom/target, mob/living/user, params)
 	var/turf/origin_turf = get_origin_turf()

diff --git a/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm b/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm
@@ -7,7 +7,7 @@
 	disp_icon_state = "glauncher"
 	activation_sounds = list('sound/weapons/gun_m92_attachable.ogg')
 
-	health = 500
+	health = 2000
 	firing_arc = 90
 	var/max_range = 7
 

diff --git a/code/modules/vehicles/hardpoints/secondary/secondary.dm b/code/modules/vehicles/hardpoints/secondary/secondary.dm
@@ -4,6 +4,6 @@
 
 	slot = HDPT_SECONDARY
 
-	damage_multiplier = 0.125
+	damage_multiplier = 0.15
 
 	activatable = TRUE
diff --git a/code/modules/vehicles/hardpoints/secondary/tow.dm b/code/modules/vehicles/hardpoints/secondary/tow.dm
@@ -6,7 +6,7 @@
 	disp_icon = "tank"
 	disp_icon_state = "towlauncher"
 
-	health = 500
+	health = 2000
 	firing_arc = 60
 
 	origins = list(0, -2)
@@ -28,6 +28,6 @@
 		"8" = list(-5, 10)
 	)
 
-	scatter = 4
+	scatter = 2
 	fire_delay = 15.0 SECONDS
 
diff --git a/code/modules/vehicles/tank/tank.dm b/code/modules/vehicles/tank/tank.dm
@@ -65,15 +65,15 @@
 
 	dmg_multipliers = list(
 		"all" = 1,
-		"acid" = 1.5, // Acid melts the tank
-		"slash" = 0.7, // Slashing a massive, solid chunk of metal does very little except leave scratches
+		"acid" = 0.5, // Acid melts the tank
+		"slash" = 0.4, // Slashing a massive, solid chunk of metal does very little except leave scratches
 		"bullet" = 0.4,
 		"explosive" = 0.8,
 		"blunt" = 0.8,
 		"abstract" = 1
 	)
 
-	explosive_resistance = 400
+	explosive_resistance = 500
 
 /obj/vehicle/multitile/tank/initialize_cameras(change_tag = FALSE)
 	if(!camera)