Skip to content

Commit

Permalink
Ballistic guns chamber on Init again (#10608)
Browse files Browse the repository at this point in the history
Partially reverts change from #10020 and fix from #10441 as per request.
  • Loading branch information
VickiMorris authored Feb 15, 2024
1 parent 7740bac commit 0fe4e7c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
3 changes: 1 addition & 2 deletions code/modules/projectiles/guns/ballistic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@
magazine = new mag_type(src)
if (!caliber)
caliber = magazine.caliber
if (bolt_type == BOLT_TYPE_NO_BOLT)
chamber_round()
chamber_round()
update_icon()

/obj/item/gun/ballistic/fire_sounds()
Expand Down
4 changes: 0 additions & 4 deletions code/modules/projectiles/guns/ballistic/rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,6 @@

mag_type = /obj/item/ammo_box/magazine/internal/boltaction/enchanted/arcane_barrage

/obj/item/gun/ballistic/rifle/boltaction/enchanted/Initialize(mapload)
. = ..()
chamber_round()

/obj/item/gun/ballistic/rifle/boltaction/enchanted/dropped()
guns_left = 0
..()
Expand Down

0 comments on commit 0fe4e7c

Please sign in to comment.