Various clothing additions (#5731)

Various clothing additions, including bowties, cardigans and layerable t-shirts.
Evening gloves, waistcoats, swept skirts, short skirts (renamed to pencil skirts) and labcoats are now recolorable in the loadout.
Winter boots have been reworked and added to the loadout, designed to match the winter coats. They also now have a super secret and probably useless advantage over other boot choices.

aurorastation.dme

@@ -1323,6 +1323,7 @@
 #include "code\modules\clothing\under\accessories\badges.dm"
 #include "code\modules\clothing\under\accessories\holster.dm"
 #include "code\modules\clothing\under\accessories\lockets.dm"
+#include "code\modules\clothing\under\accessories\shirts.dm"
 #include "code\modules\clothing\under\accessories\storage.dm"
 #include "code\modules\clothing\under\jobs\civilian.dm"
 #include "code\modules\clothing\under\jobs\engineering.dm"

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

@@ -6,7 +6,12 @@
 
 /datum/gear/accessory/waistcoat
 	display_name = "waistcoat"
-	path = /obj/item/clothing/accessory/wcoat
+	path = /obj/item/clothing/accessory/wcoat_rec
+
+/datum/gear/accessory/waistcoat/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
 
 /datum/gear/accessory/armband
 	display_name = "armband selection"
@@ -62,6 +67,14 @@
 	ties["white tie"] = /obj/item/clothing/accessory/tie/white
 	gear_tweaks += new/datum/gear_tweak/path(ties)
 
+/datum/gear/accessory/bowtie
+	display_name = "bowtie"
+	path = /obj/item/clothing/accessory/tie/bowtie
+
+/datum/gear/accessory/bowtie/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
 /datum/gear/accessory/brown_vest
 	display_name = "webbing, engineering"
 	path = /obj/item/clothing/accessory/storage/brown_vest
@@ -134,6 +147,33 @@
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
 
+/datum/gear/accessory/longsleeve
+	display_name = "long-sleeved shirt"
+	path = /obj/item/clothing/accessory/longsleeve
+
+/datum/gear/accessory/longsleeve/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/accessory/longsleeve_s
+	display_name = "long-sleeved shirt, striped"
+	path = /obj/item/clothing/accessory/longsleeve_s
+
+/datum/gear/accessory/longsleeve_s/New()
+	..()
+	var/lshirt = list()
+	lshirt["black-striped"] = /obj/item/clothing/accessory/longsleeve_s
+	lshirt["blue-striped"] = /obj/item/clothing/accessory/longsleeve_sb
+	gear_tweaks += new/datum/gear_tweak/path(lshirt)
+
+/datum/gear/accessory/tshirt
+	display_name = "t-shirt"
+	path = /obj/item/clothing/accessory/tshirt
+
+/datum/gear/accessory/tshirt/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
 /datum/gear/accessory/scarf
 	display_name = "scarf selection"
 	path = /obj/item/clothing/accessory/scarf

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

@@ -29,6 +29,10 @@
 	display_name = "evening gloves"
 	path = /obj/item/clothing/gloves/evening
 
+/datum/gear/gloves/evening/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
 /datum/gear/gloves/ring
 	display_name = "ring"
 	path = /obj/item/clothing/ring/engagement

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

@@ -9,6 +9,10 @@
 	display_name = "workboots"
 	path = /obj/item/clothing/shoes/workboots
 
+/datum/gear/shoes/winterboots
+	display_name = "winter boots"
+	path = /obj/item/clothing/shoes/winter
+
 /datum/gear/shoes/sandals
 	display_name = "sandals"
 	path = /obj/item/clothing/shoes/sandal

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

@@ -52,19 +52,12 @@
 	path = /obj/item/clothing/suit/storage/toggle/hoodie/black
 
 /datum/gear/suit/labcoat
-	display_name = "labcoat selection"
+	display_name = "labcoat"
 	path = /obj/item/clothing/suit/storage/toggle/labcoat
 
 /datum/gear/suit/labcoat/New()
 	..()
-	var/labcoat = list()
-	labcoat["labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat
-	labcoat["labcoat, blue"] = /obj/item/clothing/suit/storage/toggle/labcoat/blue
-	labcoat["labcoat, green"] = /obj/item/clothing/suit/storage/toggle/labcoat/green
-	labcoat["labcoat, orange"] = /obj/item/clothing/suit/storage/toggle/labcoat/orange
-	labcoat["labcoat, purple"] = /obj/item/clothing/suit/storage/toggle/labcoat/purple
-	labcoat["labcoat, red"] = /obj/item/clothing/suit/storage/toggle/labcoat/red
-	gear_tweaks += new/datum/gear_tweak/path(labcoat)
+	gear_tweaks = list(gear_tweak_free_color_choice)
 
 /datum/gear/suit/overalls
 	display_name = "overalls"
@@ -369,3 +362,12 @@
 /datum/gear/suit/greenjacket
 	display_name = "green suit jacket"
 	path = /obj/item/clothing/suit/storage/toggle/greengov
+
+/datum/gear/suit/cardigan
+	display_name = "cardigan"
+	path = /obj/item/clothing/suit/cardigan
+	cost = 1 // has no pockets or any use whatsoever anyway
+
+/datum/gear/suit/cardigan/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)

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

@@ -50,34 +50,12 @@
 /datum/gear/uniform/skirt/New()
 	..()
 	var/skirts = list()
-	skirts["plaid skirt, blue"] = /obj/item/clothing/under/skirt/plaid_blue
-	skirts["plaid skirt, purple"] = /obj/item/clothing/under/skirt/plaid_purple
-	skirts["plaid skirt, red"] = /obj/item/clothing/under/skirt/plaid_red
-	skirts["jumpskirt, black"] = /obj/item/clothing/under/skirt/blackjumpskirt
-	skirts["skirt, black"] = /obj/item/clothing/under/skirt/
-	skirts["short skirt, black"] = /obj/item/clothing/under/skirt/short_black
-	skirts["short skirt, blue"] = /obj/item/clothing/under/skirt/blue
-	skirts["short skirt, red"] = /obj/item/clothing/under/skirt/red
-	skirts["skirt, swept"] = /obj/item/clothing/under/skirt/swept
-
-
+	skirts["casual skirt"] = /obj/item/clothing/under/skirt/casual
+	skirts["long skirt"] = /obj/item/clothing/under/skirt/long
+	skirts["pencil skirt"] = /obj/item/clothing/under/skirt/pencil
+	skirts["swept skirt"] = /obj/item/clothing/under/skirt/swept
 	gear_tweaks += new/datum/gear_tweak/path(skirts)
-
-/datum/gear/uniform/skirt/casual
-	display_name = "casual skirt"
-	path = /obj/item/clothing/under/skirt/casual
-
-/datum/gear/uniform/skirt/casual/New()
-	..()
-	gear_tweaks = list(gear_tweak_free_color_choice)
-
-/datum/gear/uniform/skirt/long
-	display_name = "long skirt"
-	path = /obj/item/clothing/under/skirt/long
-
-/datum/gear/uniform/skirt/long/New()
-	..()
-	gear_tweaks = list(gear_tweak_free_color_choice)
+	gear_tweaks += list(gear_tweak_free_color_choice)
 
 /datum/gear/uniform/suit
 	display_name = "suit selection"

code/modules/clothing/shoes/miscellaneous.dm

@@ -136,10 +136,10 @@
 	w_class = 2
 	species_restricted = null
 
-/obj/item/clothing/shoes/winter
+/obj/item/clothing/shoes/winter_old
 	name = "winter boots"
 	desc = "Boots lined with 'synthetic' animal fur."
-	icon_state = "winterboots"
+	icon_state = "winterboots_old"
 	cold_protection = FEET|LEGS
 	min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE
 	heat_protection = FEET|LEGS
@@ -163,4 +163,17 @@
 /obj/item/clothing/shoes/heels
 	name = "high heels"
 	desc = "A pair of high-heeled shoes. Fancy!"
-	icon_state = "heels"
+	icon_state = "heels"
+
+/obj/item/clothing/shoes/winter
+	name = "winter boots"
+	desc = "A pair of heavy winter boots made out of animal furs, reaching up to the knee."
+	icon_state = "winterboots"
+	item_state = "winterboots"
+	cold_protection = FEET|LEGS
+	min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE
+	heat_protection = FEET|LEGS
+	max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+	siemens_coefficient = 0.9
+	can_hold_knife = 1

code/modules/clothing/suits/miscellaneous.dm

@@ -561,3 +561,9 @@
 	icon_open = "sec_dep_jacket_open"
 	icon_closed = "sec_dep_jacket"
 
+/obj/item/clothing/suit/cardigan
+	name = "cardigan"
+	desc = "A cozy, warm knit cardigan. Only slightly worse than a blanket."
+	icon_state = "cardigan"
+	item_state = "cardigan"
+

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

@@ -131,6 +131,11 @@
 	name = "white tie"
 	icon_state = "whitetie"
 
+/obj/item/clothing/accessory/tie/bowtie
+	name = "bowtie"
+	desc = "Snazzy!"
+	icon_state = "bowtie"
+
 /obj/item/clothing/accessory/stethoscope
 	name = "stethoscope"
 	desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing."
@@ -251,38 +256,12 @@
 	desc = "An extremely rare golden medal awarded only by company officials. To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
 	icon_state = "gold_crest"
 
-//clothing-like acessories
-
-/obj/item/clothing/accessory/wcoat
-	name = "waistcoat"
-	desc = "For some classy, murderous fun."
-	icon_state = "wcoat"
-	item_state = "wcoat"
-
 /obj/item/clothing/accessory/suspenders
 	name = "suspenders"
 	desc = "They suspend the illusion of the mime's play."
 	icon_state = "suspenders"
 	item_state = "suspenders"
 
-/obj/item/clothing/accessory/sweater
-	name = "sweater"
-	desc = "A warm knit sweater."
-	icon_state = "sweater"
-	item_state = "sweater"
-
-/obj/item/clothing/accessory/dressshirt
-	name = "dress shirt"
-	desc = "A casual dress shirt."
-	icon_state = "dressshirt"
-	item_state = "dressshirt"
-
-/obj/item/clothing/accessory/dressshirt_r
-	name = "dress shirt"
-	desc = "A casual dress shirt. This one has its sleeves rolled up."
-	icon_state = "dressshirt_r"
-	item_state = "dressshirt_r"
-
 /obj/item/clothing/accessory/scarf
 	name = "white scarf"
 	desc = "A simple scarf, to protect your neck from the cold of space."

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

@@ -0,0 +1,55 @@
+/obj/item/clothing/accessory/sweater
+	name = "sweater"
+	desc = "A warm knit sweater."
+	icon_state = "sweater"
+	item_state = "sweater"
+
+/obj/item/clothing/accessory/dressshirt
+	name = "dress shirt"
+	desc = "A casual dress shirt."
+	icon_state = "dressshirt"
+	item_state = "dressshirt"
+
+/obj/item/clothing/accessory/dressshirt_r
+	name = "dress shirt"
+	desc = "A casual dress shirt. This one has its sleeves rolled up."
+	icon_state = "dressshirt_r"
+	item_state = "dressshirt_r"
+
+//Legacy
+/obj/item/clothing/accessory/wcoat
+	name = "waistcoat"
+	desc = "For some classy, murderous fun."
+	icon_state = "wcoat"
+	item_state = "wcoat"
+
+//New one that will actually be in the loadout
+/obj/item/clothing/accessory/wcoat_rec
+	name = "waistcoat"
+	desc = "For some classy, murderous fun."
+	icon_state = "wcoat_rec"
+	item_state = "wcoat_rec"
+
+/obj/item/clothing/accessory/longsleeve
+	name = "long-sleeved shirt"
+	desc = "A long-sleeved shirt made of light fabric."
+	icon_state = "longshirt"
+	item_state = "longshirt"
+
+/obj/item/clothing/accessory/longsleeve_s
+	name = "long-sleeved shirt"
+	desc = "A long-sleeved shirt made of light fabric. This one is striped."
+	icon_state = "longshirt_s"
+	item_state = "longshirt_s"
+
+/obj/item/clothing/accessory/longsleeve_sb
+	name = "long-sleeved shirt"
+	desc = "A long-sleeved shirt made of light fabric. This one is striped."
+	icon_state = "longshirt_sb"
+	item_state = "longshirt_sb"
+
+/obj/item/clothing/accessory/tshirt
+	name = "t-shirt"
+	desc = "A simple, cheap t-shirt."
+	icon_state = "tshirt"
+	item_state = "tshirt"

code/modules/clothing/under/skirts.dm

@@ -27,6 +27,11 @@
 	icon_state = "skirt_long"
 	worn_state = "skirt_long"
 
+/obj/item/clothing/under/skirt/pencil
+	name = "pencil skirt"
+	desc = "A professional-looking pencil skirt."
+	icon_state = "skirt_pencil"
+	worn_state = "skirt_pencil"
 
 /obj/item/clothing/under/skirt/short_black
 	name = "short black skirt"

html/changelogs/shedya-modular_tshirts.yml

@@ -0,0 +1,15 @@
+# Your name.  
+author: VTCobaltblood
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Various clothing additions, including bowties, cardigans and layerable t-shirts."
+  - rscadd: "Evening gloves, waistcoats, swept skirts, short skirts (renamed to pencil skirts) and labcoats are now recolorable in the loadout."
+  - tweak: "Winter boots have been reworked and added to the loadout, designed to match the winter coats. They also now have a super secret and probably useless advantage over other boot choices."