Merge remote-tracking branch 'upstream/master' into pr/376

code/game/objects/items/weapons/shields.dm

@@ -56,7 +56,7 @@
 
 /obj/item/weapon/shield/riot
 	name = "riot shield"
-	desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
+	desc = "Composite translucent shield useful for deflecting blunt objects or high speed collisions."
 	icon = 'icons/obj/items/weapons/weapons.dmi'
 	icon_state = "riot"
 	item_state = "riot"
@@ -114,8 +114,8 @@
 	var/active = 0
 
 /obj/item/weapon/shield/riot/metal
-	name = "metal shield"
-	name = "A metal riot shield effective, but heavy."
+	name = "assault shield"
+	desc = "Composite ballistic shield, painted a dark gray. If used correctly it can repel attacks from almost anything."
 	icon_state = "riotmetal"
 	item_state = "riotmetal"
 	base_icon_state = "riotmetal"
@@ -124,7 +124,7 @@
 
 /obj/item/weapon/shield/riot/ballistic //FOR THE ROYAL MARINE SPEC DO NOT TOUCH SMELLY MAN
 	name = "FBS-B Ballistic shield"
-	desc = "Ballistic shield used by the royal marines commando. This shield is commonly used during boarding actions due to its lightweight but durible design."
+	desc = "Ballistic shield used by the royal marines commando. This shield is commonly used during boarding actions due to its lightweight but durable design."
 	desc_lore = "The Fox Ballistic Shield-B (FBS-B), was originally introduced as the FBS, attempting to be a solution to high-impact operations following increased counter-insurgency deployments since 2151. It was designed to provide maximum protection, and for the user to be able to utilize their primary armament in tandem. By 2163 tertiary ballistics trials were undertaken to ascertain it's effectiveness against improved munitions, and was additionally used as an opportunity to  deal with user complaints making their way up from quartermasters. The complaints of the original FBS were twofold: weight and extended usage in combat causing the side to melt closest to the barrel. After further material research and in the field tests were conducted, by 2171, the FBS had attained a ballistics protection classification of D, the highest available for a portable shield, by being able to stop a singular armor piercing round. This reported success was due to the usage of a new fibre reinforced lightweight composite.  In the wake of the successful improvements, the FBS was later christened the FBS-B as with the enhanced shield, the user had a tendency for maximum aggression during engagements. The nickname 'Bellicose' was given to breachers by their squaddies and later became it's official designation."
 	icon_state = "ballisticshield"
 	item_state = "ballisticshield"