Skip to content

Commit

Permalink
attempt at balancing 10mm weapons more
Browse files Browse the repository at this point in the history
reverted some recoil on the SMG but shoots slower
changed mag cap for 10mm weapons
  • Loading branch information
dahlonl committed Nov 1, 2024
1 parent e4a9366 commit b138935
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion code/modules/projectiles/boxes_magazines/external/rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/boxes_magazines/external/smg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
. = ..()
Expand Down
8 changes: 5 additions & 3 deletions code/modules/projectiles/guns/ballistic/smg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,12 @@
eject_empty_sound = 'sound/weapons/gun/smg/smg_unload.ogg'

spread = 8
spread_unwielded = 12
spread_unwielded = 11

recoil = 1
recoil_unwielded = 6
recoil = 0
recoil_unwielded = 5

fire_delay = 0.55 SECONDS

wield_delay = 0.4 SECONDS

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand All @@ -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()
. = ..()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b138935

Please sign in to comment.