[WIP] [TM ONLY] Full weapon suite re-sprite, re-style, NCR resprite

_maps/RandomZLevels/VR/yuma_VR.dmm

@@ -1930,7 +1930,6 @@
 /obj/item/gun/ballistic/shotgun/automatic/combat/auto5,
 /obj/item/gun/ballistic/shotgun/automatic/combat/citykiller,
 /obj/item/gun/ballistic/shotgun/automatic/combat/shotgunlever,
-/obj/item/gun/ballistic/shotgun/automatic/combat/neostead,
 /obj/item/gun/ballistic/shotgun/hunting,
 /obj/item/gun/ballistic/shotgun/police,
 /turf/open/floor/holofloor/plating,

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -467,9 +467,9 @@
 	subcategory = CAT_WEAPON
 
 
-//browning hi-power
+//stallard js-9
 /datum/crafting_recipe/ninemil
-	name = "9mm Pistol"
+	name = "Cheap 9mm Pistol"
 	result = /obj/item/gun/ballistic/automatic/pistol/ninemil
 	reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
 				/obj/item/stack/crafting/metalparts = 1,
@@ -482,7 +482,7 @@
 
 //m1911
 /datum/crafting_recipe/m1911
-	name = "M1911"
+	name = ".45 Auto pistol"
 	result = /obj/item/gun/ballistic/automatic/pistol/m1911
 	reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
 				/obj/item/stack/crafting/metalparts = 2,
@@ -560,7 +560,7 @@
 
 //remington rifle
 /datum/crafting_recipe/remingtonhuntingrifle
-	name = "Hunting Rifle"
+	name = "upgraded hunting rifle"
 	result = /obj/item/gun/ballistic/rifle/hunting/remington
 	reqs = list(/obj/item/stack/crafting/goodparts = 2,
 				/obj/item/stack/crafting/metalparts = 2,
@@ -573,7 +573,7 @@
 
 //battle rifle
 /datum/crafting_recipe/m1garand
-	name = "M1 Garand"
+	name = "Battle Rifle"
 	result = /obj/item/gun/ballistic/automatic/m1garand
 	reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
 				/obj/item/stack/crafting/metalparts = 2,
@@ -767,7 +767,7 @@
 	always_available = FALSE
 
 /datum/crafting_recipe/gaussrifle
-	name = "M72 Gauss Rifle"
+	name = "Gauss Rifle"
 	result = /obj/item/gun/ballistic/automatic/m72
 	reqs = list(/obj/item/stack/sheet/metal = 15,
 				/obj/item/advanced_crafting_components/flux = 1,
@@ -784,21 +784,6 @@
 	subcategory = CAT_WEAPON
 	always_available = FALSE
 
-/datum/crafting_recipe/neostead
-	name = "Neostead 2000"
-	result = /obj/item/gun/ballistic/shotgun/automatic/combat/neostead_noalt
-	reqs = list(/obj/item/stack/sheet/metal = 10,
-				/obj/item/advanced_crafting_components/assembly = 1,
-				/obj/item/advanced_crafting_components/alloys = 1,
-				/obj/item/advanced_crafting_components/receiver = 1,
-				/obj/item/stack/crafting/goodparts = 15,
-				)
-	tools = list(TOOL_AWORKBENCH)
-	time = 120
-	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
-	always_available = FALSE
-
 /datum/crafting_recipe/auto5
 	name = "Browning Auto 5"
 	result = /obj/item/gun/ballistic/shotgun/automatic/combat/auto5
@@ -978,7 +963,7 @@
 
 //Grease gun
 /datum/crafting_recipe/greasegun
-	name = "Grease Gun"
+	name = "Cheap .45 Auto SMG"
 	result = /obj/item/gun/ballistic/automatic/smg/greasegun
 	reqs = list(/obj/item/stack/sheet/metal = 5,
 				/obj/item/stack/crafting/metalparts = 3,
@@ -1004,7 +989,7 @@
 
 //Uzi
 /datum/crafting_recipe/uzi
-	name = "Uzi"
+	name = "9mm SMG"
 	result = /obj/item/gun/ballistic/automatic/smg/uzi
 	reqs = list(/obj/item/stack/sheet/metal = 5,
 				/obj/item/advanced_crafting_components/assembly = 1,
@@ -1034,7 +1019,7 @@
 
 //Thompson
 /datum/crafting_recipe/thompson
-	name = "Thompson"
+	name = ".45 Auto SMG"
 	result = /obj/item/gun/ballistic/automatic/smg/thompson
 	reqs = list(/obj/item/stack/sheet/metal = 5,
 				/obj/item/advanced_crafting_components/assembly = 1,
@@ -1094,7 +1079,7 @@
 
 //R91 Assault Rifle
 /datum/crafting_recipe/r91
-	name = "R91 Assault Rifle"
+	name = "Assault Rifle"
 	result = /obj/item/gun/ballistic/automatic/assault_rifle/r91
 	reqs = list(/obj/item/stack/sheet/metal = 5,
 				/obj/item/advanced_crafting_components/assembly = 1,
@@ -1110,7 +1095,7 @@
 
 //Type 93 Assault Rifle
 /datum/crafting_recipe/type93
-	name = "Type 93 Assault Rifle"
+	name = "Chinese Assault Rifle"
 	result = /obj/item/gun/ballistic/automatic/assault_rifle/type93
 	reqs = list(/obj/item/stack/sheet/metal = 10,
 				/obj/item/advanced_crafting_components/assembly = 1,
@@ -1125,7 +1110,7 @@
 
 //R84 LMG
 /datum/crafting_recipe/r84
-	name = "R84 LMG"
+	name = "Light Machine Gun"
 	result = /obj/item/gun/ballistic/automatic/lmg/r84
 	reqs = list(/obj/item/stack/sheet/metal = 10,
 				/obj/item/advanced_crafting_components/assembly = 1,
@@ -1141,7 +1126,7 @@
 
 //Type 88 LMG
 /datum/crafting_recipe/type88
-	name = "Type 88 LMG"
+	name = "Chinese LMG"
 	result = /obj/item/gun/ballistic/automatic/lmg/type88
 	reqs = list(/obj/item/stack/sheet/metal = 20,
 				/obj/item/advanced_crafting_components/assembly = 1,
@@ -1220,7 +1205,7 @@
 
 //aer9
 /datum/crafting_recipe/AER9
-	name = "AER-9"
+	name = "Laser Rifle"
 	result = /obj/item/gun/energy/laser/aer9
 	reqs = list(/obj/item/stack/sheet/metal = 15,
 				/obj/item/advanced_crafting_components/lenses = 1,

code/game/objects/effects/spawners/bundle.dm

@@ -171,7 +171,7 @@
 	return INITIALIZE_HINT_QDEL
 
 /obj/effect/spawner/bundle/crate/mosin
-	name = "Mosin-Nagant spawner"
+	name = "M1903 spawner"
 	items = list(
 		/obj/item/gun/ballistic/rifle/mosin,
 		/obj/item/ammo_box/a762mm

code/game/objects/items/granters.dm

@@ -826,11 +826,6 @@
 	icon_state = "blueprint2"
 	crafting_recipe_types = list(/datum/crafting_recipe/scoutcarbine)
 
-/obj/item/book/granter/crafting_recipe/blueprint/neostead
-	name = "neostead 2000 blueprint"
-	icon_state = "blueprint2"
-	crafting_recipe_types = list(/datum/crafting_recipe/neostead)
-
 /obj/item/book/granter/crafting_recipe/blueprint/gauss
 	name = "gauss rifle blueprint"
 	icon_state = "blueprint2"

code/modules/fallout/f13lootdrop.dm

@@ -857,6 +857,7 @@
 	name = "very low tier non-hobo ballistic gun"
 	icon_state = "gunverylow_loot"
 	loot = list(/obj/effect/spawner/bundle/f13/ninemil,
+				/obj/effect/spawner/bundle/f13/js45,
 				/obj/effect/spawner/bundle/f13/caravan_shotgun,
 				/obj/effect/spawner/bundle/f13/remington,
 				/obj/effect/spawner/bundle/f13/widowmaker,
@@ -868,11 +869,13 @@
 	name = "low tier ballistic gun"
 	icon_state = "gunlow_loot"
 	loot = list(/obj/effect/spawner/bundle/f13/m1911,
+				/obj/effect/spawner/bundle/f13/js45,
 				/obj/effect/spawner/bundle/f13/thatgun,
 				/obj/effect/spawner/bundle/f13/n99,
 				/obj/effect/spawner/bundle/f13/colt357,
 				/obj/effect/spawner/bundle/f13/huntingshotgun,
 				/obj/effect/spawner/bundle/f13/police_pistol,
+				/obj/effect/spawner/bundle/f13/beretta,
 				/obj/effect/spawner/bundle/f13/beretta/select,
 				)
 
@@ -997,7 +1000,7 @@
 				)
 
 /obj/effect/spawner/bundle/f13/mosin
-	name = "mosin nagant and ammo spawner"
+	name = "m1903 and ammo spawner"
 	items = list(
 				/obj/item/gun/ballistic/rifle/mosin,
 				/obj/item/ammo_box/a762mm
@@ -1024,6 +1027,13 @@
 				/obj/item/ammo_box/magazine/m45
 				)
 
+/obj/effect/spawner/bundle/f13/js45
+	name = "js45 and ammo spawner"
+	items = list(
+			/obj/item/gun/ballistic/automatic/pistol/m1911/compact,
+			/obj/item/ammo_box/magazine/m45
+			)
+
 /obj/effect/spawner/bundle/f13/ninemil
 	name = "9mm pistol and ammo spawner"
 	items = list(
@@ -1263,7 +1273,7 @@
 				)
 
 /obj/effect/spawner/bundle/f13/beretta/select
-	name = "select-fire beretta pistol and ammo spawner"
+	name = "select-fire vp70 pistol and ammo spawner"
 	items = list(
 				/obj/item/gun/ballistic/automatic/pistol/beretta/automatic,
 				/obj/item/ammo_box/magazine/m9mmds/
@@ -1283,13 +1293,6 @@
 				/obj/item/ammo_box/magazine/m14mm
 	)
 
-/obj/effect/spawner/bundle/f13/neostead
-	name = "Neostead 2000 shotgun and ammo spawner"
-	items = list(
-				/obj/item/gun/ballistic/shotgun/automatic/combat/neostead_noalt,
-				/obj/item/ammo_box/shotgun/buck
-	)
-
 /obj/effect/spawner/bundle/f13/auto5
 	name = "Auto 5 shotgun and ammo spawner"
 	items = list(
@@ -2334,7 +2337,6 @@
 	icon_state = "blueprint_loot"
 	lootcount = 1
 	loot = list(
-		/obj/item/book/granter/crafting_recipe/blueprint/neostead,
 		/obj/item/book/granter/crafting_recipe/blueprint/riotshotgun,
 		/obj/item/book/granter/crafting_recipe/blueprint/sniper,
 		/obj/item/book/granter/crafting_recipe/blueprint/brushgun,

code/modules/fallout/storage/boxes.dm

@@ -74,7 +74,7 @@ list(/obj/item/stack/sheet/metal = 20,
 						)
 	var/randomgun2 = pick(
 						/obj/item/book/granter/crafting_recipe/blueprint/rangemaster,
-						/obj/item/book/granter/crafting_recipe/blueprint/neostead,
+						/obj/item/book/granter/crafting_recipe/blueprint/citykiller,
 						)
 	var/randomgun3 = pick(
 						/obj/item/book/granter/crafting_recipe/blueprint/riotshotgun,

code/modules/jobs/job_types/enclave.dm

@@ -296,7 +296,7 @@
 
 	loadout_options = list(
 		/datum/outfit/loadout/sgt_plasrifle,	// Plasma rifle + Mk23
-		/datum/outfit/loadout/sgt_cqc, //Neostead + Plaspistol
+		/datum/outfit/loadout/sgt_cqc, // citykiller + Plaspistol
 		/datum/outfit/loadout/sgt_classic, // AK-112 + Plaspistol
 		)
 
@@ -332,7 +332,7 @@
 
 /datum/outfit/loadout/sgt_cqc
 	name = "Close Quarters Assaultman"
-	suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/neostead
+	suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/citykiller
 	backpack_contents = list(
 		/obj/item/ammo_box/shotgun/slug = 2,
 		/obj/item/ammo_box/shotgun/buck = 2,

code/modules/jobs/job_types/ncr.dm

@@ -212,7 +212,7 @@ Weapons		Service Rifle, Grease Gun, 9mm pistol, all good.
 
 /datum/outfit/loadout/ncrcptshotgun
 	name = "Frontliner"
-	suit_store = /obj/item/gun/ballistic/automatic/shotgun/pancor
+	suit_store = /obj/item/gun/ballistic/automatic/shotgun/caws
 	backpack_contents = list(
 		/obj/item/ammo_box/magazine/d12g = 3,
 	)

code/modules/projectiles/boxes_magazines/external/rifle.dm

@@ -42,7 +42,8 @@
 	icon_state = "autopipe_belt-[round(ammo_count(),9)]"
 
 /obj/item/ammo_box/magazine/m556mm
-	name = "rifle magazine (5.56mm)"
+	name = "twenty-round magazine (5.56mm)"
+	desc = "An Armalite-style magazine meant for 5.56x45mm or .223 Remington ammo. Holds twenty rounds, ideal for infantrymen."
 	icon = 'icons/fallout/objects/guns/ammo.dmi'
 	icon_state = "mrifle"
 	ammo_type = /obj/item/ammo_casing/a556mm
@@ -55,24 +56,26 @@
 	start_empty = 1
 
 /obj/item/ammo_box/magazine/m556mm/small
-	name = "small rifle magazine (5.56mm)"
+	name = "ten-round rifle magazine (5.56mm)"
+	desc = "An Armalite-style magazine meant for 5.56x45mm or .223 Remington ammo. Holds ten rounds, ideal for hunting and target shooting."
 	icon_state = "mriflesmall"
 	max_ammo = 10
 
 /obj/item/ammo_box/magazine/m556mm/small/empty
 	start_empty = 1
 
 /obj/item/ammo_box/magazine/m556mm/extended
-	name = "extended rifle magazine (5.56mm)"
+	name = "thirty-round magazine (5.56mm)"
+	desc = "An Armalite-style magazine meant for 5.56x45mm or .223 Remington ammo. Holds thirty rounds, ideal for modern warfare."
 	icon_state = "mrifleext"
 	max_ammo = 30
 
 /obj/item/ammo_box/magazine/m556mm/extended/empty
 	start_empty = 1
 
 /obj/item/ammo_box/magazine/m556mm/drum
-	name = "rifle drum magazine (5.56mm)"
-	desc = "A large drum magazine chambered for 5.56."
+	name = "fifty-round magazine (5.56mm)"
+	desc = "An Armalite-style magazine with a reinforced spring meant for 5.56x45mm or .223 Remington ammo. Holds fifty rounds, ideal for suppressive fire."
 	icon_state = "mdrum"
 	max_ammo = 50
 	w_class = WEIGHT_CLASS_NORMAL

code/modules/projectiles/boxes_magazines/internal/revolver.dm

@@ -85,14 +85,18 @@
 	name = "10mm pistol cylinder"
 	ammo_type = /obj/item/ammo_casing/c10mm
 	caliber = "10mm"
-	max_ammo = 12
+	max_ammo = 8
 
 /obj/item/ammo_box/magazine/internal/cylinder/rev44
 	name = "44 magnum cylinder"
 	ammo_type = /obj/item/ammo_casing/m44
 	caliber = "44"
 	max_ammo = 6
 
+/obj/item/ammo_box/magazine/internal/cylinder/rev44/percussion
+	name = "44 ball cylinder"
+	max_ammo = 5
+
 /obj/item/ammo_box/magazine/internal/cylinder/rev357
 	name = "357 magnum cylinder"
 	ammo_type = /obj/item/ammo_casing/a357

code/modules/projectiles/gun.dm

@@ -1130,7 +1130,7 @@ CODE FOR RESKIN
 						)
 
 
-DUAL TUBE PUMP ACTION (seems redundant with neostead but why not keep it.)
+DUAL TUBE PUMP ACTION (seems redundant with x but why not keep it.)
 /obj/item/gun/ballistic/shotgun/automatic/dual_tube/examine(mob/user)
 	. = ..()
 	. += "<span class='notice'>Alt-click to pump it.</span>"