Merge pull request #63 from dahlonl/Ringneckbalance

Changed 10mm ammo and Ringneck spread
trazodont · Nov 2, 2024 · e0ffb83 · e0ffb83
2 parents cc512cd + b138935
commit e0ffb83
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 21 deletions.
diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm
@@ -5,7 +5,7 @@
 	base_icon_state = "75"
 	ammo_type = /obj/item/ammo_casing/c10mm
 	caliber = "10mm"
-	max_ammo = 10
+	max_ammo = 8
 
 /obj/item/ammo_box/magazine/m10mm_ringneck/rifle/update_icon_state()
 	. = ..()

diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm
@@ -63,7 +63,7 @@
 	base_icon_state = "mongrel_mag"
 	ammo_type = /obj/item/ammo_casing/c10mm
 	caliber = "10mm"
-	max_ammo = 24
+	max_ammo = 20
 
 /obj/item/ammo_box/magazine/smgm10mm/update_icon_state()
 	. = ..()

diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -30,7 +30,7 @@
 	item_state = "moistnugget"
 	weapon_weight = WEAPON_HEAVY
 	mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck/rifle
-	fire_delay = 0.5 SECONDS
+	fire_delay = 0.65 SECONDS
 	burst_size = 1
 	w_class = WEIGHT_CLASS_HUGE
 	slot_flags = ITEM_SLOT_BACK

diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm
@@ -171,11 +171,13 @@
 	eject_sound = 'sound/weapons/gun/smg/smg_unload.ogg'
 	eject_empty_sound = 'sound/weapons/gun/smg/smg_unload.ogg'
 
-	spread = 7
-	spread_unwielded = 10
+	spread = 8
+	spread_unwielded = 11
 
 	recoil = 0
-	recoil_unwielded = 4
+	recoil_unwielded = 5
+
+	fire_delay = 0.55 SECONDS
 
 	wield_delay = 0.4 SECONDS
 

diff --git a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
@@ -21,7 +21,7 @@
 	load_empty_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
 	eject_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
 	eject_empty_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
-	recoil_unwielded = 3
+	recoil_unwielded = 4
 
 /obj/item/ammo_box/magazine/cm23
 	name = "CM-23 pistol magazine (10mm)"
@@ -30,7 +30,7 @@
 	base_icon_state = "cm23_mag"
 	ammo_type = /obj/item/ammo_casing/c10mm
 	caliber = "10mm"
-	max_ammo = 10
+	max_ammo = 8
 
 /obj/item/ammo_box/magazine/cm23/update_icon_state()
 	. = ..()

diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
@@ -55,9 +55,9 @@
 	)
 
 
-	spread = 6 //becuase its compact, spread is slightly worse
-	spread_unwielded = 9
-	recoil_unwielded = 2
+	spread = 7 //becuase its compact, spread is slightly worse
+	spread_unwielded = 10
+	recoil_unwielded = 4
 
 EMPTY_GUN_HELPER(automatic/pistol/ringneck)
 
@@ -70,9 +70,9 @@ EMPTY_GUN_HELPER(automatic/pistol/ringneck)
 
 	w_class = WEIGHT_CLASS_NORMAL
 
-	spread = 5 //this one is normal sized, thus in theory its better, in theory at least
-	spread_unwielded = 7
-	recoil_unwielded = 3
+	spread = 6 //this one is normal sized, thus in theory its better, in theory at least
+	spread_unwielded = 8
+	recoil_unwielded = 5
 
 EMPTY_GUN_HELPER(automatic/pistol/ringneck/indie)
 
@@ -84,7 +84,7 @@ EMPTY_GUN_HELPER(automatic/pistol/ringneck/indie)
 	base_icon_state = "ringneck_mag"
 	ammo_type = /obj/item/ammo_casing/c10mm
 	caliber = "10mm"
-	max_ammo = 10
+	max_ammo = 8
 	multiple_sprites = AMMO_BOX_FULL_EMPTY
 
 /obj/item/ammo_box/magazine/m10mm_ringneck/empty

diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm
@@ -35,32 +35,32 @@
 
 /obj/projectile/bullet/c10mm
 	name = "10mm bullet"
-	damage = 25
+	damage = 30
 	armour_penetration = -20
 
 /obj/projectile/bullet/c10mm/surplus
 	name = "10mm surplus bullet"
-	damage = 20
+	damage = 25
 
 /obj/projectile/bullet/c10mm/ap
 	name = "10mm armor-piercing bullet"
-	damage = 20
+	damage = 25
 	armour_penetration = 20
 
 /obj/projectile/bullet/c10mm/hp
 	name = "10mm hollow point bullet"
-	damage = 40
+	damage = 45
 	armour_penetration = -50
 
 /obj/projectile/bullet/incendiary/c10mm
 	name = "10mm incendiary bullet"
-	damage = 15
+	damage = 20
 	armour_penetration = -20
 	fire_stacks = 2
 
 /obj/projectile/bullet/c10mm/rubber
 	name = "10mm rubber bullet"
-	damage = 7
+	damage = 10
 	stamina = 38
 	armour_penetration = -40