Merge pull request #5121 from CHOMPStation2/upstream-merge-13884

[MIRROR] Adds more sock variants

code/datums/underwear/socks.dm

@@ -60,4 +60,128 @@
 
 /datum/category_item/underwear/socks/leggings
 	name = "Leggings"
-	icon_state = "leggings"
+	icon_state = "leggings"
+
+
+
+//NEW SOCKS BELOW HERE
+/datum/category_item/underwear/socks/white_norm
+	name = "White Socks"
+	icon_state = "white_norm"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/white_short
+	name = "Short White Socks"
+	icon_state = "white_short"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/white_knee
+	name = "White Knee Socks"
+	icon_state = "white_knee"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/white_thigh
+	name = "White Thigh Socks"
+	icon_state = "white_thigh"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/black_norm
+	name = "Black Socks"
+	icon_state = "black_norm"
+
+/datum/category_item/underwear/socks/black_short
+	name = "Short Black Socks"
+	icon_state = "black_short"
+
+/datum/category_item/underwear/socks/black_knee
+	name = "Black Knee Socks"
+	icon_state = "black_knee"
+
+/datum/category_item/underwear/socks/black_thigh
+	name = "Black Thigh Socks"
+	icon_state = "black_thigh"
+
+/datum/category_item/underwear/socks/assblastusa_knee
+	name = "Striped Patriotic Knee Socks"
+	icon_state = "assblastusa_knee"
+
+/datum/category_item/underwear/socks/assblastusa_thigh
+	name = "Striped Patriotic Thigh Socks"
+	icon_state = "assblastusa_thigh"
+
+/datum/category_item/underwear/socks/uk_knee
+	name = "United Kingdom Knee Socks"
+	icon_state = "uk_knee"
+
+/datum/category_item/underwear/socks/uk_thigh
+	name = "United Kingdom Thigh Socks"
+	icon_state = "uk_thigh"
+
+/datum/category_item/underwear/socks/commie_knee
+	name = "Yellow and Red Striped Knee Socks"
+	icon_state = "commie_knee"
+
+/datum/category_item/underwear/socks/commie_thigh
+	name = "Yellow and Red Striped Thigh Socks"
+	icon_state = "commie_thigh"
+
+/datum/category_item/underwear/socks/stockings_lpink
+	name = "Light Pink Stockings"
+	icon_state = "stockings_lpink"
+
+/datum/category_item/underwear/socks/stockings_purple
+	name = "Purple Stockings"
+	icon_state = "stockings_purple"
+
+/datum/category_item/underwear/socks/stockings_green
+	name = "Green Stockings"
+	icon_state = "stockings_green"
+
+/datum/category_item/underwear/socks/stockings_cyan
+	name = "Cyan Stockings"
+	icon_state = "stockings_cyan"
+
+/datum/category_item/underwear/socks/stockings_orange
+	name = "Orange Stockings"
+	icon_state = "stockings_orange"
+
+/datum/category_item/underwear/socks/stockings_yellow
+	name = "Yellow Stockings"
+	icon_state = "stockings_yellow"
+
+/datum/category_item/underwear/socks/stockings_dpink
+	name = "Dark Pink Stockings"
+	icon_state = "stockings_dpink"
+
+/datum/category_item/underwear/socks/stockings_blue
+	name = "Blue Stockings"
+	icon_state = "stockings_blue"
+
+/datum/category_item/underwear/socks/bee_thigh
+	name = "Bee Thigh Socks"
+	icon_state = "bee_thigh"
+
+/datum/category_item/underwear/socks/bee_knee
+	name = "Bee Knee Socks" //You do not know how much I want to make a 'bee's knees' pun.
+	icon_state = "bee_knee"
+
+/datum/category_item/underwear/socks/thocks
+	name = "Thocks"
+	icon_state = "thocks"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/ace_thigh
+	name = "Ace Pride Thigh Socks"
+	icon_state = "ace_thigh"
+
+/datum/category_item/underwear/socks/ace_knee
+	name = "Ace Pride Knee Socks"
+	icon_state = "ace_knee"
+
+/datum/category_item/underwear/socks/trans_knee
+	name = "Trans Pride Knee Socks"
+	icon_state = "trans_knee"
+
+/datum/category_item/underwear/socks/trans_thigh
+	name = "Trans Pride Thigh Socks"
+	icon_state = "trans_thigh"