Merge branch 'master' of https://github.com/PolarisSS13/Polaris into framecleanup2

code/datums/locations/s_randarr.dm

@@ -1,3 +1,5 @@
+//TODO: Make this match current lore
+
 //S'randarr
 
 /datum/locations/s_randarr

code/datums/underwear/underwear.dm

@@ -9,27 +9,34 @@
 *************/
 /datum/category_group/underwear
 	var/sort_order		// Lower sort order is applied as icons first
+	var/display_name	// For displaying in text
+	var/gender = NEUTER
 
 datum/category_group/underwear/dd_SortValue()
 	return sort_order
 
 /datum/category_group/underwear/top
 	name = "Underwear, top"
+	display_name = "top piece"
 	sort_order = 1
 	category_item_type = /datum/category_item/underwear/top
 
 /datum/category_group/underwear/bottom
 	name = "Underwear, bottom"
+	display_name = "bottom piece"
 	sort_order = 2
 	category_item_type = /datum/category_item/underwear/bottom
 
 /datum/category_group/underwear/socks
 	name = "Socks"
+	display_name = "socks"
+	gender = PLURAL
 	sort_order = 3
 	category_item_type = /datum/category_item/underwear/socks
 
 /datum/category_group/underwear/undershirt
 	name = "Undershirt"
+	display_name = "undershirt"
 	sort_order = 4		// Undershirts currently have the highest sort order because they may cover both underwear and socks.
 	category_item_type = /datum/category_item/underwear/undershirt