Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447

2019-12-30 18:14:47 +01:00
parent cd6bf76803 bfc6687916
commit 80e716eeaf
293 changed files with 21962 additions and 13202 deletions
@@ -467,6 +467,33 @@
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE

+/obj/item/clothing/under/sundresswhite
+	name = "white sundress"
+	desc = "Makes you want to frolic in a field of lillies."
+	icon_state = "sundress_white"
+	item_color = "sundress_white"
+	body_parts_covered = CHEST|GROIN
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/greendress
+	name = "green dress"
+	desc = "A tight green dress"
+	icon_state = "dress_green"
+	item_color = "dress_green"
+	body_parts_covered = CHEST|GROIN
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/pinkdress
+	name = "pink dress"
+	desc = "A tight pink dress"
+	icon_state = "dress_pink"
+	item_color = "dress_pink"
+	body_parts_covered = CHEST|GROIN
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
 /obj/item/clothing/under/captainparade
 	name = "captain's parade uniform"
 	desc = "A captain's luxury-wear, for special occasions."
@@ -509,6 +536,24 @@
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE

+/obj/item/clothing/under/westernbustle
+	name = "western bustle dress"
+	desc = "Filled with Western fire."
+	icon_state = "western_bustle"
+	item_state = "wcoat"
+	item_color = "western_bustle"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/flamenco
+	name = "flamenco dress"
+	desc = "Filled with Latin fire."
+	icon_state = "flamenco"
+	item_state = "wcoat"
+	item_color = "flamenco"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
 /obj/item/clothing/under/stripeddress
 	name = "striped dress"
 	desc = "Fashion in space."
@@ -529,6 +574,44 @@
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE

+/obj/item/clothing/under/flowerdress
+	name = "flower dress"
+	desc = "Lovely dress"
+	icon_state = "flower_dress"
+	item_state = "sailordress"
+	item_color = "flower_dress"
+	body_parts_covered = CHEST|GROIN
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/sweptskirt
+	name = "swept skirt"
+	desc = "Formal skirt"
+	icon_state = "skirt_swept"
+	item_color = "skirt_swept"
+	body_parts_covered = GROIN
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/corset
+	name = "black corset"
+	desc = "Nanotrasen is not resposible for any organ damage"
+	icon_state = "corset"
+	item_color = "corset"
+	body_parts_covered = CHEST|GROIN
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/croptop
+	name = "crop top"
+	desc = "We've saved money by giving you half a shirt!"
+	icon_state = "sailor_dress"
+	item_state = "sailordress"
+	item_color = "sailor_dress"
+	body_parts_covered = CHEST|GROIN|ARMS
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
 /obj/item/clothing/under/redeveninggown
 	name = "red evening gown"
 	desc = "Fancy dress for space bar singers."
@@ -75,3 +75,34 @@
 	desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station."
 	icon_state = "camopants"
 	item_color = "camopants"
+
+/obj/item/clothing/under/pants/jeanripped
+	name = "ripped jeans"
+	desc = "If you're wearing this you're poor or a rebel"
+	icon_state = "jean_ripped"
+	item_color = "jean_ripped"
+
+/obj/item/clothing/under/pants/jeanshort
+	name = "jean shorts"
+	desc = "These are really just jeans cut in half"
+	icon_state = "jean_shorts"
+	item_color = "jean_shorts"
+
+/obj/item/clothing/under/pants/denimskirt
+	name = "denim skirt"
+	desc = "These are really just a jean leg hole cut from a pair"
+	icon_state = "denim_skirt"
+	item_color = "denim_skirt"
+
+/obj/item/clothing/under/pants/chaps
+	name = "black chaps"
+	body_parts_covered = LEGS
+	desc = "Yeehaw"
+	icon_state = "chaps"
+	item_color = "chaps"
+
+/obj/item/clothing/under/pants/yoga
+	name = "yoga pants"
+	desc = "Comfy!"
+	icon_state = "yoga_pants"
+	item_color = "yoga_pants"
@@ -0,0 +1,166 @@
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//	Polychromic Uniforms:																							 					  //
+//																													 					  //
+//		Polychromic clothes simply consist of 4 sprites: A base, unrecoloured sprite, and up to 3 greyscaled sprites. 					  //
+//	In order to add more polychromic clothes, simply create a base sprite, and up to 3 recolourable overlays for it,  					  //
+//	and then name them as follows: [name], [name]-primary, [name]-secondary, [name]-tertiary. The sprites should	  					  //
+//	ideally be in 'icons/obj/clothing/uniform.dmi' and 'icons/mob/uniform.dmi' for the	  														  //
+//	worn sprites. After that, copy paste the code from any of the example clothes and 													  //
+//	change the names around. [name] should go in BOTH icon_state and item_color. You can preset colors and disable	  					  //
+//	any overlays using the self-explainatory vars.																	  					  //
+//																													  					  //
+//																								-Tori				  					  //
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/obj/item/clothing/under/polychromic	//enables all three overlays to reduce copypasta and defines basic stuff
+	name = "polychromic suit"
+	desc = "For when you want to show off your horrible colour coordination skills."
+	icon_state = "polysuit"
+	item_color = "polysuit"
+	item_state = "sl_suit"
+	hasprimary = TRUE
+	hassecondary = TRUE
+	hastertiary = TRUE
+	primary_color = "#FFFFFF" //RGB in hexcode
+	secondary_color = "#FFFFFF"
+	tertiary_color = "#808080"
+	can_adjust = FALSE
+	mutantrace_variation = NONE //Not all clothes are currently digi-compatible (only the shorts are as of time of writing)
+
+/obj/item/clothing/under/polychromic/worn_overlays(isinhands, icon_file, style_flags = NONE)	//this is where the main magic happens.
+	. = ..()
+	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(icon_file, "[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(icon_file, "[item_color]-secondary")
+				secondary_worn.color = secondary_color
+				. += secondary_worn
+			if(hastertiary)
+				var/mutable_appearance/tertiary_worn = mutable_appearance(icon_file, "[item_color]-tertiary")
+				tertiary_worn.color = tertiary_color
+				. += tertiary_worn
+
+/obj/item/clothing/under/polychromic/shirt	//COPY PASTE THIS TO MAKE A NEW THING
+	name = "polychromic button-up shirt"
+	desc = "A fancy button-up shirt made with polychromic threads."
+	icon_state = "polysuit"
+	item_color = "polysuit"
+	item_state = "sl_suit"
+	primary_color = "#FFFFFF" //RGB in hexcode
+	secondary_color = "#353535"
+	tertiary_color = "#353535"
+
+/obj/item/clothing/under/polychromic/kilt
+	name = "polychromic kilt"
+	desc = "It's not a skirt!"
+	icon_state = "polykilt"
+	item_color = "polykilt"
+	item_state = "kilt"
+	primary_color = "#FFFFFF" //RGB in hexcode
+	secondary_color = "#F08080"
+	hastertiary = FALSE // so it doesn't futz with digilegs
+	body_parts_covered = CHEST|GROIN|ARMS
+
+/obj/item/clothing/under/polychromic/skirt
+	name = "polychromic skirt"
+	desc = "A fancy skirt made with polychromic threads."
+	icon_state = "polyskirt"
+	item_color = "polyskirt"
+	item_state = "rainbow"
+	primary_color = "#FFFFFF" //RGB in hexcode
+	secondary_color = "#F08080"
+	tertiary_color = "#808080"
+	body_parts_covered = CHEST|GROIN|ARMS
+
+/obj/item/clothing/under/polychromic/shorts
+	name = "polychromic shorts"
+	desc = "For ease of movement and style."
+	icon_state = "polyshorts"
+	item_color = "polyshorts"
+	item_state = "rainbow"
+	primary_color = "#353535" //RGB in hexcode
+	secondary_color = "#808080"
+	tertiary_color = "#808080"
+	body_parts_covered = CHEST|GROIN|ARMS
+	mutantrace_variation = STYLE_DIGITIGRADE //to enable digitigrade wearing
+
+/obj/item/clothing/under/polychromic/jumpsuit
+	name = "polychromic tri-tone jumpsuit"
+	desc = "A fancy jumpsuit made with polychromic threads."
+	icon_state = "polyjump"
+	item_color = "polyjump"
+	item_state = "rainbow"
+	primary_color = "#FFFFFF" //RGB in hexcode
+	secondary_color = "#808080"
+	tertiary_color = "#FF3535"
+
+/obj/item/clothing/under/polychromic/shortpants
+	name = "polychromic athletic shorts"
+	desc = "95% Polychrome, 5% Spandex!"
+	icon_state = "polyshortpants"
+	item_color = "polyshortpants"
+	item_state = "rainbow"
+	hastertiary = FALSE
+	primary_color = "#FFFFFF" //RGB in hexcode
+	secondary_color = "#F08080"
+	gender = PLURAL	//Because shortS
+	body_parts_covered = GROIN	//Because there's no shirt included
+
+/obj/item/clothing/under/polychromic/pleat
+	name = "polychromic pleated skirt"
+	desc = "A magnificent pleated skirt complements the woolen polychromatic sweater."
+	icon_state = "polypleat"
+	item_color = "polypleat"
+	item_state = "rainbow"
+	primary_color = "#8CC6FF" //RGB in hexcode
+	secondary_color = "#808080"
+	tertiary_color = "#FF3535"
+	body_parts_covered = CHEST|GROIN|ARMS
+
+/obj/item/clothing/under/polychromic/femtank
+	name = "polychromic feminine tank top"
+	desc = "Great for showing off your chest in style. Not recommended for males."
+	icon_state = "polyfemtankpantsu"
+	item_color = "polyfemtankpantsu"
+	item_state = "rainbow"
+	hastertiary = FALSE
+	primary_color = "#808080" //RGB in hexcode
+	secondary_color = "#FF3535"
+	body_parts_covered = CHEST|GROIN|ARMS
+
+/obj/item/clothing/under/polychromic/shortpants/pantsu
+	name = "polychromic panties"
+	desc = "Topless striped panties. Now with 120% more polychrome!"
+	icon_state = "polypantsu"
+	item_color = "polypantsu"
+	item_state = "rainbow"
+	hastertiary = FALSE
+	primary_color = "#FFFFFF" //RGB in hexcode
+	secondary_color = "#8CC6FF"
+	body_parts_covered = GROIN
+
+/obj/item/clothing/under/polychromic/bottomless
+	name = "polychromic bottomless shirt"
+	desc = "Great for showing off your junk in dubious style."
+	icon_state = "polybottomless"
+	item_color = "polybottomless"
+	item_state = "rainbow"
+	hastertiary = FALSE
+	primary_color = "#808080" //RGB in hexcode
+	secondary_color = "#FF3535"
+	body_parts_covered = CHEST|ARMS	//Because there's no bottom included
+
+/obj/item/clothing/under/polychromic/shimatank
+	name = "polychromic tank top"
+	desc = "For those lazy summer days."
+	icon_state = "polyshimatank"
+	item_color = "polyshimatank"
+	item_state = "rainbow"
+	primary_color = "#808080" //RGB in hexcode
+	secondary_color = "#FFFFFF"
+	tertiary_color = "#8CC6FF"
+	body_parts_covered = CHEST|GROIN