blank ammo

code/modules/cargo/packs/ammo.dm

@@ -70,6 +70,12 @@
 	cost = 500
 	contains = list(/obj/item/ammo_box/a12g/slug)
 
+/datum/supply_pack/ammo/blank_shells
+	name = "Blank Shell Crate"
+	desc = "Contains a box of blank shells."
+	cost = 500
+	contains = list(/obj/item/ammo_box/a12g/blanks)
+
 /datum/supply_pack/ammo/techshells
 	name = "Unloaded Shotgun Technological Shells Crate"
 	desc = "Contains a box of 7 versatile tech shells, capable of producing a variety of deadly effects for any situation. Some assembly required."

code/modules/projectiles/ammunition/ballistic/shotgun.dm

@@ -46,6 +46,11 @@
 	icon_state = "incendiary"
 	projectile_type = /obj/projectile/bullet/incendiary/shotgun
 
+/obj/item/ammo_casing/shotgun/blank
+	name = "blank shell"
+	projectile_type = /obj/projectile/bullet/pellet/blank
+	custom_materials = list(/datum/material/iron=250)
+
 /obj/item/ammo_casing/shotgun/improvised
 	name = "improvised shell"
 	desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards."

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -238,6 +238,12 @@
 	icon_state = "12gbox-rubbershot"
 	ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
 
+/obj/item/ammo_box/a12g/blanks
+	name = "ammo box (12g blanks)"
+	desc = "A box of 12-gauge blank shells, designed for training."
+	icon_state = "12gbox-rubbershot"
+	ammo_type = /obj/item/ammo_casing/shotgun/blank
+
 /obj/item/ammo_box/c9mm
 	name = "ammo box (9mm)"
 	desc = "A box of standard 9mm ammo."

code/modules/projectiles/projectile/bullets/shotgun.dm

@@ -114,3 +114,9 @@
 	damage = 30
 	armour_penetration = -25
 	tile_dropoff = 3
+
+/obj/projectile/bullet/pellet/blank
+	name = "blank"
+	damage = 30
+	range = 2
+	armour_penetration = -70

code/modules/research/designs.dm

@@ -97,72 +97,71 @@ other types of metals and chemistry for reagents).
 	color = "#8b70ff"
 	illustration = "design"
 	custom_materials = list(/datum/material/iron =300, /datum/material/glass =100)
+	var/disk_name = "Design Disk"
+	var/design_name
 	var/list/blueprints = list()
-	var/list/starting_blueprints = list()
+	var/starting_blueprints = list()
 	var/max_blueprints = 1
 
 /obj/item/disk/design_disk/Initialize()
 	. = ..()
 	pixel_x = base_pixel_x + rand(-5, 5)
 	pixel_y = base_pixel_y + rand(-5, 5)
-	blueprints = new/list(max_blueprints)
+	if(design_name)
+		name = jointext(list(disk_name, design_name), " - ")
+	if(length(starting_blueprints))
+		for(var/design in starting_blueprints)
+			blueprints += new design()
 
 /obj/item/disk/design_disk/adv
 	name = "Advanced Component Design Disk"
+	disk_name = "Advanced Design Disk"
 	color = "#bed876"
 	desc = "A disk for storing device design data for construction in lathes. This one has a little bit of extra storage space."
 	custom_materials = list(/datum/material/iron =300, /datum/material/glass = 100, /datum/material/silver = 50)
 	max_blueprints = 3
 
 /obj/item/disk/design_disk/super
 	name = "Super Component Design Disk"
+	disk_name = "Super Design Disk"
 	color = "#c25454"
 	desc = "A disk for storing device design data for construction in lathes. This one has more extra storage space."
 	custom_materials = list(/datum/material/iron =300, /datum/material/glass = 100, /datum/material/silver = 50, /datum/material/gold = 50)
 	max_blueprints = 5
 
 /obj/item/disk/design_disk/elite
 	name = "Elite Component Design Disk"
+	disk_name = "Elite Design Disk"
 	color = "#333333"
 	desc = "A disk for storing device design data for construction in lathes. This one has absurd amounts of extra storage space."
 	custom_materials = list(/datum/material/iron =300, /datum/material/glass = 100, /datum/material/silver = 100, /datum/material/gold = 100, /datum/material/bluespace = 50)
 	max_blueprints = 10
 
 //Disks with content
 /obj/item/disk/design_disk/ammo_c10mm
-	name = "Design Disk - 10mm Ammo"
+	design_name = "10mm Ammo"
 	desc = "A design disk containing the pattern for a refill box of standard 10mm ammo, used in Stechkin pistols."
-
-/obj/item/disk/design_disk/ammo_c10mm/Initialize()
-	. = ..()
-	blueprints[1] = new /datum/design/c10mm()
-
+	starting_blueprints = (/datum/design/c10mm)
 
 /obj/item/disk/design_disk/disposable_gun
-	name = "design disk - disposable gun"
+	design_name = "Disposable gun"
 	desc = "A design disk containing designs for a cheap and disposable gun."
 	illustration = "gun"
 	max_blueprints = 2
-
-/obj/item/disk/design_disk/disposable_gun/Initialize()
-	. = ..()
-	blueprints[1] = new /datum/design/disposable_gun()
+	starting_blueprints = list(/datum/design/disposable_gun)
 
 /obj/item/disk/design_disk/clip_mechs
-	name = "design disk - CLIP exosuit modifications"
+	design_name = "CLIP exosuit modifications"
 	desc = "A design disk containing specifications for CLIP-custom exosuit conversions."
 	color = "#57b8f0"
 	max_blueprints = 2
-
-/obj/item/disk/design_disk/clip_mechs/Initialize()
-	. = ..()
-	blueprints[1] = new /datum/design/clip_ripley_upgrade()
-	blueprints[2] = new /datum/design/clip_durand_upgrade()
+	starting_blueprints = list(/datum/design/clip_ripley_upgrade, /datum/design/clip_durand_upgrade)
 
 /obj/item/disk/design_disk/ammo_c9mm
-	name = "Design Disk - 9mm Ammo"
+	design_name = "9mm Ammo"
 	desc = "A design disk containing the pattern for a refill box of standard 9mm ammo, used in Commander pistols."
+	starting_blueprints = list(/datum/design/c9mmautolathe)
 
-/obj/item/disk/design_disk/ammo_c9mm/Initialize()
-	. = ..()
-	blueprints[1] = new /datum/design/c9mmautolathe()
+/obj/item/disk/design_disk/blanks
+	design_name = "Blank Ammo"
+	starting_blueprints = list(/datum/design/blank_shell)

code/modules/research/designs/autolathe_designs.dm

@@ -796,6 +796,14 @@
 	build_path = /obj/item/ammo_casing/shotgun/beanbag
 	category = list("initial", "Security", "Ammo")
 
+/datum/design/blank_shell
+	name = "Shotgun Blank"
+	id = "blank_shell"
+	build_type = AUTOLATHE | PROTOLATHE
+	materials = list(/datum/material/iron = 2000)
+	build_path = /obj/item/ammo_casing/shotgun/blank
+	category = list("Security", "Ammo")
+
 /datum/design/riot_dart
 	name = "Foam Riot Dart"
 	id = "riot_dart"