Merge pull request #2247 from Markolie/guns2

Guns rename, take two

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

@@ -1,5 +1,5 @@
 /obj/item/weapon/gun/energy/hos
-	name = "\improper X-01 MultiPhase Energy Gun"
+	name = "head of security's energy gun"
 	desc = "This is a modern recreation of the captain's antique laser gun. This gun has several unique fire modes, but lacks the ability to recharge over time."
 	icon_state = "hoslaser"
 	item_state = null	//so the human update icon uses the icon_state instead.

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

@@ -23,7 +23,7 @@ obj/item/weapon/gun/energy/laser/retro
 
 
 /obj/item/weapon/gun/energy/laser/captain
-	name = "\improper QSJ-01 premium laser pistol"
+	name = "captain's antique laser gun"
 	icon_state = "caplaser"
 	item_state = "caplaser"
 	desc = "This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. On the item is an image of Space Station 13. The station is exploding."

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

@@ -111,7 +111,7 @@
 	burst_size = 2	
 	
 /obj/item/weapon/gun/projectile/automatic/l6_saw
-	name = "\improper L6 SAW LMG"
+	name = "\improper L6 SAW"
 	desc = "A heavily modified 7.62 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation."
 	icon_state = "l6closed100"
 	item_state = "l6closedmag"

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

@@ -3,7 +3,7 @@
 
 
 /obj/item/weapon/gun/projectile/automatic/gyropistol
-	name = "\improper Gyrojet rocket pistol"
+	name = "gyrojet pistol"
 	desc = "A prototype pistol designed to fire self propelled rockets."
 	icon_state = "gyropistol"
 	fire_sound = 'sound/effects/Explosion1.ogg'

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

@@ -1,5 +1,5 @@
 /obj/item/weapon/gun/projectile/automatic/pistol
-	name = "\improper FK-69 pistol"
+	name = "stechkin pistol"
 	desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors."
 	icon_state = "pistol"
 	w_class = 2
@@ -19,7 +19,7 @@
 	return
 
 /obj/item/weapon/gun/projectile/automatic/pistol/m2411
-	name = "\improper M2411 pistol"
+	name = "M2411"
 	desc = "John Browning's classic updated for the modern day. Uses .45 rounds."
 	icon_state = "m2411"
 	w_class = 3.0
@@ -28,7 +28,7 @@
 	can_suppress = 0
 
 /obj/item/weapon/gun/projectile/automatic/pistol/deagle
-	name = "\improper Desert Eagle pistol"
+	name = "desert eagle"
 	desc = "A robust .50 AE handgun."
 	icon_state = "deagle"
 	force = 14.0

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

@@ -104,7 +104,7 @@
 ///////////////////////
 
 /obj/item/weapon/gun/projectile/shotgun/boltaction
-	name = "\improper Mosin Nagant rifle"
+	name = "\improper Mosin Nagant"
 	desc = "This piece of junk looks like something that could have been used 700 years ago."
 	icon_state = "moistnugget"
 	item_state = "moistnugget"
@@ -239,7 +239,7 @@
 		sawn_state = SAWN_INTACT
 	
 /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog
-	name = "\improper MLG-12 'Bulldog' Shotgun"
+	name = "\improper 'Bulldog' Shotgun"
 	desc = "A compact, mag-fed semi-automatic shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
 	icon_state = "bulldog"
 	item_state = "bulldog"