cargo shorts and icon organizing

code/modules/client/preference_setup/loadout/loadout_uniform_ch.dm

@@ -96,3 +96,16 @@
 /datum/gear/uniform/vrsuit //Pathname of this particular item in the menu.
 	display_name = "vr suit" //The name of the suit as shown in the loadout menu
 	path = /obj/item/clothing/under/vrsuit //Pathname of the suit which is found in custom_clothes_ch.dm
+
+// Cargo shorts. The full-of-pockets kind, not the department 
+/datum/gear/uniform/cshorts
+	display_name = "cargo shorts"
+	path = /obj/item/clothing/under/shorts/cshorts/khaki
+
+/datum/gear/uniform/cshorts/New()
+	..()
+	var/list/cargo_shorts = list(
+		"Olive cargo shorts" = /obj/item/clothing/under/shorts/cshorts/olive,
+		"Khaki cargo shorts" = /obj/item/clothing/under/shorts/cshorts/khaki
+	)
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cargo_shorts))

code/modules/clothing/suits/hooded_ch.dm

@@ -2,7 +2,7 @@
 
 /obj/item/clothing/suit/storage/hooded/wintercoat/security/santa
 	name = "Santa's coat"
-	icon = 'icons/obj/clothing/uniforms_ch.dmi'
+	icon = 'icons/inventory/uniform/item_ch.dmi'
 	icon_override = 'icons/mob/suit_ch.dmi'
 	icon_state = "santacoat"
 	item_state_slots = list(slot_r_hand_str = "coatsecurity", slot_l_hand_str = "coatsecurity")

code/modules/clothing/under/miscellaneous_ch.dm

@@ -1,8 +1,8 @@
 /obj/item/clothing/under/sexybunny_white
 	name = "Bunny girl suit"
 	desc = "this seems to come with extra padding, exaggerating the chest some."
-	icon = 'icons/obj/clothing/uniforms_ch.dmi'
-	icon_override = 'icons/mob/uniform_ch.dmi'
+	icon = 'icons/inventory/uniform/item_ch.dmi'
+	icon_override = 'icons/inventory/uniform/mob_ch.dmi'
 	icon_state = "sexybunny_white"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
 

code/modules/clothing/under/shorts_ch.dm

@@ -0,0 +1,12 @@
+/obj/item/clothing/under/shorts/cshorts
+    name = "cargo shorts"
+    desc = "When you just don't have enough pockets."
+    icon = 'icons/inventory/uniform/item_ch.dmi'
+    icon_override = 'icons/inventory/uniform/mob_ch.dmi'
+    icon_state = "cshorts_olive"
+
+/obj/item/clothing/under/shorts/cshorts/olive
+    icon_state = "cshorts_olive"
+
+/obj/item/clothing/under/shorts/cshorts/khaki
+    icon_state = "cshorts_khaki"

code/modules/vore/fluffstuff/custom_clothes_ch.dm

@@ -147,6 +147,6 @@
 	name = "VR Suit" //The name of the suit when examined
 	desc = "An ancient suit used by studio companies long ago to make their virtual reality bones work better." //The description of the suit when examined
 	sensor_mode = 3 //Sensor mode which means that by default when someone spawns they will have tracking sensors on
-	icon = 'icons/obj/clothing/uniforms_ch.dmi' //The icon of the suit when shown in the player's HUD
-	icon_override = 'icons/mob/uniform_ch.dmi' //The icon of the suit worn by the character's sprite
+	icon = 'icons/inventory/uniform/item_ch.dmi' //The icon of the suit when shown in the player's HUD
+	icon_override = 'icons/inventory/uniform/mob_ch.dmi' //The icon of the suit worn by the character's sprite
 	icon_state = "vrsuit" //The name of the suit within the .dmi file

vorestation.dme

@@ -1202,8 +1202,8 @@
 #include "code\game\objects\items\glassjar.dm"
 #include "code\game\objects\items\gunbox.dm"
 #include "code\game\objects\items\gunbox_vr.dm"
-#include "code\game\objects\items\magazine.dm"
 #include "code\game\objects\items\latexballoon.dm"
+#include "code\game\objects\items\magazine.dm"
 #include "code\game\objects\items\paintkit.dm"
 #include "code\game\objects\items\pizza_voucher_vr.dm"
 #include "code\game\objects\items\poi_items.dm"
@@ -2189,6 +2189,7 @@
 #include "code\modules\clothing\under\pants.dm"
 #include "code\modules\clothing\under\shiny_vr.dm"
 #include "code\modules\clothing\under\shorts.dm"
+#include "code\modules\clothing\under\shorts_ch.dm"
 #include "code\modules\clothing\under\solgov.dm"
 #include "code\modules\clothing\under\solgov_vr.dm"
 #include "code\modules\clothing\under\syndicate.dm"