Merge pull request #6334 from Schnayy/clothingpack1

New Clothing & Sweaters

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

@@ -493,3 +493,11 @@ datum/gear/suit/duster
 	display_name = "snowsuit, supply"
 	path = /obj/item/clothing/suit/storage/snowsuit/cargo
 	allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician","Head of Personnel")
+
+/datum/gear/suit/miscellaneous/cardigan
+	display_name = "cardigan"
+	path = /obj/item/clothing/suit/storage/toggle/cardigan
+
+/datum/gear/suit/miscellaneous/cardigan/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)

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

@@ -502,3 +502,14 @@
 	display_name = "plain ascetic garb"
 	path = /obj/item/clothing/under/ascetic
 
+/datum/gear/uniform/pleated
+	display_name = "pleated skirt"
+	path = /obj/item/clothing/under/skirt/pleated
+
+/datum/gear/uniform/pleated/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/uniform/lilacdress
+	display_name = "lilac dress"
+	path = /obj/item/clothing/under/dress/lilacdress

code/modules/clothing/suits/miscellaneous.dm

@@ -323,7 +323,7 @@ obj/item/clothing/suit/kamishimo
 	item_state_slots = list(slot_r_hand_str = "leather_jacket", slot_l_hand_str = "leather_jacket")
 	flags_inv = HIDEHOLSTER
 
-obj/item/clothing/suit/storage/toggle/peacoat
+/obj/item/clothing/suit/storage/toggle/peacoat
 	name = "peacoat"
 	desc = "A well-tailored, stylish peacoat."
 	icon_state = "peacoat"
@@ -338,6 +338,14 @@ obj/item/clothing/suit/storage/toggle/peacoat
 	blood_overlay_type = "coat"
 	allowed = list(/obj/item/weapon/tank/emergency/oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter)
 	flags_inv = HIDEHOLSTER
+
+/obj/item/clothing/suit/storage/toggle/cardigan
+	name = "cardigan"
+	desc = "A cozy cardigan in a classic style."
+	icon_state = "cardigan"
+	addblends = "cardigan_a"
+	flags_inv = HIDEHOLSTER
+
 /*
  * stripper
  */

code/modules/clothing/under/accessories/clothing.dm

@@ -349,6 +349,25 @@
 	desc = "A really cheesy holiday sweater, it actually kinda itches."
 	icon_state = "turtleneck_winterred"
 
+/obj/item/clothing/accessory/sweater/uglyxmas
+	name = "ugly Christmas sweater"
+	desc = "A gift that probably should've stayed in the back of the closet."
+	icon_state = "uglyxmas"
+
+/obj/item/clothing/accessory/sweater/flowersweater
+	name = "flowery sweater"
+	desc =  "An oversized and flowery pink sweater."
+	icon_state = "flowersweater"
+
+/obj/item/clothing/accessory/sweater/redneck
+	name = "red turtleneck"
+	desc = "A comfortable turtleneck in a dark red."
+	icon_state = "turtleneck_red"
+
+//***
+// End of sweaters
+//***
+
 /obj/item/clothing/accessory/cowledvest
 	name = "cowled vest"
 	desc = "A body warmer for the 26th century."

code/modules/clothing/under/miscellaneous.dm

@@ -453,6 +453,10 @@
 	icon_state = "sari_green"
 	item_state_slots = list(slot_r_hand_str = "dress_green", slot_l_hand_str = "dress_green")
 
+/obj/item/clothing/under/dress/lilacdress
+	name = "lilac dress"
+	desc = "A simple black dress adorned in fake purple lilacs."
+	icon_state = "lilacdress"
 
 /*
  * wedding stuff

code/modules/clothing/under/shorts.dm

@@ -130,6 +130,12 @@
 	desc = "A piece of cloth wrapped around the waist."
 	icon_state = "loincloth"
 
+/obj/item/clothing/under/skirt/pleated
+	name = "pleated skirt"
+	desc = "A simple pleated skirt. It's like high school all over again."
+	icon_state = "pleated"
+	addblends = "pleated_a"
+
 /obj/item/clothing/under/skirt/outfit
 	name = "black skirt"
 	desc = "A black skirt, very fancy!"