Merge pull request #613 from Citadel-Station-13/upstream-merge-26563

[MIRROR] Renames generic armor and athletic shorts

code/modules/clothing/suits/armor.dm

@@ -13,7 +13,7 @@
 	armor = list(melee = 30, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 50, acid = 50)
 
 /obj/item/clothing/suit/armor/vest
-	name = "armor"
+	name = "armor vest"
 	desc = "A slim armored vest that protects against most types of damage."
 	icon_state = "armoralt"
 	item_state = "armoralt"

code/modules/clothing/suits/armor.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm	(rejected hunks)
+@@ -140,7 +140,7 @@
+ 		return 1
+ 
+ /obj/item/clothing/suit/armor/vest/det_suit
+-	name = "armor"
++	name = "detective's armor vest"
+ 	desc = "An armored vest with a detective's badge on it."
+ 	icon_state = "detective-armor"
+ 	allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/ballistic,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder,/obj/item/weapon/melee/classic_baton/telescopic)

code/modules/clothing/under/shorts.dm

@@ -8,25 +8,31 @@
 	can_adjust = 0
 
 /obj/item/clothing/under/shorts/red
+	name = "red athletic shorts"
 	icon_state = "redshorts"
 	item_color = "redshorts"
 
 /obj/item/clothing/under/shorts/green
+	name = "green athletic shorts"
 	icon_state = "greenshorts"
 	item_color = "greenshorts"
 
 /obj/item/clothing/under/shorts/blue
+	name = "blue athletic shorts"
 	icon_state = "blueshorts"
 	item_color = "blueshorts"
 
 /obj/item/clothing/under/shorts/black
+	name = "black athletic shorts"
 	icon_state = "blackshorts"
 	item_color = "blackshorts"
 
 /obj/item/clothing/under/shorts/grey
+	name = "grey athletic shorts"
 	icon_state = "greyshorts"
 	item_color = "greyshorts"
 
 /obj/item/clothing/under/shorts/purple
+	name = "purple athletic shorts"
 	icon_state = "purpleshorts"
 	item_color = "purpleshorts"