Sorts out existing projectile weapons (#22059)

This PR is intended to sort out our existing guns into something
resembling organization. In addition, ancient decrepit guns are removed,
and abstract paths are labeled as such.

In addition, all guns are now standardized to refer to their model.
Considering the huge number of weapons we have, a `pistol` is not
descriptive enough.

NOTE: At over 200 files touched, this is being split. Not everything was
sorted, but this is already a monster to sort through. The rest can
wait.

code/modules/cargo/items/weaponry.dm

@@ -145,7 +145,7 @@
 	description = "The HI L.W.A.P. is an older design of Hephaestus Industries. A designated marksman rifle capable of shooting powerful ionized bolts."
 	price = 2100
 	items = list(
-		/obj/item/gun/energy/sniperrifle
+		/obj/item/gun/energy/rifle/laser/sniper
 	)
 	access = ACCESS_ARMORY
 	container_type = "crate"
@@ -546,14 +546,14 @@
 	groupable = TRUE
 	spawn_amount = 1
 
-/singleton/cargo_item/compacttungstenslug
+/singleton/cargo_item/duslug
 	category = "weaponry"
-	name = "compact tungsten gauss slugs"
+	name = "depleted uranium gauss slugs"
 	supplier = "virgo"
-	description = "A box with several compact tungsten slugs, aimed for use in gauss carbines."
+	description = "A box with several depleted uranium slugs, aimed for use in older gauss rifles."
 	price = 125
 	items = list(
-		/obj/item/storage/box/ammo/tungstenslugs
+		/obj/item/storage/box/ammo/duslugs
 	)
 	access = ACCESS_ARMORY
 	container_type = "crate"

code/modules/clothing/chameleon.dm

@@ -479,9 +479,9 @@
 //**Chameleon Gun**
 //*****************
 /obj/item/gun/energy/chameleon
-	name = "desert eagle"
+	name = "\improper Desert Eagle pistol"
 	desc = null
-	icon = 'icons/obj/guns/deagle.dmi'
+	icon = 'icons/obj/guns/faction/antique/deagle.dmi'
 	icon_state = "deagle"
 	w_class = WEIGHT_CLASS_NORMAL
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)

code/modules/clothing/spacesuits/rig/modules/combat.dm

@@ -126,7 +126,7 @@
 	interface_name = "mounted laser cannon"
 	interface_desc = "A shoulder-mounted cell-powered laser cannon."
 
-	var/gun_type = /obj/item/gun/energy/lasercannon/mounted
+	var/gun_type = /obj/item/gun/energy/rifle/laser/heavy/mounted
 	var/obj/item/gun/gun
 
 /obj/item/rig_module/mounted/New()

code/modules/heavy_vehicle/equipment/combat.dm

@@ -37,7 +37,7 @@
 	desc = "An exosuit-mounted laser rifle. Handle with care."
 	icon_state = "mecha_laser"
 	restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND)
-	holding_type = /obj/item/gun/energy/laser/mounted/mech
+	holding_type = /obj/item/gun/energy/rifle/laser/mounted/mech
 
 /obj/item/mecha_equipment/mounted_system/combat/smg
 	name = "mounted submachinegun"
@@ -107,7 +107,7 @@
 	name = "mounted riot submachine gun"
 	projectile_type = /obj/projectile/bullet/pistol/rubber
 
-/obj/item/gun/energy/laser/mounted/mech
+/obj/item/gun/energy/rifle/laser/mounted/mech
 	use_external_power = TRUE
 	self_recharge = TRUE
 	has_safety = FALSE

code/modules/item_worth/worths_list.dm

@@ -32,12 +32,12 @@ var/list/worths = list(
 					/obj/item/gun/energy/gun = 70,
 					/obj/item/gun/energy/pistol = 55,
 					/obj/item/gun/energy/laser/shotgun = 480,
-					/obj/item/gun/energy/laser/practice = 50,
-					/obj/item/gun/energy/laser = 100,
+					/obj/item/gun/energy/rifle/laser/practice = 50,
+					/obj/item/gun/energy/rifle/laser = 100,
 					/obj/item/gun/energy/retro = 140,
 					/obj/item/gun/energy/captain = 850,
 					/obj/item/gun/energy/xray = 350,
-					/obj/item/gun/energy/sniperrifle = 640,
+					/obj/item/gun/energy/rifle/laser/sniper = 640,
 					/obj/item/gun/energy/lasertag = 1,
 					/obj/item/gun/energy/pulse/pistol = 450,
 					/obj/item/gun/energy/pulse  = 500,
@@ -45,10 +45,8 @@ var/list/worths = list(
 					/obj/item/gun/energy/decloner = 650,
 					/obj/item/gun/energy/floragun = 150,
 					/obj/item/gun/energy/mindflayer = 450,
-					/obj/item/gun/energy/toxgun = 350,
 					/obj/item/gun/energy/mousegun = 200,
 					/obj/item/gun/energy/net = 350,
-					/obj/item/gun/energy/vaurca/bfg = 2000,
 					/obj/item/gun/energy/vaurca/gatlinglaser = 600,
 					/obj/item/gun/energy/vaurca/blaster = 450,
 					/obj/item/gun/energy/vaurca/thermaldrill = 500,
@@ -57,7 +55,7 @@ var/list/worths = list(
 					/obj/item/gun/energy/crossbow/largecrossbow = 160,
 					/obj/item/gun/energy/crossbow = 75,
 					/obj/item/gun/energy/temperature = 300,
-					/obj/item/gun/energy/lawgiver = 700,
+					/obj/item/gun/energy/acp = 700,
 					/obj/item/gun/custom_ka/frame01/prebuilt = 250,
 					/obj/item/gun/custom_ka/frame02/prebuilt = 350,
 					/obj/item/gun/custom_ka/frame03/prebuilt = 450,
@@ -69,7 +67,6 @@ var/list/worths = list(
 					/obj/item/gun/energy/gravity_gun = 450,
 					/obj/item/gun/energy = 210,
 //LAUNCHERS,
-					/obj/item/gun/launcher/spikethrower = 350,
 					/obj/item/gun/launcher/rocket = 800,
 					/obj/item/gun/launcher/crossbow = 12,
 					/obj/item/gun/launcher/pneumatic = 20,

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -953,7 +953,7 @@ GLOBAL_LIST_INIT(robot_modules, list(
 
 /obj/item/robot_module/military/Initialize()
 	. = ..()
-	modules += new /obj/item/gun/energy/laser/mounted(src)
+	modules += new /obj/item/gun/energy/rifle/laser/mounted(src)
 	modules += new /obj/item/melee/hammer/powered(src)
 	modules += new /obj/item/borg/combat/shield(src)
 	modules += new /obj/item/borg/combat/mobility(src)
@@ -962,7 +962,7 @@ GLOBAL_LIST_INIT(robot_modules, list(
 	modules += new /obj/item/extinguisher(src) // For navigating space and/or low grav, and just being useful.
 	modules += new /obj/item/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws.
 	modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to.
-	emag = new /obj/item/gun/energy/lasercannon/mounted(src)
+	emag = new /obj/item/gun/energy/rifle/laser/heavy/mounted(src)
 
 /obj/item/robot_module/drone
 	name = "drone module"
@@ -1216,7 +1216,7 @@ GLOBAL_LIST_INIT(robot_modules, list(
 	modules += new /obj/item/handcuffs/cyborg(src)
 	modules += new /obj/item/melee/baton/robot(src)
 	modules += new /obj/item/melee/hammer/powered(src)
-	modules += new /obj/item/gun/energy/lasercannon/mounted/cyborg/overclocked(src)
+	modules += new /obj/item/gun/energy/rifle/laser/heavy/mounted/cyborg/overclocked(src)
 	modules += new /obj/item/borg/combat/shield(src)
 	modules += new /obj/item/borg/combat/mobility(src)
 	// BST
@@ -1347,7 +1347,7 @@ GLOBAL_LIST_INIT(robot_modules, list(
 	modules += new /obj/item/healthanalyzer(src)
 	modules += new /obj/item/borg/sight/thermal(src)
 	modules += new /obj/item/gun/energy/pulse/mounted(src)
-	modules += new /obj/item/gun/energy/lasercannon/mounted/cyborg/overclocked(src)
+	modules += new /obj/item/gun/energy/rifle/laser/heavy/mounted/cyborg/overclocked(src)
 	modules += new /obj/item/handcuffs/cyborg(src)
 	modules += new /obj/item/melee/baton/robot(src)
 	modules += new /obj/item/tank/jetpack/carbondioxide(src)

code/modules/mob/living/simple_animal/hostile/pirate.dm

@@ -46,7 +46,7 @@
 	rapid = 1
 	projectiletype = /obj/projectile/beam
 	corpse = /obj/effect/landmark/mobcorpse/pirate/ranged
-	weapon1 = /obj/item/gun/energy/laser
+	weapon1 = /obj/item/gun/energy/rifle/laser
 
 
 /mob/living/simple_animal/hostile/pirate/death()

code/modules/projectiles/ammunition/boxes.dm

@@ -151,7 +151,7 @@ If nothing is chosen, reload sounds revert to the default, which is metal_slide_
 /obj/item/ammo_magazine/c45m/dominia
 	name = "dominian service pistol magazine (.45)"
 	desc = "A magazine specifically designed for a Dominian service pistol."
-	icon = 'icons/obj/guns/dominia_pistol.dmi'
+	icon = 'icons/obj/guns/faction/dominian_empire/dominia_pistol.dmi'
 	icon_state = "dom_pistol_mag"
 	max_ammo = 11
 
@@ -445,7 +445,7 @@ If nothing is chosen, reload sounds revert to the default, which is metal_slide_
 /obj/item/ammo_magazine/a556/dlmg
 	name = "MPR-24/5 light machine gun magazine (5.56mm)"
 	max_ammo = 50
-	icon = 'icons/obj/guns/dominia_lmg.dmi'
+	icon = 'icons/obj/guns/faction/dominian_empire/dominia_lmg.dmi'
 	icon_state = "dom_lmg_mag"
 
 /obj/item/ammo_magazine/a65
@@ -524,7 +524,7 @@ If nothing is chosen, reload sounds revert to the default, which is metal_slide_
 
 /obj/item/ammo_magazine/c762/dominia
 	name = "mpr-24/5 carbine magazine (7.62mm)"
-	icon = 'icons/obj/guns/dominia_carbine.dmi'
+	icon = 'icons/obj/guns/faction/dominian_empire/dominia_carbine.dmi'
 	icon_state = "dom_carbine_mag"
 
 /obj/item/ammo_magazine/boltaction
@@ -648,7 +648,7 @@ If nothing is chosen, reload sounds revert to the default, which is metal_slide_
 /obj/item/ammo_magazine/xanan_shotgun
 	name = "magazine"
 	desc = "A magazine for the dNAC-12 combat shotgun."
-	icon = 'icons/obj/guns/xanu_shotgun_mags.dmi'
+	icon = 'icons/obj/guns/faction/dna_defense/xanu_shotgun_mags.dmi'
 	icon_state = "xanu_shell_magazine"
 	caliber = "shotgun"
 	insert_sound = SFX_RELOAD_RIFLE_SLIDE

code/modules/projectiles/ammunition/bullets.dm

@@ -407,9 +407,9 @@
 	projectile_type = /obj/projectile/bullet/gauss
 	max_stack = 2
 
-/obj/item/ammo_casing/gauss/carbine
-	name = "compact tungsten slug"
-	desc = "A heavy tungsten gauss slug. This one has a casing adapated for carbine models."
+/obj/item/ammo_casing/gauss/old
+	name = "depleted uranium slug"
+	desc = "A depleted uranium gauss slug. It seems quite old."
 	projectile_type = /obj/projectile/bullet/gauss/carbine
 
 /obj/item/ammo_casing/gauss/emp

code/modules/projectiles/gun.dm

@@ -40,10 +40,10 @@
 		original_settings = null
 
 /// Parent gun type. Guns are weapons that can be aimed at mobs and act over a distance.
-/obj/item/gun
+ABSTRACT_TYPE(/obj/item/gun)
 	name = "gun"
 	desc = "It's a gun. It's pretty terrible, though."
-	icon = 'icons/obj/guns/pistol.dmi'
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/pistol.dmi'
 	var/gun_gui_icons = 'icons/obj/guns/gun_gui.dmi'
 	icon_state = "pistol"
 	item_state = "pistol"
@@ -258,7 +258,7 @@
 	underlays.Cut()
 	if(bayonet)
 		var/image/I
-		I = image(icon = 'icons/obj/guns/bayonet.dmi', icon_state = "bayonet")
+		I = image(icon = 'icons/obj/guns/attachments/bayonet.dmi', icon_state = "bayonet")
 		I.pixel_x = knife_x_offset
 		I.pixel_y = knife_y_offset
 		underlays += I
@@ -407,7 +407,9 @@
 		if(user.a_intent == I_HURT)
 			toggle_safety(user)
 		else
+			var/safety_cooldown = 5 // Half a second
 			handle_click_empty(user)
+			user.setClickCooldown(safety_cooldown)
 			return FALSE
 
 	if(!special_check(user))
@@ -762,6 +764,7 @@
 	return new_mode
 
 /obj/item/gun/attack_self(mob/user)
+	. = ..()
 	if(is_wieldable)
 		toggle_wield(usr)
 		update_held_icon()
@@ -1012,7 +1015,7 @@
 /obj/item/gun/proc/critical_fail(var/mob/user)
 	return
 
-/obj/item/gun/attackby(obj/item/attacking_item, mob/user)
+/obj/item/gun/attackby(obj/item/attacking_item, mob/user, params)
 	if(istype(attacking_item, /obj/item/material/knife/bayonet))
 		if(!can_bayonet)
 			balloon_alert(user, "doesn't fit!")

code/modules/projectiles/guns/alien.dm

@@ -1,107 +0,0 @@
-//Alien pinning weapon.
-/obj/item/gun/launcher/spikethrower
-	name = "spike thrower"
-	desc = "A vicious alien projectile weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive."
-	var/last_regen = 0
-	var/spike_gen_time = 100
-	var/max_spikes = 3
-	var/spikes = 3
-	release_force = 30
-	slot_flags = SLOT_BELT|SLOT_BACK
-	icon = 'icons/obj/guns/spikethrower.dmi'
-	icon_state = "spikethrower3"
-	item_state = "spikethrower"
-	fire_sound_text = "a strange noise"
-	fire_sound = 'sound/weapons/bladeslice.ogg'
-	needspin = FALSE
-
-/obj/item/gun/launcher/spikethrower/feedback_hints(mob/user, distance, is_adjacent)
-	. += ..()
-	if(distance > 1)
-		return
-	. += "It has <b>[spikes] spike\s</b> remaining."
-
-/obj/item/gun/launcher/spikethrower/Initialize()
-	. = ..()
-	last_regen = world.time
-
-/obj/item/gun/launcher/spikethrower/Destroy()
-	return ..()
-
-/obj/item/gun/launcher/spikethrower/process()
-	if(spikes < max_spikes && world.time > last_regen + spike_gen_time)
-		spikes++
-		last_regen = world.time
-		update_icon()
-
-/obj/item/gun/launcher/spikethrower/proc/regen_spike()
-	spikes++
-	update_icon()
-	if (spikes < max_spikes)
-		addtimer(CALLBACK(src, PROC_REF(regen_spike)), spike_gen_time, TIMER_UNIQUE)
-
-/obj/item/gun/launcher/spikethrower/update_icon()
-	icon_state = "spikethrower[spikes]"
-
-/obj/item/gun/launcher/spikethrower/special_check(user)
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		if(H.species && H.species.name != SPECIES_VAURCA_WARRIOR || SPECIES_VAURCA_ATTENDANT)
-			to_chat(user, SPAN_WARNING("\The [src] does not respond to you!"))
-			return FALSE
-	return ..()
-
-/obj/item/gun/launcher/spikethrower/update_release_force()
-	return
-
-/obj/item/gun/launcher/spikethrower/consume_next_projectile()
-	if(spikes < 1) return null
-	spikes--
-	addtimer(CALLBACK(src, PROC_REF(regen_spike)), spike_gen_time, TIMER_UNIQUE)
-	return new /obj/item/spike(src)
-
-//This gun only functions for vaurca warriors. The on-sprite is too huge to render properly on other sprites.
-/obj/item/gun/energy/noisecannon
-	name = "alien heavy cannon"
-	desc = "It's some kind of enormous alien weapon, as long as a man is tall."
-
-	icon = 'icons/obj/guns/noisecannon.dmi'
-	icon_state = "noisecannon"
-	item_state = "noisecannon"
-	recoil = 1
-
-	force = 15
-	projectile_type = /obj/projectile/energy/sonic
-	cell_type = /obj/item/cell/super
-	fire_delay = 40
-	fire_sound = 'sound/effects/basscannon.ogg'
-	needspin = FALSE
-
-	var/mode = 1
-
-/obj/item/gun/energy/noisecannon/attack_hand(mob/user as mob)
-	if(loc != user)
-		var/mob/living/carbon/human/H = user
-		if(istype(H))
-			if(H.species.name == SPECIES_VAURCA_WARRIOR || SPECIES_VAURCA_ATTENDANT)
-				..()
-				return
-		to_chat(user, SPAN_WARNING("\The [src] is far too large for you to pick up."))
-		return
-
-/obj/item/gun/energy/noisecannon/update_icon()
-	return
-
-//Projectile.
-/obj/projectile/energy/sonic
-	name = "distortion"
-	icon = 'icons/obj/machinery/particle_accelerator2.dmi'
-	icon_state = "particle"
-	damage = 60
-	damage_type = DAMAGE_BRUTE
-	check_armor = BULLET
-	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
-
-	embed = 0
-	weaken = 5
-	stun = 5

code/modules/projectiles/guns/bang.dm

@@ -1,55 +1,145 @@
-/obj/item/gun/bang
-	name = "some shitty-ass gun"
+#define FRAME_ANIM_TIME 3
+ABSTRACT_TYPE(/obj/item/gun/bang)
+	name = "flag gun"
 	desc = "This is a gun. Neat!"
-	icon = 'icons/obj/guns/revolver.dmi'
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/revolver.dmi'
 	icon_state = "revolver"
 	item_state = "revolver"
-	fire_sound = 'sound/misc/sadtrombone.ogg'
+	fire_sound = 'sound/machines/crate_close.ogg'
+	suppressed_sound = 'sound/machines/crate_close.ogg'
+	var/empty_sound_flag = SFX_PLASTIC_DRY_FIRE
 	needspin = FALSE
 	var/fakecaliber = "357"
-	var/image/bang_flag
-	var/fired_gun = 0
-	var/pixel_offset_x = -2
-	var/pixel_offset_y = 13
+	var/fired_gun = FALSE
+	var/pixel_offset_x = 28
+	var/pixel_offset_y = 12
+	/// Caches offset matrix for use later
+	VAR_PRIVATE/matrix/TM
+	var/obj/effect/overlay/vis/bang_flag
+	///Pixel offset for the suppressor overlay on the x axis.
+	var/suppressor_x_offset
+	///Pixel offset for the suppressor overlay on the y axis.
+	var/suppressor_y_offset
+
+/obj/item/gun/bang/update_icon()
+	..()
+	if(suppressed)
+		var/mutable_appearance/MA = mutable_appearance('icons/obj/guns/attachments/suppressor.dmi', "suppressor")
+		if(suppressor_x_offset)
+			MA.pixel_x = suppressor_x_offset
+		if(suppressor_y_offset)
+			MA.pixel_y = suppressor_y_offset
+		underlays += MA
 
 /obj/item/gun/bang/mechanics_hints(mob/user, distance, is_adjacent)
 	. += ..()
-	. += "This is a ballistic weapon. It fires [fakecaliber] ammunition. To reload most guns, click the gun with an empty hand to remove any spent casings or magazines, and then insert new ones."
+	if(!fired_gun)
+		. += "This is a ballistic weapon. It fires [fakecaliber] ammunition. To reload most guns, click the gun with an empty hand to remove any spent casings or magazines, and then insert new ones."
+	else
+		. += "This is a fake weapon. It won't do you much good. Click to retract the flag."
+
+/obj/item/gun/bang/feedback_hints(mob/user, distance, is_adjacent)
+	. = ..()
+	if(fired_gun)
+		. += SPAN_NOTICE("A flag is sticking out of the barrel!")
 
 /obj/item/gun/bang/Initialize()
 	. = ..()
-	bang_flag = image('icons/obj/bang_flag.dmi', "bang_flag")
-	bang_flag.pixel_x = pixel_offset_x
-	bang_flag.pixel_y = pixel_offset_y
+	TM = matrix()
+	TM.Translate(pixel_offset_x, pixel_offset_y)
 
-/obj/item/gun/bang/handle_click_empty(mob/user)
-	if (user)
-		to_chat(user, SPAN_DANGER("The flag is already out!"))
+// Doesn't send a signal
+/obj/item/gun/bang/proc/handle_click_empty_flag(mob/user)
+	playsound(loc, empty_sound_flag, 30, TRUE)
+	balloon_alert_to_viewers("*click*")
 
-/obj/item/gun/bang/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0)
-	if(!user || !target) return
+/obj/item/gun/bang/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0, accuracy_decrease=0, is_offhand=0)
+	if(!fire_checks(target,user,clickparams,pointblank,reflex))
+		return FALSE
 
 	if(fired_gun)
-		handle_click_empty(user)
-		return
+		handle_click_empty_flag(user)
+		return FALSE
 
-	add_fingerprint(user)
+	balloon_alert_to_viewers("*pop*")
 
 	if (user)
-		user.visible_message(SPAN_DANGER("A flag pops out of the barrel!"))
+		user.visible_message(SPAN_NOTICE("A flag pops out of the barrel of \the [src.name]'s barrel!"), SPAN_WARNING("A flag pops out of the barrel!"))
 	else
-		src.visible_message(SPAN_DANGER("A flag pops out of the barrel of \the [src.name]'s barrel!"))
-	playsound(src, fire_sound, 20, 1)
-	src.AddOverlays(bang_flag)
-	fired_gun = 1
+		visible_message(SPAN_NOTICE("A flag pops out of the barrel of \the [src.name]'s barrel!"))
 
-/obj/item/gun/bang/attack_hand(mob/user as mob)
-	if(user.get_inactive_hand() == src && fired_gun)
-		src.CutOverlays(bang_flag)
+	appearance_flags &= KEEP_TOGETHER
+	play_fire_sound()
+	add_vis_contents(return_flag())
+	fired_gun = TRUE
+
+	addtimer(CALLBACK(src, PROC_REF(play_sad_sound)), 4) //4 deciseconds
+
+/obj/item/gun/bang/attack_self(mob/user)
+	. = ..()
+	if(fired_gun)
 		user.visible_message(SPAN_NOTICE("\The [user] pushes the flag back into the barrel of \the [src.name]."),
 								SPAN_NOTICE("You push the flag back into the barrel of \the [src.name]."))
-
+		bang_flag.icon_state = "bang_flag_rew"
+		addtimer(CALLBACK(src, PROC_REF(remove_flag)), FRAME_ANIM_TIME)
 		playsound(src.loc, 'sound/weapons/TargetOff.ogg', 50,1)
-		fired_gun = 0
-	else
-		return ..()
+		return TRUE
+
+/obj/item/gun/bang/attackby(obj/item/attacking_item, mob/user, params)
+	. = ..()
+	if(astype(attacking_item, /obj/item/suppressor))
+		if(!can_suppress)
+			balloon_alert(user, "doesn't fit!")
+			return
+
+		if(suppressed)
+			balloon_alert(user, "already has a suppressor!")
+			return
+
+		if(user.l_hand != attacking_item && user.r_hand != attacking_item)
+			balloon_alert(user, "not in hand!")
+			return
+
+		user.drop_from_inventory(suppressor, src)
+		balloon_alert(user, "[attacking_item.name] attached")
+		install_suppressor(attacking_item)
+		return
+
+/obj/item/gun/bang/proc/return_flag()
+	PRIVATE_PROC(TRUE)
+	bang_flag = new(src)
+	bang_flag.icon = 'icons/obj/bang_flag.dmi'
+	bang_flag.icon_state = "bang_flag"
+	bang_flag.layer = FLOAT_LAYER
+	bang_flag.plane = FLOAT_PLANE
+	bang_flag.transform = TM
+	return bang_flag
+
+/obj/item/gun/bang/proc/remove_flag()
+	if(!(initial(appearance_flags) & KEEP_TOGETHER))
+		appearance_flags &= ~KEEP_TOGETHER
+	remove_vis_contents(bang_flag)
+	QDEL_NULL(bang_flag)
+	fired_gun = FALSE
+
+/obj/item/gun/bang/proc/play_sad_sound()
+	PRIVATE_PROC(TRUE)
+	playsound(src, 'sound/misc/sadtrombone.ogg', 20, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, ignore_walls = FALSE)
+
+
+//This stuff only exists to avoid suppressors from revealing a fake gun. Eventually, we should add a base-level attachments system to replace this mess
+///Installs a new suppressor, assumes that the suppressor is already in the contents of src
+/obj/item/gun/bang/proc/install_suppressor(obj/item/suppressor/S)
+	suppressed = TRUE
+	w_class += S.w_class //Add our weight class to the item's weight class
+	suppressor = S
+	update_icon()
+
+/obj/item/gun/bang/clear_suppressor()
+	if(!can_unsuppress)
+		return
+	if(istype(suppressor))
+		w_class -= suppressor.w_class
+	return ..()
+
+#undef FRAME_ANIM_TIME

code/modules/projectiles/guns/bang/pistol.dm

@@ -1,93 +1,106 @@
 /obj/item/gun/bang/colt
-	name = "vintage .45 pistol"
-	desc = "A cheap Martian knock-off of a Colt M1911. Uses .45 rounds."
-	icon = 'icons/obj/guns/colt.dmi'
+	name = "\improper Pattern 5 combat pistol"
+	desc = "A robust metal-framed semi-automatic pistol chambered in .45 produced in the system of San Colette."
+	desc_extended = "The Pattern 5 Pistol is the standard-issue sidearm for the Civil Guard, San Colette’s local military force. Loosely based on the standard 9mm pistol of the Solarian Army, the P5 fires a larger .45 round intended for use against heavier targets. \
+	The P5 is produced by the San Colette Interstellar Armaments Company (CAISC) and is often found abroad due to its rugged construction."
+	icon = 'icons/obj/guns/faction/caisc/pattern_5.dmi'
 	icon_state = "colt"
 	item_state = "colt"
-	pixel_offset_x = 30
-	pixel_offset_y = 18
+	pixel_offset_x = 29
+	pixel_offset_y = 12
 	fakecaliber = ".45"
 
 /obj/item/gun/bang/sec
-	name = "\improper .45 pistol"
-	desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. Uses .45 rounds."
-	desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
-	icon = 'icons/obj/guns/secgun.dmi'
+	name = "\improper Mk58 pistol"
+	desc = "A NanoTrasen-designed .45 sidearm, found among law enforcement and security forces."
+	desc_extended = "The Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/secgun.dmi'
 	icon_state = "secgun"
 	item_state = "secgun"
-	pixel_offset_x = 28
-	pixel_offset_y = 14
+	pixel_offset_x = 26
+	pixel_offset_y = 12
 	fakecaliber = ".45"
+
 /obj/item/gun/bang/sec/flash
 	name = ".45 signal pistol"
 	fakecaliber = ".45 signal"
 
 /obj/item/gun/bang/sec/wood
-	name = "custom .45 pistol"
-	desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. It has a wooden grip. Uses .45 rounds."
-	desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a wooden grip. It uses .45 rounds."
-	icon = 'icons/obj/guns/secgun_wood.dmi'
+	name = "custom Mk58 pistol"
+	desc = "A NanoTrasen-designed .45 sidearm, found among law enforcement and security forces. It has a wooden grip."
+	desc_extended = "The Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a faux wooden grip. It uses .45 rounds."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/secgun_wood.dmi'
 	icon_state = "secgunwood"
 	item_state = "secgunwood"
 	fakecaliber = ".45"
+
 /obj/item/gun/bang/x9
-	name = "automatic .45 pistol"
-	desc = "The x9 tactical pistol is a lightweight fast firing handgun. Uses .45 rounds."
-	icon = 'icons/obj/guns/x9.dmi'
-	icon_state = "x9tactical"
-	item_state = "x9"
-	pixel_offset_x = 28
-	pixel_offset_y = 13
+	name = "\improper Mk58-A machine pistol"
+	desc = "A NanoTrasen-designed .45 sidearm, modified for fully-automatic fire. Issued to select security and law enforcement groups."
+	desc_extended = "The Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security \
+	forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. \
+	A trademark of NanoTrasen security forces. This one has been modified for fully-automatic fire from the factory and sports a collapsible shoulder stock for better control. It uses .45 rounds."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/x9.dmi'
+	icon_state = "secgunauto"
+	item_state = "secgunauto"
+	pixel_offset_x = 32
+	pixel_offset_y = 14
 	fakecaliber = ".45"
 
 /obj/item/gun/bang/tanto
-	desc = "A crude-looking open-bolt machine pistol manufactured by a multitude of arms companies, or in some cases, particularly handy individuals. \
-	Owing to their low cost and relative effectiveness, weapons like these are very common all across the Spur, from the tunnels of Oran to fringe colonies along the frontier. \
-	This pistol is made almost entirely from sheet metal and has cloth wrappings around the grip for shooter comfort."
-	name = "10mm pistol"
-	icon = 'icons/obj/guns/c05r.dmi'
+	name = "\improper Mk1-A Tanto machine pistol"
+	desc = "An automatic variant of the NanoTrasen Mk1 Everyman handgun that has been built to accept detachable magazines, negating one of the original \
+	weapon's biggest shortcomings. It is marketed towards lower-echelon security companies as a machine pistol named the Tanto, and features a burst-fire selector \
+	and sturdier barrel with heatshield to better take advantage of the higher capacity."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/tanto.dmi'
 	icon_state = "c05r"
 	item_state = "c05r"
-	pixel_offset_x = 31
-	pixel_offset_y = 14
+	pixel_offset_x = 28
+	pixel_offset_y = 12
 	fakecaliber = "10mm"
 
 /obj/item/gun/bang/silenced
-	name = "silenced pistol"
-	desc = "A small, quiet, easily concealable gun. Uses .45 rounds."
-	icon = 'icons/obj/guns/silenced_pistol.dmi'
+	name = "\improper Mrrazhakulii suppressed pistol"
+	desc = "A small, quiet, easily concealable gun."
+	desc_extended = "Created as a disposable and concealable weapon, the Mrrazhakulii suppressed pistol is a firearm with a suppressor integrated as part of its barrel. \
+		Carried by guerrilla forces and spies, those guns are used in assassination and subterfuge operations. Due to using cheap and available materials, such as \
+		recycled iron and tires, countless of those pistols were distributed among cells and ALA soldiers."
+	icon = 'icons/obj/guns/faction/dpra/mrrazhakulii_suppressed_pistol.dmi'
 	icon_state = "silenced_pistol"
 	item_state = "silenced_pistol"
-	pixel_offset_x = -4
-	pixel_offset_y = 15
+	pixel_offset_x = 32
+	pixel_offset_y = 12
 	fakecaliber = ".45"
 
 /obj/item/gun/bang/deagle
-	name = ".50 magnum pistol"
-	desc = "A robust handgun that uses .50 AE ammo."
-	icon = 'icons/obj/guns/deagle.dmi'
+	name = "\improper Desert Eagle pistol"
+	desc = "An antique, usually impractical handgun firing .50 Action Express rounds. This one is still in good condition, if a bit rough around the edges."
+	icon = 'icons/obj/guns/faction/antique/deagle.dmi'
 	icon_state = "deagle"
 	item_state = "deagle"
-	pixel_offset_x = -4
-	pixel_offset_y = 16
+	pixel_offset_x = 28
+	pixel_offset_y = 12
 	fakecaliber = ".50"
 
 /obj/item/gun/bang/pistol
-	name = "9mm pistol"
-	desc = "500 years since its creation and the Stechkin automatic pistol is still a common sight throughout the Frontier."
-	icon = 'icons/obj/guns/pistol.dmi'
+	name = "\improper Moonlight pistol"
+	desc = "An extremely popular compact handgun, used throughout human space."
+	desc_extended = "The Zavodskoi Interstellar Moonlight 9mm can be found in the hands of just about anyone imaginable - special operatives, common criminals, police officers, the average Joe - on account of the time-tested design, low price point, reliability, and ease of concealment. Having a threaded barrel helps, too, and it isn't uncommon to see the Moonlight as a prop in spy films, suppressed."
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/pistol.dmi'
 	icon_state = "pistol"
 	item_state = "pistol"
-	pixel_offset_x = 26
-	pixel_offset_y = 14
+	pixel_offset_x = 28
+	pixel_offset_y = 13
 	fakecaliber = "9mm"
+	can_suppress = TRUE
+	suppressor_x_offset = 3
 
 /obj/item/gun/bang/pirate
 	name = "zip gun"
 	desc = "Little more than a barrel, handle, and firing mechanism, cheap makeshift firearms like this one are not uncommon in frontier systems."
-	icon = 'icons/obj/guns/zipgun.dmi'
+	icon = 'icons/obj/guns/faction/frontier/zipgun.dmi'
 	icon_state = "zipgun"
 	item_state = "zipgun"
-	pixel_offset_x = 0
-	pixel_offset_y = 12
+	pixel_offset_x = 32
+	pixel_offset_y = 10
 	fakecaliber = "7.62mm"

code/modules/projectiles/guns/bang/revolver.dm

@@ -1,4 +1,4 @@
 /obj/item/gun/bang/revolver
-	name = "revolver"
-	desc = "The classic Zavodskoi Interstellar .357 revolver, for when you only want to shoot once."
+	name = "\improper Mark II revolver"
+	desc = "The revised Mark II Zavodskoi Interstellar revolver, utilizing a robust firing mechanism to deliver deadly rounds downrange. This is a monster of a hand cannon, with a beautiful cedar grip and a transparent plastic cover (so as to not splinter your hands while firing)."
 	fakecaliber = ".357"

code/modules/projectiles/guns/energy.dm

@@ -1,7 +1,7 @@
-/obj/item/gun/energy
+ABSTRACT_TYPE(/obj/item/gun/energy)
 	name = "energy gun"
 	desc = "A basic energy-based gun."
-	icon = 'icons/obj/guns/ecarbine.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/ecarbine.dmi'
 	icon_state = "energykill100"
 	item_state = "energykill100"
 	fire_sound = 'sound/weapons/Taser.ogg'

code/modules/projectiles/guns/energy/blaster.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/energy/blaster
 	name = "blaster pistol"
 	desc = "A tiny energy pistol converted to fire off energy bolts rather than lasers beams."
-	icon = 'icons/obj/guns/blaster_pistol.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/blaster_pistol.dmi'
 	icon_state = "blaster_pistol"
 	item_state = "blaster_pistol"
 	has_item_ratio = FALSE
@@ -48,7 +48,7 @@
 /obj/item/gun/energy/blaster/revolver
 	name = "blaster revolver"
 	desc = "A robust eight-shot blaster."
-	icon = 'icons/obj/guns/blaster_revolver.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/blaster_revolver.dmi'
 	icon_state = "blaster_revolver"
 	item_state = "blaster_revolver"
 	fire_sound = 'sound/weapons/laserstrong.ogg'
@@ -63,7 +63,7 @@
 /obj/item/gun/energy/blaster/carbine
 	name = "blaster carbine"
 	desc = "A short-barreled blaster carbine meant for easy handling and comfort when in combat."
-	icon = 'icons/obj/guns/blaster_carbine.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/blaster_carbine.dmi'
 	icon_state = "blaster_carbine"
 	item_state = "blaster_carbine"
 	max_shots = 16
@@ -76,7 +76,7 @@
 /obj/item/gun/energy/blaster/rifle
 	name = "bolt slinger"
 	desc = "A blaster rifle which seems to work by accelerating particles and flinging them out in destructive bolts."
-	icon = 'icons/obj/guns/blaster_rifle.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/blaster_rifle.dmi'
 	icon_state = "blaster_rifle"
 	item_state = "blaster_rifle"
 	max_shots = 20
@@ -110,10 +110,10 @@
 		to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!"))
 
 /obj/item/gun/energy/blaster/tcaf
-	name = "blaster rifle"
-	desc = "Developed by Zavodskoi Interstellar, the Z.I. Guardian is a burst-fire blaster rifle designed for the armed forces of the Republic of Biesel. Cheap, reliable and easy to mass-produce, these weapons can be seen across the branches of the TCAF."
+	name = "\improper Guardian blaster rifle"
+	desc = "Developed by Zavodskoi Interstellar, the Guardian is a burst-fire blaster rifle designed for the armed forces of the Republic of Biesel. Cheap, reliable and easy to mass-produce, these weapons can be seen across the branches of the TCAF."
 	desc_extended = "Released in early 2464, the Guardian is a modernisation of the outdated blasters previously used by the TCFL developed in conjunction with the Zo'ra Hive. Since its release, it has been widely adopted by Biesel, leading to a slight fall in NanoTrasen market share as Zavodskoi took their place as the main arms supplier of the TCAF."
-	icon = 'icons/obj/guns/blaster_ar.dmi'
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/blaster_ar.dmi'
 	icon_state = "blaster_ar"
 	item_state = "blaster_ar"
 	max_shots = 24
@@ -137,12 +137,12 @@
 		)
 
 /obj/item/gun/energy/blaster/himeo
-	name = "himean assault blaster"
+	name = "\improper Type-11 assault blaster"
 	desc = "The standard infantry blaster of the Himean Planetary Guard. 'TO RESIST EVIL BY FORCE' is stamped on the side."
 	desc_extended = "Originally developed in 2351, the Type-11 \"Guthrie\" is a descendant of the first Himean-made weapons; haphazardly overcharged mining equipment. If it ain't broke, don't fix it; variants \
 	of this rifle have served in the United Syndicates' arsenal for generations, although none have matched modern improvements 'borrowed' from Zavodskoi Interstellar. Waterproof, spaceproof, idiot-proof; it's here to stay, even as advanced Xanan ballistics \
 	creep their way into the market. Ironically, lend-lease aid to the now-defunct League of Independent Corporate-Free Systems have seen a great deal of these end up in the hands of pirates."
-	icon = 'icons/obj/guns/himeo_blaster.dmi'
+	icon = 'icons/obj/guns/faction/himeo_free_consortium/himeo_blaster.dmi'
 	icon_state = "himeoblaster"
 	item_state = "himeoblaster"
 	projectile_type = /obj/projectile/energy/blaster/heavy
@@ -220,11 +220,11 @@
 		update_icon()
 
 /obj/item/gun/energy/blaster/himeo/pistol
-	name = "himean heavy blaster pistol"
+	name = "\improper Type-45 heavy blaster pistol"
 	desc = "The standard sidearm of the Himean Planetary Guard. For those revolutions you cannot fight with fists."
 	desc_extended = "A plasma cutter gave its life for the first Type-45 \"Sabo-Tabby\" pistol. Powered by the same hydrogen cells as the Type-11 \"Guthrie\" rifle, this robust model has earned the nickname of \
 	the 'One Big Handgun' in those foreign markets it has cropped up. What was initially seen as a flaw in the power converter led to its 'magnum'-sized blaster bolts."
-	icon = 'icons/obj/guns/himeo_pistol.dmi'
+	icon = 'icons/obj/guns/faction/himeo_free_consortium/himeo_pistol.dmi'
 	icon_state = "himeopistol"
 	item_state = "himeopistol"
 	projectile_type = /obj/projectile/energy/blaster/heavy

code/modules/projectiles/guns/energy/crank.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/energy/rifle/icelance
-	name = "icelance rifle"
+	name = "\improper Tui'ad icelance rifle"
 	desc = "A Tajaran made rifle, it houses a crank-chargable internal battery. It only holds three shots and each shot must be cranked manually."
-	icon = 'icons/obj/guns/icelance.dmi'
+	icon = 'icons/obj/guns/faction/pra/icelance.dmi'
 	icon_state = "icelance"
 	item_state = "icelance"
 	has_item_ratio = FALSE

code/modules/projectiles/guns/energy/freezeray.dm

@@ -1,6 +1,6 @@
 /obj/item/gun/energy/freeze
-	name = "freeze ray gun"
-	desc = "A portable freezing ray gun designated to quickly lower temperatures."
+	name = "freeze ray"
+	desc = "A portable freezing ray designed to quickly lower temperatures."
 	icon = 'icons/obj/guns/freezeray.dmi'
 	icon_state = "icer"
 	item_state = "icer"

code/modules/projectiles/guns/energy/laser.dm

@@ -1,43 +1,6 @@
-/obj/item/gun/energy/laser
-	name = "laser carbine"
-	desc = "A NanoTrasen G40E carbine, designed to kill with concentrated energy blasts."
-	icon = 'icons/obj/guns/laserrifle.dmi'
-	icon_state = "laserrifle100"
-	item_state = "laserrifle100"
-	has_item_ratio = FALSE // the back and suit slots have ratio sprites but the in-hands dont
-	fire_sound = 'sound/weapons/laser1.ogg'
-	slot_flags = SLOT_BELT|SLOT_BACK
-	accuracy = 1
-	w_class = WEIGHT_CLASS_NORMAL
-	force = 20
-	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
-	matter = list(DEFAULT_WALL_MATERIAL = 2000)
-	projectile_type = /obj/projectile/beam/midlaser
-	can_turret = TRUE
-	turret_is_lethal = TRUE
-	turret_sprite_set = "laser"
-
-	modifystate = "laserrifle"
-
-/obj/item/gun/energy/laser/mounted
-	name = "mounted laser carbine"
-	has_safety = FALSE
-	self_recharge = TRUE
-	use_external_power = TRUE
-	can_turret = FALSE
-
-/obj/item/gun/energy/laser/mounted/cyborg/overclocked
-	max_shots = 15
-	recharge_time = 1
-
-/obj/item/gun/energy/laser/practice
-	name = "practice laser carbine"
-	desc = "A modified version of the NT G40E, this one fires less concentrated energy bolts designed for target practice."
-	projectile_type = /obj/projectile/beam/practice
-
 /obj/item/gun/energy/retro
-	name = "retro laser"
-	icon = 'icons/obj/guns/retro.dmi'
+	name = "\improper L104 laser gun"
+	icon = 'icons/obj/guns/faction/antique/retro.dmi'
 	icon_state = "retro"
 	item_state = "retro"
 	has_item_ratio = FALSE
@@ -57,9 +20,9 @@
 	modifystate = "retro"
 
 /obj/item/gun/energy/captain
-	name = "antique laser gun"
-	icon = 'icons/obj/guns/caplaser.dmi'
-	desc = "This is an antique laser gun. All craftsmanship is of the highest quality. The object menaces with spikes of energy."
+	name = "\improper X-00 laser gun"
+	icon = 'icons/obj/guns/faction/antique/caplaser.dmi'
+	desc = "This is the X-00, an antique laser gun, out of production for decades and well beyond anyone's capacity to recreate. All craftsmanship is of the highest quality. The gun menaces with spikes of energy."
 	icon_state = "caplaser"
 	item_state = "caplaser"
 	has_item_ratio = FALSE
@@ -80,42 +43,11 @@
 	. += ..()
 	. += "Unlike most energy weapons, this weapon recharges itself."
 
-/obj/item/gun/energy/lasercannon
-	name = "laser cannon"
-	desc = "A NanoTrasen designed laser cannon capable of acting as a powerful support weapon."
-	desc_extended = "The NT LC-4 is a laser cannon developed and produced by NanoTrasen. Produced and sold to organizations both in need of a highly powerful support weapon and can afford its high unit cost. In spite of the low capacity, it is a highly capable tool, cutting down fortifications and armored targets with ease."
-	icon = 'icons/obj/guns/lasercannon.dmi'
-	icon_state = "lasercannon100"
-	item_state = "lasercannon100"
-	fire_sound = 'sound/weapons/lasercannonfire.ogg'
-	origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
-	slot_flags = SLOT_BELT|SLOT_BACK
-	projectile_type = /obj/projectile/beam/heavylaser
-	charge_cost = 400
-	max_shots = 5
-	fire_delay = 20
-	can_turret = TRUE
-	turret_is_lethal = TRUE
-	turret_sprite_set = "cannon"
-
-	modifystate = "lasercannon"
-
-/obj/item/gun/energy/lasercannon/mounted
-	name = "mounted laser cannon"
-	self_recharge = TRUE
-	use_external_power = TRUE
-	recharge_time = 10
-	can_turret = FALSE
-
-/obj/item/gun/energy/lasercannon/mounted/cyborg/overclocked
-	recharge_time = 1
-	max_shots = 15
-
 /obj/item/gun/energy/xray
-	name = "xray laser gun"
-	desc = "A NanoTrasen designed high-power laser sidearm capable of expelling concentrated xray blasts."
-	desc_extended = "The NT XG-1 is a laser sidearm developed and produced by NanoTrasen. A recent invention, used for specialist operations, it is presently being produced and sold in limited capacity over the galaxy. Designed for precision strikes, releasing concentrated xray blasts that are capable of hitting targets behind cover. It is compact with relatively high capacity to other sidearms."
-	icon = 'icons/obj/guns/xray.dmi'
+	name = "\improper XG-1 X-Ray laser pistol"
+	desc = "A NanoTrasen designed high-power laser sidearm capable of expelling concentrated X-Ray blasts."
+	desc_extended = "The XG-1 is a laser sidearm developed and produced by NanoTrasen. A recent invention, used for specialist operations, it is presently being produced and sold in limited capacity over the galaxy. Designed for precision strikes, releasing concentrated xray blasts that are capable of hitting targets behind cover. It is compact with relatively high capacity to other sidearms."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/xray.dmi'
 	icon_state = "xray"
 	item_state = "xray"
 	has_item_ratio = FALSE
@@ -138,52 +70,11 @@
 	recharge_time = 5
 	can_turret = FALSE
 
-/obj/item/gun/energy/sniperrifle
-	name = "marksman energy rifle"
-	desc = "The HI L.W.A.P. is an older NanoTrasen design. A designated marksman rifle capable of shooting powerful ionized beams, this is a weapon to kill from a distance."
-	icon = 'icons/obj/guns/sniper.dmi'
-	icon_state = "sniper"
-	item_state = "sniper"
-	has_item_ratio = FALSE // same as the laserrifle
-	fire_sound = 'sound/weapons/marauder.ogg'
-	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 5, TECH_POWER = 4)
-	projectile_type = /obj/projectile/beam/sniper
-	slot_flags = SLOT_BACK
-	charge_cost = 400
-	max_shots = 4
-	fire_delay = 45
-	force = 15
-	w_class = WEIGHT_CLASS_BULKY
-	accuracy = -3 //shooting at the hip
-	scoped_accuracy = 4
-	can_turret = TRUE
-	turret_sprite_set = "sniper"
-	turret_is_lethal = TRUE
-
-	is_wieldable = TRUE
-
-	fire_delay_wielded = 35
-	accuracy_wielded = 0
-
-/obj/item/gun/energy/sniperrifle/mechanics_hints(mob/user, distance, is_adjacent)
-	. += ..()
-	. += "To use the scope, use the appropriate verb in the object tab."
-
-/obj/item/gun/energy/sniperrifle/verb/scope()
-	set category = "Object.Held"
-	set name = "Use Scope"
-	set src in usr
-
-	if(wielded)
-		toggle_scope(2.0, usr)
-	else
-		to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!"))
-
 /obj/item/gun/energy/laser/shotgun
-	name = "laser shotgun"
+	name = "\improper QB-2 laser shotgun"
 	desc = "A NanoTrasen designed laser weapon, designed to split a single amplified beam four times."
-	desc_extended = "The NT QB-2 is a laser weapon developed and produced by NanoTrasen. Designed to fill in the niche that ballistic shotguns do, but in the form of laser weaponry. It is equipped with a special crystal lens that splits a single laser beam into four."
-	icon = 'icons/obj/guns/lasershotgun.dmi'
+	desc_extended = "The QB-2 is a laser weapon developed and produced by NanoTrasen. Designed to fill in the niche that ballistic shotguns do, but in the form of laser weaponry. It is equipped with a special crystal lens that splits a single laser beam into four."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/lasershotgun.dmi'
 	icon_state = "lasershotgun"
 	item_state = "lasershotgun"
 	modifystate = null
@@ -209,13 +100,13 @@
 	turret_sprite_set = "laser"
 
 /obj/item/gun/energy/laser/shotgun/research
-	name = "expedition shotgun"
+	name = "\improper QB-2E laser shotgun"
 	desc = "A NanoTrasen designed laser weapon, designed to split a single amplified beam four times. This one is marked for expeditionary use."
 	pin = /obj/item/firing_pin/away_site
 
 ////////Laser Tag////////////////////
 
-/obj/item/gun/energy/lasertag
+ABSTRACT_TYPE(/obj/item/gun/energy/lasertag)
 	name = "laser tag gun"
 	desc = "A simple low-power laser gun, outfitted for use in laser tag arenas."
 	item_state = "laser"
@@ -249,16 +140,16 @@
 		pin = new pin_path(src)
 	switch(set_color)
 		if("red")
-			icon = 'icons/obj/guns/redtag.dmi'
+			icon = 'icons/obj/guns/faction/toy/redtag.dmi'
 		if("blue")
-			icon = 'icons/obj/guns/bluetag.dmi'
+			icon = 'icons/obj/guns/faction/toy/bluetag.dmi'
 	icon_state = "[set_color]tag"
 	item_state = icon_state
 	modifystate = item_state
 	update_held_icon()
 
 /obj/item/gun/energy/lasertag/blue
-	icon = 'icons/obj/guns/bluetag.dmi'
+	icon = 'icons/obj/guns/faction/toy/bluetag.dmi'
 	icon_state = "bluetag"
 	item_state = "bluetag"
 	projectile_type = /obj/projectile/beam/laser_tag/blue
@@ -266,6 +157,6 @@
 	turret_sprite_set = "blue"
 
 /obj/item/gun/energy/lasertag/red
-	icon = 'icons/obj/guns/redtag.dmi'
+	icon = 'icons/obj/guns/faction/toy/redtag.dmi'
 	icon_state = "redtag"
 	item_state = "redtag"

code/modules/projectiles/guns/energy/lawgiver.dm

@@ -1,6 +1,6 @@
-/obj/item/gun/energy/lawgiver
-	name = "advanced combi-pistol mk2"
-	icon = 'icons/obj/guns/lawgiver.dmi'
+/obj/item/gun/energy/acp
+	name = "\improper ACP-2"
+	icon = 'icons/obj/guns/faction/stellar_corporate_conglomerate/combipistol.dmi'
 	icon_state = "lawgiver"
 	item_state = "lawgiver"
 	has_item_ratio = FALSE
@@ -86,17 +86,17 @@
 		)
 	)
 
-/obj/item/gun/energy/lawgiver/Initialize()
+/obj/item/gun/energy/acp/Initialize()
 	. = ..()
 	become_hearing_sensitive()
 	power_supply = new /obj/item/cell/device/variable(src, 2000)
 	var/datum/firemode/new_mode = firemodes[sel_mode]
 	new_mode.apply_to(src)
 
-/obj/item/gun/energy/lawgiver/Destroy()
+/obj/item/gun/energy/acp/Destroy()
 	return ..()
 
-/obj/item/gun/energy/lawgiver/proc/play_message()
+/obj/item/gun/energy/acp/proc/play_message()
 	while (message_enabled && !message_disable) //Shut down command issued. Inform user that boardcasting has been stopped
 		usr.audible_message(SPAN_WARNING("[usr]'s [src.name] broadcasts: [message]"),"")
 		playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0)
@@ -105,7 +105,7 @@
 	message_enabled = 0
 	message_disable = 0
 
-/obj/item/gun/energy/lawgiver/unique_action(mob/living/carbon/user) //can probably remove this in favor of the DNA locked firing pins. not touching that now though. edit: lol nevermind snowflake code of the year
+/obj/item/gun/energy/acp/unique_action(mob/living/carbon/user) //can probably remove this in favor of the DNA locked firing pins. not touching that now though. edit: lol nevermind snowflake code of the year
 	if(dna != null)
 		return
 	else
@@ -115,7 +115,7 @@
 		desc += "<br>Linked to: [user.real_name]"
 		return
 
-/obj/item/gun/energy/lawgiver/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, pointblank=0, reflex = 0)
+/obj/item/gun/energy/acp/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, pointblank=0, reflex = 0)
 	if(src.dna != user.dna.unique_enzymes && !emagged)
 		if(istype(user, /mob/living/carbon/human))
 			//Save the users active hand
@@ -136,18 +136,18 @@
 		return 0
 	..()
 
-/obj/item/gun/energy/lawgiver/proc/Emag(mob/user as mob)
+/obj/item/gun/energy/acp/proc/Emag(mob/user as mob)
 	to_chat(usr, SPAN_WARNING("You short out [src]'s id check"))
 	emagged = 1
 	return 1
 
-/obj/item/gun/energy/lawgiver/attackby(obj/item/attacking_item, mob/user)
+/obj/item/gun/energy/acp/attackby(obj/item/attacking_item, mob/user)
 	if (istype(attacking_item, /obj/item/card/emag) && !emagged)
 		Emag(user)
 	else
 		..()
 
-/obj/item/gun/energy/lawgiver/hear_talk(mob/living/M in range(0,src), msg)
+/obj/item/gun/energy/acp/hear_talk(mob/living/M in range(0,src), msg)
 	var/mob/living/carbon/human/H = M
 	if (!H || !istype(H))
 		return
@@ -155,7 +155,7 @@
 		hear(msg)
 	return
 
-/obj/item/gun/energy/lawgiver/proc/hear(var/msg)
+/obj/item/gun/energy/acp/proc/hear(var/msg)
 	var/datum/firemode/old_mode = firemodes[sel_mode]
 
 	var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = ""," " = "")

code/modules/projectiles/guns/energy/nuclear.dm

@@ -1,8 +1,8 @@
 /obj/item/gun/energy/gun
-	name = "energy carbine"
+	name = "\improper EC-4 energy carbine"
 	desc = "A NanoTrasen designed energy-based carbine with two settings: Stun and kill."
 	desc_extended = "The NT EC-4 is an energy carbine developed and produced by NanoTrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy."
-	icon = 'icons/obj/guns/ecarbine.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/ecarbine.dmi'
 	icon_state = "energystun"
 	item_state = "energystun"
 	fire_sound = 'sound/weapons/Taser.ogg'
@@ -123,10 +123,10 @@
 	update_mode()
 
 /obj/item/gun/energy/pistol
-	name = "energy pistol"
+	name = "\improper EP-3 energy pistol"
 	desc = "A NanoTrasen energy-based pistol gun with two settings: Stun and kill."
-	desc_extended = "The NT EP-3 is an energy sidearm developed and produced by NanoTrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy."
-	icon = 'icons/obj/guns/epistol.dmi'
+	desc_extended = "The EP-3 is an energy sidearm developed and produced by NanoTrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/epistol.dmi'
 	icon_state = "epistolstun100"
 	item_state = "epistolstun100"
 	fire_sound = 'sound/weapons/Taser.ogg'
@@ -150,10 +150,10 @@
 		)
 
 /obj/item/gun/energy/pistol/hegemony
-	name = "hegemony energy pistol"
+	name = "\improper Zkrehk-Guild Beamgun"
 	desc = "An upgraded variant of the standard energy pistol with two settings: Incapacitate and Smite."
 	desc_extended = "This is the Zkrehk-Guild Beamgun, an energy-based sidearm designed and manufactured on Moghes. A special crystal used in its design allows it to penetrate armor with pinpoint accuracy."
-	icon = 'icons/obj/guns/hegemony_pistol.dmi'
+	icon = 'icons/obj/guns/faction/izweski_hegemony/hegemony_pistol.dmi'
 	icon_state = "hegemony_pistol"
 	item_state = "hegemony_pistol"
 	has_item_ratio = FALSE
@@ -179,7 +179,7 @@
 	name = "golden deep ornate energy pistol"
 	desc = "An intricate golden energy pistol, engraved with a quality unlike no other. If you had to describe this pistol in one word, it would be <b>expensive.</b>"
 	desc_extended = "Possessed by only the most affluent affiliates of the Golden Deep, this ornate energy pistol covered in gold is the result of a commission, which had the artistic quality of Ultra Maz combined with the scientific technology acquired by the Estriconian to produce a weapon that many outsiders see as a firearm more valuable than the assets it was made to protect."
-	icon = 'icons/obj/guns/goldendeep_ornatepistol.dmi'
+	icon = 'icons/obj/guns/faction/golden_deep/goldendeep_ornatepistol.dmi'
 	icon_state = "ornatepistolstun100"
 	item_state = "ornatepistolstun100"
 	has_item_ratio = FALSE
@@ -202,10 +202,10 @@
 		)
 
 /obj/item/gun/energy/repeater
-	name = "energy repeater"
+	name = "\improper SCC-ER1 energy repeater"
 	desc = "A Stellar Corporate Conglomerate created energy repeater, extremely lightweight. It has three settings: Single, Three-Burst, and Full-Auto."
 	desc_extended = "The SCC-ER1 was designed to be a reliable yet concealable firearm, capable of defending SCC assets and agents from various attackers."
-	icon = 'icons/obj/guns/erepeater.dmi'
+	icon = 'icons/obj/guns/faction/stellar_corporate_conglomerate/erepeater.dmi'
 	icon_state = "energysmg100"
 	item_state = "energysmg100"
 	modifystate = "energysmg"
@@ -227,10 +227,10 @@
 		)
 
 /obj/item/gun/energy/repeater/pistol
-	name = "Energy Pistol"
+	name = "\improper SCC-ER1-2 energy pistol"
 	desc = "A more compact and portable version of the Stellar Corporate Conglomerate Energy Repeater. It has two settings: Stun, and Lethal."
 	desc_extended = "The SCC-ER1-2 was designed to be a reliable yet more compact version of the SCC-ER1, capable of defending Staff and Assets."
-	icon = 'icons/obj/guns/sccpistol.dmi'
+	icon = 'icons/obj/guns/faction/stellar_corporate_conglomerate/sccpistol.dmi'
 	icon_state = "sccpistolstun100"
 	item_state = "sccpistolstun"
 	has_item_ratio = FALSE
@@ -251,7 +251,7 @@
 		list(mode_name="lethal", projectile_type=/obj/projectile/beam/pistol/scc/weak, modifystate="sccpistolkill", fire_sound='sound/weapons/energy_repeater.ogg')
 		)
 
-/obj/item/gun/energy/gun/skrell
+ABSTRACT_TYPE(/obj/item/gun/energy/gun/skrell)
 	self_recharge = TRUE
 	fire_sound = 'sound/weapons/Laser2.ogg'
 	modifystate = null
@@ -266,7 +266,7 @@
 /obj/item/gun/energy/gun/skrell/pistol
 	name = "nralakk particle pistol"
 	desc = "A Nralakk Federation particle-beam pistol with two settings: Disable and Lethal."
-	icon = 'icons/obj/guns/nralakkpistol.dmi'
+	icon = 'icons/obj/guns/faction/nralakk_federation/nralakkpistol.dmi'
 	icon_state = "particlepistol"
 	item_state = "particlepistol"
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
@@ -282,7 +282,7 @@
 /obj/item/gun/energy/gun/skrell/smg
 	name = "nralakk particle submachinegun"
 	desc = "A Nralakk Federation particle-beam submachine gun with two settings: Disable and Lethal."
-	icon = 'icons/obj/guns/nralakksmg.dmi'
+	icon = 'icons/obj/guns/faction/nralakk_federation/nralakksmg.dmi'
 	icon_state = "particlesmg"
 	item_state = "particlesmg"
 	slot_flags = SLOT_BELT|SLOT_HOLSTER|SLOT_BACK
@@ -297,7 +297,7 @@
 		)
 
 /obj/item/gun/energy/gun/qukala
-	name = "tqi-qop carbine"
+	name = "\improper Tqi-Qop carbine"
 	desc = "The Tqi-Qop Carbine is the main weapon of the Qukala. Its compact light frame and excellent ammo capacity make it a superb weapon for the Skrell."
 	desc_extended = ""
 	icon = 'icons/obj/item/gun/energy/gun/qukala.dmi'
@@ -329,7 +329,7 @@
 	can_turret = FALSE
 
 /obj/item/gun/energy/fedpistol
-	name = "nralakk energy pistol"
+	name = "\improper Xuqm-3 energy pistol"
 	desc = "A Skrell-made pistol that utilises a psionic control mechanism. It's made from a lightweight alloy."
 	desc_extended = "A sidearm usually seen in the hands of Nralakk Federation officials and law enforcement, the Xuqm-3 energy pistol has a psionically-linked firing pin that checks for a developed Zona Bovinae in its user before it can be fired. A wire can be attached to the user's wrist to allow for mode switching using psionics rather than changing it physically. For non-psionic users, a small dial for mode switching has been attached."
 	icon = 'icons/obj/guns/psi_pistol.dmi'

code/modules/projectiles/guns/energy/pulse.dm

@@ -1,7 +1,45 @@
+/obj/item/gun/energy/rifle/pulse
+	name = "\improper PL-10 pulse rifle"
+	desc = "A top-of-the-line, heavy-duty, multifaceted energy rifle with three firing modes. The gold standard for NanoTrasen's heavier security specialists."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/pulse.dmi'
+	icon_state = "pulse"
+	item_state = "pulse"
+	fire_sound = 'sound/weapons/laser1.ogg'
+	projectile_type = /obj/projectile/beam
+	sel_mode = 2
+	origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 6, TECH_MAGNET = 4)
+	secondary_projectile_type = /obj/projectile/beam/pulse
+	secondary_fire_sound = 'sound/weapons/pulse.ogg'
+	can_switch_modes = FALSE
+	turret_sprite_set = "pulse"
+	turret_is_lethal = TRUE
+
+	modifystate = null
+
+	firemodes = list(
+		list(mode_name="stun", projectile_type=/obj/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg'),
+		list(mode_name="lethal", projectile_type=/obj/projectile/beam, fire_sound='sound/weapons/laser1.ogg'),
+		list(mode_name="DESTROY", projectile_type=/obj/projectile/beam/pulse, fire_sound='sound/weapons/pulse.ogg')
+		)
+
+/obj/item/gun/energy/rifle/pulse/destroyer
+	name = "\improper PL-10D pulse destroyer"
+	desc = "A heavy-duty, pulse-based energy weapon. Because of its complexity and cost, it is rarely seen in use except by specialists."
+	fire_sound = 'sound/weapons/pulse.ogg'
+	projectile_type = /obj/projectile/beam/pulse
+	burst_delay = 5
+	burst = 3
+	max_shots = 30
+	secondary_projectile_type = null
+	secondary_fire_sound = null
+
+/obj/item/gun/energy/rifle/pulse/destroyer/toggle_firing_mode(mob/living/user)
+	to_chat(user, SPAN_WARNING("[src.name] has three settings, and they are all DESTROY."))
+
 /obj/item/gun/energy/pulse
-	name = "pulse carbine"
-	desc = "A weapon that uses advanced pulse-based beam generation technology to emit powerful laser blasts. Because of its complexity and cost, it is rarely seen in use except by specialists."
-	icon = 'icons/obj/guns/pulse_carbine.dmi'
+	name = "\improper PL-4 pulse carbine"
+	desc = "A next-generation pulse weapon for NanoTrasen's security forces. High production costs and logistical issues have limited its deployment to specialist Loss Prevention and Emergency Response units."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/pulse_carbine.dmi'
 	icon_state = "pulse_carbine"
 	item_state = "pulse_carbine"
 	slot_flags = SLOT_BELT
@@ -33,10 +71,10 @@
 	can_turret = FALSE
 
 /obj/item/gun/energy/pulse/pistol
-	name = "pulse pistol"
+	name = "\improper PL-7 pulse pistol"
 	desc = "A weapon that uses advanced pulse-based beam generation technology to emit powerful laser blasts. This one is a really compact model."
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
-	icon = 'icons/obj/guns/pulse_pistol.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/pulse_pistol.dmi'
 	icon_state = "pulse_pistol"
 	item_state = "pulse_pistol"
 	offhand_accuracy = 1

code/modules/projectiles/guns/energy/rifle.dm

@@ -1,8 +1,8 @@
 /obj/item/gun/energy/rifle
-	name = "energy rifle"
+	name = "\improper ER-2 energy rifle"
 	desc = "A NanoTrasen designed energy-based rifle with two settings: Stun and Kill."
-	desc_extended = "The NT ER-2 is an energy rifle developed and produced by NanoTrasen. Widely produced and sold across the galaxy. Designed to both stun and kill with concentrated energy blasts of varying strengths based on the fire mode, focused through a crystal lens. Considered to be a dual-purpose rifle with prolonged combat capability."
-	icon = 'icons/obj/guns/erifle.dmi'
+	desc_extended = "The ER-2 is an energy rifle developed and produced by NanoTrasen. Widely produced and sold across the galaxy. Designed to both stun and kill with concentrated energy blasts of varying strengths based on the fire mode, focused through a crystal lens. Considered to be a dual-purpose rifle with prolonged combat capability."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/erifle.dmi'
 	icon_state = "eriflestun"
 	item_state = "eriflestun"
 	fire_sound = 'sound/weapons/Taser.ogg'
@@ -38,10 +38,10 @@
 		)
 
 /obj/item/gun/energy/rifle/laser
-	name = "laser rifle"
+	name = "\improper LR-6 laser rifle"
 	desc = "A NanoTrasen designed laser weapon, designed to kill with concentrated energy blasts."
-	desc_extended = "The NT LR-6 is a laser rifle developed and produced by NanoTrasen. Designed to kill with concentrated energy blasts focused through a crystal lens. It is considered to be the template of other standard laser weaponry."
-	icon = 'icons/obj/guns/laserrifle.dmi'
+	desc_extended = "The LR-6 is a laser rifle developed and produced by NanoTrasen. Designed to kill with concentrated energy blasts focused through a crystal lens. It is considered to be the template of other standard laser weaponry."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/laserrifle.dmi'
 	icon_state = "laserrifle"
 	item_state = "laserrifle"
 	has_item_ratio = FALSE // the back and suit slots have ratio sprites but the in-hands dont
@@ -60,15 +60,68 @@
 	modifystate = null
 
 /obj/item/gun/energy/rifle/laser/practice
-	name = "practice laser rifle"
-	desc = "A modified version of the NT LR-6. It fires less concentrated laser beams that are visible, but ultimately harmless, designed for target practice."
+	name = "\improper LR-6P practice laser rifle"
+	desc = "A modified version of the LR-6. It fires less concentrated laser beams that are visible, but ultimately harmless, designed for target practice."
 	projectile_type = /obj/projectile/beam/practice
 
+
+/obj/item/gun/energy/rifle/laser/mounted
+	name = "mounted laser rifle"
+	has_safety = FALSE
+	self_recharge = TRUE
+	use_external_power = TRUE
+	can_turret = FALSE
+
+/obj/item/gun/energy/rifle/laser/mounted/cyborg/overclocked
+	max_shots = 15
+	recharge_time = 1
+
+/obj/item/gun/energy/rifle/laser/sniper
+	name = "\improper HI L.W.A.P. marksman energy rifle"
+	desc = "The HI L.W.A.P. is an older NanoTrasen design. A designated marksman rifle capable of shooting powerful ionized beams, this is a weapon to kill from a distance."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/nt_laser_sniper.dmi'
+	icon_state = "sniper"
+	item_state = "sniper"
+	has_item_ratio = FALSE // same as the laserrifle
+	fire_sound = 'sound/weapons/marauder.ogg'
+	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 5, TECH_POWER = 4)
+	projectile_type = /obj/projectile/beam/sniper
+	slot_flags = SLOT_BACK
+	charge_cost = 400
+	max_shots = 4
+	fire_delay = 45
+	force = 15
+	w_class = WEIGHT_CLASS_BULKY
+	accuracy = -3 //shooting at the hip
+	scoped_accuracy = 4
+	can_turret = TRUE
+	turret_sprite_set = "sniper"
+	turret_is_lethal = TRUE
+
+	is_wieldable = TRUE
+
+	fire_delay_wielded = 35
+	accuracy_wielded = 0
+
+/obj/item/gun/energy/rifle/laser/sniper/mechanics_hints(mob/user, distance, is_adjacent)
+	. += ..()
+	. += "To use the scope, use the appropriate verb in the object tab."
+
+/obj/item/gun/energy/rifle/laser/sniper/verb/scope()
+	set category = "Object.Held"
+	set name = "Use Scope"
+	set src in usr
+
+	if(wielded)
+		toggle_scope(2.0, usr)
+	else
+		to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!"))
+
 /obj/item/gun/energy/rifle/laser/noctiluca
-	name = "combat laser rifle"
+	name = "\improper Noctiluca XM/24 combat laser rifle"
 	desc = "The Noctiluca XM/24 is a brand new model of laser rifle, developed entirely by Kumar Arms, a Zavodskoi Interstellar subsidiary. Easy to handle for users with minimal training, reliable and with a reasonable form factor, it is poised to become the new standard for laser weaponry."
 	desc_extended = "The Noctiluca XM/24 was unveiled at the tail end of 2463 in the SCC Future Firearms contest and was released by Zavodskoi in June 2464 after achieving a stunning victory over the other competitors. Zavodskoi installations are prioritized for acquisition of this new rifle, with along the SCCV Horizon. The Noctiluca's specialty lies in its revolutionary dual-function laser diffuser, which is able to modulate the laser into either a standard beam or an armor-piercing super-concentrated beam."
-	icon = 'icons/obj/guns/crew_laser.dmi'
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/crew_laser.dmi'
 	icon_state = "trilaser"
 	item_state = "trilaser"
 	max_shots = 15
@@ -90,10 +143,10 @@
 	it has a secondary armor-piercing mode, which does less damage but has extremely high armor piercing."
 
 /obj/item/gun/energy/rifle/laser/heavy
-	name = "laser cannon"
-	desc = "A nanotrasen designed laser cannon capable of acting as a powerful support weapon."
-	desc_extended = "The NT LC-4 is a laser cannon developed and produced by NanoTrasen. Produced and sold to organizations both in need of a highly powerful support weapon and can afford its high unit cost. In spite of the low capacity, it is a highly capable tool, cutting down fortifications and armored targets with ease."
-	icon = 'icons/obj/guns/lasercannon.dmi'
+	name = "\improper LC-4 laser cannon"
+	desc = "A NanoTrasen designed laser cannon capable of acting as a powerful support weapon."
+	desc_extended = "The LC-4 is a laser cannon developed and produced by NanoTrasen. Produced and sold to organizations both in need of a highly powerful support weapon and can afford its high unit cost. In spite of the low capacity, it is a highly capable tool, cutting down fortifications and armored targets with ease."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/lasercannon.dmi'
 	icon_state = "lasercannon100"
 	item_state = "lasercannon100"
 	has_item_ratio = TRUE
@@ -115,11 +168,22 @@
 	accuracy_wielded = 2
 	fire_delay_wielded = 20
 
+/obj/item/gun/energy/rifle/laser/heavy/mounted
+	name = "mounted laser cannon"
+	self_recharge = TRUE
+	use_external_power = TRUE
+	recharge_time = 10
+	can_turret = FALSE
+
+/obj/item/gun/energy/rifle/laser/heavy/mounted/cyborg/overclocked
+	recharge_time = 1
+	max_shots = 15
+
 /obj/item/gun/energy/rifle/laser/xray
-	name = "xray laser rifle"
-	desc = "A NanoTrasen designed high-power laser rifle capable of expelling concentrated xray blasts."
-	desc_extended = "The NT XR-1 is a laser firearm developed and produced by NanoTrasen. A recent innovation, used for specialist operations, it is presently being produced and sold in limited capacity over the galaxy. Designed for precision strikes, releasing concentrated xray blasts that are capable of hitting targets behind cover, all the while having a large ammo capacity."
-	icon = 'icons/obj/guns/xrifle.dmi'
+	name = "\improper XR-1 X-Ray laser rifle"
+	desc = "A NanoTrasen designed high-power laser rifle capable of expelling concentrated X-Ray blasts."
+	desc_extended = "The XR-1 is a laser firearm developed and produced by NanoTrasen. A recent innovation, used for specialist operations, it is presently being produced and sold in limited capacity over the galaxy. Designed for precision strikes, releasing concentrated xray blasts that are capable of hitting targets behind cover, all the while having a large ammo capacity."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/xrifle.dmi'
 	icon_state = "xrifle"
 	item_state = "xrifle"
 	fire_sound = 'sound/weapons/laser3.ogg'
@@ -134,44 +198,6 @@
 	turret_sprite_set = "xray"
 	turret_is_lethal = TRUE
 
-/obj/item/gun/energy/rifle/pulse
-	name = "pulse rifle"
-	desc = "A weapon that uses advanced pulse-based beam generation technology to emit powerful laser blasts. Because of its complexity and cost, it is rarely seen in use except by specialists."
-	icon = 'icons/obj/guns/pulse.dmi'
-	icon_state = "pulse"
-	item_state = "pulse"
-	fire_sound = 'sound/weapons/laser1.ogg'
-	projectile_type = /obj/projectile/beam
-	sel_mode = 2
-	origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 6, TECH_MAGNET = 4)
-	secondary_projectile_type = /obj/projectile/beam/pulse
-	secondary_fire_sound = 'sound/weapons/pulse.ogg'
-	can_switch_modes = FALSE
-	turret_sprite_set = "pulse"
-	turret_is_lethal = TRUE
-
-	modifystate = null
-
-	firemodes = list(
-		list(mode_name="stun", projectile_type=/obj/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg'),
-		list(mode_name="lethal", projectile_type=/obj/projectile/beam, fire_sound='sound/weapons/laser1.ogg'),
-		list(mode_name="DESTROY", projectile_type=/obj/projectile/beam/pulse, fire_sound='sound/weapons/pulse.ogg')
-		)
-
-/obj/item/gun/energy/rifle/pulse/destroyer
-	name = "pulse destroyer"
-	desc = "A heavy-duty, pulse-based energy weapon. Because of its complexity and cost, it is rarely seen in use except by specialists."
-	fire_sound = 'sound/weapons/pulse.ogg'
-	projectile_type = /obj/projectile/beam/pulse
-	burst_delay = 5
-	burst = 3
-	max_shots = 30
-	secondary_projectile_type = null
-	secondary_fire_sound = null
-
-/obj/item/gun/energy/rifle/pulse/destroyer/toggle_firing_mode(mob/living/user)
-	to_chat(user, SPAN_WARNING("[src.name] has three settings, and they are all DESTROY."))
-
 /obj/item/gun/energy/rifle/laser/tachyon
 	name = "tachyon rifle"
 	desc = "A Vaurcan rifle that fires a beam of concentrated faster than light particles, capable of passing through most forms of matter."
@@ -200,9 +226,9 @@
 		to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!"))
 
 /obj/item/gun/energy/rifle/ionrifle
-	name = "ion rifle"
-	desc = "The NT Mk70 EW Halicon is a man portable anti-armor weapon designed to disable mechanical threats, produced by NanoTrasen."
-	icon = 'icons/obj/guns/ionrifle.dmi'
+	name = "\improper Mk70 EW ion rifle"
+	desc = "The Mk70 EW \"Halicon\" is a man portable anti-armor weapon designed to disable mechanical threats, produced by NanoTrasen."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/ionrifle.dmi'
 	icon_state = "ionrifle"
 	item_state = "ionrifle"
 	has_item_ratio = FALSE
@@ -242,10 +268,10 @@
 	projectile_type = /obj/projectile/beam/midlaser/skrell/heavy
 
 /obj/item/gun/energy/rifle/hegemony
-	name = "hegemony energy rifle"
+	name = "\improper Zkrehk-Guild heavy beamgun"
 	desc = "An upgraded variant of the standard laser rifle. It does not have a stun setting."
 	desc_extended = "The Zkrehk-Guild Heavy Beamgun, an energy-based rifle designed and manufactured on Moghes. A special crystal used in its design allows it to penetrate armor with pinpoint accuracy."
-	icon = 'icons/obj/guns/hegemony_rifle.dmi'
+	icon = 'icons/obj/guns/faction/izweski_hegemony/hegemony_rifle.dmi'
 	icon_state = "hegemonyrifle"
 	item_state = "hegemonyrifle"
 	has_item_ratio = FALSE

code/modules/projectiles/guns/energy/special.dm

@@ -92,7 +92,7 @@
 /obj/item/gun/energy/mindflayer
 	name = "mind flayer"
 	desc = "A custom-built weapon of some kind."
-	icon = 'icons/obj/guns/xray.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/xray.dmi'
 	icon_state = "xray"
 	item_state = "xray"
 	has_item_ratio = FALSE
@@ -101,25 +101,10 @@
 	can_turret = TRUE
 	turret_sprite_set = "xray"
 
-/obj/item/gun/energy/toxgun
-	name = "phoron pistol"
-	desc = "A specialized firearm designed to fire lethal bolts of phoron."
-	icon = 'icons/obj/guns/toxgun.dmi'
-	icon_state = "toxgun"
-	item_state = "toxgun"
-	has_item_ratio = FALSE
-	fire_sound = 'sound/effects/stealthoff.ogg'
-	w_class = WEIGHT_CLASS_NORMAL
-	origin_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4)
-	projectile_type = /obj/projectile/energy/phoron
-	can_turret = TRUE
-	turret_is_lethal = FALSE
-	turret_sprite_set = "net"
-
 /obj/item/gun/energy/mousegun
-	name = "pest gun"
+	name = "\improper Arodentia Pesti-Shock gun"
 	desc = "The NT \"Arodentia\" Pesti-Shock is a highly sophisticated and probably safe beamgun designed for rapid pest-control."
-	icon = 'icons/obj/guns/pestishock.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/pestishock.dmi'
 	icon_state = "pestishock"
 	item_state = "pestishock"
 	has_item_ratio = FALSE
@@ -153,9 +138,9 @@
 		return TRUE
 
 /obj/item/gun/energy/mousegun/xenofauna
-	name = "xenofauna gun"
+	name = "\improper Xenovermino Zap-Blast xenofauna gun"
 	desc = "The NT \"Xenovermino\" Zap-Blast is a highly sophisticated and probably safe beamgun designed to deal with hostile xenofauna."
-	icon = 'icons/obj/guns/xenogun.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/xenogun.dmi'
 	icon_state = "xenogun"
 	item_state = "xenogun"
 	projectile_type = /obj/projectile/beam/mousegun/xenofauna
@@ -193,32 +178,13 @@
 	desc = "Vaurcae weapons tend to be specialized and highly lethal. This one doesn't do much"
 	var/is_charging = 0 //special var for sanity checks in the three guns that currently use charging as a special_check
 
-/obj/item/gun/energy/vaurca/bfg
-	name = "BFG 9000"
-	desc = "'Bio-Force Gun'. Yeah, right."
-	icon = 'icons/obj/guns/bfg.dmi'
-	icon_state = "bfg"
-	item_state = "bfg"
-	has_item_ratio = FALSE
-	charge_meter = 0
-	w_class = WEIGHT_CLASS_BULKY
-	fire_sound = 'sound/magic/LightningShock.ogg'
-	force = 33
-	projectile_type = /obj/projectile/energy/bfg
-	slot_flags = SLOT_BACK
-	max_shots = 3
-	sel_mode = 1
-	fire_delay = 10
-	accuracy = 20
-	muzzle_flash = 10
-
 #define GATLINGLASER_DISPERSION_CONCENTRATED list(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
 #define GATLINGLASER_DISPERSION_SPRAY list(0, 5, 5, 10, 10, 15, 15, 20, 20, 25, 25, 25, 30, 30, 35, 40)
 
 /obj/item/gun/energy/vaurca/gatlinglaser
 	name = "gatling laser"
 	desc = "A highly sophisticated rapid fire laser weapon."
-	icon = 'icons/obj/guns/gatling.dmi'
+	icon = 'icons/obj/guns/faction/vaurca_hives/gatling_laser.dmi'
 	icon_state = "gatling"
 	item_state = "gatling"
 	has_item_ratio = FALSE
@@ -274,7 +240,7 @@
 	name = "\improper thermic blaster"
 	desc = "An opulent Vaurceisan pistol, handcrafted for each wielder by the Court of Queen's master weaponsmiths. For those Ta and few notable Warriors who wield it, the Thermic Blaster is as much a badge of office as it is a fiercely deadly weapon."
 	desc_extended = "The Thermic Blaster is a weapon with a history dating back as far as the Vaurcesian Court of Queens, for since its founding, it has forged one of these blasters for every newborn Ta, bestowed as a coming-of-age gift. With every major advancement in technology, the Court's weaponsmiths have gathered together to upgrade the existing batch, resulting in many Thermic Blasters being millennia old, and many Ta add personal flourishes. This iteration of the firearm was developed after the Zo'rane arrival in the Spur and distributed as a celebration for the refounding of the Court of Queens. The Court may occasionally bestow this exceptionally expensive Blaster on an accomplished Warrior, but very few ever leave Vaurca hands and those that do are fiercely prized."
-	icon = 'icons/obj/guns/blaster.dmi'
+	icon = 'icons/obj/guns/faction/vaurca_hives/thermic_blaster.dmi'
 	icon_state = "blaster"
 	item_state = "blaster"
 	has_item_ratio = FALSE
@@ -298,8 +264,8 @@
 /obj/item/gun/energy/vaurca/typec
 	name = "thermal lance"
 	desc = "A powerful piece of Zo'rane energy artillery, converted to be portable...if you weigh a metric tonne, that is."
-	icon = 'icons/obj/guns/megaglaive.dmi'
-	sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/obj/guns/megaglaive.dmi')
+	icon = 'icons/obj/guns/faction/vaurca_hives/megaglaive.dmi'
+	sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/obj/guns/faction/vaurca_hives/megaglaive.dmi')
 	icon_state = "megaglaive0"
 	item_state = "megaglaive"
 	origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 8)
@@ -464,9 +430,9 @@
 	can_turret = FALSE
 
 /obj/item/gun/energy/tesla
-	name = "tesla gun"
+	name = "\improper Elektrotek Model anti-personnel rifle"
 	desc = "A gun that shoots a projectile that bounces from living thing to living thing. Keep your distance from whatever you are shooting at."
-	icon = 'icons/obj/guns/tesla.dmi'
+	icon = 'icons/obj/guns/faction/pra/elektrotek.dmi'
 	icon_state = "tesla"
 	item_state = "tesla"
 	has_item_ratio = FALSE
@@ -511,7 +477,7 @@
 /obj/item/laserpack
 	name = "galatean bioelectrical reactor backpack"
 	desc = "An ominously-thrumming backpack-mounted machine, powering an O61 Infantry Laser Rifle."
-	icon = 'icons/obj/guns/galatea_laser.dmi'
+	icon = 'icons/obj/guns/faction/galatean_technocracy/galatea_laser.dmi'
 	icon_state = "laserpack_holstered"
 	item_state = "laserpack_holstered"
 	contained_sprite = 1
@@ -614,12 +580,12 @@
 		return ..()
 
 /obj/item/gun/energy/galatea
-	name = "galatean laser rifle"
+	name = "\improper O61-B laser rifle"
 	desc = "The Galatean O61-B, an export model of their advanced Mark 61 Infantry Rifle."
 	desc_extended = "Galatean soldiers are heavily bioaugmented, combining soldier and weapon into a cohesive unit. The Mark 61 Infantry Rifle is one such example, drawing on the bioelectricity of the human body \
 	through an implant with which to power the gun. Unaugmented users complained of headaches, lethargy, and impossible dreams; The O61B has integrated the bioaugments into the firing mechanism, preventing 'baselines' \
 	from even using it. Luckily, this is an export version, the O61-B, which allows foreign users a taste of advanced Technocracy weaponry for the low price of a single bioaugment."
-	icon = 'icons/obj/guns/galatea_laser.dmi'
+	icon = 'icons/obj/guns/faction/galatean_technocracy/galatea_laser.dmi'
 	icon_state = "galatealaser"
 	item_state = "galatealaser"
 	slot_flags = 0

code/modules/projectiles/guns/energy/stun.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/energy/taser
-	name = "taser gun"
-	desc = "The NT Mk30 NL is a small, low capacity gun used for non-lethal takedowns."
-	icon = 'icons/obj/guns/taser.dmi'
+	name = "\improper Mk30 NL stun pistol"
+	desc = "The Mk30 NL is a small, low capacity pistol produced by NanoTrasen used for non-lethal takedowns."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/stunpistol.dmi'
 	icon_state = "taser"
 	item_state = "taser"
 	fire_sound = 'sound/weapons/Taser.ogg'
@@ -13,16 +13,16 @@
 	turret_is_lethal = FALSE
 
 /obj/item/gun/energy/taser/mounted
-	name = "mounted taser gun"
+	name = "mounted stun gun"
 	self_recharge = TRUE
 	use_external_power = TRUE
 	can_turret = FALSE
 
 /obj/item/gun/energy/stunrevolver
-	name = "stun revolver"
+	name = "\improper ST-30 stun revolver"
 	desc = "A NanoTrasen designed high-tech revolver that fires rechargeable stun bolts."
 	desc_extended = "The ST-30 is a highly advanced sidearm produced by NanoTrasen. It is designed for self-defense in a less-than-lethal manner. While the weapon design itself is not groundbreaking, it fires high velocity energy bolts with rechargeable cartridges, possessing unusual high stopping power."
-	icon = 'icons/obj/guns/stunrevolver.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/stunrevolver.dmi'
 	icon_state = "stunrevolver"
 	item_state = "stunrevolver"
 	has_item_ratio = FALSE

code/modules/projectiles/guns/launcher.dm

@@ -1,4 +1,4 @@
-/obj/item/gun/launcher
+ABSTRACT_TYPE(/obj/item/gun/launcher)
 	name = "launcher"
 	desc = "A device that launches things."
 	w_class = WEIGHT_CLASS_HUGE

code/modules/projectiles/guns/launcher/crossbow.dm

@@ -16,19 +16,6 @@
 /obj/item/arrow/proc/removed() //Helper for metal rods falling apart.
 	return
 
-/obj/item/spike
-	name = "alloy spike"
-	desc = "It's about a foot of weird silver metal with a wicked point."
-	sharp = TRUE
-	edge = FALSE
-	throwforce = 5
-	w_class = WEIGHT_CLASS_SMALL
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "metal-rod"
-	item_state = "bolt"
-	drop_sound = 'sound/items/drop/sword.ogg'
-	pickup_sound = SFX_PICKUP_SWORD
-
 /obj/item/arrow/quill
 	name = "alien quill"
 	desc = "A wickedly barbed quill from some bizarre animal."

code/modules/projectiles/guns/launcher/rocket.dm

@@ -53,9 +53,9 @@
 	..()
 
 /obj/item/gun/launcher/rocket/konyang
-	name = "konyang rocket launcher"
+	name = "\improper KGM-701D rocket launcher"
 	desc = "An unguided rocket launcher often used by the armed forces of Konyang."
 	desc_extended = "The KGM-701 is a heavy anti-tank guided missile in use by the Konyang Army, another carryover from their old Solarian stockpiles. Capable of handling any tank that wouldn't get bogged down on Konyang's soft terrain, the KGM-701 is expected to soldier on for many years to come. This however, is not a KGM-701, but the KGM-701D, the unguided discount variation of the old Solarian ATGM, typically issued to colonial garrisons and not rated against any modern vehicles."
-	icon = 'icons/obj/guns/konyang_weapons.dmi'
+	icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
 	icon_state = "kgm"
 	item_state = "kgm"

code/modules/projectiles/guns/projectile.dm

@@ -1,4 +1,4 @@
-/obj/item/gun/projectile
+ABSTRACT_TYPE(/obj/item/gun/projectile)
 	name = "gun"
 	desc = "A gun that fires bullets."
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
@@ -71,7 +71,7 @@
 /obj/item/gun/projectile/update_icon()
 	..()
 	if(suppressed)
-		var/mutable_appearance/MA = mutable_appearance('icons/obj/guns/suppressor.dmi', "suppressor")
+		var/mutable_appearance/MA = mutable_appearance('icons/obj/guns/attachments/suppressor.dmi', "suppressor")
 		if(suppressor_x_offset)
 			MA.pixel_x = suppressor_x_offset
 		if(suppressor_y_offset)

code/modules/projectiles/guns/projectile/automatic.dm

@@ -51,12 +51,12 @@
 	icon_state = (ammo_magazine)? "mini-uzi" : "mini-uzi-e"
 
 /obj/item/gun/projectile/automatic/c20r
-	name = "submachine gun"
+	name = "\improper CA-25E submachine gun"
 	desc = "A conventional bullpup submachine gun with an extendable stock."
 	desc_extended = "The Colettish Armaments Model 25 SMG is a typical product of the San Colette Interstellar Armaments Company (CAISC). Rejected by the Solarian military due to competition with the Zavodskoi M470-L, the CA-M25 was repurposed \
 	into the Colettish Armaments Model 25 Export (CA-25E) and has found reasonable success in mercenary groups across the Orion Spur. Recently many have found their ways into the hands of violent non-state actors in the Corporate Reconstruction Zone, where \
 	they contribute to the further destabilization of the region. Curiously, these models typically have a filed-off serial number or no serial number at all."
-	icon = 'icons/obj/guns/c20r.dmi'
+	icon = 'icons/obj/guns/faction/caisc/ca-25e.dmi'
 	icon_state = "c20r"
 	item_state = "c20r"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -83,10 +83,10 @@
 	return
 
 /obj/item/gun/projectile/automatic/c20r/sol
-	name = "solarian submachine gun"
+	name = "\improper M470-L submachine gun"
 	desc = "Designed by Zavodskoi as a scaled-down version of their M469, the M470-L is a personal defense weapon intended for use by second-line personnel from all branches of the Solarian military, such as support troops and Navy crewmen."
 	desc_extended = null
-	icon = 'icons/obj/guns/sol_smg.dmi'
+	icon = 'icons/obj/guns/faction/sol_alliance/sol_smg.dmi'
 	icon_state = "vityaz"
 	item_state = "vityaz"
 	suppressor_x_offset = 10
@@ -96,9 +96,9 @@
 	icon_state = (ammo_magazine)? "vityaz" : "vityaz-empty"
 
 /obj/item/gun/projectile/automatic/c20r/sol/siib
-	name = "solarian SIIB submachine gun"
+	name = "\improper M470-SIIB submachine gun"
 	desc = "Based off the standard solarian M470-L, this SMG is used by SIIB Operatives during raids and specialist operations. Officially, this variant of the SMG does not exist."
-	icon = 'icons/obj/guns/sol_smg.dmi'
+	icon = 'icons/obj/guns/faction/sol_alliance/sol_smg.dmi'
 	icon_state = "vityaz-siib"
 	item_state = "vityaz-siib"
 
@@ -107,12 +107,12 @@
 	icon_state = (ammo_magazine)? "vityaz-siib" : "vityaz-siib-empty"
 
 /obj/item/gun/projectile/automatic/xanusmg
-	name = "\improper Xanan submachine gun"
+	name = "dNAC-4.6 II submachine gun"
 	desc = "A sleek metal-framed submachine gun, produced by d.N.A Defense for the All-Xanu Armed Forces."
 	desc_extended = "The dNAC-4.6 II submachine gun is a custom-made submachine gun for the All-Xanu Armed Forces, designed to use the same 4.6mm rounds as the dNAC-4.6 pistol. It mainly sees use as a personal defensive weapon for pilots and drivers, but has also been used aboard the spacefleet's vessels for close quarters combat."
 	magazine_type = /obj/item/ammo_magazine/c46m/extended
 	allowed_magazines = list(/obj/item/ammo_magazine/c46m/extended)
-	icon = 'icons/obj/guns/xanu_smg.dmi'
+	icon = 'icons/obj/guns/faction/dna_defense/xanu_smg.dmi'
 	icon_state = "xanu_smg"
 	item_state = "xanu_smg"
 	caliber = "4.6mm"
@@ -130,9 +130,9 @@
 
 
 /obj/item/gun/projectile/automatic/wt550
-	name = "machine pistol"
-	desc = "The ZI 550 Saber is a cheap self-defense weapon, mass-produced by Zavodskoi Interstellar for paramilitary and private use."
-	icon = 'icons/obj/guns/wt550.dmi'
+	name = "\improper 550 Saber machine pistol"
+	desc = "The 550 Saber is a cheap self-defense weapon, mass-produced by Zavodskoi Interstellar for paramilitary and private use."
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/wt550.dmi'
 	icon_state = "wt550"
 	item_state = "wt550"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -189,10 +189,10 @@
 
 //Ballistic rifles, go.
 
-/obj/item/gun/projectile/automatic/rifle
+ABSTRACT_TYPE(/obj/item/gun/projectile/automatic/rifle)
 	name = "automatic rifle"
 	desc = "A weapon firing an intermediate caliber round, or larger."
-	icon = 'icons/obj/guns/arifle.dmi'
+	icon = 'icons/obj/guns/faction/frontier/arifle.dmi'
 	icon_state = "arifle"
 	item_state = "arifle"
 	w_class = WEIGHT_CLASS_BULKY
@@ -226,7 +226,7 @@
 	accuracy_wielded = 2
 
 /obj/item/gun/projectile/automatic/rifle/sts35
-	name = "assault rifle"
+	name = "\improper STS35 assault rifle"
 	desc = "A durable, rugged-looking automatic weapon of a make popular on the frontier worlds. It is unmarked."
 	desc_extended = "The STS35 is a durable, reliable and cheap to buy fully automatic assault rifle with many licensed manufacturers across \
 	the galaxy. It comes in different versions and calibres, this one uses 7.62 rounds. The manufacturer markings have been filed off."
@@ -239,7 +239,7 @@
 	icon_state = (ammo_magazine)? "arifle" : "arifle-empty"
 
 /obj/item/gun/projectile/automatic/rifle/shorty
-	name = "short-barreled assault rifle"
+	name = "\improper STS35 short-barreled assault rifle"
 	desc = "A durable, rugged-looking automatic weapon that has been heavily modified. \
 	Key changes include significant shortening of the barrel and the addition of an improvised vertical foregrip, \
 	condensing heavy firepower into a relatively small and maneuverable package intended for close-in \
@@ -251,7 +251,7 @@
 	extensive experience fighting in claustrophobic environments aboard ships and stations, weapons like these are common among Coalition Rangers conducting high-risk boarding operations \
 	along the Frontier, who rely on its ability to rapidly gain fire superiority in the event of an ambush. While no formal name exists for it, \
 	and no two examples are quite alike, weapons of this type are commonly just referred to as the \"Shorty\"."
-	icon = 'icons/obj/guns/shorty.dmi'
+	icon = 'icons/obj/guns/faction/frontier/shorty.dmi'
 	icon_state = "shorty"
 	item_state = "shorty"
 	can_bayonet = TRUE
@@ -269,12 +269,12 @@
 	icon_state = (ammo_magazine)? "shorty" : "shorty-empty"
 
 /obj/item/gun/projectile/automatic/rifle/carbine
-	name = "ballistic carbine"
+	name = "\improper ST24 carbine"
 	desc = "A durable, rugged-looking semi-automatic weapon of a make popular on the frontier worlds. Doesn't accept large-capacity magazines. It is unmarked."
 	desc_extended = "The ST24 is often considered the little brother of its larger and fully automatic counterpart, the STS35. It is a \
 	reliable and cheap to buy carbine with many licensed manufacturers across the galaxy. It comes in different versions and calibres, \
 	some even boasting select fire functionality. This one uses 5.56 rounds and is semi-automatic. The manufacturer markings have been filed off."
-	icon = 'icons/obj/guns/bcarbine.dmi'
+	icon = 'icons/obj/guns/faction/frontier/bcarbine.dmi'
 	icon_state = "bcarbine"
 	item_state = "bcarbine"
 	caliber = "a556"
@@ -292,11 +292,11 @@
 	icon_state = (ammo_magazine)? "bcarbine" : "bcarbine-empty"
 
 /obj/item/gun/projectile/automatic/rifle/carbine/civcarbine
-	name = "bullpup carbine"
-	desc = "A variant of the ZI Bulldog assault carbine, the ZI Terrier is a slimmer and lighter version, only capable of accepting smaller magazines. \
+	name = "\improper Terrier bullpup carbine"
+	desc = "A variant of the Bulldog assault carbine, the ZI Terrier is a slimmer and lighter version, only capable of accepting smaller magazines. \
 	It also lacks the integrated grenade launcher and burst fire of the Bulldog."
 	desc_extended = "It makes you feel like a corporate goon when you hold it."
-	icon = 'icons/obj/guns/crew_rifle.dmi'
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/crew_rifle.dmi'
 	magazine_type = /obj/item/ammo_magazine/a556/carbine/polymer
 	allowed_magazines = list(/obj/item/ammo_magazine/a556/carbine, /obj/item/ammo_magazine/a556/carbine/polymer)
 	icon_state = "civcarbine"
@@ -308,10 +308,10 @@
 	icon_state = (ammo_magazine)? "civcarbine" : "civcarbine-empty"
 
 /obj/item/gun/projectile/automatic/rifle/sol
-	name = "solarian assault rifle"
+	name = "\improper M469 assault rifle"
 	desc = "A reliable assault rifle manufactured by Zavodskoi Interstellar, the M469 is the standard service rifle of the Solarian Armed Forces, most commonly associated with its ground forces. \
 	Though the design is old, it continues to see widespread use in the Alliance and its breakaway states and likely will for years to come."
-	icon = 'icons/obj/guns/sol_rifle.dmi'
+	icon = 'icons/obj/guns/faction/sol_alliance/sol_rifle.dmi'
 	icon_state = "battlerifle"
 	item_state = "battlerifle"
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 3, TECH_ILLEGAL = 2)
@@ -331,12 +331,12 @@
 	var/use_launcher = 0
 
 /obj/item/gun/projectile/automatic/rifle/dominia
-	name = "dominian rifle"
+	name = "\improper MPR-24/5 rifle"
 	desc = "The standard-issue rifle of the Empire of Dominia's Imperial Army. Loads from 30 round 5.56 magazines."
 	desc_extended = "The Moroz Pattern Rifle, Year of 2424 has been the standard-issue rifle of the Imperial Army for decades thanks to its durable construction and ease \
 	of use. The Imperial Army has repeatedly modernized and updated the MPR-24 over the past 40 years, and the rifle is now in its fifth modernization: \
 	one that they hope will keep it competitive well into the 2470s."
-	icon = 'icons/obj/guns/dominia_rifle.dmi'
+	icon = 'icons/obj/guns/faction/dominian_empire/dominia_rifle.dmi'
 	icon_state = "acr"
 	item_state = "acr"
 	caliber = "a556"
@@ -349,10 +349,10 @@
 	icon_state = (ammo_magazine)? "acr" : "acr-empty"
 
 /obj/item/gun/projectile/automatic/rifle/z8
-	name = "bullpup assault carbine"
-	desc = "The ZI Bulldog bullpup assault carbine, Zavodskoi Industries' answer to any problem that can be solved by an assault rifle."
+	name = "\improper Bulldog bullpup assault carbine"
+	desc = "The Bulldog bullpup assault carbine, Zavodskoi Industries' answer to any problem that can be solved by an assault rifle."
 	desc_extended = "It makes you feel like a corporate commando when you hold it."
-	icon = 'icons/obj/guns/carbine.dmi'
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/carbine.dmi'
 	icon_state = "carbine"
 	item_state = "carbine"
 	w_class = WEIGHT_CLASS_BULKY
@@ -426,10 +426,10 @@
 		icon_state = "carbine-empty"
 
 /obj/item/gun/projectile/automatic/rifle/jingya
-	name = "burst rifle"
+	name = "\improper Jingya A-1 burst rifle"
 	desc = "The Jingya A-1 is the first of a new line of NanoTrasen rifles, developed in cooperation with Zavodskoi Interstellar's Kumar Arms subsidiary. Primarily made of high strength polymers, the rifle is designed to be cheap to mass produce while remaining reliable."
 	desc_extended = "The Jingya A-1 won a hard-fought victory in the ballistic side of the SCC Future Firearms contest hosted in 2463, which was also its first unveiling: this rifle is made to function where laser weaponry may be either too risky or not functional for the engagement at hand. It is slated to be deployed for trial usage by a select few special TCFL regiments in Mictlan."
-	icon = 'icons/obj/guns/burst_rifle.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/burst_rifle.dmi'
 	icon_state = "arx"
 	item_state = "arx"
 	w_class = WEIGHT_CLASS_BULKY
@@ -460,11 +460,11 @@
 		icon_state = "arx-empty"
 
 /obj/item/gun/projectile/automatic/rifle/l6_saw
-	name = "light machine gun"
+	name = "\improper CA-75E LMG"
 	desc = "A squad machine gun with a clunky, outdated loading mechanism. Loads from 7.62mm ammunition boxes. Gentlemen, lock and load."
 	desc_extended = "Created by the San Colette Interstellar Armaments Company (CAISC) explicitly for export, the Colettish Armaments Model 75 Export machine gun is a cheap yet outdated method of providing large amounts of firepower to a squad. \
 	The CA-75E is not used by San Colette’s Civil Guard and is typically sold to mercenary groups or other Solarian systems. Since the Solarian Collapse more and more CA-75Es have found themselves in the hands of pirates and rebels in the Corporate Reconstruction Zone, and captured models curiously often have no serial number."
-	icon = 'icons/obj/guns/l6.dmi'
+	icon = 'icons/obj/guns/faction/caisc/ca-75e.dmi'
 	icon_state = "l6closed100"
 	item_state = "l6closedmag"
 	w_class = WEIGHT_CLASS_BULKY
@@ -534,7 +534,7 @@
 	..()
 
 /obj/item/gun/projectile/automatic/rifle/adhomian
-	name = "adhomian automatic rifle"
+	name = "\improper Tsarrayut'yan assault rifle"
 	desc = "The Tsarrayut'yan rifle is a select-fire automatic rifle producted by the People's Republic of Adhomai."
 	icon = 'icons/obj/guns/tsarrayut.dmi'
 	icon_state = "tsarrayut"
@@ -575,10 +575,10 @@
 	..()
 
 /obj/item/gun/projectile/automatic/rifle/dpra
-	name = "adhomian assault rifle"
+	name = "\improper Mrrazhak Model-1 assault rifle"
 	desc = "The Mrrazhak Model-1 is the newest Al'mariist automatic rifle. The Mrrazhak is notorious for its simple and reliable design; it can be fabricated and assembled without the \
 	need of a specialized industry or a highly trained workforce."
-	icon = 'icons/obj/guns/mrrazhak.dmi'
+	icon = 'icons/obj/guns/faction/dpra/mrrazhak.dmi'
 	icon_state = "mrrazhak"
 	item_state = "mrrazhak"
 	contained_sprite = TRUE
@@ -609,9 +609,9 @@
 	icon_state = (ammo_magazine)? "mrrazhak" : "mrrazhak_nomag"
 
 /obj/item/gun/projectile/automatic/tommygun
-	name = "submachine gun"
-	desc = "An Adhomian-made submachine gun."
-	icon = 'icons/obj/guns/tommygun.dmi'
+	name = "\improper Thompson submachine gun"
+	desc = "An antique submachine gun. Still working, if a bit rough around the edges."
+	icon = 'icons/obj/guns/faction/antique/tommygun.dmi'
 	icon_state = "tommygun"
 	item_state = "tommygun"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -634,11 +634,11 @@
 	icon_state = (ammo_magazine)? "tommygun" : "tommygun-empty"
 
 /obj/item/gun/projectile/automatic/tommygun/dom
-	name = "dominian submachine gun"
+	name = "\improper MPMC-30 submachine gun"
 	desc = "A submachine gun featuring a novel top loading configuration, used by the Empire of Dominia's armed forces."
 	desc_extended = "The Moroz Pattern Machine Carbine, Model of 2430 is a lightweight, handy weapon intended for use by vehicle crews, airborne troops, and other units that do not require a full-length rifle. \
 	Simplistic in design and function, the MPMC-30 is highly reliable in nearly all environments, lending itself well to use by colonial forces. In particular, the Imperial Fisanduhian Gendarmerie are known to make heavy use of the weapon."
-	icon = 'icons/obj/guns/dominia_smg.dmi'
+	icon = 'icons/obj/guns/faction/dominian_empire/dominia_smg.dmi'
 	icon_state = "owen"
 	item_state = "owen"
 	max_shells = 20
@@ -649,10 +649,10 @@
 	icon_state = (ammo_magazine)? "owen" : "owen-empty"
 
 /obj/item/gun/projectile/automatic/tommygun/assassin
-	name = "integrally suppressed machine pistol"
+	name = "\improper APCC RatAway machine pistol"
 	desc = "An Eridanian “rat hunting” gun manufactured by the Amon Pest Control Company. Commonly used by corporate assassins, uncommonly used by pest control workers. Chambered in 6mm."
-	desc_extended = "The APCC RatAway SMG is manufactured by a shell company of Ringspire for use in corporate assassination duties. Extremely quiet and firing caseless ammunition, it is an ideal weapon for putting down those who dare to threaten megacorporate interests."
-	icon = 'icons/obj/guns/assassin_smg.dmi'
+	desc_extended = "The APCC RatAway machine pistol is manufactured by a shell company of Ringspire for use in corporate assassination duties. Extremely quiet and firing caseless ammunition, it is an ideal weapon for putting down those who dare to threaten megacorporate interests."
+	icon = 'icons/obj/guns/faction/eridani_federation/assassin_smg.dmi'
 	icon_state = "assassin_smg"
 	item_state = "assassin_smg"
 	magazine_type = /obj/item/ammo_magazine/submachinemag/assassin
@@ -670,13 +670,13 @@
 	icon_state = (ammo_magazine) ? "assassin_smg" : "assassin_smg-empty"
 
 /obj/item/gun/projectile/automatic/tommygun/konyang
-	name = "konyang police submachine gun"
+	name = "\improper K45 police submachine gun"
 	desc = "A compact submachine gun made specifically for the Konyang National Police. Takes .45 ammo."
 	desc_extended = "Produced by one of Einstein Engines' local subsidiaries on Konyang, the K45 \"Pogpung\" submachine gun is Taepung Arms' entry into the submachine gun market. \
 	The National Police purchased a large number of K45s for their patrol units due to reports that service revolvers were inadequate at stopping rampant IPCs. The K45-P variant \
 	specially designed for the police forces is chambered in the organization's preferred .45 caliber and is limited to 3-round bursts due to the relatively limited firearms training of \
 	National Police officers."
-	icon = 'icons/obj/guns/konyang_weapons.dmi'
+	icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
 	icon_state = "k45carbine"
 	item_state = "k45carbine"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -697,7 +697,7 @@
 /obj/item/gun/projectile/automatic/rifle/dnac
 	name = "dNAC-6.5 assault rifle"
 	desc = "A durable, sleek-looking bullpup rifle manufactured by d.N.A Defense & Aerospace for the All-Xanu Armed Forces. This model has been adopted by a majority of the Coalition's military forces as well due to its simplicity and reliability."
-	icon = 'icons/obj/guns/xanu_rifle.dmi'
+	icon = 'icons/obj/guns/faction/dna_defense/xanu_rifle.dmi'
 	icon_state = "xanu_rifle"
 	item_state = "xanu_rifle"
 	magazine_type = /obj/item/ammo_magazine/a65
@@ -787,10 +787,10 @@
 		to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!"))
 
 /obj/item/gun/projectile/automatic/rifle/konyang/k556
-	name = "konyang assault rifle"
+	name = "\improper K556 assault rifle"
 	desc = "The K556 is the standard assault rifle of the Konyang Armed Forces. Sturdy and reliable."
-	desc_extended = "The K556 assault rifle is a new design in use by elements of the Konyang Armed Forces, designed in-house by the military in partnership with Einstein Engines'local subsidiaries. It has yet to see widespread service as the government is reluctant to spend money on new small arms when they already possess large stockpiles from the colonial period. This has not stopped the Aerospace Forces from making the transition to the new weapon however, as its compact design, light weight, and accuracy make it ideal for use aboard a spacecraft."
-	icon = 'icons/obj/guns/konyang_weapons.dmi'
+	desc_extended = "The K556 assault rifle is a new design in use by elements of the Konyang Armed Forces, designed in-house by the military in partnership with Einstein Engines' local subsidiaries. It has yet to see widespread service as the government is reluctant to spend money on new small arms when they already possess large stockpiles from the colonial period. This has not stopped the Aerospace Forces from making the transition to the new weapon however, as its compact design, light weight, and accuracy make it ideal for use aboard a spacecraft."
+	icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
 	icon_state = "k556rifle"
 	item_state = "k556rifle"
 	slot_flags = SLOT_BACK|SLOT_OCLOTHING
@@ -807,10 +807,10 @@
 	icon_state = (ammo_magazine)? "k556rifle" : "k556rifle-e"
 
 /obj/item/gun/projectile/automatic/rifle/konyang/konyang47
-	name = "konyang assault carbine"
+	name = "\improper Dering-K1 assault carbine"
 	desc = "The Dering-K1 is the carbine version of the K556. Intended to be used by vehicle crews, second line infantry, support crew and staff or when you have limited space to work with."
 	desc_extended = "The Dering K1 battle rifle is a standard Solarian M469 given a service extension package by Zavodskoi Interstellar. Many of the rifles bear Konyanger proof marks right next to old Solarian ones, indicating their heritage. Its more robust design is tailored for naval and swamp warfare, while still maintaining the firepower needed for frontline combat operations."
-	icon = 'icons/obj/guns/konyang_weapons.dmi'
+	icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
 	icon_state = "k47"
 	item_state = "k47"
 	slot_flags = SLOT_BACK|SLOT_OCLOTHING
@@ -829,7 +829,7 @@
 /obj/item/gun/projectile/automatic/rifle/konyang/pirate_rifle
 	name = "re-bored rifle"
 	desc = "A wooden rifle, repaired and re-bored to actually work again. Fires eight rounds of .308 in semi-auto."
-	icon = 'icons/obj/guns/konyang_weapons.dmi'
+	icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
 	icon_state = "poacher"
 	item_state = "poacher"
 	slot_flags = SLOT_BACK|SLOT_OCLOTHING
@@ -842,11 +842,11 @@
 	max_shells = 8
 
 /obj/item/gun/projectile/automatic/rifle/dominia_carbine
-	name = "dominian carbine"
+	name = "\improper MPC-24/5 carbine"
 	desc = "A carbine variant of the MPR-24/5 with a shorter barrel and folding stock. Loads from 20 round 7.62 magazines."
 	desc_extended = "The carbine variant of the MPR-24/5 is commonly seen in the hands of vehicle crews, airborne troops, and other units that do not require a \
 	full-length rifle. Paramilitary units, such as the Imperial Fisanduhian Gendarmerie, are armed with these rather than full-length rifles."
-	icon = 'icons/obj/guns/dominia_carbine.dmi'
+	icon = 'icons/obj/guns/faction/dominian_empire/dominia_carbine.dmi'
 	icon_state = "dom_carbine"
 	item_state = "dom_carbine"
 	slot_flags = SLOT_BACK|SLOT_OCLOTHING
@@ -863,12 +863,12 @@
 	icon_state = (ammo_magazine)? "dom_carbine" : "dom_carbine-empty"
 
 /obj/item/gun/projectile/automatic/rifle/dominia_lmg
-	name = "dominian light machine gun"
+	name = "\improper MPMG-24/5 platoon machine gun"
 	desc = "A machine gun based on the MPR-24/5 platform."
 	desc_extended = "Originally developed as a platoon-level weapon but later converted to squad-level use, the MPR-24/5 PMG (Platoon Machine Gun) is \
 	the most commonly-issued machine gun in the Imperial Army. The PMG is reliable and capable yet fairly heavy, and most non-geneboosted soldiers \
 	issued it receive a special load-bearing harness to make using it easier."
-	icon = 'icons/obj/guns/dominia_lmg.dmi'
+	icon = 'icons/obj/guns/faction/dominian_empire/dominia_lmg.dmi'
 	icon_state = "dom_lmg"
 	item_state = "dom_lmg"
 	caliber = "a556"
@@ -885,9 +885,9 @@
 	icon_state = (ammo_magazine)? "dom_lmg" : "dom_lmg-empty"
 
 /obj/item/gun/projectile/automatic/rifle/shotgun
-	name = "assault shotgun"
-	desc = "A experimental, semi-automatic combat shotgun, designed for boarding operations and law enforcement agencies."
-	icon = 'icons/obj/guns/assaultshotgun.dmi'
+	name = "Mastiff assault shotgun"
+	desc = "Designed by Zavodskoi Interstellar to be the end-all-be-all for boarding attempts, the Mastiff wasn't as successful as outlooks claimed."
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/assaultshotgun.dmi'
 	icon_state = "assaultshotgun"
 	item_state = "assaultshotgun"
 	w_class = WEIGHT_CLASS_BULKY
@@ -921,7 +921,7 @@
 	name = "dNAC-12 combat shotgun"
 	desc = "A magazine-fed semi-automatic combat shotgun, designed by d.N.A Defense on Xanu Prime."
 	desc_extended = "The dNAC-12 combat shotgun was designed for the All-Xanu Grand Army and the All-Xanu National Militia for its law enforcement duties and military police. Due to its reliability, ease of use, and flexibility however, it has been adopted by the Air Corps and Spacefleet as well for defensive purposes."
-	icon = 'icons/obj/guns/xanu_shotgun.dmi'
+	icon = 'icons/obj/guns/faction/dna_defense/xanu_shotgun.dmi'
 	icon_state = "xanu_shotgun"
 	item_state = "xanu_shotgun"
 	magazine_type = /obj/item/ammo_magazine/xanan_shotgun/shells
@@ -937,7 +937,7 @@
 		)
 
 /obj/item/gun/projectile/automatic/rifle/shotgun/konyang
-	name = "magazine-fed shotgun"
+	name = "\improper RCG-1 shotgun"
 	desc = "A compact semi-automatic shotgun, fed by a magazine. Unsuspectic, but powerful and not to be underestimated. Takes standard 12g shotgun ammo."
 	desc_extended = "The RCG-1, locally produced on Konyang, also nicknamed \"The Showstopper\" for its wide variety of applications. It uses a compact design with a newly developed type of double spring mechanism in the magazine \
 	to eradicate all kinds of feeding malfunctions, as well as groundbreaking caseless shotgun ammunition. Favoured by the Commandos of Konyang's Special Forces."
@@ -964,11 +964,11 @@
 	icon_state = (ammo_magazine)? "mshotgun" : "mshotgun-empty"
 
 /obj/item/gun/projectile/automatic/rifle/hook_mg
-	name = "unathi hook machine gun"
+	name = "\improper Hook machine gun"
 	desc = "A ballistic machine gun of Unathi manufacture, often used by the forces of the Traditionalist Coalition during the Contact War."
 	desc_extended = "The Hook Machinegun is a heavy automatic machinegun of Moghesian manufacture. Though the name of the creators of this weapon was lost to the destruction of the nuclear exchange, the Hook was known to be found in the hands of some of the better-equipped forces of the Traditionalist Coalition during the Contact War. \
 	This machine gun is carried on one's shoulder and thus can be used with a single hand. Though it can fire heavy cartridges, it is quite lacking in accuracy."
-	icon = 'icons/obj/guns/unathi_ballistics.dmi'
+	icon = 'icons/obj/guns/faction/izweski_hegemony/unathi_ballistics.dmi'
 	icon_state = "hookmg"
 	item_state = "hookmg"
 	caliber = "5.8mm"
@@ -989,11 +989,11 @@
 	icon_state = (ammo_magazine)? "hookmg" : "hookmg-empty"
 
 /obj/item/gun/projectile/automatic/tempestsmg
-	name = "tempest submachine gun"
-	desc = "The tempest sub-machine gun is a Hegemonic design dating back to the 2350s, though still produced in ample numbers to this day. While rather large and heavy for a weapon of its class, its simplicity and reliability have made it a popular weapon among Unathi for over a century, and the aging weapon was even used as the basis for future designs."
+	name = "\improper Tempest submachine gun"
+	desc = "The Tempest sub-machine gun is a Hegemonic design dating back to the 2350s, though still produced in ample numbers to this day. While rather large and heavy for a weapon of its class, its simplicity and reliability have made it a popular weapon among Unathi for over a century, and the aging weapon was even used as the basis for future designs."
 	magazine_type = /obj/item/ammo_magazine/tempestsmg
 	allowed_magazines = list(/obj/item/ammo_magazine/tempestsmg)
-	icon = 'icons/obj/guns/unathi_ballistics.dmi'
+	icon = 'icons/obj/guns/faction/izweski_hegemony/unathi_ballistics.dmi'
 	icon_state = "tempestsmg"
 	item_state = "tempestsmg"
 	caliber = "11.6mm"

code/modules/projectiles/guns/projectile/cannon.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/projectile/cannon
-	name = "hand cannon"
+	name = "culverin"
 	desc = "An amalgamation of ancient and modern tajaran technology. This old naval cannon was turned into a portable firearm."
-	icon = 'icons/obj/guns/cannon.dmi'
+	icon = 'icons/obj/guns/faction/nka/cannon.dmi'
 	icon_state = "cannon"
 	item_state = "cannon"
 	caliber = "cannon"
@@ -29,9 +29,9 @@
 	return ..()
 
 /obj/item/gun/projectile/nuke
-	name = "nuclear launcher"
+	name = "\improper Mai'Dhaztha Model anti-material nuclear warhead launcher"
 	desc = "A launcher weapon designated to fire miniaturized nuclear warheads."
-	icon = 'icons/obj/guns/blockbuster.dmi' // hoh
+	icon = 'icons/obj/guns/faction/pra/maidhaztha.dmi'
 	icon_state = "blockbuster"
 	item_state = "blockbuster"
 	caliber = "nuke"
@@ -69,7 +69,7 @@
 /obj/item/gun/projectile/recoilless_rifle
 	name = "adhomian recoilless rifle"
 	desc = "An inexpensive, one use anti-tank weapon used extensively by the Tajaran armed forces."
-	icon = 'icons/obj/guns/recoilless_rifle.dmi'
+	icon = 'icons/obj/guns/faction/dpra/recoilless_rifle.dmi'
 	icon_state = "recoilless_rifle"
 	item_state = "recoilless_rifle"
 	caliber = "recoilless_rifle"
@@ -110,9 +110,9 @@
 	return FALSE
 
 /obj/item/gun/projectile/peac
-	name = "point entry anti-materiel cannon"
+	name = "\improper SCC-PEAC-1 anti-materiel cannon"
 	desc = "An SCC-designed, man-portable cannon meant to neutralize mechanized threats. The disgustingly large accelerator capacitors make room for only one shot, so make it count."
-	icon = 'icons/obj/guns/peac.dmi'
+	icon = 'icons/obj/guns/faction/stellar_corporate_conglomerate/peac.dmi'
 	icon_state = "peac"
 	item_state = "peac"
 	caliber = "peac"

code/modules/projectiles/guns/projectile/improvised.dm

@@ -3,7 +3,7 @@
 /obj/item/gun/projectile/shotgun/improvised //similar to the double barrel, but without the option to fire both barrels
 	name = "improvised shotgun"
 	desc = "An improvised pipe assembly that can fire shotgun shells."
-	icon = 'icons/obj/guns/ishotgun.dmi'
+	icon = 'icons/obj/guns/faction/improvised/ishotgun.dmi'
 	icon_state = "ishotgun"
 	item_state = "ishotgun"
 	max_shells = 2
@@ -164,7 +164,7 @@
 	accuracy = -1
 	offhand_accuracy = 1
 	fire_delay = ROF_PISTOL
-	icon = 'icons/obj/guns/ipistol.dmi'
+	icon = 'icons/obj/guns/faction/improvised/ipistol.dmi'
 	icon_state = "ipistol"
 	item_state = "ipistol"
 	caliber = ".45"
@@ -231,7 +231,7 @@
 /obj/item/gun/projectile/automatic/improvised
 	name = "improvised machine pistol"
 	desc = "An improvised automatic handgun."
-	icon = 'icons/obj/guns/ismg.dmi'
+	icon = 'icons/obj/guns/faction/improvised/ismg.dmi'
 	icon_state = "ismg"
 	item_state = "ismg"
 	load_method = MAGAZINE

code/modules/projectiles/guns/projectile/pistol.dm

@@ -1,11 +1,11 @@
 /obj/item/gun/projectile/colt
-	name = ".45 combat pistol"
-	desc = "A robust metal-framed semi-automatic pistol produced in the system of San Colette."
+	name = "\improper Pattern 5 pistol"
+	desc = "A robust metal-framed semi-automatic pistol chambered in .45 produced in the system of San Colette."
 	desc_extended = "The Pattern 5 Pistol is the standard-issue sidearm for the Civil Guard, San Colette’s local military force. Loosely based on the standard 9mm pistol of the Solarian Army, the P5 fires a larger .45 round intended for use against heavier targets. \
 	The P5 is produced by the San Colette Interstellar Armaments Company (CAISC) and is often found abroad due to its rugged construction."
 	magazine_type = /obj/item/ammo_magazine/c45m
 	allowed_magazines = list(/obj/item/ammo_magazine/c45m)
-	icon = 'icons/obj/guns/colt.dmi'
+	icon = 'icons/obj/guns/faction/caisc/pattern_5.dmi'
 	icon_state = "colt"
 	item_state = "colt"
 	caliber = ".45"
@@ -46,12 +46,12 @@
 		return 1
 
 /obj/item/gun/projectile/colt/super
-	name = "ornamental .45 combat pistol"
-	desc = "A robust metal-framed semi-automatic pistol produced in the system of San Colette. This example sports a short slide, wood-paneled grips, and few signs of use, likely belonging to someone of higher stature."
+	name = "ornamental Pattern 5 pistol"
+	desc = "A robust metal-framed semi-automatic pistol chambered in .45 produced in the system of San Colette. This example sports a short slide, wood-paneled grips, and few signs of use, likely belonging to someone of higher stature."
 	desc_extended = "The Pattern 5 Pistol is the standard-issue sidearm for the Civil Guard, San Colette’s local military force. Loosely based on the standard 9mm pistol of the Solarian Army, the P5 fires a larger .45 round intended for use against heavier targets. \
 	The P5 is produced by the San Colette Interstellar Armaments Company (CAISC) and is often found abroad due to its rugged construction."
 	magazine_type = /obj/item/ammo_magazine/c45m/stendo
-	icon = 'icons/obj/guns/coltsuper.dmi'
+	icon = 'icons/obj/guns/faction/caisc/ornamental_pattern_5.dmi'
 	icon_state = "coltsuper"
 	item_state = "coltsuper"
 
@@ -63,12 +63,12 @@
 		icon_state = "coltsuper-e"
 
 /obj/item/gun/projectile/automatic/lebman
-	name = "automatic .45 combat pistol"
-	desc = "A robust metal-framed semi-automatic pistol produced in the system of San Colette. This example has been modified to allow fully-automatic fire, and sports a prominent vertical grip and muzzle compensator to aid in control."
+	name = "automatic Pattern 5 pistol"
+	desc = "A robust metal-framed semi-automatic pistol chambered in .45 produced in the system of San Colette. This example has been modified to allow fully-automatic fire, and sports a prominent vertical grip and muzzle compensator to aid in control."
 	desc_extended = "The Pattern 5 Pistol is the standard-issue sidearm for the Civil Guard, San Colette’s local military force. Loosely based on the standard 9mm pistol of the Solarian Army, the P5 fires a larger .45 round intended for use against heavier targets. \
 	The P5 is produced by the San Colette Interstellar Armaments Company (CAISC) and is often found abroad due to its rugged construction."
 	magazine_type = /obj/item/ammo_magazine/c45m/lebman
-	icon = 'icons/obj/guns/coltauto.dmi'
+	icon = 'icons/obj/guns/faction/caisc/pattern_5_auto.dmi'
 	icon_state = "coltauto"
 	item_state = "coltauto"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -90,10 +90,10 @@
 		icon_state = "coltauto-e"
 
 /obj/item/gun/projectile/sec
-	name = "\improper .45 pistol"
-	desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces."
-	desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
-	icon = 'icons/obj/guns/secgun.dmi'
+	name = "\improper Mk58 pistol"
+	desc = "A NanoTrasen-designed .45 sidearm, found among law enforcement and security forces."
+	desc_extended = "The Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/secgun.dmi'
 	icon_state = "secgun"
 	item_state = "secgun"
 	magazine_type = /obj/item/ammo_magazine/c45m/rubber
@@ -124,10 +124,10 @@
 	magazine_type = /obj/item/ammo_magazine/c45m/flash
 
 /obj/item/gun/projectile/sec/wood
-	name = "custom .45 pistol"
-	desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. It has a wooden grip."
-	desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a faux wooden grip. It uses .45 rounds."
-	icon = 'icons/obj/guns/secgun_wood.dmi'
+	name = "custom Mk58 pistol"
+	desc = "A NanoTrasen-designed .45 sidearm, found among law enforcement and security forces. It has a wooden grip."
+	desc_extended = "The Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a faux wooden grip. It uses .45 rounds."
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/secgun_wood.dmi'
 	icon_state = "secgunwood"
 	item_state = "secgunwood"
 
@@ -139,12 +139,12 @@
 		icon_state = "secgunwood-e"
 
 /obj/item/gun/projectile/automatic/x9
-	name = "automatic .45 pistol"
-	desc = "A NanoTrasen-designed sidearm, modified for fully-automatic fire. Issued to select security and law enforcement groups."
-	desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security \
+	name = "\improper Mk58-A machine pistol"
+	desc = "A NanoTrasen-designed .45 sidearm, modified for fully-automatic fire. Issued to select security and law enforcement groups."
+	desc_extended = "The Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security \
 	forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. \
 	A trademark of NanoTrasen security forces. This one has been modified for fully-automatic fire from the factory and sports a collapsible shoulder stock for better control. It uses .45 rounds."
-	icon = 'icons/obj/guns/x9.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/x9.dmi'
 	icon_state = "secgunauto"
 	item_state = "secgunauto"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -170,11 +170,11 @@
 		icon_state = "secgunauto-e"
 
 /obj/item/gun/projectile/tanto
+	name = "\improper Mk1-A Tanto machine pistol"
 	desc = "An automatic variant of the NanoTrasen Mk1 Everyman handgun that has been built to accept detachable magazines, negating one of the original \
 	weapon's biggest shortcomings. It is marketed towards lower-echelon security companies as a machine pistol named the Tanto, and features a burst-fire selector \
 	and sturdier barrel with heatshield to better take advantage of the higher capacity."
-	name = "10mm auto-pistol"
-	icon = 'icons/obj/guns/c05r.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/tanto.dmi'
 	icon_state = "c05r"
 	item_state = "c05r"
 	magazine_type = /obj/item/ammo_magazine/mc10mm
@@ -201,12 +201,12 @@
 		icon_state = "c05r-e"
 
 /obj/item/gun/projectile/silenced
-	name = "suppressed pistol"
+	name = "\improper Mrrazhakulii suppressed pistol"
 	desc = "A small, quiet, easily concealable gun."
 	desc_extended = "Created as a disposable and concealable weapon, the Mrrazhakulii suppressed pistol is a firearm with a suppressor integrated as part of its barrel. \
 		Carried by guerrilla forces and spies, those guns are used in assassination and subterfuge operations. Due to using cheap and available materials, such as \
 		recycled iron and tires, countless of those pistols were distributed among cells and ALA soldiers."
-	icon = 'icons/obj/guns/silenced_pistol.dmi'
+	icon = 'icons/obj/guns/faction/dpra/mrrazhakulii_suppressed_pistol.dmi'
 	icon_state = "silenced_pistol"
 	item_state = "silenced_pistol"
 	fire_sound = 'sound/weapons/gunshot/gunshot_suppressed.ogg'
@@ -230,9 +230,9 @@
 		icon_state = "[initial(icon_state)]-e"
 
 /obj/item/gun/projectile/deagle
-	name = ".50 magnum pistol"
-	desc = "A very robust handgun."
-	icon = 'icons/obj/guns/deagle.dmi'
+	name = "\improper Desert Eagle pistol"
+	desc = "An antique, usually impractical handgun firing .50 Action Express rounds. This one is still in good condition, if a bit rough around the edges."
+	icon = 'icons/obj/guns/faction/antique/deagle.dmi'
 	icon_state = "deagle"
 	item_state = "deagle"
 	force = 15
@@ -253,9 +253,9 @@
 		icon_state = "[initial(icon_state)]-e"
 
 /obj/item/gun/projectile/deagle/adhomai
-	name = "adhomian heavy pistol"
+	name = "\improper Nal'tor heavy pistol"
 	desc = "A bulky handgun used by republican commissars and high-ranking members of the Hadiist Party."
-	icon = 'icons/obj/guns/adhomian_heavy_pistol.dmi'
+	icon = 'icons/obj/guns/faction/pra/naltor_heavy_pistol.dmi'
 	icon_state = "adhomian_heavy_pistol"
 	item_state = "adhomian_heavy_pistol"
 	desc_extended = "Given to Republican Commissars and high ranking Party members, the Nal'tor Model Pistol is notable for its large caliber. Unlike the Adar'Mazy pistol, only a \
@@ -289,10 +289,10 @@
 		icon_state = "gyropistol"
 
 /obj/item/gun/projectile/pistol
-	name = "9mm pistol"
+	name = "\improper Moonlight pistol"
 	desc = "An extremely popular compact handgun, used throughout human space."
 	desc_extended = "The Zavodskoi Interstellar Moonlight 9mm can be found in the hands of just about anyone imaginable - special operatives, common criminals, police officers, the average Joe - on account of the time-tested design, low price point, reliability, and ease of concealment. Having a threaded barrel helps, too, and it isn't uncommon to see the Moonlight as a prop in spy films, suppressed."
-	icon = 'icons/obj/guns/pistol.dmi'
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/pistol.dmi'
 	icon_state = "pistol"
 	item_state = "pistol"
 	w_class = WEIGHT_CLASS_SMALL
@@ -307,18 +307,18 @@
 	magazine_type = /obj/item/ammo_magazine/mc9mm
 	allowed_magazines = list(/obj/item/ammo_magazine/mc9mm)
 	fire_delay = ROF_PISTOL
-	suppressor_x_offset = 5
+	suppressor_x_offset = 3
 
 /obj/item/gun/projectile/pistol/flash
 	name = "9mm signal pistol"
 	magazine_type = /obj/item/ammo_magazine/mc9mm/flash
 
 /obj/item/gun/projectile/pistol/detective
+	name = "\improper Mk21 Blackjack pistol"
 	desc = "A compact NanoTrasen designed sidearm, popular with law enforcement personnel for concealed carry purposes. It has a faux wooden grip."
-	desc_extended = "The NT Mk21 Blackjack is a ballistic sidearm developed and produced by NanoTrasen. Unlike the related Mk58, the Blackjack is a rather high quality piece - typically issued to higher ranking law enforcement personnel, the Mk21 is compact and chambered in 9mm caliber. With all the bells and whistles of a modern, quality police pistol, the Blackjack's main drawback is the notoriously nippy recoil - 9mm in such a small package can be unpleasant for the average shooter."
-	name = "compact 9mm pistol"
+	desc_extended = "The Mk21 Blackjack is a ballistic sidearm developed and produced by NanoTrasen. Unlike the related Mk58, the Blackjack is a rather high quality piece - typically issued to higher ranking law enforcement personnel, the Mk21 is compact and chambered in 9mm caliber. With all the bells and whistles of a modern, quality police pistol, the Blackjack's main drawback is the notoriously nippy recoil - 9mm in such a small package can be unpleasant for the average shooter."
 	magazine_type = /obj/item/ammo_magazine/mc9mm
-	icon = 'icons/obj/guns/detgun.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/detgun.dmi'
 	icon_state = "detgun"
 	item_state = "detgun"
 	can_suppress = FALSE
@@ -353,7 +353,7 @@
 /obj/item/gun/projectile/pirate
 	name = "zip gun"
 	desc = "Little more than a barrel, handle, and firing mechanism, cheap makeshift firearms like this one are not uncommon in frontier systems."
-	icon = 'icons/obj/guns/zipgun.dmi'
+	icon = 'icons/obj/guns/faction/frontier/zipgun.dmi'
 	icon_state = "zipgun"
 	item_state = "zipgun"
 	handle_casings = CYCLE_CASINGS //player has to take the old casing out manually before reloading
@@ -379,11 +379,11 @@
 	. = ..()
 
 /obj/item/gun/projectile/leyon
-	name = "10mm pistol"
+	name = "\improper Mk1 Everyman pistol"
 	desc = "NanoTrasen's first marketed firearm design, the Mk1, better known as the Everyman, was an instant hit - though it is a crude, \
 	stripper clip-fed design with a very small capacity, the Everyman is absurdly inexpensive and famously reliable, and is now one of the most \
 	common weapons found in the Orion Spur."
-	icon = 'icons/obj/guns/leyon.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/everyman.dmi'
 	icon_state = "leyon"
 	item_state = "leyon"
 	caliber = "10mm"
@@ -404,14 +404,14 @@
 		icon_state = "leyon-e"
 
 /obj/item/gun/projectile/pistol/sol
-	name = "solarian service pistol"
+	name = "\improper M8 pistol"
 	desc = "Manufactured by Zavodskoi Interstellar and based off of a full-sized variant of their 9mm design, the compact M8 is the standard service pistol of the Solarian Armed Forces."
-	icon = 'icons/obj/guns/sol_pistol.dmi'
+	icon = 'icons/obj/guns/faction/sol_alliance/sol_pistol.dmi'
 	icon_state = "m8"
 	item_state = "m8"
 	can_suppress = TRUE
-	suppressor_x_offset = 9
-	suppressor_y_offset = 3
+	suppressor_x_offset = 3
+	suppressor_y_offset = -2
 
 /obj/item/gun/projectile/pistol/sol/update_icon()
 	..()
@@ -421,9 +421,8 @@
 		icon_state = "m8-empty"
 
 /obj/item/gun/projectile/pistol/sol/siib
-	name = "solarian SIIB silenced pistol"
+	name = "\improper M8-SIIB suppressed pistol"
 	desc = "A variant of the M8 solarian service pistol, this paticular variant comes with an integrated recoil compensator and are used by SIIB agents and operatives. Officially, this pistol does not exist."
-	icon = 'icons/obj/guns/sol_pistol.dmi'
 	icon_state = "m8-siib"
 	item_state = "m8-siib"
 	suppressed = FALSE
@@ -437,10 +436,10 @@
 		icon_state = "m8-siib-empty"
 
 /obj/item/gun/projectile/pistol/sol/konyang
-	name = "konyang service pistol"
+	name = "\improper K8 pistol"
 	desc = "The compact M8, redesignated as the K8, is the standard service pistol of the Konyanger Armed Forces. Inherited from the Solarian military, Zavodskoi has since given these handguns \
 	a service extension package, including laser sights and replacement of worn-out parts."
-	icon = 'icons/obj/guns/konyang_weapons.dmi'
+	icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
 	icon_state = "k8"
 	item_state = "k8"
 
@@ -452,9 +451,9 @@
 		icon_state = "k8-empty"
 
 /obj/item/gun/projectile/pistol/adhomai
-	name = "adhomian service pistol"
+	name = "\improper Adar'Mazy pistol"
 	desc = "The Adar'Mazy pistol is an Adhomian firearm commonly issued to People's Republic officers, government officials and low-ranking Party members."
-	icon = 'icons/obj/guns/adhomian_pistol.dmi'
+	icon = 'icons/obj/guns/faction/pra/adhomian_pistol.dmi'
 	icon_state = "adhomian_pistol"
 	item_state = "adhomian_pistol"
 	can_suppress = FALSE
@@ -469,7 +468,7 @@
 		icon_state = "adhomian_pistol-e"
 
 /obj/item/gun/projectile/pistol/super_heavy
-	name = "super-heavy pistol"
+	name = "\improper Kumar Arms 2557 super-heavy pistol"
 	desc = "A big, bulky, and extremely powerful pistol, intended to pierce even your strongest enemy. You should wield this thing with two hands, if you want your wrists to stay intact."
 	desc_extended = "The Kumar Arms 2557 is a newly designed type of \"super-heavy\" pistol. \
 	It features a light-weight polymer pistol grip, a bulky plasteel frame and an extra long barrel. \
@@ -536,12 +535,12 @@
 					RH.take_damage(30)
 
 /obj/item/gun/projectile/xanupistol
-	name = "\improper Xanan service pistol"
+	name = "dNAC-4.6 service pistol"
 	desc = "A sleek metal-framed semi-automatic pistol, produced by d.N.A Defense for the All-Xanu Armed Forces."
 	desc_extended = "The dNAC-4.6 pistol is the standard issue sidearm for the All-Xanu Armed Forces. Designed to use 4.6x30mm rounds with less weight but better armor penetration than the 9mm pistols it replaced, the dNAC-4.6 has seen great success in Xanu Prime and beyond, as it has been adopted as a standard sidearm for police forces, military units, and other entities across the Coalition of Colonies and beyond."
 	magazine_type = /obj/item/ammo_magazine/c46m
 	allowed_magazines = list(/obj/item/ammo_magazine/c46m, /obj/item/ammo_magazine/c46m/extended)
-	icon = 'icons/obj/guns/xanu_pistol.dmi'
+	icon = 'icons/obj/guns/faction/dna_defense/xanu_pistol.dmi'
 	icon_state = "xanu_pistol"
 	item_state = "xanu_pistol"
 	caliber = "4.6mm"
@@ -567,13 +566,13 @@
 		icon_state = "xanu_pistol-e"
 
 /obj/item/gun/projectile/pistol/dominia
-	name = "dominian service pistol"
+	name = "\improper MPP-50 pistol"
 	desc = "The Imperial Army's standard-issue handgun. Cheap, reliable, and easy to use."
 	desc_extended = "The Moroz Pattern Pistol, Year of 2450 (MPP-50) is a reliable handgun chambered in 7.62 \
 	Imperial Short which features an unusual magazine. Zavodskoi Interstellar is a major producer of these handguns."
 	magazine_type = /obj/item/ammo_magazine/c45m/dominia
 	allowed_magazines = list(/obj/item/ammo_magazine/c45m/dominia)
-	icon = 'icons/obj/guns/dominia_pistol.dmi'
+	icon = 'icons/obj/guns/faction/dominian_empire/dominia_pistol.dmi'
 	icon_state = "dom_pistol"
 	item_state = "dom_pistol"
 	caliber = ".45"
@@ -589,13 +588,13 @@
 		icon_state = "dom_pistol-e"
 
 /obj/item/gun/projectile/pistol/spitter
-	name = "unathi spitter pistol"
+	name = "\improper Relzi-5 Spitter pistol"
 	desc = "The venerable 'spitter' pistol is an Unathi design nearly three centuries old. Though no longer in use by the Hegemony's forces, these guns are still commonplace in the hands of criminals, Wastelanders, and former Traditionalists."
 	desc_extended = "The Relzi-5 pistol, colloquially referred to as the 'spitter' was a common Unathi sidearm for centuries, though the design was already being phased out of Izweski use by the start of the Contact War due to superior-quality energy weapons becoming available.\
 	In the modern day, they are no longer produced, but the sheer volume of them in service means they can be found all over Moghes, and even in the wider Orion Spur."
 	magazine_type = /obj/item/ammo_magazine/spitterpistol
 	allowed_magazines = list(/obj/item/ammo_magazine/spitterpistol)
-	icon = 'icons/obj/guns/unathi_ballistics.dmi'
+	icon = 'icons/obj/guns/faction/izweski_hegemony/unathi_ballistics.dmi'
 	icon_state = "spitterpistol"
 	item_state = "spitterpistol"
 	caliber = "11.6mm"

code/modules/projectiles/guns/projectile/plasma.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/projectile/plasma
-	name = "plasma shotgun"
+	name = "OEI-2 plasma shotgun"
 	desc = "A marvel of Elyran weapons technology which utilizes superheated plasma to pierce thick armor with gruesome results."
-	icon = 'icons/obj/guns/slammer.dmi'
+	icon = 'icons/obj/guns/faction/elyran_republic/slammer.dmi'
 	icon_state = "slammer"
 	item_state = "slammer"
 	w_class = WEIGHT_CLASS_BULKY
@@ -23,9 +23,9 @@
 		icon_state = "[initial(icon_state)]-empty"
 
 /obj/item/gun/projectile/plasma/bolter
-	name = "plasma bolter"
+	name = "\improper OEI-2M plasma bolter"
 	desc = "A miniaturized, less efficient version of the infamous plasma slammer. Sacrifices much of its power for a more compact frame."
-	icon = 'icons/obj/guns/bolter.dmi'
+	icon = 'icons/obj/guns/faction/elyran_republic/bolter.dmi'
 	icon_state = "bolter"
 	item_state = "bolter"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -37,7 +37,7 @@
 	fire_delay = ROF_RIFLE
 
 /obj/item/gun/energy/mountedplasma
-	name = "plasma cannon"
+	name = "mounted plasma cannon"
 	fire_sound = 'sound/weapons/gunshot/slammer.ogg'
 	burst = 2
 	burst_delay = 3
@@ -48,9 +48,9 @@
 	projectile_type = /obj/projectile/plasma
 
 /obj/item/gun/projectile/plasma/bolter/pistol
-	name = "plasma pistol"
+	name = "\improper OEI-7 plasma pistol"
 	desc = "An Elyran designed firearm, used for diplomatic protection and high-value escort, which fires super heated bolts of plasma. Rare outside of Elyra due to the maintenance and production costs."
-	icon = 'icons/obj/guns/plasma_pistol.dmi'
+	icon = 'icons/obj/guns/faction/elyran_republic/plasma_pistol.dmi'
 	icon_state = "plasma"
 	item_state = "plasma"
 	magazine_type = /obj/item/ammo_magazine/plasma/light/pistol

code/modules/projectiles/guns/projectile/revolver.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/projectile/revolver
-	name = "revolver"
-	desc = "The revised Mark II Zavodskoi Interstellar revolver, utilizing a robust firing mechanism to deliver deadly rounds downrange. This is a monster of a hand cannon, with a beautiful cedar grip and a transparent plastic cover(so as to not splinter your hands while firing)."
-	icon = 'icons/obj/guns/revolver.dmi'
+	name = "\improper Mark II revolver"
+	desc = "The revised Mark II Zavodskoi Interstellar revolver, utilizing a robust firing mechanism to deliver deadly rounds downrange. This is a monster of a hand cannon, with a beautiful cedar grip and a transparent plastic cover (so as to not splinter your hands while firing)."
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/revolver.dmi'
 	icon_state = "revolver"
 	item_state = "revolver"
 	accuracy = 1
@@ -44,9 +44,9 @@
 	return ..()
 
 /obj/item/gun/projectile/revolver/mateba
-	name = "automatic revolver"
+	name = "\improper Hammerhead autorevolver"
 	desc = "The Hammerhead .454 autorevolver, a very rare weapon typical of special ops teams and mercenary teams. It packs quite the punch."
-	icon = 'icons/obj/guns/autorevolver.dmi'
+	icon = 'icons/obj/guns/faction/eridani_federation/autorevolver.dmi'
 	icon_state = "autorevolver"
 	item_state = "autorevolver"
 	max_shells = 7
@@ -58,13 +58,13 @@
 	magazine_type = /obj/item/ammo_magazine/a454
 
 /obj/item/gun/projectile/revolver/mateba/captain
-	name = "\improper SCC command autorevolver"
+	name = "\improper Protektor autorevolver"
 	desc = "A ludicrously powerful .454 autorevolver with equally ludicrous recoil which is issued by the SCC to the administrators of critical facilities and vessels. While revolvers may be a thing of the past, the stopping power displayed by this weapon is second to none."
 	desc_extended = "A Zavodskoi Interstellar design from the mid 2450s intended for export to the Eridani Corporate Federation and the Republic of Biesel, the Protektor \
 	revolver was never designed with practicality in mind. The .454 rounds fired from this weapon are liable to snap the wrist of an unprepared shooter and \
 	any following shots will be difficult to place onto a human-sized target due to the recoil, let alone a skrell. But nobody buys a Protektor for the purpose of \
 	practicality: they buy it due to having too much money and wanting a revolver large enough for their ego."
-	icon = 'icons/obj/guns/captain_revolver.dmi'
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/captain_revolver.dmi'
 	icon_state = "captain_revolver"
 	item_state = "captain_revolver"
 	is_wieldable = TRUE
@@ -96,7 +96,7 @@
 /obj/item/gun/projectile/revolver/detective
 	name = "antique revolver"
 	desc = "An old, obsolete revolver. It has no identifying marks, and is chambered in an equally antiquated caliber."
-	icon = 'icons/obj/guns/detective.dmi'
+	icon = 'icons/obj/guns/faction/antique/detective.dmi'
 	icon_state = "detective"
 	item_state = "detective"
 	max_shells = 6
@@ -130,7 +130,7 @@
 /obj/item/gun/projectile/revolver/derringer
 	name = "derringer"
 	desc = "A small pocket pistol, easily concealed."
-	icon = 'icons/obj/guns/derringer.dmi'
+	icon = 'icons/obj/guns/faction/frontier/derringer.dmi'
 	icon_state = "derringer"
 	item_state = "derringer"
 	accuracy = -1
@@ -160,7 +160,7 @@
 	if(attacking_item.tool_behaviour != TOOL_WIRECUTTER || icon_state == "revolver")
 		return ..()
 	to_chat(user, SPAN_NOTICE("You snip off the toy markings off the [src]."))
-	icon = 'icons/obj/guns/revolver.dmi'
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/revolver.dmi'
 	name = "revolver"
 	icon_state = "revolver"
 	item_state = "revolvers"
@@ -168,9 +168,9 @@
 	return 1
 
 /obj/item/gun/projectile/revolver/lemat
-	name = "grapeshot revolver"
-	desc = "A six shot revolver, with a secondary firing barrel for loading shotgun shells."
-	icon = 'icons/obj/guns/lemat.dmi'
+	name = "\improper P100 Mako revolver"
+	desc = "The P100 Mako is a 6-shot .38 Special revolver with a secondary firing barrel that can load shotgun shells."
+	icon = 'icons/obj/guns/faction/frontier/lemat.dmi'
 	icon_state = "lemat"
 	item_state = "lemat"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
@@ -267,9 +267,9 @@
 		. += "\The [src] has a secondary barrel that is empty."
 
 /obj/item/gun/projectile/revolver/adhomian
-	name = "adhomian service revolver"
-	desc = "The Royal Firearms Service Revolver is a simple and reliable design, favored by the nobility of the New Kingdom of Adhomai."
-	icon = 'icons/obj/guns/adhomian_revolver.dmi'
+	name = "\improper Royal Firearms Model 1 revolver"
+	desc = "The Royal Firearms Model 1 service Revolver is a simple and reliable design, favored by the nobility of the New Kingdom of Adhomai."
+	icon = 'icons/obj/guns/faction/nka/adhomian_revolver.dmi'
 	icon_state = "adhomian_revolver"
 	item_state = "adhomian_revolver"
 	caliber = "38"
@@ -312,7 +312,7 @@
 	name = "reclaimed revolver"
 	desc = "A revolver, made out of cheap scrap metal. Often used by Konyang's pirates."
 	desc_extended = "A six-shot revolver, crudely hacked together out of different kinds of scrap metal and wood. Made working by the ingenuity Konyang's pirates often need to show. Chambered in .38 ammo."
-	icon = 'icons/obj/guns/konyang_weapons.dmi'
+	icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
 	icon_state = "38_revolver"
 	item_state = "38_revolver"
 	caliber = "38"
@@ -328,12 +328,12 @@
 		icon_state = "38_revolver-e"
 
 /obj/item/gun/projectile/revolver/konyang/police
-	name = "police service revolver"
+	name = "\improper Nam-Kawada revolver"
 	desc = "A compact and reliable .45 caliber revolver. This one has Konyang National Police markings as well as a lanyard attached to it."
 	desc_extended = "The Nam-Kawada model .45 caliber revolver, named after its two inventors, is an adaptation of an old Zavodskoi design designed to be easily made from colony ship autolathes. \
 	The original design was first introduced in 2307 due to a growing need to arm the nascent Konyang National Police (then known as the Suwon Colonial Constabulary) in the face of both wildlife and the occasional criminal activity.\
 	The lack of a need for an upgrade, as well as institutional attachment to the design, has led to its continued use for almost two centuries."
-	icon = 'icons/obj/guns/konyang_weapons.dmi'
+	icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
 	icon_state = "police_gun"
 	item_state = "police_gun"
 	w_class = WEIGHT_CLASS_NORMAL

code/modules/projectiles/guns/projectile/rifle.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/projectile/shotgun/pump/rifle
-	name = "bolt action rifle"
+	name = "\improper Harrzhak pattern bolt action rifle"
 	desc = "A cheap ballistic rifle, often found in the hands of Tajaran conscripts."
-	icon = 'icons/obj/guns/moistnugget.dmi'
+	icon = 'icons/obj/guns/faction/pra/bolt.dmi'
 	icon_state = "moistnugget"
 	item_state = "moistnugget"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
@@ -40,9 +40,9 @@
 	ammo_type = /obj/item/ammo_casing/a68/blank
 
 /obj/item/gun/projectile/shotgun/pump/rifle/scope
-	name = "sniper bolt action rifle"
+	name = "scoped Harrzhak pattern bolt action rifle"
 	desc = "A cheap ballistic rifle, often found in the hands of Tajaran conscripts. This one has a telescopic sight attached to it."
-	icon = 'icons/obj/guns/bolt_scope.dmi'
+	icon = 'icons/obj/guns/faction/pra/bolt_scope.dmi'
 
 /obj/item/gun/projectile/shotgun/pump/rifle/scope/verb/scope()
 	set category = "Object.Held"
@@ -135,11 +135,11 @@
 	jam_chance = min(jam_chance + 5, 100)
 
 /obj/item/gun/projectile/shotgun/pump/rifle/dominia
-	name = "dominian sniper rifle"
+	name = "\improper MPMR-08/2 sniper rifle"
 	desc = "A precision rifle used by snipers and sharpshooters of the Imperial Army. One of the few modern military-grade weapons to use a bolt for its action."
 	desc_extended = "The MPMR-08/2 is a precisely machined and meticulously designed rifle which prioritizes accuracy and precision over rate of fire. \
 	Outside of the Imperial Army, it is commonly seen in the hands of competition shooters."
-	icon = 'icons/obj/guns/dominia_bolt_action.dmi'
+	icon = 'icons/obj/guns/faction/dominian_empire/dominia_bolt_action.dmi'
 	icon_state = "dom_bolt_action"
 	item_state = "dom_bolt_action"
 	caliber = "a762"
@@ -158,9 +158,9 @@
 		to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!"))
 
 /obj/item/gun/projectile/contender
-	name = "pocket rifle"
+	name = "\improper H-H Gram pocket rifle"
 	desc = "A perfect, pristine replica of an ancient one-shot hand-cannon. This one has been modified to work almost like a bolt-action."
-	icon = 'icons/obj/guns/pockrifle.dmi'
+	icon = 'icons/obj/guns/faction/frontier/pockrifle.dmi'
 	icon_state = "pockrifle"
 	item_state = "pockrifle"
 	caliber = "a556"
@@ -224,9 +224,9 @@
 	..()
 
 /obj/item/gun/projectile/shotgun/pump/rifle/vintage
-	name = "vintage bolt action rifle"
+	name = "\improper M1903 Springfield rifle"
 	desc = "An extremely old-looking rifle. Words you can't read are stamped on the gun. Doesn't look like it'll take any modern rounds."
-	icon = 'icons/obj/guns/springfield.dmi'
+	icon = 'icons/obj/guns/faction/antique/springfield.dmi'
 	icon_state = "springfield"
 	item_state = "springfield"
 	origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 3)
@@ -321,13 +321,20 @@
 	..()
 
 /obj/item/gun/projectile/gauss
-	name = "gauss thumper"
-	desc = "An outdated gauss weapon which sees sparing use in modern times."
+	name = "\improper NGS-01 gauss thumper"
+	desc = "An outdated model of gauss weapon which sees sparing use in modern times."
+	desc_extended = "Designed by NanoTrasen in 2398, the NGS-01 was an offshoot of the venerable HeS-05 gauss rifle. After purchasing \
+	the defunct Henricus company’s designs, work began on an upgrade. Trading in the depleted uranium rounds for tungsten that was more \
+	common in the Solarian core worlds, the power equipment was also made more compact thanks to the usage of phoron components pioneered by NT. \
+	This allowed for a magazine-based ammo loading system, no longer requiring the simple break-action that isolated the ammo from the hot temperatures. \
+	The result was the “Thumper” model of gauss gun. Its popularity quickly established NanoTrasen as a new player in the firearms \
+	industry. While at this point obsolete compared to newer models, its cheapness led it to be established as the official weapon of the \
+	then-recently established Tau Ceti Foreign Legion in 2459, providing it a new lease of life despite its obvious shortcomings due to its age."
 	w_class = WEIGHT_CLASS_NORMAL
 	slot_flags = SLOT_BACK
 	magazine_type = /obj/item/ammo_magazine/gauss
 	allowed_magazines = list(/obj/item/ammo_magazine/gauss)
-	icon = 'icons/obj/guns/gauss_thumper.dmi'
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/gauss_thumper.dmi'
 	icon_state = "gauss_thumper"
 	item_state = "gauss_thumper"
 	caliber = "gauss"
@@ -356,7 +363,8 @@
 /obj/item/gun/energy/gauss/mounted/mech
 	name = "heavy gauss cannon"
 	desc = "An outdated and power hungry gauss cannon, modified to deliver high explosive rounds at high velocities."
-	icon = 'icons/obj/guns/gauss_thumper.dmi'
+	desc_extended = null
+	icon = 'icons/obj/guns/faction/nanotrasen_corporation/gauss_thumper.dmi' //TODO: Needs a proper sprite
 	icon_state = "gauss_thumper"
 	fire_sound = SFX_SHOOT_GAUSS
 	fire_delay = ROF_UNWIELDY
@@ -369,15 +377,20 @@
 	recharge_time = 12
 	needspin = FALSE
 
-/obj/item/gun/projectile/gauss/carbine
-	name = "gauss carbine"
-	desc = "A simple gun utilizing the gauss technology. It is still reliable and cheap despite being outdated."
-	icon = 'icons/obj/guns/gauss_carbine.dmi'
+/obj/item/gun/projectile/gauss/old
+	name = "\improper Henricus HeS-05 gauss rifle"
+	desc = "A simple break-action gun utilizing gauss technology. It is still reliable and cheap despite being an out of date model."
+	desc_extended = "The Henricus company was de Namur Defense Systems’s chief rival throughout the 23rd and 24th centuries. While de Namur primarily \
+	focused on projectile weapons and armor, the Henricus company was known for its innovative at the time gauss weaponry. While popular throughout the \
+	Coalition, competition by megacorporations allowed in by the Solarian Reproachment chipped at their market share as the weapons became \
+	considered dated, and upgrades were slow to come. The Henricus company eventually shuttered its doors in 2391, its last production facilities \
+	being sold to de Namur."
+	icon = 'icons/obj/guns/faction/frontier/gauss_carbine.dmi'
 	icon_state = "gauss_carbine"
 	item_state = "gauss_carbine"
 	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = SLOT_BACK
-	ammo_type = /obj/item/ammo_casing/gauss/carbine
+	ammo_type = /obj/item/ammo_casing/gauss/old
 	load_method = SINGLE_CASING
 	handle_casings = HOLD_CASINGS
 	max_shells = 1
@@ -385,23 +398,27 @@
 	fire_delay_wielded = ROF_INTERMEDIATE
 	accuracy_wielded = 1
 
-/obj/item/gun/projectile/gauss/carbine/update_icon()
+/obj/item/gun/projectile/gauss/old/update_icon()
 	..()
 	if(loaded.len)
 		icon_state = "gauss_carbine"
 	else
 		icon_state = "gauss_carbine-e"
 
-/obj/item/gun/projectile/gauss/carbine/special_check(mob/user)
+/obj/item/gun/projectile/gauss/old/special_check(mob/user)
 	if(!wielded)
 		to_chat(user, SPAN_WARNING("You can't fire without stabilizing \the [src]!"))
 		return 0
 	return ..()
 
 /obj/item/gun/projectile/shotgun/pump/lever_action
-	name = "lever action rifle"
-	desc = "A lever action rifle with a side-loading port, these are still popular with frontiersmen for hunting and self-defense purposes."
-	icon = 'icons/obj/guns/leveraction.dmi'
+	name = "\improper Harrier-Elrond Zalen lever action rifle"
+	desc = "A lever action rifle from the frontier with a side-loading port, the Zalen is popular with frontiersmen for hunting and self-defense purposes."
+	desc_extended = "The Harrier-Elrond company is not well-known outside of the human frontier, and the outskirts of the Coalition. Mostly providing cheap \
+	firearms for those not readily served by the mega-corporations, a single factory is able to provide for an entire standard years’ demand. \
+	Despite this, the nearly century of business the company have been in have allowed for numerous copies to be found throughout the human frontier, \
+	and in many cases even beyond."
+	icon = 'icons/obj/guns/faction/frontier/leveraction.dmi'
 	icon_state = "leveraction"
 	item_state = "leveraction"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
@@ -420,12 +437,12 @@
 	can_sawoff = FALSE
 
 /obj/item/gun/projectile/shotgun/pump/rifle/magazine_fed/crackrifle
-	name = "crack rifle"
+	name = "\improper Azarak-96 crack rifle"
 	desc = "A heavy bolt-action rifle of Moghesian manufacture."
 	desc_extended = "Manufactured by the Azarak Kingdom in 2350, the Azarak-96 'Crack Rifle' is a bolt-action rifle of Moghesian manufacture, easily recognizable by its long bayonet and large magazine wrapped around its trigger guard.\
 	This heavy but powerful weapon is mostly known for its use by the common warrior of the Traditionalist Coalition during the Contact War.\
 	Many of these rifles survived the ravages of the Contact War, a testament to their reliability."
-	icon = 'icons/obj/guns/unathi_ballistics.dmi'
+	icon = 'icons/obj/guns/faction/izweski_hegemony/unathi_ballistics.dmi'
 	icon_state = "crackrifle"
 	item_state = "crackrifle"
 	caliber = "5.8mm"

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -1,4 +1,4 @@
-/obj/item/gun/projectile/shotgun
+ABSTRACT_TYPE(/obj/item/gun/projectile/shotgun)
 	name = "strange shotgun"
 	desc = DESC_PARENT
 	accuracy = -1
@@ -48,7 +48,7 @@
 /obj/item/gun/projectile/shotgun/pump
 	name = "pump shotgun"
 	desc = "An ubiquitous unbranded shotgun. Useful for sweeping alleys."
-	icon = 'icons/obj/guns/shotgun.dmi'
+	icon = 'icons/obj/guns/faction/frontier/shotgun.dmi'
 	icon_state = "shotgun"
 	item_state = "shotgun"
 	max_shells = 7 // max of 8
@@ -114,9 +114,9 @@
 	ammo_type = null
 
 /obj/item/gun/projectile/shotgun/pump/combat
-	name = "combat shotgun"
+	name = "\improper KS-40 combat shotgun"
 	desc = "Built for close quarters combat, the Hephaestus Industries KS-40 is widely regarded as a weapon of choice for repelling boarders."
-	icon = 'icons/obj/guns/cshotgun.dmi'
+	icon = 'icons/obj/guns/faction/hephaestus_industries/cshotgun.dmi'
 	icon_state = "cshotgun"
 	item_state = "cshotgun"
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
@@ -127,9 +127,9 @@
 	cycle_anim = FALSE
 
 /obj/item/gun/projectile/shotgun/pump/combat/sol
-	name = "solarian combat shotgun"
+	name = "\improper M63 combat shotgun"
 	desc = "A compact combat shotgun manufactured by Zavodskoi Interstellar for the Solarian Armed Forces, the M63 is most frequently employed by assaulters fighting in close-quarters environments, though it is also uncommonly used as a defensive weapon by Navy crewmen. Chambered in 12 gauge."
-	icon = 'icons/obj/guns/sol_shotgun.dmi'
+	icon = 'icons/obj/guns/faction/sol_alliance/sol_shotgun.dmi'
 	icon_state = "malella"
 	item_state = "malella"
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 3, TECH_ILLEGAL = 2)
@@ -216,11 +216,11 @@
 	force = 11
 
 /obj/item/gun/projectile/shotgun/doublebarrel/nitro
-	name = "gauss express rifle"
+	name = "\improper Pattern Nine gauss express rifle"
 	desc = "A Galatean nitro express rifle. Loaded with tungsten slugs."
 	desc_extended = "While Galatea almost universally uses lasers for their weapons, gauss weapons see some use in the hands of expeditionary forces and military specialist units. The Pattern Nine is a single-barrel, double-shot \
 	rifle designed for intermediate range anti-infantry specialists just as much as it is for Tsukuyomian game wardens."
-	icon = 'icons/obj/guns/galatea_nitro.dmi'
+	icon = 'icons/obj/guns/faction/galatean_technocracy/galatea_nitro.dmi'
 	icon_state = "nitrorifle"
 	item_state = "nitrorifle"
 	//SPEEDLOADER because rapid unloading.
@@ -245,7 +245,7 @@
 /obj/item/gun/projectile/shotgun/foldable
 	name = "foldable shotgun"
 	desc = "A single-shot shotgun that can be folded for easy concealment."
-	icon = 'icons/obj/guns/overunder.dmi'
+	icon = 'icons/obj/guns/faction/frontier/overunder.dmi'
 	icon_state = "overunder"
 	item_state = "overunder"
 	accuracy = 0
@@ -316,7 +316,7 @@
 	name = "wall gun"
 	desc = "A small yet powerful shotgun of Unathi make."
 	desc_extended = "The Moghesian wall gun, a classic Hegemonic weapon that saw plenty of service before and during the Contact War. This small-sized, break-action shotgun manages to pack a serious punch despite being barely larger than a pistol, however, it comes at the cost of extremely limited capacity. The wall gun is still produced and distributed nowadays, generally given to vehicle and ship crews and law enforcers."
-	icon = 'icons/obj/guns/unathi_ballistics.dmi'
+	icon = 'icons/obj/guns/faction/izweski_hegemony/unathi_ballistics.dmi'
 	icon_state = "wallgun"
 	item_state = "wallgun"
 	accuracy = 0

code/modules/projectiles/guns/projectile/sniper.dm

@@ -1,10 +1,10 @@
 /obj/item/gun/projectile/heavysniper
-	name = "anti-materiel rifle"
+	name = "\improper PTR-7 anti-materiel rifle"
 	desc = "The PTR-7 is man-portable anti-armor rifle fitted with a high-powered scope, capable of penetrating through most windows, airlocks, and non-reinforced walls with ease."
 	desc_extended = "A single-shot, bolt-action anachronism in an age of energy weapons, the PTR-7 was originally developed to combat exosuits, either by disabling critical systems \
 	or killing the pilot. Firing a high-velocity 14.5mm cartridge designed to defeat heavy armor, the PTR-7 boasts penetrative power unmatched by most in its class, though recent advancements \
 	in composites have rendered the weapon less effective at its intended purpose. Nonetheless, it still sees use among some groups as a general-purpose anti-materiel rifle."
-	icon = 'icons/obj/guns/heavysniper.dmi'
+	icon = 'icons/obj/guns/faction/frontier/heavysniper.dmi'
 	icon_state = "heavysniper"
 	item_state = "heavysniper"
 	w_class = WEIGHT_CLASS_BULKY
@@ -100,7 +100,7 @@
 /obj/item/gun/projectile/heavysniper/unathi
 	name = "hegemony slugger"
 	desc = "An incredibly large firearm, produced by an Ouerean Guild. Uses custom slugger rounds."
-	icon = 'icons/obj/guns/unathi_slugger.dmi'
+	icon = 'icons/obj/guns/faction/izweski_hegemony/unathi_slugger.dmi'
 	icon_state = "slugger"
 	item_state = "slugger"
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 4)
@@ -146,7 +146,7 @@
 	desc_extended = "Designed and sold by Zeng-Hu Pharmaceuticals and produced on contract by Zavodskoi's Kumar Arms subsidiary, the rifle has quietly become ubiquitous among xenobiological researchers. \
 	While the weapon platform itself is expensive for a dart gun, users have come to adore it thanks to the benefit of its conditionally cheap ammo. Pricey off the shelf, facilities often pay a fraction \
 	of the cost thanks to rebates and bulk order discounts."
-	icon = 'icons/obj/guns/tranqsniper.dmi'
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/tranqsniper.dmi'
 	icon_state = "tranqsniper"
 	item_state = "tranqsniper"
 	w_class = WEIGHT_CLASS_BULKY
@@ -176,9 +176,9 @@
 		icon_state = "tranqsniper"
 
 /obj/item/gun/projectile/dragunov
-	name = "adhomian marksman rifle"
+	name = "\improper Ho'taki marksman rifle"
 	desc = "A semi-automatic marksman rifle."
-	icon = 'icons/obj/guns/dragunov.dmi'
+	icon = 'icons/obj/guns/faction/pra/hotaki.dmi'
 	icon_state = "dragunov"
 	item_state = "dragunov"
 
@@ -231,11 +231,11 @@
 		to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!"))
 
 /obj/item/gun/projectile/automatic/rifle/w556
-	name = "scout rifle"
-	desc = "The ZI Greyhound, the designated marksman rifle variant of Zavodskoi's ZI Bulldog carbine. Features a longer, heavier barrel \
+	name = "\improper Greyhound marksman rifle"
+	desc = "The Greyhound, the designated marksman rifle variant of Zavodskoi's Bulldog carbine. Features a longer, heavier barrel \
 	with a low-power fixed-magnification optic. A vertical grip has been attached under the forend, to help offset the change in balance \
 	and improve handling."
-	icon = 'icons/obj/guns/w556.dmi'
+	icon = 'icons/obj/guns/faction/zavodskoi_interstellar/w556.dmi'
 	icon_state = "w556rifle"
 	item_state = "w556rifle"
 	w_class = WEIGHT_CLASS_BULKY

code/modules/projectiles/projectile/beams.dm

@@ -46,7 +46,7 @@
 	impact_type = /obj/effect/projectile/impact/laser/scc
 
 /obj/projectile/beam/pistol/hegemony
-	icon = 'icons/obj/guns/hegemony_pistol.dmi'
+	icon = 'icons/obj/guns/faction/izweski_hegemony/hegemony_pistol.dmi'
 	icon_state = "hegemony_pistol"
 	damage = 30
 

code/modules/projectiles/suppressor.dm

@@ -1,7 +1,7 @@
 /obj/item/suppressor
 	name = "suppressor"
 	desc = "A suppressor"
-	icon = 'icons/obj/guns/suppressor.dmi'
+	icon = 'icons/obj/guns/attachments/suppressor.dmi'
 	icon_state = "suppressor_item"
 	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 3)
 	w_class = WEIGHT_CLASS_SMALL

code/modules/random_map/drop/drop_types.dm

@@ -31,9 +31,9 @@ GLOBAL_LIST_INIT_TYPED(supply_drop, /datum/supply_drop_loot, null)
 /datum/supply_drop_loot/lasers/New()
 	..()
 	contents = list(
-		/obj/item/gun/energy/laser,
-		/obj/item/gun/energy/laser,
-		/obj/item/gun/energy/sniperrifle,
+		/obj/item/gun/energy/rifle/laser,
+		/obj/item/gun/energy/rifle/laser,
+		/obj/item/gun/energy/rifle/laser/sniper,
 		/obj/item/gun/energy/rifle/ionrifle)
 
 /datum/supply_drop_loot/ballistics

code/modules/reagents/reagent_containers/spray.dm

@@ -261,7 +261,7 @@
 /obj/item/reagent_containers/spray/chemsprayer/xenobiology
 	name = "xenoblaster"
 	desc = "A child's plastic watergun repurposed for the use in pacifying slimes. Has an adjustable nozzle that controls precision as well as strength."
-	icon = 'icons/obj/guns/xenoblaster.dmi'
+	icon = 'icons/obj/guns/faction/toy/xenoblaster.dmi'
 	icon_state = "xenoblaster"
 	item_state = "xenoblaster"
 	contained_sprite = TRUE