Add new tier of guns and bullets, add .357 caliber, plus minor gun tweaks

mods/persistence/_persistence.dme

@@ -25,13 +25,13 @@
 #include "controllers\subsystems\mapping.dm"
 #include "controllers\subsystems\mining.dm"
 #include "controllers\subsystems\persistence.dm"
+#include "controllers\subsystems\skills.dm"
+#include "controllers\subsystems\initialization\chargen.dm"
+#include "controllers\subsystems\initialization\fabrication.dm"
 #include "controllers\subsystems\persistence\persistence_loading.dm"
 #include "controllers\subsystems\persistence\persistence_saving.dm"
 #include "controllers\subsystems\persistence\persistence_stats.dm"
 #include "controllers\subsystems\persistence\persistence_storage.dm"
-#include "controllers\subsystems\skills.dm"
-#include "controllers\subsystems\initialization\chargen.dm"
-#include "controllers\subsystems\initialization\fabrication.dm"
 #include "controllers\subsystems\processing\specifications.dm"
 #include "datums\extensions\extensions.dm"
 #include "datums\extensions\holster.dm"
@@ -234,12 +234,16 @@
 #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\357\bullets.dm"
+#include "modules\projectiles\ammunition\357\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\energy\tier2\laspistol.dm"
+#include "modules\projectiles\guns\energy\tier2\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"
@@ -252,6 +256,12 @@
 #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\guns\projectile\tier2\boltaction.dm"
+#include "modules\projectiles\guns\projectile\tier2\pistol.dm"
+#include "modules\projectiles\guns\projectile\tier2\pistol_pocket.dm"
+#include "modules\projectiles\guns\projectile\tier2\revolver.dm"
+#include "modules\projectiles\guns\projectile\tier2\shotgun_pump.dm"
+#include "modules\projectiles\guns\projectile\tier2\smg.dm"
 #include "modules\reagents\Chemistry-Holder.dm"
 #include "modules\reagents\chems\chems.dm"
 #include "modules\reagents\chems\recipes.dm"
@@ -282,6 +292,7 @@
 #include "modules\surgery\_surgery.dm"
 #include "modules\world_save\_persistence.dm"
 #include "modules\world_save\load_cache.dm"
+#include "modules\world_save\save_testing.dm"
 #include "modules\world_save\saved_vars.dm"
 #include "modules\world_save\saved_vars\matrix.dm"
 #include "modules\world_save\saved_vars\saved_icon_states.dm"
@@ -294,7 +305,6 @@
 #include "modules\world_save\serializers\one_off_serializer.dm"
 #include "modules\world_save\serializers\sql_serializer.dm"
 #include "modules\world_save\serializers\sql_serializer_db.dm"
-#include "modules\world_save\save_testing.dm"
 #include "modules\world_save\wrappers\_late_wrapper.dm"
 #include "modules\world_save\wrappers\_wrapper.dm"
 #include "modules\world_save\wrappers\_wrapper_holder.dm"

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

@@ -2,46 +2,82 @@
 	path = /obj/item/ammo_magazine/fivefiftysix/handmade
 
 /datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/box/tier0
-	path = /obj/item/ammo_magazine/box/fivefiftysix/handmade
+	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
+	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
+	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
+	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
+	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
+	path = /obj/item/ammo_magazine/box_fortyfive/simple
 
 /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/handmade
 
 /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/handmade
 
 /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/simple
 
 /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/simple
+
+/datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/magazine/tier0
+	path = /obj/item/ammo_magazine/threefiftyseven/handmade
+
+/datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/box/tier0
+	path = /obj/item/ammo_magazine/box_threefiftyseven/handmade
+
+/datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/magazine/tier1
+	path = /obj/item/ammo_magazine/threefiftyseven/simple
+
+/datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/box/tier1
+	path = /obj/item/ammo_magazine/box_threefiftyseven/simple
+
+/datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/magazine/tier2
+	path = /obj/item/ammo_magazine/threefiftyseven/advanced
+
+/datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/box/tier2
+	path = /obj/item/ammo_magazine/box_threefiftyseven/advanced
+
+/datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/slug/tier2
+	path = /obj/item/ammo_magazine/box_twelvegauge/slug/advanced
+
+/datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/buckshot/tier2
+	path = /obj/item/ammo_magazine/box_twelvegauge/buckshot/advanced
+
+/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/magazine/tier2
+	path = /obj/item/ammo_magazine/twentytwolr/advanced
+
+/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/box/tier2
+	path = /obj/item/ammo_magazine/box_twentytwolr/advanced
+
+/datum/fabricator_recipe/protolathe/ammunition/fortyfive/magazine/tier2
+	path = /obj/item/ammo_magazine/fortyfive/advanced
+
+/datum/fabricator_recipe/protolathe/ammunition/fortyfive/box/tier2
+	path = /obj/item/ammo_magazine/box_fortyfive/advanced

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

@@ -42,3 +42,27 @@
 
 /datum/fabricator_recipe/protolathe/weapon/tier1/laser_pistol
 	path = /obj/item/gun/energy/laser/pistol/simple
+
+/datum/fabricator_recipe/protolathe/weapon/tier2/laser_rifle
+	path = /obj/item/gun/energy/laser/rifle/advanced
+
+/datum/fabricator_recipe/protolathe/weapon/tier2/laser_pistol
+	path = /obj/item/gun/energy/laser/pistol/advanced
+
+/datum/fabricator_recipe/protolathe/weapon/tier2/bolt_action
+	path = /obj/item/gun/projectile/bolt_action/advanced/empty
+
+/datum/fabricator_recipe/protolathe/weapon/tier2/pistol_pocket
+	path = /obj/item/gun/projectile/pistol_pocket/advanced/empty
+
+/datum/fabricator_recipe/protolathe/weapon/tier2/pistol
+	path = /obj/item/gun/projectile/pistol/advanced/empty
+
+/datum/fabricator_recipe/protolathe/weapon/tier2/revolver
+	path = /obj/item/gun/projectile/revolver/advanced/empty
+
+/datum/fabricator_recipe/protolathe/weapon/tier2/smg
+	path = /obj/item/gun/projectile/automatic/smg/advanced/empty
+
+/datum/fabricator_recipe/protolathe/weapon/tier2/shotgun_pump
+	path = /obj/item/gun/projectile/shotgun/pump/advanced/empty

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

@@ -79,4 +79,28 @@
 	pellets = 6
 	range_step = 1
 	spread_step = 10
-	penetration_modifier = 1.3
+	penetration_modifier = 1.3
+
+/obj/item/ammo_casing/twelvegauge/slug/advanced
+	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
+
+/obj/item/projectile/bullet/twelvegauge/advanced
+	damage = 70
+	distance_falloff = 4
+	penetration_modifier = 0.85
+
+/obj/item/ammo_casing/twelvegauge/buckshot/advanced
+	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
+
+/obj/item/projectile/bullet/pellet/twelvegauge/advanced
+	damage = 20
+	pellets = 6
+	range_step = 1
+	spread_step = 8
+	penetration_modifier = 1.25

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

@@ -1,4 +1,4 @@
-/obj/item/ammo_magazine/box/twelvegauge
+/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"
@@ -8,19 +8,19 @@
 	ammo_type = /obj/item/ammo_casing/twelvegauge
 	max_ammo = 16
 
-/obj/item/ammo_magazine/box/twelvegauge/slug
+/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
+/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
+/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"
@@ -31,7 +31,7 @@
 	)
 	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/handmade
 
-/obj/item/ammo_magazine/box/twelvegauge/buckshot/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"
@@ -42,7 +42,7 @@
 	)
 	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/handmade
 
-/obj/item/ammo_magazine/box/twelvegauge/slug/simple
+/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"
@@ -54,7 +54,7 @@
 	)
 	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/simple
 
-/obj/item/ammo_magazine/box/twelvegauge/buckshot/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"
@@ -64,4 +64,30 @@
 		/decl/material/solid/plastic   = MATTER_AMOUNT_REINFORCEMENT,
 		/decl/material/solid/cardboard = MATTER_AMOUNT_TRACE
 	)
-	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/simple
+	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/simple
+
+/obj/item/ammo_magazine/box_twelvegauge/slug/advanced
+	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}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic   = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE,
+		/decl/material/solid/cardboard = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/advanced
+
+/obj/item/ammo_magazine/box_twelvegauge/buckshot/advanced
+	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}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic   = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE,
+		/decl/material/solid/cardboard = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/advanced

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

@@ -32,4 +32,14 @@
 /obj/item/projectile/bullet/twentytwolr/simple
 	damage = 25
 	distance_falloff = 4
-	penetration_modifier = 1.2
+	penetration_modifier = 1.2
+
+/obj/item/ammo_casing/twentytwolr/advanced
+	name = "advanced .22LR round"
+	desc = ".22 Long Rifle round of ancient design. Sports mediocre range and unimpressive armor penetration due to low velocity."
+	icon = 'mods/persistence/icons/obj/ammunition/22lr/tier2.dmi'
+	projectile_type = /obj/item/projectile/bullet/twentytwolr/advanced
+
+/obj/item/projectile/bullet/twentytwolr/advanced
+	damage = 30
+	distance_falloff = 3

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

@@ -11,7 +11,7 @@
 	max_ammo = 0
 	multiple_sprites = 1
 
-/obj/item/ammo_magazine/box/twentytwolr
+/obj/item/ammo_magazine/box_twentytwolr
 	name = "packet of generic .22LR rounds"
 	desc = "A packet of unsettlingly generic .22LR rounds."
 	icon_state = "box_22lr1"
@@ -30,7 +30,7 @@
 	ammo_type = /obj/item/ammo_casing/twentytwolr/handmade
 	max_ammo = 5
 
-/obj/item/ammo_magazine/box/twentytwolr/handmade
+/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"
@@ -53,7 +53,7 @@
 	ammo_type = /obj/item/ammo_casing/twentytwolr/simple
 	max_ammo = 12
 
-/obj/item/ammo_magazine/box/twentytwolr/simple
+/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"
@@ -63,4 +63,30 @@
 		/decl/material/solid/plastic   = MATTER_AMOUNT_REINFORCEMENT,
 		/decl/material/solid/cardboard = MATTER_AMOUNT_TRACE
 	)
-	ammo_type = /obj/item/ammo_casing/twentytwolr/simple
+	ammo_type = /obj/item/ammo_casing/twentytwolr/simple
+
+/obj/item/ammo_magazine/twentytwolr/advanced
+	name = "advanced .22LR magazine"
+	desc = ".22LR magazine of modern design. Good capacity, and can be used well with both handguns and submachine guns alike."
+	icon_state = "22lr2"
+	origin_tech = "{'combat':3}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/metal/aluminium = MATTER_AMOUNT_REINFORCEMENT
+	)
+	ammo_type = /obj/item/ammo_casing/twentytwolr/advanced
+	max_ammo = 20
+
+/obj/item/ammo_magazine/box_twentytwolr/advanced
+	name = "packet of advanced .22LR rounds"
+	desc = "Container of modern design intended for holding loose .22LR rounds."
+	icon_state = "box_22lr2"
+	origin_tech = "{'combat':3,'materials':3}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic   = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE,
+		/decl/material/solid/cardboard = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twentytwolr/advanced