pistol compat

lineart, loadout box restrictions, and mapping for new guns

code/game/machinery/vending/vending_types.dm

@@ -261,7 +261,7 @@
 		/obj/item/explosive/grenade/custom/teargas = 40,
 		/obj/item/ammo_magazine/smg/m39/rubber = 40,
 		/obj/item/ammo_magazine/pistol/rubber = 40,
-		/obj/item/ammo_magazine/pistol/mod88/rubber = 40,
+		/obj/item/ammo_magazine/pistol/vp70/rubber = 40,
 		/obj/item/ammo_magazine/rifle/rubber = 40,
 		/obj/item/ammo_magazine/rifle/m4ra/rubber = 40,
 		/obj/item/clothing/head/helmet/marine/MP = 8,

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

@@ -38,7 +38,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer, list(
 
 		list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null),
 		list("M44 Revolver", 0, /obj/item/storage/belt/gun/m44/mp, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
-		list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
+		list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/vp70, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
 		list("M4A3 Pistol", 0, /obj/item/storage/belt/gun/m4a3/commander, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
 		list("VP78 Pistol", 0, /obj/item/storage/belt/gun/m4a3/vp78, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
 

code/game/machinery/vending/vendor_types/requisitions.dm

@@ -311,7 +311,7 @@
 		list("Shotgun Shell Box (Flechette x 100)", 0, /obj/item/ammo_box/magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
 		list("Shotgun Shell Box (Slugs x 100)", 0, /obj/item/ammo_box/magazine/shotgun, VENDOR_ITEM_REGULAR),
 		list("Shotgun Shell Box (16g) (Breaching x 120)", 0, /obj/item/ammo_box/magazine/shotgun/light/breaching, VENDOR_ITEM_REGULAR),
-		list("Magazine Box (88 Mod 4 AP x 16)", 0, /obj/item/ammo_box/magazine/mod88, VENDOR_ITEM_REGULAR),
+		list("Magazine Box (VP70 x 16)", 0, /obj/item/ammo_box/magazine/vp70, VENDOR_ITEM_REGULAR),
 		list("Magazine Box (SU-6 x 16)", 0, /obj/item/ammo_box/magazine/su6, VENDOR_ITEM_REGULAR),
 		list("Magazine Box (VP78 x 16)", 0, /obj/item/ammo_box/magazine/vp78, VENDOR_ITEM_REGULAR),
 		list("Magazine Box (XM51 x 8)", 0, /obj/item/ammo_box/magazine/xm51, VENDOR_ITEM_REGULAR),

code/game/objects/items/storage/misc.dm

@@ -123,6 +123,8 @@
 /obj/item/storage/box/loadout/upp
 	name = "Type 73 storing case"
 	desc = "A small case containing a loaded Type 73, and additional magazines."
+	can_hold = list(/obj/item/weapon/gun/pistol/t73, /obj/item/ammo_magazine/pistol/t73)
+
 /obj/item/storage/box/loadout/upp/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/pistol/t73())
 	for(var/i = 1 to storage_slots - 1)
@@ -131,6 +133,7 @@
 /obj/item/storage/box/loadout/M4A3_custom_loadout
 	name = "M4A3 storage case"
 	desc = "A relatively large storage case containing a loaded M4A3 and additional magazines."
+	can_hold = list(/obj/item/weapon/gun/pistol/m4a3/custom, /obj/item/ammo_magazine/pistol)
 
 /obj/item/storage/box/loadout/M4A3_custom_loadout/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/pistol/m4a3/custom())
@@ -140,6 +143,7 @@
 /obj/item/storage/box/loadout/HG45_civilian_loadout
 	name = "HG 45 'Aguila' storage case"
 	desc = "A relatively large storage case containing a loaded HG 45 'Aguila' and additional magazines."
+	can_hold = list(/obj/item/weapon/gun/pistol/highpower, /obj/item/ammo_magazine/pistol/highpower)
 
 /obj/item/storage/box/loadout/HG45_civilian_loadout/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/pistol/highpower())
@@ -149,6 +153,7 @@
 /obj/item/storage/box/loadout/HG45_marine_loadout
 	name = "HG 45 'Marina' storage case"
 	desc = "A relatively large storage case containing a loaded HG 45 'Marina' and additional magazines."
+	can_hold = list(/obj/item/weapon/gun/pistol/highpower/black, /obj/item/ammo_magazine/pistol/highpower/black)
 
 /obj/item/storage/box/loadout/HG45_marine_loadout/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/pistol/highpower/black())
@@ -158,6 +163,7 @@
 /obj/item/storage/box/loadout/HG44_loadout
 	name = "HG 44 'Automag' storage case"
 	desc = "A relatively large storage case containing a loaded HG 44 'Automag' and additional magazines."
+	can_hold = list(/obj/item/weapon/gun/pistol/highpower/automag, /obj/item/ammo_magazine/pistol/highpower/automag)
 
 /obj/item/storage/box/loadout/HG44_loadout/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/pistol/highpower/automag())
@@ -167,6 +173,7 @@
 /obj/item/storage/box/loadout/Spearhead_loadout
 	name = "Spearhead Armoury storage case"
 	desc = "A relatively large storage case containing a loaded Spearhead Armoury autorevolver and additional speedloaders."
+	can_hold = list(/obj/item/weapon/gun/revolver/spearhead, /obj/item/ammo_magazine/revolver/spearhead)
 
 /obj/item/storage/box/loadout/Spearhead_loadout/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/revolver/spearhead())
@@ -176,6 +183,7 @@
 /obj/item/storage/box/loadout/Spearhead_loadout/custom
 	name = "Spearhead Armoury storage case"
 	desc = "A relatively large storage case containing a loaded Spearhead Armoury autorevolver and additional speedloaders."
+	can_hold = list(/obj/item/weapon/gun/revolver/spearhead/black, /obj/item/ammo_magazine/revolver/spearhead)
 
 /obj/item/storage/box/loadout/Spearhead_loadout/custom/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/revolver/spearhead/black())
@@ -185,6 +193,7 @@
 /obj/item/storage/box/loadout/M1911_loadout
 	name = "M1911 storage case"
 	desc = "A relatively large storage case containing a loaded M1911 and additional magazines."
+	can_hold = list(/obj/item/weapon/gun/pistol/m1911, /obj/item/ammo_magazine/pistol/m1911)
 
 /obj/item/storage/box/loadout/M1911_loadout/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/pistol/m1911())
@@ -194,6 +203,7 @@
 /obj/item/storage/box/loadout/M44_loadout
 	name = "M44 storage case"
 	desc = "A relatively large storage case containing a loaded M44 revolver and additional speedloaders."
+	can_hold = list(/obj/item/weapon/gun/revolver/m44, /obj/item/ammo_magazine/revolver)
 
 /obj/item/storage/box/loadout/M44_loadout/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/revolver/m44())
@@ -203,6 +213,7 @@
 /obj/item/storage/box/loadout/M44_custom_loadout
 	name = "M44 storage case"
 	desc = "A relatively large storage case containing a loaded M44 revolver and additional speedloaders."
+	can_hold = list(/obj/item/weapon/gun/revolver/m44/custom, /obj/item/ammo_magazine/revolver)
 
 /obj/item/storage/box/loadout/M44_custom_loadout/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/revolver/m44/custom())
@@ -215,6 +226,7 @@
 	w_class = SIZE_SMALL
 	max_w_class = SIZE_TINY
 	storage_slots = 4
+	can_hold = list(/obj/item/weapon/gun/pistol/clfpistol, /obj/item/ammo_magazine/pistol/clfpistol)
 
 /obj/item/storage/box/loadout/clf/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/pistol/clfpistol())

code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm

@@ -46,9 +46,9 @@
 	switch(choice)
 		if(1 to 6)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/spearhead, WEAR_IN_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY)
 			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE)
 			new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
 			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK)
@@ -72,9 +72,9 @@
 			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE)
 		if(9 to 10)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/spearhead, WEAR_IN_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY)
 			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5, WEAR_J_STORE)
 			new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
 			new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND)
@@ -104,9 +104,9 @@
 /datum/equipment_preset/synth/survivor/cmb/synth/load_gear(mob/living/carbon/human/new_human)
 	//backpack
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/security, WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/device/autopsy_scanner, WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK)

code/modules/gear_presets/uscm_event.dm

@@ -350,7 +350,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/chief(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp70(new_human), WEAR_WAIST)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/chief(new_human), WEAR_JACKET)
 	if(new_human.disabilities & NEARSIGHTED)
 		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES)

code/modules/gear_presets/uscm_ship.dm

@@ -814,7 +814,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp70(new_human), WEAR_WAIST)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/pilot(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE)

code/modules/projectiles/ammo_boxes/magazine_boxes.dm

@@ -645,15 +645,15 @@
 	overlay_gun_type = "_357"
 	overlay_content = "_speed"
 	num_of_magazines = 12
-	magazine_type = /obj/item/ammo_magazine/revolver/cmb
+	magazine_type = /obj/item/ammo_magazine/revolver/spearhead
 
 /obj/item/ammo_box/magazine/spearhead/empty
 	empty = TRUE
 
 /obj/item/ammo_box/magazine/spearhead/normalpoint
 	name = "speed loaders box (Spearhead x 12)"
 	overlay_ammo_type = "_357_reg"
-	magazine_type = /obj/item/ammo_magazine/revolver/cmb/normalpoint
+	magazine_type = /obj/item/ammo_magazine/revolver/spearhead
 
 /obj/item/ammo_box/magazine/spearhead/normalpoint/empty
 	empty = TRUE