fixes

shiptest-ss13 · Oct 15, 2024 · 3ea49fd · 3ea49fd
1 parent b047795
commit 3ea49fd
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 19 deletions.
diff --git a/code/game/objects/items/storage/ammo_can.dm b/code/game/objects/items/storage/ammo_can.dm
@@ -8,6 +8,13 @@
 	pickup_sound =  'sound/items/handling/ammobox_pickup.ogg'
 	material_flags = NONE
 	has_latches = FALSE
+	w_class = WEIGHT_CLASS_BULKY
+
+/obj/item/storage/toolbox/ammo/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_volume = STORAGE_VOLUME_BACKPACK
+	STR.max_w_class = MAX_WEIGHT_CLASS_BACKPACK
 
 /obj/item/storage/toolbox/ammo/a850r/PopulateContents()
 	name = "ammo can (8x50mmR)"

diff --git a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
@@ -25,17 +25,6 @@
 	stock_max = 10
 	availability_prob = 0
 
-/datum/blackmarket_item/ammo/himehabu_box
-	name = ".22 LR Ammo Box"
-	desc = "A 75 round ammo box of .22 LR. Trust me, you'll need every shot."
-	item = /obj/item/storage/box/ammo/c22lr
-
-	price_min = 100
-	price_max = 300
-	stock_min = 6
-	stock_max = 10
-	availability_prob = 0
-
 /datum/blackmarket_item/ammo/a357_box
 	name = ".357 Ammo Box"
 	desc = "A 50 round ammo box of .357."

diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -98,7 +98,7 @@
 	name = "Himehabu Pistol"
 	desc = "Great things come in small packages. The Himehabu is perfect for all your espionage needs. Chambered in .22lr."
 	item = /obj/item/gun/ballistic/automatic/pistol/himehabu
-	pair_item = list(/datum/blackmarket_item/ammo/himehabu_mag, /datum/blackmarket_item/ammo/himehabu_box)
+	pair_item = list(/datum/blackmarket_item/ammo/himehabu_mag)
 
 	price_min = 100
 	price_max = 600
@@ -320,7 +320,7 @@
 	name = "Pounder Submachine Gun"
 	desc = "There's a certain quality to quantity. With a massive 50 round capacity, this .22lr submachine is capable of laying down an jawdropping amount of fire."
 	item = /obj/item/gun/ballistic/automatic/smg/pounder
-	pair_item = list(/datum/blackmarket_item/ammo/pounder_mag,/datum/blackmarket_item/ammo/himehabu_box)
+	pair_item = list(/datum/blackmarket_item/ammo/pounder_mag)
 
 	price_min = 1500
 	price_max = 2000

diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm
@@ -137,4 +137,4 @@
 	desc = "A .22 LR bullet casing."
 	projectile_type = /obj/projectile/bullet/c22lr
 	caliber = "22lr"
-	stack_size = 15
+	stack_size = 25
diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm
@@ -44,7 +44,7 @@
 	icon_state = "rifle-brass"
 	caliber = "5.56x42mm"
 	projectile_type = /obj/projectile/bullet/a556_42
-	stack_size = 5
+	stack_size = 15
 
 // 5.45x39mm (SKM-24v)
 
@@ -91,7 +91,7 @@
 	icon_state = "caseless"
 	caliber = ".299 caseless"
 	projectile_type = /obj/projectile/bullet/c299
-	stack_size = 5
+	stack_size = 15
 
 /obj/item/ammo_casing/a65clip
 	name = "6.5x57mm CLIP bullet casing"

diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
@@ -120,7 +120,7 @@
 	if(istype(attacking_obj, /obj/item/ammo_box/magazine/ammo_stack))
 		var/obj/item/ammo_box/attacking_box = attacking_obj
 		for(var/obj/item/ammo_casing/casing_to_insert in attacking_box.stored_ammo)
-			if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after(user, 1 SECONDS, attacking_box, timed_action_flags = IGNORE_USER_LOC_CHANGE)))
+			if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after(user, 0.5 SECONDS, attacking_box, timed_action_flags = IGNORE_USER_LOC_CHANGE)))
 				break
 			var/did_load = give_round(casing_to_insert, replace_spent)
 			if(!did_load)

diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/_ammo_stack.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/_ammo_stack.dm
@@ -13,7 +13,7 @@
 	multiple_sprites = AMMO_BOX_ONE_SPRITE
 	multiload = FALSE
 	start_empty = TRUE
-	max_ammo = 12
+	max_ammo = 25
 
 /obj/item/ammo_box/magazine/ammo_stack/update_icon(updates)
 	icon = initial(icon)

diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_rifle_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_rifle_stacks.dm
@@ -121,7 +121,7 @@
 
 /obj/item/ammo_box/magazine/ammo_stack/prefilled/c299
 	ammo_type = /obj/item/ammo_casing/caseless/c299
-	max_ammo = 5
+	max_ammo = 15
 
 /obj/item/storage/box/ammo/c299
 	name = "box of .299 Eoehoma caseless ammo"