Skip to content

Commit 9ea2fb5

Browse files
francinumSmArtKar
andauthored
Ports tg#84247 (#1047)
tgstation/tgstation#84247 Co-authored-by: SmArtKar <[email protected]>
1 parent db02b35 commit 9ea2fb5

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

code/modules/projectiles/boxes_magazines/_box_magazine.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
stack_trace("Tried loading unsupported ammocasing type [load_type] into ammo box [type].")
6666
return
6767

68-
for(var/i in max(1, stored_ammo.len) to max_ammo)
68+
for(var/i in max(1, stored_ammo.len + 1) to max_ammo)
6969
stored_ammo += new round_check(src)
7070
update_ammo_count()
7171

code/modules/projectiles/boxes_magazines/internal/revolver.dm

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
ammo_type = /obj/item/ammo_casing/a357
1616
caliber = CALIBER_357
1717
max_ammo = 6
18+
start_empty = TRUE
1819

19-
/obj/item/ammo_box/magazine/internal/rus357/Initialize(mapload)
20+
/obj/item/ammo_box/magazine/internal/cylinder/rus357/Initialize(mapload)
2021
stored_ammo += new ammo_type(src)
2122
. = ..()

0 commit comments

Comments
 (0)