more changes

shiptest-ss13 · Oct 10, 2024 · 263f43e · 263f43e
1 parent d5d3b3d
commit 263f43e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -328,10 +328,10 @@
 	..()
 	for(var/i in 1 to 3)
 		new /obj/item/storage/box/lethalshot(src)
-		new /obj/item/ammo_box/magazine/co9mm(src) //WS edit - begin - better safe than sorry
 		new /obj/item/ammo_box/magazine/co9mm(src)
 		new /obj/item/ammo_box/magazine/co9mm(src)
-		new /obj/item/ammo_box/magazine/co9mm(src) //WS edit - end
+		new /obj/item/ammo_box/magazine/co9mm(src)
+		new /obj/item/ammo_box/magazine/co9mm(src)
 
 /obj/structure/closet/secure_closet/labor_camp_security
 	name = "labor camp security locker"

diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm
@@ -45,6 +45,7 @@
 	icon_state = "pistol-brass"
 	caliber = "9mm"
 	projectile_type = /obj/projectile/bullet/c9mm
+	stack_size = 15
 
 /obj/item/ammo_casing/c9mm/surplus
 	name = "9mm surplus bullet casing"

diff --git a/code/modules/projectiles/ammunition/ballistic/smg.dm b/code/modules/projectiles/ammunition/ballistic/smg.dm
@@ -15,6 +15,7 @@
 	icon_state = "rifle-brass"
 	caliber = "4.6x30mm"
 	projectile_type = /obj/projectile/bullet/c46x30mm
+	stack_size = 15
 
 /obj/item/ammo_casing/c46x30mm/ap
 	name = "4.6x30mm armor-piercing bullet casing"

diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm
@@ -88,6 +88,7 @@
 
 /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm
 	ammo_type = /obj/item/ammo_casing/c9mm
+	max_ammo = 15
 
 /obj/item/storage/box/ammo/c9mm
 	name = "box of 9mm ammo"
@@ -288,7 +289,7 @@
 /obj/item/storage/box/ammo/a357
 	name = "box of .357 ammo"
 	desc = "A box of standard .357 ammo."
-	icon_state = "22lrbox"
+	icon_state = "357box"
 
 /obj/item/storage/box/ammo/a357/PopulateContents()
 	..()