Ballistics Firearm Operations Overhaul and New Improvised Firearms

code/__DEFINES/combat.dm

@@ -213,6 +213,7 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define BOLT_TYPE_NO_BOLT 3
 #define BOLT_TYPE_LOCKING 4
 #define BOLT_TYPE_PUMP 5	//Requires 2 hands to pump, but standard
+#define BOLT_TYPE_TWO_STEP 6 //Pump, but each interaction toggles bolt between locked and unlocked
 // Sawn off nerfs
 #define SAWN_OFF_ACC_PENALTY 25
 #define SAWN_OFF_RECOIL 1

code/datums/components/crafting/recipes.dm

@@ -371,6 +371,19 @@
 	subcategory = CAT_AMMO
 	dangerous_craft = TRUE
 
+/datum/crafting_recipe/improvisedglassslug
+	name = "Glasspack Shotgun Shell"
+	result = /obj/item/ammo_casing/shotgun/improvised/glasspack
+	reqs = list(/obj/item/grenade/chem_grenade = 1,
+				/obj/item/stack/sheet/glass = 1,
+				/obj/item/stack/cable_coil = 1,
+				/datum/reagent/fuel = 10)
+	tools = list(TOOL_SCREWDRIVER)
+	time = 5
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+	dangerous_craft = TRUE
+
 /datum/crafting_recipe/laserslug
 	name = "Scatter Laser Shell"
 	result = /obj/item/ammo_casing/shotgun/laserslug
@@ -383,6 +396,99 @@
 	subcategory = CAT_AMMO
 	dangerous_craft = TRUE
 
+/datum/crafting_recipe/a762improv
+	name = "Improvised 7.62 Cartridge"
+	result = /obj/item/ammo_casing/a762/improv
+	reqs = list(/obj/item/grenade/chem_grenade = 1,
+				/obj/item/stack/sheet/iron = 1,
+				/obj/item/stack/cable_coil = 1,
+				/datum/reagent/fuel = 10)
+	tools = list(TOOL_SCREWDRIVER)
+	time = 5
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+	dangerous_craft = TRUE
+
+/datum/crafting_recipe/a762hotload
+	name = "Hot-Loaded 7.62 Cartridge"
+	result = /obj/item/ammo_casing/a762/improv/hotload
+	reqs = list(/obj/item/grenade/chem_grenade = 1,
+				/obj/item/stack/sheet/iron = 1,
+				/obj/item/stack/cable_coil = 1,
+				/datum/reagent/blackpowder = 10)
+	tools = list(TOOL_SCREWDRIVER)
+	time = 5
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+	dangerous_craft = TRUE
+
+/datum/crafting_recipe/improv9mm_pack
+	name = "Improvised 9mm Ammo Pack"
+	result = /obj/item/ammo_box/pouch/c9mm/improv
+	reqs = list(/obj/item/grenade/chem_grenade = 2,
+				/obj/item/stack/rods = 3,
+				/obj/item/stack/cable_coil = 3,
+				/datum/reagent/fuel = 20,
+				/obj/item/paper = 1)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	time = 15
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+	dangerous_craft = TRUE
+
+/datum/crafting_recipe/improv10mm_pack
+	name = "Improvised 10mm Ammo Pack"
+	result = /obj/item/ammo_box/pouch/c10mm/improv
+	reqs = list(/obj/item/grenade/chem_grenade = 2,
+				/obj/item/stack/sheet/iron = 2,
+				/obj/item/stack/cable_coil = 2,
+				/datum/reagent/fuel = 20,
+				/obj/item/paper = 1)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	time = 15
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+	dangerous_craft = TRUE
+
+/datum/crafting_recipe/improv38_pack
+	name = "Improvised .38 Ammo Pack"
+	result = /obj/item/ammo_box/pouch/c38/improv
+	reqs = list(/obj/item/grenade/chem_grenade = 2,
+				/obj/item/stack/rods = 2,
+				/obj/item/stack/cable_coil = 2,
+				/datum/reagent/fuel = 20,
+				/obj/item/paper = 1)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	time = 15
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+	dangerous_craft = TRUE
+
+/datum/crafting_recipe/improv357
+	name = "Improvised .357 Cartridge"
+	result = /obj/item/ammo_casing/a357/improv
+	reqs = list(/obj/item/grenade/chem_grenade = 1,
+				/obj/item/stack/sheet/iron = 1,
+				/obj/item/stack/cable_coil = 2,
+				/datum/reagent/blackpowder = 10)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	time = 5
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+	dangerous_craft = TRUE
+
+/datum/crafting_recipe/pipesmg_mag
+	name = "Pipe Repeater Magazine"
+	result = /obj/item/ammo_box/magazine/pipem9mm
+	reqs = list(/obj/item/grenade/chem_grenade = 1,
+				/obj/item/stock_parts/matter_bin = 1,
+				/obj/item/stack/cable_coil = 3,
+				/obj/item/stack/package_wrap = 3)
+	tools = list(TOOL_WELDER, TOOL_WIRECUTTER)
+	time = 50
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+
 /datum/crafting_recipe/arrow
 	name = "Arrow"
 	result = /obj/item/ammo_casing/caseless/arrow/wood
@@ -428,8 +534,38 @@
 	reqs = list(/obj/item/weaponcrafting/receiver = 1,
 				/obj/item/pipe = 1,
 				/obj/item/weaponcrafting/stock = 1,
+				/obj/item/assembly/igniter = 1,
 				/obj/item/stack/package_wrap = 5)
-	tools = list(TOOL_SCREWDRIVER)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER)
+	time = 100
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+	dangerous_craft = TRUE
+
+/datum/crafting_recipe/piperifle
+	name = "Singleshot Pipe Rifle"
+	result = /obj/item/gun/ballistic/rifle/pipe
+	reqs = list(/obj/item/weaponcrafting/receiver = 1,
+				/obj/item/pipe = 1,
+				/obj/item/weaponcrafting/stock = 1,
+				/obj/item/assembly/igniter = 1,
+				/obj/item/stack/package_wrap = 5)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER)
+	time = 100
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+	dangerous_craft = TRUE
+
+/datum/crafting_recipe/pipesmg
+	name = "Mag-Fed Pipe Repeater"
+	result = /obj/item/gun/ballistic/automatic/pipe_smg
+	reqs = list(/obj/item/weaponcrafting/receiver = 1,
+				/obj/item/pipe = 2,
+				/obj/item/stack/rods = 2,
+				/obj/item/stack/sheet/wood = 2,
+				/obj/item/assembly/igniter = 1,
+				/obj/item/stack/package_wrap = 5)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER)
 	time = 100
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON

code/game/objects/items/shrapnel.dm

@@ -26,6 +26,10 @@
 	name = "\improper .38 DumDum bullet"
 	embedding = list(embed_chance=70, fall_chance=7, jostle_chance=7, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
 
+/obj/item/shrapnel/bullet/shotgun/glass // Improvised glasspack shell
+	name = "glass shard"
+	embedding = list(embed_chance=60, fall_chance=2, jostle_chance=10, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.3, pain_mult=2, jostle_pain_mult=3, rip_time=8)
+
 /obj/projectile/bullet/shrapnel
 	name = "flying shrapnel shard"
 	damage = 9

code/modules/projectiles/ammunition/_ammunition.dm

@@ -63,7 +63,8 @@
 		BB = new projectile_type(src, src)
 
 /obj/item/ammo_casing/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/ammo_box))
+	//Regular boxes of ammo can sweep shells up from the floor, magazines that get insert into guns do not though
+	if(istype(I, /obj/item/ammo_box) && !istype(I, /obj/item/ammo_box/magazine))
 		var/obj/item/ammo_box/box = I
 		if(isturf(loc))
 			var/boolets = 0

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

@@ -6,6 +6,14 @@
 	caliber = "10mm"
 	projectile_type = /obj/projectile/bullet/c10mm
 
+/obj/item/ammo_casing/c10mm/improv
+	name = "improvised 10mm bullet casing"
+	desc = "A handmade 10mm bullet casing."
+	caliber = "10mm"
+	projectile_type = /obj/projectile/bullet/c10mm/improv
+	randomspread = TRUE
+	variance = 10 //Shit ammo is inaccurate.
+
 /obj/item/ammo_casing/c10mm/ap
 	name = "10mm armor-piercing bullet casing"
 	desc = "A 10mm armor-piercing bullet casing."
@@ -29,6 +37,12 @@
 	caliber = "9mm"
 	projectile_type = /obj/projectile/bullet/c9mm
 
+/obj/item/ammo_casing/c9mm/improv
+	name = "improvised 9mm bullet casing"
+	desc = "A handmade 9mm bullet casing."
+	randomspread = TRUE
+	variance = 10 //Shit ammo is inaccurate.
+
 /obj/item/ammo_casing/c9mm/ap
 	name = "9mm armor-piercing bullet casing"
 	desc = "A 9mm armor-piercing bullet casing."

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

@@ -12,6 +12,12 @@
 	caliber = "357"
 	projectile_type = /obj/projectile/bullet/a357/match
 
+/obj/item/ammo_casing/a357/improv
+	name = "improv .357 bullet casing"
+	desc = "An improvised .357 bullet casing."
+	projectile_type = /obj/projectile/bullet/a357/improv
+	variance = 15
+
 // 7.62x38mmR (Nagant Revolver)
 
 /obj/item/ammo_casing/n762
@@ -77,6 +83,13 @@
 	icon_state = "sS-casing"
 	projectile_type = /obj/projectile/bullet/c38/emp
 
+/obj/item/ammo_casing/c38/improv
+	name = "improv .38 bullet casing"
+	desc = "An improvised .38 bullet casing."
+	caliber = "38"
+	projectile_type = /obj/projectile/bullet/c38/improv
+	variance = 10
+
 /obj/item/ammo_casing/caseless/mime
 	name = "invisible .38 bullet casing"
 	icon_state = null

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

@@ -1,4 +1,4 @@
-// 7.62 (Nagant Rifle)
+// 7.62 (Nagant Rifle / Pipe Rifle)
 
 /obj/item/ammo_casing/a762
 	name = "7.62 bullet casing"
@@ -7,6 +7,17 @@
 	caliber = "a762"
 	projectile_type = /obj/projectile/bullet/a762
 
+/obj/item/ammo_casing/a762/improv
+	name = "a762 improvised cartridge"
+	desc = "A handmade 7.62 cartidge, made from metal and some other scraps. It reeks of welding fuel."
+	icon_state = "762improv"
+	projectile_type = /obj/projectile/bullet/a762/improv
+
+/obj/item/ammo_casing/a762/improv/hotload
+	name = "7.62 hotload cartridge"
+	desc = "A higher quality handmade 7.62 cartridge. It smells like charcoal."
+	projectile_type = /obj/projectile/bullet/a762/improv/hotload
+
 /obj/item/ammo_casing/a762/enchanted
 	projectile_type = /obj/projectile/bullet/a762_enchanted
 

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

@@ -5,26 +5,30 @@
 	desc = "A 12 gauge lead slug."
 	icon_state = "blshell"
 	caliber = "shotgun"
+	var/high_power = TRUE
 	custom_materials = list(/datum/material/iron=4000)
 	projectile_type = /obj/projectile/bullet/shotgun_slug
 
 /obj/item/ammo_casing/shotgun/beanbag
 	name = "beanbag slug"
 	desc = "A weak beanbag slug for riot control."
 	icon_state = "bshell"
+	high_power = FALSE
 	custom_materials = list(/datum/material/iron=250)
 	projectile_type = /obj/projectile/bullet/shotgun_beanbag
 
 /obj/item/ammo_casing/shotgun/incendiary
 	name = "incendiary slug"
 	desc = "An incendiary-coated shotgun slug."
 	icon_state = "ishell"
+	high_power = FALSE
 	projectile_type = /obj/projectile/bullet/incendiary/shotgun
 
 /obj/item/ammo_casing/shotgun/dragonsbreath
 	name = "dragonsbreath shell"
 	desc = "A shotgun shell which fires a spread of incendiary pellets."
 	icon_state = "ishell2"
+	high_power = FALSE
 	projectile_type = /obj/projectile/bullet/incendiary/shotgun/dragonsbreath
 	pellets = 4
 	variance = 35
@@ -68,6 +72,7 @@
 	name = "rubber shot"
 	desc = "A shotgun casing filled with densely-packed rubber balls, used to incapacitate crowds from a distance."
 	icon_state = "bshell"
+	high_power = FALSE
 	projectile_type = /obj/projectile/bullet/pellet/shotgun_rubbershot
 	pellets = 6
 	variance = 20
@@ -77,6 +82,7 @@
 	name = "custom incapacitating shot"
 	desc = "A shotgun casing filled with... something. used to incapacitate targets."
 	icon_state = "bountyshell"
+	high_power = FALSE
 	projectile_type = /obj/projectile/bullet/pellet/shotgun_incapacitate
 	pellets = 12//double the pellets, but half the stun power of each, which makes this best for just dumping right in someone's face.
 	variance = 20
@@ -86,11 +92,20 @@
 	name = "improvised shell"
 	desc = "A shotgun shell improvised from small metal shards. It won't travel as far as a regular shotgun shell, but it will still pack a punch against unarmoured opponents at close ranges."
 	icon_state = "improvshell"
+	high_power = FALSE
 	projectile_type = /obj/projectile/bullet/pellet/shotgun_improvised
 	custom_materials = list(/datum/material/iron=250)
 	pellets = 9
 	variance = 15
 
+/obj/item/ammo_casing/shotgun/improvised/glasspack
+	name = "improvised glass-packed shell"
+	desc = "An extremely weak shotgun shell that's been filled with shards of glass instead of metal pellets."
+	projectile_type = /obj/projectile/bullet/pellet/shotgun_glass
+	custom_materials = list(/datum/material/iron=100, /datum/material/glass=100)
+	pellets = 5
+	variance = 15
+
 /obj/item/ammo_casing/shotgun/ion
 	name = "ion shell"
 	desc = "An advanced shotgun shell which uses a subspace ansible crystal to produce an effect similar to a standard ion rifle. \
@@ -118,6 +133,7 @@
 	name = "shotgun dart"
 	desc = "A dart for use in shotguns. Can be injected with up to 30 units of any chemical."
 	icon_state = "cshell"
+	high_power = FALSE
 	projectile_type = /obj/projectile/bullet/dart
 	var/reagent_amount = 30
 
@@ -131,6 +147,7 @@
 /obj/item/ammo_casing/shotgun/dart/noreact
 	name = "cryostasis shotgun dart"
 	desc = "A dart for use in shotguns, using similar technology as cryostatis beakers to keep internal reagents from reacting. Can be injected with up to 10 units of any chemical."
+	high_power = FALSE
 	icon_state = "cnrshell"
 	reagent_amount = 10
 
@@ -140,6 +157,7 @@
 
 /obj/item/ammo_casing/shotgun/dart/bioterror
 	desc = "A shotgun dart filled with deadly toxins."
+	high_power = FALSE
 
 /obj/item/ammo_casing/shotgun/dart/bioterror/Initialize(mapload)
 	. = ..()
@@ -153,5 +171,6 @@
 	name = "breaching slug"
 	desc = "A 12 gauge anti-material slug. Great for breaching airlocks and windows with minimal shots."
 	icon_state = "breacher"
+	high_power = FALSE
 	projectile_type = /obj/projectile/bullet/shotgun_breaching
 	custom_materials = list(/datum/material/iron=4000)