Fix PR #584 and some additions for lockers and kink vendor

modular_citadel/code/modules/client/loadout/suit.dm

@@ -172,4 +172,14 @@
 /datum/gear/christmascoatrg
 	name = "Red and Green Christmas Coat"
 	category = SLOT_WEAR_SUIT
-	path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatrg
+	path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatrg
+
+/datum/gear/kromajacket
+	name = "Kromatose Military Jacket"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/polychromic/kromajacket
+
+/datum/gear/kromacrop
+	name = "Kromatose Short Jacket"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/polychromic/kromacrop

modular_citadel/code/modules/client/loadout/uniform.dm

@@ -450,3 +450,15 @@
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/corset
 	cost = 1
+
+/datum/gear/corset
+	name = "Corset"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/corset
+	cost = 1
+
+/datum/gear/shortsbra
+	name = "Kromatic Shorts and Top"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/polychromic/shortsbra
+	cost = 1

modular_citadel/code/modules/clothing/suits/polychromic_suit.dm

@@ -0,0 +1,56 @@
+/obj/item/clothing/suit/polychromic //enables all three overlays to reduce copypasta and defines basic stuff
+	name = "Kromatose Jacket"
+	desc = "A polychromatic jacket"
+	icon = 'modular_citadel/icons/polyclothes/item/suit.dmi'
+	alternate_worn_icon = 'modular_citadel/icons/polyclothes/mob/suit.dmi'
+	icon_state = "kromajacket"
+	item_color = "kromajacket"
+	item_state = "militaryjacket"
+	hasprimary = TRUE
+	hassecondary = TRUE
+	hastertiary = TRUE
+	primary_color = "#FFFFFF" //RGB in hexcode
+	secondary_color = "#FFFFFF"
+	tertiary_color = "#808080"
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+
+/obj/item/clothing/suit/polychromic/worn_overlays(isinhands, icon_file)	//this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon
+	. = ..()
+	if(hasprimary | hassecondary | hastertiary)
+		if(!isinhands)	//prevents the worn sprites from showing up if you're just holding them
+			if(hasprimary)	//checks if overlays are enabled
+				var/mutable_appearance/primary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-primary")	//automagical sprite selection
+				primary_worn.color = primary_color	//colors the overlay
+				. += primary_worn	//adds the overlay onto the buffer list to draw on the mob sprite.
+			if(hassecondary)
+				var/mutable_appearance/secondary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-secondary")
+				secondary_worn.color = secondary_color
+				. += secondary_worn
+			if(hastertiary)
+				var/mutable_appearance/tertiary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-tertiary")
+				tertiary_worn.color = tertiary_color
+				. += tertiary_worn
+
+/obj/item/clothing/suit/polychromic/kromajacket
+	name = "Kromatose Military Jacket"
+	desc = "A polychromatic jacket, in the military style"
+	icon_state = "kromajacket"
+	item_color = "kromajacket"
+	item_state = "militaryjacket"
+	primary_color = "#FFFFFF" //RGB in hexcode
+	secondary_color = "#353535"
+	tertiary_color = "#353535"
+	body_parts_covered= CHEST|GROIN|ARMS
+	allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/radio)
+
+/obj/item/clothing/suit/polychromic/kromacrop
+	name = "Kromatose Short Jacket"
+	desc = "A short polychromatic jacket, in the military style"
+	icon_state = "kromacrop"
+	item_color = "kromacrop"
+	item_state = "militaryjacket"
+	primary_color = "#FFFFFF" //RGB in hexcode
+	secondary_color = "#353535"
+	tertiary_color = "#353535"
+	body_parts_covered= CHEST|GROIN|ARMS
+	allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/radio)

modular_citadel/code/modules/clothing/under/polychromic_clothes.dm

@@ -198,4 +198,15 @@
 	hastertiary = FALSE
 	primary_color = "#808080" //RGB in hexcode
 	secondary_color = "#FF3535"
-	body_parts_covered = GROIN
+	body_parts_covered = GROIN
+
+/obj/item/clothing/under/polychromic/shortsbra
+	name = "Kromatic Shorts and Top"
+	desc = "A pair of shorts and a bikini top! They even change color!"
+	icon_state = "shortsbra"
+	item_color = "shortsbra"
+	item_state = "rainbow"
+	primary_color = "#808080" //RGB in hexcode
+	secondary_color = "#FFFFFF"
+	hastertiary = FALSE
+	body_parts_covered= CHEST|GROIN