Mk221 changes, a vendor change, ithaca's in wood

- Updates Mk221 onmob
- Unloads shotguns by default
- Ithaca's are put in wooden crates instead of sleek black ones
- Chief Engineer vendors can now vend combat shotguns cause there was a conflict and who cares

code/game/machinery/vending/vendor_types/crew/senior_officers.dm

@@ -158,7 +158,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_chief_engineer, list(
 		list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
 
 		list("PRIMARY FIREARMS (CHOOSE 1)", 0, null, null, null),
-		list("M37A2 Pump Shotgun", 0, /obj/item/storage/box/guncase/pumpshotgun, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR),
+		list("MK221 Tactical Shotgun", 0, /obj/item/storage/box/guncase/shotgun/combat, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR),
 		list("M41A Pulse Rifle MK2", 0, /obj/item/storage/box/guncase/m41a, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR),
 		list("M240 Incinerator Unit", 0, /obj/item/storage/box/guncase/flamer, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR),
 

code/modules/cm_marines/equipment/guncases.dm

@@ -47,7 +47,7 @@
 //------------
 /obj/item/storage/box/guncase/mou53
 	name = "\improper MOU53 shotgun case"
-	desc = "A gun case containing the MOU53 shotgun. It does come loaded, but you'll still have to find ammunition as you go."
+	desc = "A gun case containing a MOU53 shotgun. It does come loaded, but you'll still have to find ammunition as you go."
 	storage_slots = 2
 	can_hold = list(/obj/item/weapon/gun/shotgun/double/mou53, /obj/item/attachable/stock/mou53)
 
@@ -58,7 +58,7 @@
 //------------
 /obj/item/storage/box/guncase/lmg
 	name = "\improper M41AE2 heavy pulse rifle case"
-	desc = "A gun case containing the M41AE2 heavy pulse rifle. You can get additional ammunition at requisitions."
+	desc = "A gun case containing a M41AE2 heavy pulse rifle. You can get additional ammunition at requisitions."
 	storage_slots = 5
 	can_hold = list(/obj/item/weapon/gun/rifle/lmg, /obj/item/ammo_magazine/rifle/lmg)
 
@@ -72,7 +72,7 @@
 //------------
 /obj/item/storage/box/guncase/m41aMK1
 	name = "\improper M41A pulse rifle MK1 case"
-	desc = "A gun case containing the M41A pulse rifle MK1. It can only use proprietary MK1 magazines."
+	desc = "A gun case containing a loaded M41A pulse rifle MK1 and two additional magazines."
 	storage_slots = 3
 	can_hold = list(/obj/item/weapon/gun/rifle/m41aMK1, /obj/item/ammo_magazine/rifle/m41aMK1)
 
@@ -84,7 +84,7 @@
 
 /obj/item/storage/box/guncase/m41aMK1AP
 	name = "\improper M41A pulse rifle MK1 AP case"
-	desc = "A gun case containing the M41A pulse rifle MK1 loaded with AP rounds. It can only use proprietary MK1 magazines."
+	desc = "A gun case containing a M41A pulse rifle MK1 loaded with AP rounds and two additional magazines."
 	storage_slots = 3
 	can_hold = list(/obj/item/weapon/gun/rifle/m41aMK1, /obj/item/ammo_magazine/rifle/m41aMK1)
 
@@ -97,7 +97,7 @@
 //M79 grenade launcher
 /obj/item/storage/box/guncase/m79
 	name = "\improper M79 grenade launcher case"
-	desc = "A gun case containing the modernized M79 grenade launcher. Comes with 3 baton slugs, 3 hornet shells and 3 star shell grenades."
+	desc = "A gun case containing a modernized M79 grenade launcher. Comes with 3 baton slugs, 3 hornet shells and 3 star shell grenades."
 	storage_slots = 4
 	can_hold = list(/obj/item/weapon/gun/launcher/grenade/m81/m79, /obj/item/storage/box/packet)
 
@@ -111,7 +111,7 @@
 //R4T lever action rifle
 /obj/item/storage/box/guncase/r4t_scout
 	name = "\improper R4T lever action rifle case"
-	desc = "A gun case containing the R4T lever action rifle, intended for scouting. Comes with an ammunition belt, the optional revolver attachment for it, two boxes of ammunition, a sling, and a stock for the rifle."
+	desc = "A gun case containing a R4T lever action rifle, intended for scouting. Comes with an ammunition belt, the optional revolver attachment for it, two boxes of ammunition, a sling, and a stock for the rifle."
 	storage_slots = 7
 	can_hold = list(/obj/item/weapon/gun/lever_action/r4t, /obj/item/attachable/stock/r4t, /obj/item/attachable/magnetic_harness/lever_sling, /obj/item/ammo_magazine/lever_action, /obj/item/ammo_magazine/lever_action/training, /obj/item/storage/belt/shotgun/lever_action, /obj/item/storage/belt/gun/m44/lever_action/attach_holster, /obj/item/device/motiondetector/m717)
 
@@ -126,7 +126,7 @@
 
 /obj/item/storage/box/guncase/xm88
 	name = "\improper XM88 heavy rifle case"
-	desc = "A gun case containing the XM88 Heavy Rifle, a prototype weapon designed for use against heavily armored infantry targets and light vehicles. Contains an ammunition belt, two boxes of ammunition, the XS-9 Targeting Relay attachment, and the stock for the rifle."
+	desc = "A gun case containing a XM88 Heavy Rifle, a prototype weapon designed for use against heavily armored infantry targets and light vehicles. Contains an ammunition belt, two boxes of ammunition, the XS-9 Targeting Relay attachment, and the stock for the rifle."
 	storage_slots = 6
 	can_hold = list(/obj/item/weapon/gun/lever_action/xm88, /obj/item/attachable/stock/xm88, /obj/item/attachable/scope/mini/xm88, /obj/item/ammo_magazine/lever_action/xm88, /obj/item/storage/belt/shotgun/xm88)
 
@@ -141,7 +141,7 @@
 //------------
 /obj/item/storage/box/guncase/flamer
 	name = "\improper M240 incinerator case"
-	desc = "A gun case containing the M240A1 incinerator unit. It does come loaded, but you'll still have to find extra tanks as you go."
+	desc = "A gun case containing a M240A1 incinerator unit. It does come loaded, but you'll still have to find extra tanks as you go."
 	storage_slots = 4
 	can_hold = list(/obj/item/weapon/gun/flamer, /obj/item/ammo_magazine/flamer_tank, /obj/item/attachable/attached_gun/extinguisher)
 
@@ -162,7 +162,7 @@
 //------------
 /obj/item/storage/box/guncase/m56d
 	name = "\improper M56D heavy machine gun case"
-	desc = "A gun case containing the M56D heavy machine gun. You'll need to order resupplies from requisitions or scavenge them on the field. How do they fit all this into a case? Wouldn't you need a crate."
+	desc = "A gun case containing a M56D heavy machine gun. You'll need to order resupplies from requisitions or scavenge them on the field. How do they fit all this into a case? Wouldn't you need a crate."
 	storage_slots = 8
 	can_hold = list(/obj/item/device/m56d_gun, /obj/item/ammo_magazine/m56d, /obj/item/device/m56d_post, /obj/item/tool/wrench, /obj/item/tool/screwdriver, /obj/item/ammo_magazine/m56d, /obj/item/pamphlet/skill/machinegunner, /obj/item/storage/belt/marine/m2c)
 
@@ -179,7 +179,7 @@
 //------------
 /obj/item/storage/box/guncase/m2c
 	name = "\improper M2C heavy machine gun case"
-	desc = "A gun case containing the M2C heavy machine gun. It doesn't come loaded, but it does have spare ammunition. You'll have to order extras from requisitions."
+	desc = "A gun case containing a M2C heavy machine gun. It doesn't come loaded, but it does have spare ammunition. You'll have to order extras from requisitions."
 	storage_slots = 7
 	can_hold = list(/obj/item/pamphlet/skill/machinegunner, /obj/item/device/m2c_gun, /obj/item/ammo_magazine/m2c, /obj/item/storage/belt/marine/m2c, /obj/item/pamphlet/skill/machinegunner)
 
@@ -206,29 +206,37 @@
 
 
 //------------
-/obj/item/storage/box/guncase/pumpshotgun
-	name = "\improper M37A2 Pump Shotgun case"
-	desc = "A gun case containing the M37A2 Pump Shotgun."
-	icon_state = "guncase_red"
-	storage_slots = 4
+/obj/item/storage/box/guncase/shotguncombat
+	name = "\improper MK221 tactical shotgun case"
+	desc = "A gun case containing an unloaded MK221 tactical shotgun, two boxes of 12 gauge buckshot, and one box of 12 gauge slug."
+	icon_state = "guncase"
+	storage_slots = 3
 	can_hold = list(/obj/item/weapon/gun/shotgun/pump, /obj/item/ammo_magazine/shotgun/buckshot, /obj/item/ammo_magazine/shotgun/flechette, /obj/item/ammo_magazine/shotgun/slugs)
 
-/obj/item/storage/box/guncase/pumpshotgun/fill_preset_inventory()
+/obj/item/storage/box/guncase/shotguncombat/fill_preset_inventory()
+	new /obj/item/weapon/gun/shotgun/combat(src)
+	new /obj/item/ammo_magazine/shotgun/buckshot(src)
+	new /obj/item/ammo_magazine/shotgun/slugs(src)
+
+/obj/item/storage/box/guncase/shotgunpump
+	name = "\improper Ithaca 37 pump-action shotgun case"
+	desc = "A gun case containing an unloaded Ithaca 37 pump-action shotgun and one box of 12 gauge USCM Special buckshot."
+	icon_state = "matebacase"
+	storage_slots = 3
+
+/obj/item/storage/box/guncase/shotgun/pump/special/fill_preset_inventory()
 	new /obj/item/weapon/gun/shotgun/pump(src)
-	for(var/i = 1 to 3)
-		var/random_pick = rand(1, 3)
-		switch(random_pick)
-			if(1)
-				new /obj/item/ammo_magazine/shotgun/buckshot(src)
-			if(2)
-				new /obj/item/ammo_magazine/shotgun/flechette(src)
-			if(3)
-				new /obj/item/ammo_magazine/shotgun/slugs(src)
-
-/obj/item/storage/box/guncase/pumpshotgun/special
+	new /obj/item/ammo_magazine/shotgun/buckshot(src)
+	new /obj/item/ammo_magazine/shotgun/slugs(src)
+
+
+/obj/item/storage/box/guncase/shotgunpump/special
+	name = "\improper Ithaca 37 pump-action shotgun case"
+	desc = "A gun case containing an unloaded Ithaca 37 pump-action shotgun and one box of 12 gauge USCM Special buckshot."
+	icon_state = "matebacase"
 	storage_slots = 2
 
-/obj/item/storage/box/guncase/pumpshotgun/special/fill_preset_inventory()
+/obj/item/storage/box/guncase/shotgun/pump/special/fill_preset_inventory()
 	new /obj/item/weapon/gun/shotgun/pump/special(src)
 	new /obj/item/ammo_magazine/shotgun/buckshot/special(src)
 

code/modules/projectiles/guns/shotguns.dm

@@ -1069,8 +1069,8 @@ can cause issues with ammo types getting mixed up during the burst.
 //Shotguns in this category will need to be pumped each shot.
 
 /obj/item/weapon/gun/shotgun/pump
-	name = "customized Ithaca 37 hunting shotgun"
-	desc = "A customized Ithaca 37 hunting shotgun. Its wooden stock has been replaced with a bakelite pistol grip, and its barrel and magazine tube have been cut down to half their lengths for easier handling in close quarters at the cost of magazine size, only fitting four shells and one chambered. Despite it's age, the Ithaca 37, along with a number of other 20th century weapons remain a somewhat common sight given their enduring designs."
+	name = "Ithaca 37 pump-action shotgun"
+	desc = "A customized Ithaca 37 hunting shotgun. Its wooden stock has been replaced with a bakelite pistol grip, and its barrel and magazine tube have been cut down to half their lengths for easier handling in close quarters at the cost of magazine size, only fitting four shells and one chambered."
 	icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi'
 	icon_state = "m37"
 	item_state = "m37"

code/modules/projectiles/magazines/shotguns.dm

@@ -90,12 +90,14 @@ Generic internal magazine. All shotguns will use this or a variation with differ
 Since all shotguns share ammo types, the gun path is going to be the same for all of them. And it
 also doesn't really matter. You can only reload them with handfuls.
 */
+
 /obj/item/ammo_magazine/internal/shotgun
 	name = "shotgun tube"
 	desc = "An internal magazine. It is not supposed to be seen or removed."
 	default_ammo = /datum/ammo/bullet/shotgun/buckshot
 	caliber = "12g"
 	max_rounds = 4
+	current_rounds = 0
 	chamber_closed = 0
 
 /obj/item/ammo_magazine/internal/shotgun/double //For a double barrel.
@@ -118,7 +120,7 @@ also doesn't really matter. You can only reload them with handfuls.
 
 /obj/item/ammo_magazine/internal/shotgun/combat
 	caliber = "12g"
-	max_rounds = 7
+	max_rounds = 6
 
 /obj/item/ammo_magazine/internal/shotgun/combat/riot
 	caliber = "20g"