Merge pull request #2668 from fauxki/bleeding-edge-freeze

Bleeding edge freeze - Swimsuits, Jacket, Formal Wear

code/game/objects/structures/crates_lockers/closets/fitness.dm

@@ -12,6 +12,11 @@
 	new /obj/item/clothing/under/shorts/red(src)
 	new /obj/item/clothing/under/shorts/blue(src)
 	new /obj/item/clothing/under/shorts/green(src)
+	new /obj/item/clothing/under/swimsuit/red(src)
+	new /obj/item/clothing/under/swimsuit/black(src)
+	new /obj/item/clothing/under/swimsuit/blue(src)
+	new /obj/item/clothing/under/swimsuit/green(src)
+	new /obj/item/clothing/under/swimsuit/purple(src)
 
 
 /obj/structure/closet/boxinggloves

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -16,6 +16,7 @@
 		else
 			new /obj/item/weapon/storage/backpack/satchel_cap(src)
 		new /obj/item/clothing/suit/captunic(src)
+		new /obj/item/clothing/suit/captunic/trek(src)
 		new /obj/item/clothing/head/helmet/cap(src)
 		new /obj/item/clothing/under/rank/captain(src)
 		new /obj/item/clothing/suit/armor/vest(src)
@@ -27,6 +28,7 @@
 		new /obj/item/weapon/gun/energy/gun(src)
 		new /obj/item/clothing/suit/armor/captain(src)
 		new /obj/item/weapon/melee/telebaton(src)
+		new /obj/item/clothing/under/dress/dress_cap(src)
 		return
 
 
@@ -55,6 +57,7 @@
 		new /obj/item/weapon/gun/energy/gun(src)
 		new /obj/item/device/flash(src)
 		new /obj/item/clothing/glasses/sunglasses(src)
+		new /obj/item/clothing/under/dress/dress_hop(src)
 		return
 
 

code/modules/clothing/head/misc.dm

@@ -7,6 +7,13 @@
 	flags = FPRINT|TABLEPASS
 	item_state = "centhat"
 
+/obj/item/clothing/head/hairflower
+	name = "hair flower pin"
+	icon_state = "hairflower"
+	desc = "Smells nice."
+	item_state = "hairflower"
+	flags = FPRINT|TABLEPASS
+
 /obj/item/clothing/head/powdered_wig
 	name = "powdered wig"
 	desc = "A powdered wig."

code/modules/clothing/shoes/colour.dm

@@ -68,6 +68,12 @@
 	permeability_coefficient = 0.01
 	color = "white"
 
+/obj/item/clothing/shoes/leather
+	name = "leather shoes"
+	desc = "A sturdy pair of leather shoes."
+	icon_state = "leather"
+	color = "leather"
+
 /obj/item/clothing/shoes/rainbow
 	name = "rainbow shoes"
 	desc = "Very gay shoes."

code/modules/clothing/suits/jobs.dm

@@ -21,6 +21,11 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	flags_inv = HIDEJUMPSUIT
 
+/obj/item/clothing/suit/captunic/trek
+	name = "captain's uniform jacket"
+	desc = "A less formal jacket for everyday captain use."
+	icon_state = "capjacket"
+
 //Chaplain
 /obj/item/clothing/suit/chaplain_hoodie
 	name = "chaplain hoodie"

code/modules/clothing/suits/miscellaneous.dm

@@ -287,6 +287,13 @@
 	desc = "A rather skimpy green dress."
 	icon_state = "stripper_g_over"
 	item_state = "stripper_g"
+
+/obj/item/clothing/under/stripper/mankini
+	name = "the mankini"
+	desc = "No honest man would wear this abomination"
+	icon_state = "mankini"
+	color = "mankini"
+
 /obj/item/clothing/suit/xenos
 	name = "xenos suit"
 	desc = "A suit made out of chitinous alien hide."
@@ -294,3 +301,35 @@
 	item_state = "xenos_helm"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+
+//swimsuit
+
+/obj/item/clothing/under/swimsuit/black
+	name = "black swimsuit"
+	desc = "An oldfashioned black swimsuit."
+	icon_state = "swim_black"
+	color = "swim_black"
+
+/obj/item/clothing/under/swimsuit/blue
+	name = "blue swimsuit"
+	desc = "An oldfashioned blue swimsuit."
+	icon_state = "swim_blue"
+	color = "swim_blue"
+
+/obj/item/clothing/under/swimsuit/purple
+	name = "purple swimsuit"
+	desc = "An oldfashioned purple swimsuit."
+	icon_state = "swim_purp"
+	color = "swim_purp"
+
+/obj/item/clothing/under/swimsuit/green
+	name = "green swimsuit"
+	desc = "An oldfashioned green swimsuit."
+	icon_state = "swim_green"
+	color = "swim_green"
+
+/obj/item/clothing/under/swimsuit/red
+	name = "red swimsuit"
+	desc = "An oldfashioned red swimsuit."
+	icon_state = "swim_red"
+	color = "swim_red"

code/modules/clothing/under/miscellaneous.dm

@@ -12,6 +12,13 @@
 	color = "blue_pyjamas"
 	item_state = "w_suit"
 
+/obj/item/clothing/under/captain_fly
+	name = "rogue captains uniform"
+	desc = "For the man who doesn't care because he's still free."
+	icon_state = "captain_fly"
+	item_state = "captain_fly"
+	color = "captain_fly"
+
 /obj/item/clothing/under/scratch
 	name = "white suit"
 	desc = "A white suit, suitable for an excellent host"
@@ -232,70 +239,116 @@
 	color = "gladiator"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
+//dress
+
+/obj/item/clothing/under/dress/dress_fire
+	name = "flame dress"
+	desc = "A small black dress with blue flames print on it."
+	icon_state = "dress_fire"
+	color = "dress_fire"
+
+/obj/item/clothing/under/dress/dress_green
+	name = "green dress"
+	desc = "A simple, tight fitting green dress."
+	icon_state = "dress_green"
+	color = "dress_green"
+
+/obj/item/clothing/under/dress/dress_orange
+	name = "orange dress"
+	desc = "A fancy orange gown for those who like to show leg."
+	icon_state = "dress_orange"
+	color = "dress_orange"
+
+/obj/item/clothing/under/dress/dress_pink
+	name = "pink dress"
+	desc = "A simple, tight fitting pink dress."
+	icon_state = "dress_pink"
+	color = "dress_pink"
+
+/obj/item/clothing/under/dress/dress_yellow
+	name = "yellow dress"
+	desc = "A flirty, little yellow dress."
+	icon_state = "dress_yellow"
+	color = "dress_yellow"
+
+/obj/item/clothing/under/dress/dress_saloon
+	name = "saloon girl dress"
+	desc = "A old western inspired gown for the girl who likes to drink."
+	icon_state = "dress_saloon"
+	color = "dress_saloon"
+
+/obj/item/clothing/under/dress/dress_rd
+	name = "research director dress uniform"
+	desc = "Feminine fashion for the style concious RD."
+	icon_state = "dress_rd"
+	color = "dress_rd"
+
+/obj/item/clothing/under/dress/dress_cap
+	name = "captain dress uniform"
+	desc = "Feminine fashion for the style concious captain."
+	icon_state = "dress_cap"
+	color = "dress_cap"
+
+/obj/item/clothing/under/dress/dress_hop
+	name = "head of personal dress uniform"
+	desc = "Feminine fashion for the style concious HoP."
+	icon_state = "dress_hop"
+	color = "dress_hop"
+
+/obj/item/clothing/under/dress/plaid_blue
+	name = "blue plaid skirt"
+	desc = "A preppy blue skirt with a white blouse."
+	icon_state = "plaid_blue"
+	color = "plaid_blue"
+
+/obj/item/clothing/under/dress/plaid_red
+	name = "red plaid skirt"
+	desc = "A preppy red skirt with a white blouse."
+	icon_state = "plaid_red"
+	color = "plaid_red"
+
+/obj/item/clothing/under/dress/plaid_purple
+	name = "blue purple skirt"
+	desc = "A preppy purple skirt with a white blouse."
+	icon_state = "plaid_purple"
+	color = "plaid_purple"
+
 //wedding stuff
+
 /obj/item/clothing/under/wedding/bride_orange
 	name = "orange wedding dress"
 	desc = "A big and puffy orange dress."
 	icon_state = "bride_orange"
-	item_state = "creamsuit"
 	color = "bride_orange"
 	flags_inv = HIDESHOES
 
-/obj/item/clothing/under/wedding/suit_white
+/obj/item/clothing/under/wedding/bride_purple
-	name = "white suit"
+	name = "purple wedding dress"
-	desc = "A fabulous white suit with orange shirt."
+	desc = "A big and puffy purple dress."
-	icon_state = "white_suit"
+	icon_state = "bride_purple"
-	item_state = "creamsuit"
+	color = "bride_purple"
-	color = "white_suit"
+	flags_inv = HIDESHOES
 
-/obj/item/clothing/under/wedding/bridesmaid
+/obj/item/clothing/under/wedding/bride_blue
-	name = "yellow dress"
+	name = "blue wedding dress"
-	desc = "A big and puffy orange dress."
+	desc = "A big and puffy blue dress."
-	icon_state = "bridesmaid"
+	icon_state = "bride_blue"
-	item_state = "creamsuit"
+	color = "bride_blue"
-	color = "bridesmaid"
+	flags_inv = HIDESHOES
 
-/obj/item/clothing/under/wedding/firedress
+/obj/item/clothing/under/wedding/bride_red
-	name = "flaming hot black dress"
+	name = "red wedding dress"
-	desc = "A small black dress with blue flames print on it."
+	desc = "A big and puffy red dress."
-	icon_state = "dress_fire"
+	icon_state = "bride_red"
-	item_state = "creamsuit"
+	color = "bride_red"
-	color = "dress_fire"
+	flags_inv = HIDESHOES
 
-/obj/item/clothing/under/wedding/dress_orange
+/obj/item/clothing/under/wedding/bride_white
-	name = "orange dress"
+	name = "orange wedding dress"
-	icon_state = "d_orange"
+	desc = "A white wedding gown made from the finest silk."
-	color = "d_orange"
+	icon_state = "bride_white"
-
+	color = "bride_white"
-/obj/item/clothing/under/wedding/dress_green
+	flags_inv = HIDESHOES
-	name = "green dress"
-	icon_state = "d_green"
-	color = "d_green"
-
-/obj/item/clothing/under/wedding/dress_purple
-	name = "purple dress"
-	icon_state = "d_purple"
-	color = "d_purple"
-
-/obj/item/clothing/under/wedding/dress_red
-	name = "red dress"
-	icon_state = "d_red"
-	color = "d_red"
-
-/obj/item/clothing/under/wedding/dress_blue
-	name = "blue dress"
-	icon_state = "d_blue"
-	color = "d_blue"
-
-/obj/item/clothing/under/wedding/officer_blue
-	name = "blue officer dress"
-	icon_state = "officer_blue"
-	color = "officer_blue"
-
-/obj/item/clothing/under/wedding/dress_vampire
-	name = "vampire dress"
-	icon_state = "d_vampire"
-	color = "d_vampire"
 
 /obj/item/clothing/under/sundress
 	name = "sundress"