ammo expansion + moar guns

mods/persistence/_persistence.dme

@@ -32,11 +32,11 @@
 #include "controllers\subsystems\processing\specifications.dm"
 #include "datums\extensions\extensions.dm"
 #include "datums\extensions\holster.dm"
-#include "datums\inventory_slots\_inventory_slot.dm"
 #include "datums\extensions\label.dm"
 #include "datums\extensions\lockable.dm"
 #include "datums\extensions\assembly\assembly.dm"
 #include "datums\extensions\eye\area_control.dm"
+#include "datums\inventory_slots\_inventory_slot.dm"
 #include "datums\mind\mind.dm"
 #include "datums\music_tracks\blood_loss.dm"
 #include "datums\music_tracks\juno.dm"
@@ -132,8 +132,9 @@
 #include "modules\fabrication\_fabricator.dm"
 #include "modules\fabrication\fabricator_build.dm"
 #include "modules\fabrication\fabricator_intake.dm"
-#include "modules\fabrication\designs\textile\space.dm"
+#include "modules\fabrication\designs\protolathe\designs_ammunition.dm"
 #include "modules\fabrication\designs\protolathe\designs_weapons.dm"
+#include "modules\fabrication\designs\textile\space.dm"
 #include "modules\hydroponics\grown.dm"
 #include "modules\hydroponics\grown_indedible.dm"
 #include "modules\hydroponics\seed_machines.dm"
@@ -222,20 +223,31 @@
 #include "modules\power\fuel_assembly\fuel_assembly.dm"
 #include "modules\power\fusion\fuel_injector.dm"
 #include "modules\projectiles\ammunition.dm"
+#include "modules\projectiles\overrides.dm"
+#include "modules\projectiles\ammunition\5.56\bullets.dm"
+#include "modules\projectiles\ammunition\5.56\magazines.dm"
+#include "modules\projectiles\ammunition\12g\bullets.dm"
+#include "modules\projectiles\ammunition\12g\magazines.dm"
+#include "modules\projectiles\ammunition\22_LR\bullets.dm"
+#include "modules\projectiles\ammunition\22_LR\magazines.dm"
+#include "modules\projectiles\ammunition\45\bullets.dm"
+#include "modules\projectiles\ammunition\45\magazines.dm"
 #include "modules\projectiles\guns\projectile.dm"
 #include "modules\projectiles\guns\energy\tier0\lasrifle.dm"
 #include "modules\projectiles\guns\energy\tier1\laspistol.dm"
 #include "modules\projectiles\guns\energy\tier1\lasrifle.dm"
 #include "modules\projectiles\guns\projectile\tier0\boltaction.dm"
+#include "modules\projectiles\guns\projectile\tier0\pistol.dm"
 #include "modules\projectiles\guns\projectile\tier0\revolver.dm"
 #include "modules\projectiles\guns\projectile\tier0\shotgun.dm"
 #include "modules\projectiles\guns\projectile\tier1\boltaction.dm"
 #include "modules\projectiles\guns\projectile\tier1\pistol.dm"
 #include "modules\projectiles\guns\projectile\tier1\pistol_gold.dm"
+#include "modules\projectiles\guns\projectile\tier1\pistol_pocket.dm"
 #include "modules\projectiles\guns\projectile\tier1\revolver.dm"
 #include "modules\projectiles\guns\projectile\tier1\shotgun_db.dm"
+#include "modules\projectiles\guns\projectile\tier1\shotgun_db_sawn.dm"
 #include "modules\projectiles\guns\projectile\tier1\shotgun_pump.dm"
-#include "modules\projectiles\overrides.dm"
 #include "modules\reagents\Chemistry-Holder.dm"
 #include "modules\reagents\chems\chems.dm"
 #include "modules\reagents\chems\recipes.dm"

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

@@ -0,0 +1,35 @@
+/datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/magazine/tier0
+	path = /obj/item/ammo_magazine/fivefiftysix/handmade
+
+/datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/box/tier0
+	path = /obj/item/ammo_magazine/box/fivefiftysix/handmade
+
+/datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/magazine/tier1
+	path = /obj/item/ammo_magazine/fivefiftysix/simple
+
+/datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/box/tier1
+	path = /obj/item/ammo_magazine/box/fivefiftysix/simple
+
+/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/magazine/tier0
+	path = /obj/item/ammo_magazine/twentytwolr/handmade
+
+/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/box/tier0
+	path = /obj/item/ammo_magazine/box/twentytwolr/handmade
+
+/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/magazine/tier1
+	path = /obj/item/ammo_magazine/twentytwolr/simple
+
+/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/box/tier1
+	path = /obj/item/ammo_magazine/box/twentytwolr/simple
+
+/datum/fabricator_recipe/protolathe/ammunition/fortyfive/magazine/tier0
+	path = /obj/item/ammo_magazine/fortyfive/handmade
+
+/datum/fabricator_recipe/protolathe/ammunition/fortyfive/box/tier0
+	path = /obj/item/ammo_magazine/box/fortyfive/handmade
+
+/datum/fabricator_recipe/protolathe/ammunition/fortyfive/magazine/tier1
+	path = /obj/item/ammo_magazine/fortyfive/simple
+
+/datum/fabricator_recipe/protolathe/ammunition/fortyfive/box/tier1
+	path = /obj/item/ammo_magazine/box/fortyfive/simple

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

@@ -4,6 +4,9 @@
 /datum/fabricator_recipe/protolathe/weapon/tier0/revolver
 	path = /obj/item/gun/projectile/revolver/handmade/empty
 
+/datum/fabricator_recipe/protolathe/weapon/tier0/pistol
+	path = /obj/item/gun/projectile/pistol/handmade/empty
+
 /datum/fabricator_recipe/protolathe/weapon/tier0/shotgun
 	path = /obj/item/gun/projectile/shotgun/handmade/empty
 
@@ -13,6 +16,9 @@
 /datum/fabricator_recipe/protolathe/weapon/tier1/bolt_action
 	path = /obj/item/gun/projectile/bolt_action/simple/empty
 
+/datum/fabricator_recipe/protolathe/weapon/tier1/pistol_pocket
+	path = /obj/item/gun/projectile/pistol_pocket/simple/empty
+
 /datum/fabricator_recipe/protolathe/weapon/tier1/pistol
 	path = /obj/item/gun/projectile/pistol/simple/empty
 

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

@@ -0,0 +1,82 @@
+#define CALIBER_12G "12g"
+
+/obj/item/ammo_casing/twelvegauge
+	name = "generic 12g shell"
+	desc = "An unsettlingly generic 12g shell."
+	icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi'
+	caliber = CALIBER_12G
+	projectile_type = /obj/item/projectile/bullet/twelvegauge
+
+/obj/item/ammo_casing/twelvegauge/slug
+	name = "generic 12g slug shell"
+	desc = "An unsettlingly generic 12g slug shell."
+	icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi'
+	caliber = CALIBER_12G
+	projectile_type = /obj/item/projectile/bullet/twelvegauge
+
+/obj/item/projectile/bullet/twelvegauge
+	fire_sound = 'sound/weapons/gunshot/shotgun.ogg'
+	damage = 40
+	distance_falloff = 3
+
+/obj/item/ammo_casing/twelvegauge/buckshot
+	name = "generic 12g buckshot shell"
+	desc = "An unsettlingly generic 12g buckshot shell."
+	icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_buckshot.dmi'
+	caliber = CALIBER_12G
+	projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge
+
+/obj/item/projectile/bullet/pellet/twelvegauge
+	fire_sound = 'sound/weapons/gunshot/shotgun.ogg'
+	damage = 10
+	pellets = 6
+	range_step = 1
+	spread_step = 10
+
+/obj/item/ammo_casing/twelvegauge/slug/handmade
+	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
+
+/obj/item/projectile/bullet/twelvegauge/handmade
+	damage = 40
+	distance_falloff = 5
+	penetration_modifier = 1.1
+
+/obj/item/ammo_casing/twelvegauge/buckshot/handmade
+	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
+
+/obj/item/projectile/bullet/pellet/twelvegauge/handmade
+	damage = 10
+	pellets = 6
+	range_step = 1
+	spread_step = 10
+	penetration_modifier = 1.5
+
+/obj/item/ammo_casing/twelvegauge/slug/simple
+	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
+
+/obj/item/projectile/bullet/twelvegauge/simple
+	damage = 60
+	distance_falloff = 5
+	penetration_modifier = 0.9
+
+/obj/item/ammo_casing/twelvegauge/buckshot/simple
+	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
+
+/obj/item/projectile/bullet/pellet/twelvegauge/simple
+	damage = 15
+	pellets = 6
+	range_step = 1
+	spread_step = 10
+	penetration_modifier = 1.3

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

@@ -0,0 +1,67 @@
+/obj/item/ammo_magazine/box/twelvegauge
+	name = "packet of generic 12g shells"
+	desc = "A packet of unsettlingly generic 12g shells."
+	icon_state = "box_12g1_slug"
+	icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi'
+	material = /decl/material/solid/metal/steel
+	caliber = CALIBER_12G
+	ammo_type = /obj/item/ammo_casing/twelvegauge
+	max_ammo = 16
+
+/obj/item/ammo_magazine/box/twelvegauge/slug
+	name = "packet of generic 12g slug shells"
+	desc = "A packet of unsettlingly generic 12g slug shells."
+	icon_state = "box_12g1_slug"
+	ammo_type = /obj/item/ammo_casing/twelvegauge/slug
+
+/obj/item/ammo_magazine/box/twelvegauge/buckshot
+	name = "packet of generic 12g buckshot shells"
+	desc = "A packet of unsettlingly generic 12g buckshot shells."
+	icon_state = "box_12g1_buckshot"
+	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot
+
+/obj/item/ammo_magazine/box/twelvegauge/slug/handmade
+	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}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/handmade
+
+/obj/item/ammo_magazine/box/twelvegauge/buckshot/handmade
+	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}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/handmade
+
+/obj/item/ammo_magazine/box/twelvegauge/slug/simple
+	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}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic   = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/cardboard = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/simple
+
+/obj/item/ammo_magazine/box/twelvegauge/buckshot/simple
+	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}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic   = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/cardboard = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/simple

mods/persistence/modules/projectiles/ammunition/22_LR/bullets.dm

@@ -0,0 +1,35 @@
+#define CALIBER_22LR ".22LR"
+
+/obj/item/ammo_casing/twentytwolr
+	name = "generic .22LR round"
+	desc = "An unsettlingly generic .22LR round."
+	icon = 'mods/persistence/icons/obj/ammunition/22lr/tier1.dmi'
+	caliber = CALIBER_22LR
+	projectile_type = /obj/item/projectile/bullet/twentytwolr
+
+/obj/item/projectile/bullet/twentytwolr
+	fire_sound = 'sound/weapons/gunshot/gunshot_pistol.ogg'
+	damage = 10
+	distance_falloff = 1
+
+/obj/item/ammo_casing/twentytwolr/handmade
+	name = "makeshift .22LR round"
+	desc = ".22 Long Rifle round of dubious origin. Sports poor range and very poor armor penetration due to shoddy construction."
+	icon = 'mods/persistence/icons/obj/ammunition/22lr/tier0.dmi'
+	projectile_type = /obj/item/projectile/bullet/twentytwolr/handmade
+
+/obj/item/projectile/bullet/twentytwolr/handmade
+	damage = 15
+	distance_falloff = 6
+	penetration_modifier = 1.5
+
+/obj/item/ammo_casing/twentytwolr/simple
+	name = "standard .22LR round"
+	desc = ".22 Long Rifle round of ancient design. Sports unimpressive range and poor armor penetration due to low velocity."
+	icon = 'mods/persistence/icons/obj/ammunition/22lr/tier1.dmi'
+	projectile_type = /obj/item/projectile/bullet/twentytwolr/simple
+
+/obj/item/projectile/bullet/twentytwolr/simple
+	damage = 25
+	distance_falloff = 4
+	penetration_modifier = 1.2

mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm

@@ -0,0 +1,66 @@
+/obj/item/ammo_magazine/twentytwolr
+	name = "generic .22LR magazine"
+	desc = "An unsettlingly generic .22LR magazine."
+	icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi'
+	icon_state = "22lr1"
+	mag_type = MAGAZINE
+	caliber = CALIBER_22LR
+	material = /decl/material/solid/metal/steel
+	ammo_type = /obj/item/ammo_casing/twentytwolr
+	initial_ammo = 0
+	max_ammo = 0
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/box/twentytwolr
+	name = "packet of generic .22LR rounds"
+	desc = "A packet of unsettlingly generic .22LR rounds."
+	icon_state = "box_22lr1"
+	icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi'
+	material = /decl/material/solid/metal/steel
+	caliber = CALIBER_22LR
+	ammo_type = /obj/item/ammo_casing/twentytwolr
+	max_ammo = 30
+
+/obj/item/ammo_magazine/twentytwolr/handmade
+	name = "makeshift .22LR magazine"
+	desc = ".22LR magazine of dubious origin. Suffers from reduced capacity due to flimsy materials and shoddy craftsmanship."
+	icon_state = "22lr0"
+	origin_tech = "{'combat':1}"
+	material = /decl/material/solid/plastic
+	ammo_type = /obj/item/ammo_casing/twentytwolr/handmade
+	max_ammo = 5
+
+/obj/item/ammo_magazine/box/twentytwolr/handmade
+	name = "packet of makeshift .22LR rounds"
+	desc = "Container of dubious origin intended for holding loose .22LR rounds."
+	icon_state = "box_22lr0"
+	origin_tech = "{'combat':1,'materials':1}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twentytwolr/handmade
+
+/obj/item/ammo_magazine/twentytwolr/simple
+	name = "standard .22LR magazine"
+	desc = ".22LR magazine of ancient design. Servicable capacity, but outpaced by more modern designs."
+	icon_state = "22lr1"
+	origin_tech = "{'combat':2}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT
+	)
+	ammo_type = /obj/item/ammo_casing/twentytwolr/simple
+	max_ammo = 12
+
+/obj/item/ammo_magazine/box/twentytwolr/simple
+	name = "packet of standard .22LR rounds"
+	desc = "Container of ancient design intended for holding loose .22LR rounds."
+	icon_state = "box_22lr1"
+	origin_tech = "{'combat':2,'materials':2}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic   = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/cardboard = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twentytwolr/simple