Merge branch 'master' into misc-marine-changes

cmss13-devs · Apr 4, 2024 · e9d05fe · e9d05fe
2 parents 8ab30be + 9be3ce9
commit e9d05fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/code/game/objects/items/storage/misc.dm b/code/game/objects/items/storage/misc.dm
@@ -129,7 +129,7 @@
 	desc = "A small case containing the once-standard sidearm of the UPP, the Type 73, and two additional magazines. The contained sidearm is probably looted off a dead officer or from a captured stockpile, either way this thing is worth a pretty penny."
 	icon = 'icons/obj/items/storage.dmi'
 	icon_state = "matebacase"
-	w_class = SIZE_MEDIUM
+	w_class = SIZE_LARGE
 	max_w_class = SIZE_MEDIUM
 	storage_slots = 3
 
@@ -143,7 +143,7 @@
 	desc = "A relatively large storage case containing the 1911 and additional magazines. Purchased by enlisted or aspiring PMCs looking to carry a timeless classic"
 	icon = 'icons/obj/items/storage.dmi'
 	icon_state = "matebacase"
-	w_class = SIZE_MEDIUM
+	w_class = SIZE_LARGE
 	max_w_class = SIZE_MEDIUM
 	storage_slots = 3
 

diff --git a/code/modules/projectiles/ammo_boxes/round_boxes.dm b/code/modules/projectiles/ammo_boxes/round_boxes.dm
@@ -48,6 +48,7 @@
 	overlay_content = "_reg"
 	default_ammo = /datum/ammo/bullet/smartgun
 	caliber = "10x28mm"
+	bullet_amount = 1000
 	max_bullet_amount = 1000
 
 /obj/item/ammo_box/rounds/smartgun/empty