Assortment of Gun Overhaul fixes and QOL changes

mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm

@@ -1,83 +1,83 @@
 /datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/magazine/tier0
-	path = /obj/item/ammo_magazine/fivefiftysix/handmade
+	path = /obj/item/ammo_magazine/fivefiftysix/tierzero
 
 /datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/box/tier0
-	path = /obj/item/ammo_magazine/box_fivefiftysix/handmade
+	path = /obj/item/ammo_magazine/box_fivefiftysix/tierzero
 
 /datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/magazine/tier1
-	path = /obj/item/ammo_magazine/fivefiftysix/simple
+	path = /obj/item/ammo_magazine/fivefiftysix/tierone
 
 /datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/box/tier1
-	path = /obj/item/ammo_magazine/box_fivefiftysix/simple
+	path = /obj/item/ammo_magazine/box_fivefiftysix/tierone
 
 /datum/fabricator_recipe/protolathe/ammunition/twentytwolr/magazine/tier0
-	path = /obj/item/ammo_magazine/twentytwolr/handmade
+	path = /obj/item/ammo_magazine/twentytwolr/tierzero
 
 /datum/fabricator_recipe/protolathe/ammunition/twentytwolr/box/tier0
-	path = /obj/item/ammo_magazine/box_twentytwolr/handmade
+	path = /obj/item/ammo_magazine/box_twentytwolr/tierzero
 
 /datum/fabricator_recipe/protolathe/ammunition/twentytwolr/magazine/tier1
-	path = /obj/item/ammo_magazine/twentytwolr/simple
+	path = /obj/item/ammo_magazine/twentytwolr/tierone
 
 /datum/fabricator_recipe/protolathe/ammunition/twentytwolr/box/tier1
-	path = /obj/item/ammo_magazine/box_twentytwolr/simple
+	path = /obj/item/ammo_magazine/box_twentytwolr/tierone
 
 /datum/fabricator_recipe/protolathe/ammunition/fortyfive/magazine/tier0
-	path = /obj/item/ammo_magazine/fortyfive/handmade
+	path = /obj/item/ammo_magazine/fortyfive/tierzero
 
 /datum/fabricator_recipe/protolathe/ammunition/fortyfive/box/tier0
-	path = /obj/item/ammo_magazine/box_fortyfive/handmade
+	path = /obj/item/ammo_magazine/box_fortyfive/tierzero
 
 /datum/fabricator_recipe/protolathe/ammunition/fortyfive/magazine/tier1
-	path = /obj/item/ammo_magazine/fortyfive/simple
+	path = /obj/item/ammo_magazine/fortyfive/tierone
 
 /datum/fabricator_recipe/protolathe/ammunition/fortyfive/box/tier1
-	path = /obj/item/ammo_magazine/box_fortyfive/simple
+	path = /obj/item/ammo_magazine/box_fortyfive/tierone
 
 /datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/slug/tier0
-	path = /obj/item/ammo_magazine/box_twelvegauge/slug/handmade
+	path = /obj/item/ammo_magazine/box_twelvegauge/slug/tierzero
 
 /datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/buckshot/tier0
-	path = /obj/item/ammo_magazine/box_twelvegauge/buckshot/handmade
+	path = /obj/item/ammo_magazine/box_twelvegauge/buckshot/tierzero
 
 /datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/slug/tier1
-	path = /obj/item/ammo_magazine/box_twelvegauge/slug/simple
+	path = /obj/item/ammo_magazine/box_twelvegauge/slug/tierone
 
 /datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/buckshot/tier1
-	path = /obj/item/ammo_magazine/box_twelvegauge/buckshot/simple
+	path = /obj/item/ammo_magazine/box_twelvegauge/buckshot/tierone
 
 /datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/magazine/tier0
-	path = /obj/item/ammo_magazine/threefiftyseven/handmade
+	path = /obj/item/ammo_magazine/threefiftyseven/tierzero
 
 /datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/box/tier0
-	path = /obj/item/ammo_magazine/box_threefiftyseven/handmade
+	path = /obj/item/ammo_magazine/box_threefiftyseven/tierzero
 
 /datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/magazine/tier1
-	path = /obj/item/ammo_magazine/threefiftyseven/simple
+	path = /obj/item/ammo_magazine/threefiftyseven/tierone
 
 /datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/box/tier1
-	path = /obj/item/ammo_magazine/box_threefiftyseven/simple
+	path = /obj/item/ammo_magazine/box_threefiftyseven/tierone
 
 /datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/magazine/tier2
-	path = /obj/item/ammo_magazine/threefiftyseven/advanced
+	path = /obj/item/ammo_magazine/threefiftyseven/tiertwo
 
 /datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/box/tier2
-	path = /obj/item/ammo_magazine/box_threefiftyseven/advanced
+	path = /obj/item/ammo_magazine/box_threefiftyseven/tiertwo
 
 /datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/slug/tier2
-	path = /obj/item/ammo_magazine/box_twelvegauge/slug/advanced
+	path = /obj/item/ammo_magazine/box_twelvegauge/slug/tiertwo
 
 /datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/buckshot/tier2
-	path = /obj/item/ammo_magazine/box_twelvegauge/buckshot/advanced
+	path = /obj/item/ammo_magazine/box_twelvegauge/buckshot/tiertwo
 
 /datum/fabricator_recipe/protolathe/ammunition/twentytwolr/magazine/tier2
-	path = /obj/item/ammo_magazine/twentytwolr/advanced
+	path = /obj/item/ammo_magazine/twentytwolr/tiertwo
 
 /datum/fabricator_recipe/protolathe/ammunition/twentytwolr/box/tier2
-	path = /obj/item/ammo_magazine/box_twentytwolr/advanced
+	path = /obj/item/ammo_magazine/box_twentytwolr/tiertwo
 
 /datum/fabricator_recipe/protolathe/ammunition/fortyfive/magazine/tier2
-	path = /obj/item/ammo_magazine/fortyfive/advanced
+	path = /obj/item/ammo_magazine/fortyfive/tiertwo
 
 /datum/fabricator_recipe/protolathe/ammunition/fortyfive/box/tier2
-	path = /obj/item/ammo_magazine/box_fortyfive/advanced
+	path = /obj/item/ammo_magazine/box_fortyfive/tiertwo

mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm

@@ -1,68 +1,68 @@
 /datum/fabricator_recipe/protolathe/weapon/tier0/bolt_action
-	path = /obj/item/gun/projectile/bolt_action/handmade/empty
+	path = /obj/item/gun/projectile/bolt_action/tierzero/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier0/revolver
-	path = /obj/item/gun/projectile/revolver/handmade/empty
+	path = /obj/item/gun/projectile/revolver/tierzero/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier0/pistol
-	path = /obj/item/gun/projectile/pistol/handmade/empty
+	path = /obj/item/gun/projectile/pistol/tierzero/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier0/shotgun
-	path = /obj/item/gun/projectile/shotgun/handmade/empty
+	path = /obj/item/gun/projectile/shotgun/tierzero/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier0/laser_rifle
-	path = /obj/item/gun/energy/laser/rifle/handmade
+	path = /obj/item/gun/energy/laser/rifle/tierzero
 
 /datum/fabricator_recipe/protolathe/weapon/tier1/bolt_action
-	path = /obj/item/gun/projectile/bolt_action/simple/empty
+	path = /obj/item/gun/projectile/bolt_action/tierone/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier1/pistol_pocket
-	path = /obj/item/gun/projectile/pistol/pistol_pocket/simple/empty
+	path = /obj/item/gun/projectile/pistol/pistol_pocket/tierone/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier1/pistol
-	path = /obj/item/gun/projectile/pistol/simple/empty
+	path = /obj/item/gun/projectile/pistol/tierone/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier1/pistol_golden
-	path = /obj/item/gun/projectile/pistol/simple/golden/empty
+	path = /obj/item/gun/projectile/pistol/tierone/golden/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier1/revolver
-	path = /obj/item/gun/projectile/revolver/simple/empty
+	path = /obj/item/gun/projectile/revolver/tierone/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier1/shotgun_double
-	path = /obj/item/gun/projectile/shotgun/simple/empty
+	path = /obj/item/gun/projectile/shotgun/tierone/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier1/shotgun_double_sawn
-	path = /obj/item/gun/projectile/shotgun/simple/sawnoff/empty
+	path = /obj/item/gun/projectile/shotgun/tierone/sawnoff/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier1/shotgun_pump
-	path = /obj/item/gun/projectile/shotgun/pump/simple/empty
+	path = /obj/item/gun/projectile/shotgun/pump/tierone/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier1/laser_rifle
-	path = /obj/item/gun/energy/laser/rifle/simple
+	path = /obj/item/gun/energy/laser/rifle/tierone
 
 /datum/fabricator_recipe/protolathe/weapon/tier1/laser_pistol
-	path = /obj/item/gun/energy/laser/pistol/simple
+	path = /obj/item/gun/energy/laser/pistol/tierone
 
 /datum/fabricator_recipe/protolathe/weapon/tier2/laser_rifle
-	path = /obj/item/gun/energy/laser/rifle/advanced
+	path = /obj/item/gun/energy/laser/rifle/tiertwo
 
 /datum/fabricator_recipe/protolathe/weapon/tier2/laser_pistol
-	path = /obj/item/gun/energy/laser/pistol/advanced
+	path = /obj/item/gun/energy/laser/pistol/tiertwo
 
 /datum/fabricator_recipe/protolathe/weapon/tier2/bolt_action
-	path = /obj/item/gun/projectile/bolt_action/advanced/empty
+	path = /obj/item/gun/projectile/bolt_action/tiertwo/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier2/pistol_pocket
-	path = /obj/item/gun/projectile/pistol/pistol_pocket/advanced/empty
+	path = /obj/item/gun/projectile/pistol/pistol_pocket/tiertwo/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier2/pistol
-	path = /obj/item/gun/projectile/pistol/advanced/empty
+	path = /obj/item/gun/projectile/pistol/tiertwo/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier2/revolver
-	path = /obj/item/gun/projectile/revolver/advanced/empty
+	path = /obj/item/gun/projectile/revolver/tiertwo/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier2/smg
-	path = /obj/item/gun/projectile/automatic/smg/advanced/empty
+	path = /obj/item/gun/projectile/automatic/smg/tiertwo/empty
 
 /datum/fabricator_recipe/protolathe/weapon/tier2/shotgun_pump
-	path = /obj/item/gun/projectile/shotgun/pump/advanced/empty
+	path = /obj/item/gun/projectile/shotgun/pump/tiertwo/empty

mods/persistence/modules/projectiles/ammunition/12g/bullets.dm

@@ -33,72 +33,72 @@
 	range_step = 1
 	spread_step = 10
 
-/obj/item/ammo_casing/twelvegauge/slug/handmade
+/obj/item/ammo_casing/twelvegauge/slug/tierzero
 	name = "makeshift 12g slug shell"
 	desc = "12g slug shell of dubious origin. Sports decent armor penetration capabilities and high damage, but suffers from poor range."
 	icon = 'mods/persistence/icons/obj/ammunition/12g/tier0_slug.dmi'
-	projectile_type = /obj/item/projectile/bullet/twelvegauge/handmade
+	projectile_type = /obj/item/projectile/bullet/twelvegauge/tierzero
 
-/obj/item/projectile/bullet/twelvegauge/handmade
+/obj/item/projectile/bullet/twelvegauge/tierzero
 	damage = 40
 	distance_falloff = 5
 	penetration_modifier = 1.1
 
-/obj/item/ammo_casing/twelvegauge/buckshot/handmade
+/obj/item/ammo_casing/twelvegauge/buckshot/tierzero
 	name = "makeshift 12g buckshot shell"
 	desc = "12g buckshot shell of dubious origin. Sports high damage, but suffers from poor armor penetration and very poor range."
 	icon = 'mods/persistence/icons/obj/ammunition/12g/tier0_buckshot.dmi'
-	projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge/handmade
+	projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge/tierzero
 
-/obj/item/projectile/bullet/pellet/twelvegauge/handmade
+/obj/item/projectile/bullet/pellet/twelvegauge/tierzero
 	damage = 10
 	pellets = 6
 	range_step = 1
 	spread_step = 10
 	penetration_modifier = 1.5
 
-/obj/item/ammo_casing/twelvegauge/slug/simple
+/obj/item/ammo_casing/twelvegauge/slug/tierone
 	name = "standard 12g slug shell"
 	desc = "12g slug shell of ancient design. Sports decent armor penetration capabilities and high damage, but suffers from poor range."
 	icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi'
-	projectile_type = /obj/item/projectile/bullet/twelvegauge/simple
+	projectile_type = /obj/item/projectile/bullet/twelvegauge/tierone
 
-/obj/item/projectile/bullet/twelvegauge/simple
+/obj/item/projectile/bullet/twelvegauge/tierone
 	damage = 60
 	distance_falloff = 5
 	penetration_modifier = 0.9
 
-/obj/item/ammo_casing/twelvegauge/buckshot/simple
+/obj/item/ammo_casing/twelvegauge/buckshot/tierone
 	name = "standard 12g buckshot shell"
 	desc = "12g buckshot shell of ancient design. Sports high damage, but suffers from poor armor penetration and very poor range."
 	icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_buckshot.dmi'
-	projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge/simple
+	projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge/tierone
 
-/obj/item/projectile/bullet/pellet/twelvegauge/simple
+/obj/item/projectile/bullet/pellet/twelvegauge/tierone
 	damage = 15
 	pellets = 6
 	range_step = 1
 	spread_step = 10
 	penetration_modifier = 1.3
 
-/obj/item/ammo_casing/twelvegauge/slug/advanced
+/obj/item/ammo_casing/twelvegauge/slug/tiertwo
 	name = "advanced 12g slug shell"
 	desc = "12g slug shell of modern design. Sports good armor penetration capabilities and very high damage, but suffers from unimpressive range."
 	icon = 'mods/persistence/icons/obj/ammunition/12g/tier2_slug.dmi'
-	projectile_type = /obj/item/projectile/bullet/twelvegauge/advanced
+	projectile_type = /obj/item/projectile/bullet/twelvegauge/tiertwo
 
-/obj/item/projectile/bullet/twelvegauge/advanced
+/obj/item/projectile/bullet/twelvegauge/tiertwo
 	damage = 70
 	distance_falloff = 4
 	penetration_modifier = 0.85
 
-/obj/item/ammo_casing/twelvegauge/buckshot/advanced
+/obj/item/ammo_casing/twelvegauge/buckshot/tiertwo
 	name = "advanced 12g buckshot shell"
 	desc = "12g buckshot shell of modern design. Sports incredibly high damage, but suffers from poor armor penetration and poor range."
 	icon = 'mods/persistence/icons/obj/ammunition/12g/tier2_buckshot.dmi'
-	projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge/advanced
+	projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge/tiertwo
 
-/obj/item/projectile/bullet/pellet/twelvegauge/advanced
+/obj/item/projectile/bullet/pellet/twelvegauge/tiertwo
 	damage = 20
 	pellets = 6
 	range_step = 1

mods/persistence/modules/projectiles/ammunition/12g/magazines.dm

@@ -20,74 +20,74 @@
 	icon_state = "box_12g1_buckshot"
 	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot
 
-/obj/item/ammo_magazine/box_twelvegauge/slug/handmade
+/obj/item/ammo_magazine/box_twelvegauge/slug/tierzero
 	name = "packet of makeshift 12g slug shells"
 	desc = "Container of dubious origin intended for holding loose 12g slug shells."
 	icon_state = "box_12g0_slug"
-	origin_tech = "{'combat':1,'materials':1}"
+	origin_tech = "{'combat':5,'materials':5}"
 	material = /decl/material/solid/metal/steel
 	matter = list(
 		/decl/material/solid/organic/plastic = MATTER_AMOUNT_TRACE
 	)
-	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/handmade
+	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/tierzero
 
-/obj/item/ammo_magazine/box_twelvegauge/buckshot/handmade
+/obj/item/ammo_magazine/box_twelvegauge/buckshot/tierzero
 	name = "packet of makeshift 12g buckshot shells"
 	desc = "Container of dubious origin intended for holding loose 12g buckshot shells."
 	icon_state = "box_12g0_buckshot"
-	origin_tech = "{'combat':1,'materials':1}"
+	origin_tech = "{'combat':5,'materials':5}"
 	material = /decl/material/solid/metal/steel
 	matter = list(
 		/decl/material/solid/organic/plastic = MATTER_AMOUNT_TRACE
 	)
-	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/handmade
+	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/tierzero
 
-/obj/item/ammo_magazine/box_twelvegauge/slug/simple
+/obj/item/ammo_magazine/box_twelvegauge/slug/tierone
 	name = "packet of standard 12g slug shells"
 	desc = "Container of ancient design intended for holding loose 12g slug shells."
 	icon_state = "box_12g1_slug"
-	origin_tech = "{'combat':2,'materials':2}"
+	origin_tech = "{'combat':8,'materials':8}"
 	material = /decl/material/solid/metal/steel
 	matter = list(
 		/decl/material/solid/organic/plastic   = MATTER_AMOUNT_REINFORCEMENT,
 		/decl/material/solid/organic/cardboard = MATTER_AMOUNT_TRACE
 	)
-	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/simple
+	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/tierone
 
-/obj/item/ammo_magazine/box_twelvegauge/buckshot/simple
+/obj/item/ammo_magazine/box_twelvegauge/buckshot/tierone
 	name = "packet of standard 12g buckshot shells"
 	desc = "Container of ancient design intended for holding loose 12g buckshot shells."
 	icon_state = "box_12g1_buckshot"
-	origin_tech = "{'combat':2,'materials':2}"
+	origin_tech = "{'combat':8,'materials':8}"
 	material = /decl/material/solid/metal/steel
 	matter = list(
 		/decl/material/solid/organic/plastic   = MATTER_AMOUNT_REINFORCEMENT,
 		/decl/material/solid/organic/cardboard = MATTER_AMOUNT_TRACE
 	)
-	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/simple
+	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/tierone
 
-/obj/item/ammo_magazine/box_twelvegauge/slug/advanced
+/obj/item/ammo_magazine/box_twelvegauge/slug/tiertwo
 	name = "packet of advanced 12g slug shells"
 	desc = "Container of modern design intended for holding loose 12g slug shells."
 	icon_state = "box_12g2_slug"
-	origin_tech = "{'combat':3,'materials':3}"
+	origin_tech = "{'combat':12,'materials':12}"
 	material = /decl/material/solid/metal/steel
 	matter = list(
 		/decl/material/solid/organic/plastic   = MATTER_AMOUNT_REINFORCEMENT,
 		/decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE,
 		/decl/material/solid/organic/cardboard = MATTER_AMOUNT_TRACE
 	)
-	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/advanced
+	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/tiertwo
 
-/obj/item/ammo_magazine/box_twelvegauge/buckshot/advanced
+/obj/item/ammo_magazine/box_twelvegauge/buckshot/tiertwo
 	name = "packet of advanced 12g buckshot shells"
 	desc = "Container of modern design intended for holding loose 12g buckshot shells."
 	icon_state = "box_12g2_buckshot"
-	origin_tech = "{'combat':3,'materials':3}"
+	origin_tech = "{'combat':12,'materials':12}"
 	material = /decl/material/solid/metal/steel
 	matter = list(
 		/decl/material/solid/organic/plastic   = MATTER_AMOUNT_REINFORCEMENT,
 		/decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE,
 		/decl/material/solid/organic/cardboard = MATTER_AMOUNT_TRACE
 	)
-	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/advanced
+	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/tiertwo