Merge branch 'refill' into 'dev'

Magazines refill 48 rounds per transfer from ammo box instead of 40 See merge request cmdevs/colonial-warfare!206
Watermelon914 · Nov 8, 2020 · e77f937 · e77f937
2 parents 071c48c + 7feaaf7
commit e77f937
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm
@@ -242,7 +242,7 @@
 		list("AMMUNITION BOXES", -1, null, null),
 		list("Rifle Ammunition Box (10x24mm)", round(scale * 0.9), /obj/item/ammo_box/rounds, VENDOR_ITEM_REGULAR),
 		list("Rifle Ammunition Box (10x24mm AP)", round(scale * 0.75), /obj/item/ammo_box/rounds/ap, VENDOR_ITEM_REGULAR),
-		list("SMG Ammunition Box (10x20mm)", round(scale * 0.9), /obj/item/ammo_box/rounds/smg, VENDOR_ITEM_REGULAR),
+		list("SMG Ammunition Box (10x20mm HV)", round(scale * 0.9), /obj/item/ammo_box/rounds/smg, VENDOR_ITEM_REGULAR),
 		list("SMG Ammunition Box (10x20mm AP)", round(scale * 0.75), /obj/item/ammo_box/rounds/smg/ap, VENDOR_ITEM_REGULAR),
 
 		list("MAGAZINE BOXES", -1, null, null),

diff --git a/code/game/machinery/vending/vendor_types/wo_vendors.dm b/code/game/machinery/vending/vendor_types/wo_vendors.dm
@@ -184,7 +184,7 @@
 		list("AMMUNITION BOXES", -1, null, null),
 		list("Rifle Ammunition Box (10x24mm)", round(scale * 0.9), /obj/item/ammo_box/rounds, VENDOR_ITEM_REGULAR),
 		list("Rifle Ammunition Box (10x24mm AP)", round(scale * 0.75), /obj/item/ammo_box/rounds/ap, VENDOR_ITEM_REGULAR),
-		list("SMG Ammunition Box (10x20mm)", round(scale * 0.9), /obj/item/ammo_box/rounds/smg, VENDOR_ITEM_REGULAR),
+		list("SMG Ammunition Box (10x20mm HV)", round(scale * 0.9), /obj/item/ammo_box/rounds/smg, VENDOR_ITEM_REGULAR),
 		list("SMG Ammunition Box (10x20mm AP)", round(scale * 0.75), /obj/item/ammo_box/rounds/smg/ap, VENDOR_ITEM_REGULAR),
 		)
 

diff --git a/code/modules/projectiles/updated_projectiles/ammunition.dm b/code/modules/projectiles/updated_projectiles/ammunition.dm
@@ -966,13 +966,13 @@ Turn() or Shift() as there is virtually no overhead. ~N
 			var/bullets_transferred = 0
 
 			//Amount of times timed action will be activated.
-			//Standard M41A mag of 40 rounds takes 1.5 to refill from the box.
-			for(var/i = 1;i <= Ceiling(S / 40); i++)
+			//Standard M41A mag of 40 rounds or SMG mag of 48 takes 1.5 to refill from the box.
+			for(var/i = 1;i <= Ceiling(S / 48); i++)
 				if(!do_after(user, 15, INTERRUPT_ALL, action_icon))
 					to_chat(user, SPAN_NOTICE("You stop transferring rounds from [source] into [destination]."))
 					break
 				playsound(loc, pick('sound/weapons/handling/mag_refill_1.ogg', 'sound/weapons/handling/mag_refill_2.ogg', 'sound/weapons/handling/mag_refill_3.ogg'), 25, 1)
-				var/transfer = min(S - bullets_transferred, 40)
+				var/transfer = min(S - bullets_transferred, 48)
 				destination_current += transfer
 				source_current -= transfer
 				bullets_transferred += transfer