Greytide Worldwide (#8242)

code/modules/client/preference_setup/loadout/lists/footwear.dm

@@ -14,7 +14,9 @@
 	var/jackboots = list(
 		"Standard"			=	/obj/item/clothing/shoes/jackboots,
 		"Duty"				=	/obj/item/clothing/shoes/jackboots/duty,
-		"Duty, long"		=	/obj/item/clothing/shoes/jackboots/duty/long
+		"Duty, long"		=	/obj/item/clothing/shoes/jackboots/duty/long,
+		"Service"			= 	/obj/item/clothing/shoes/jackboots/ironhammer,
+		"Oberth"			= 	/obj/item/clothing/shoes/jackboots/german
 	)
 	gear_tweaks += new /datum/gear_tweak/path(jackboots)
 
@@ -31,6 +33,20 @@
 	display_name = "shoes, classy"
 	path = /obj/item/clothing/shoes/reinforced
 
+/datum/gear/shoes/lacey
+	display_name = "classy shoes, selection"
+	path = /obj/item/clothing/shoes/reinforced
+
+/datum/gear/shoes/lacey/New()
+	..()
+	var/lacey = list(
+		"Standard"			=	/obj/item/clothing/shoes/reinforced,
+		"Service"			=	/obj/item/clothing/shoes/reinforced/ironhammer
+	)
+	gear_tweaks += new /datum/gear_tweak/path(lacey)
+
+
+
 /*//Same with /datum/gear/shoes/lacey
 
 /datum/gear/shoes/dress

code/modules/client/preference_setup/loadout/lists/headwear.dm

@@ -71,6 +71,10 @@
 	path = /obj/item/clothing/head/soft/sec
 	allowed_roles = list(ASSISTANT_TITLE)
 
+/datum/gear/head/cap/synd
+	display_name = "cap, old syndicate"
+	path = /obj/item/clothing/head/soft/synd
+
 /datum/gear/head/cap/rainbow
 	display_name = "cap, rainbow"
 	path = /obj/item/clothing/head/soft/rainbow
@@ -84,13 +88,12 @@
 	var/cap = list(
 		"White"			=	/obj/item/clothing/head/soft/mime,
 		"Grey"			=	/obj/item/clothing/head/soft/grey,
-		"Brown-Flat"	=	/obj/item/clothing/head/flatcap,
+		"Black"			=	/obj/item/clothing/head/soft/black,
 		"Red"			=	/obj/item/clothing/head/soft/red,
 		"Orange"		=	/obj/item/clothing/head/soft/orange,
 		"Yellow"		=	/obj/item/clothing/head/soft/yellow,
 		"Green"			=	/obj/item/clothing/head/soft/green,
 		"Blue"			=	/obj/item/clothing/head/soft/blue,
-		"Blue Station"	=	/obj/item/clothing/head/mailman,
 		"Purple"		=	/obj/item/clothing/head/soft/purple,
 	)
 	gear_tweaks += new /datum/gear_tweak/path(cap)

code/modules/client/preference_setup/loadout/lists/uniforms.dm

@@ -9,41 +9,23 @@
 	display_name = "kilt"
 	path = /obj/item/clothing/under/kilt
 
-/datum/gear/uniform/crewman
-	display_name = "jumpsuit, crewman"
-	path = /obj/item/clothing/under/rank/crewman
-
 /datum/gear/uniform/jumpsuit/rainbow
 	display_name = "jumpsuit, rainbow"
 	path = /obj/item/clothing/under/rainbow
 
 /datum/gear/uniform/jumpsuit/color_presets
 	display_name = "jumpsuit, color presets"
-	path = /obj/item/clothing/under/aqua
-	cost = 2
+	path = /obj/item/clothing/under/color/grey
+	cost = 1
 
 /datum/gear/uniform/jumpsuit/color_presets/New()
 	..()
 	var/jumpsuit = list(
 		"Black"			=	/obj/item/clothing/under/color/black,
 		"White"			=	/obj/item/clothing/under/color/white,
-		"Blue"			=	/obj/item/clothing/under/color/blue,
-		"Green"			=	/obj/item/clothing/under/color/green,
 		"Grey"			=	/obj/item/clothing/under/color/grey,
-		"Pink"			=	/obj/item/clothing/under/color/pink,
-		"Yellow"		=	/obj/item/clothing/under/color/yellow,
-		"Light-Blue"	=	/obj/item/clothing/under/lightblue,
-		"Red"			=	/obj/item/clothing/under/color/red,
-		"Aqua"			=	/obj/item/clothing/under/aqua,
-		"Purple"		=	/obj/item/clothing/under/purple,
-		"Light-Purple"	=	/obj/item/clothing/under/lightpurple,
-		"Light-Green"	=	/obj/item/clothing/under/lightgreen,
-		"Light-Brown"	=	/obj/item/clothing/under/lightbrown,
-		"Brown"			=	/obj/item/clothing/under/brown,
-		"Yellow-Green"	=	/obj/item/clothing/under/yellowgreen,
-		"Dark-Blue"		=	/obj/item/clothing/under/darkblue,
-		"Light-Red"		=	/obj/item/clothing/under/lightred,
-		"Dark-Red"		=	/obj/item/clothing/under/darkred,
+		"Orange"		=	/obj/item/clothing/under/color/orange,
+		"Crewman"		= 	/obj/item/clothing/under/rank/crewman
 	)
 	gear_tweaks += new /datum/gear_tweak/path(jumpsuit)
 
@@ -61,7 +43,8 @@
 	var/leisure = list(
 		"Brown Jacket" 			=	 /obj/item/clothing/under/leisure,
 		"White Blazer" 			=	 /obj/item/clothing/under/leisure/white,
-		"Patterned Pullover" 	=	 /obj/item/clothing/under/leisure/pullover
+		"Patterned Pullover" 	=	 /obj/item/clothing/under/leisure/pullover,
+		"Business Casual"		=	 /obj/item/clothing/under/leisure/joe
 	)
 	gear_tweaks += new /datum/gear_tweak/path(leisure)
 
@@ -166,7 +149,7 @@
 
 /datum/gear/uniform/punk
 	display_name = "punk outfit, selection"
-	path = /obj/item/clothing/under/genericb
+	path = /obj/item/clothing/under/johnny
 
 /datum/gear/uniform/punk/New()
 	..()

code/modules/clothing/head/soft_caps.dm

@@ -29,43 +29,48 @@
 /obj/item/clothing/head/soft/red
 	name = "red cap"
 	initial_name = "red cap"
-	desc = "A baseball hat in a tasteless red color."
+	desc = "A baseball hat in a tasteful crimson color."
 	icon_state = "redsoft"
 
 /obj/item/clothing/head/soft/blue
 	name = "blue cap"
 	initial_name = "blue cap"
-	desc = "A peaked cap in a tasteless blue color."
+	desc = "A baseball cap in a tasteless blue color."
 	icon_state = "bluesoft"
 
 /obj/item/clothing/head/soft/green
 	name = "green cap"
 	initial_name = "green cap"
-	desc = "A peaked cap in a tasteless green color."
+	desc = "A baseball cap in a tasteless green color."
 	icon_state = "greensoft"
 
 /obj/item/clothing/head/soft/yellow
 	name = "yellow cap"
 	initial_name = "yellow cap"
-	desc = "A peaked cap in a tasteless yellow color."
+	desc = "A baseball cap in a tasteless yellow color."
 	icon_state = "yellowsoft"
 
 /obj/item/clothing/head/soft/grey
 	name = "grey cap"
 	initial_name = "grey cap"
-	desc = "A peaked cap in a tasteful grey color."
+	desc = "A baseball cap in a tasteful grey color. Reeks of welder fuel."
 	icon_state = "greysoft"
 
+/obj/item/clothing/head/soft/black
+	name = "black cap"
+	initial_name = "black cap"
+	desc = "A simple baseball cap in a tasteful black color."
+
 /obj/item/clothing/head/soft/orange
 	name = "orange cap"
 	initial_name = "orange cap"
-	desc = "A peaked cap in a tasteless orange color."
+	desc = "A baseball cap in a bleak orange color."
 	icon_state = "orangesoft"
 
 /obj/item/clothing/head/soft/mime
 	name = "white cap"
 	initial_name = "cap"
-	desc = "A peaked cap in a tasteless white color."
+	desc = "A baseball cap in a tasteless white color."
 	icon_state = "mimesoft"
 
 /obj/item/clothing/head/soft/purple
@@ -77,7 +82,7 @@
 /obj/item/clothing/head/soft/rainbow
 	name = "rainbow cap"
 	initial_name = "rainbow cap"
-	desc = "A peaked cap in a bright rainbow of colors."
+	desc = "A flimsy cap in a bright rainbow of colors."
 	icon_state = "rainbowsoft"
 
 /obj/item/clothing/head/soft/sec
@@ -86,10 +91,16 @@
 	desc = "A washed out red cap bearing logo of the long defunct \"Securitech\" company."
 	icon_state = "secsoft"
 
+/obj/item/clothing/head/soft/synd
+	name = "ancient syndicate cap"
+	initial name = "ancient syndicate cap"
+	desc = "A corporate war style field cap. Popular among patriots and veterans nowadays."
+	icon_state = "syndsoft"
+
 /obj/item/clothing/head/soft/sec/corp
 	name = "corporate security cap"
 	initial_name = "corporate security cap"
-	desc = "A field cap in corporate colors."
+	desc = "An old field cap for an ancient security corp. Popular fashion statement recently."
 	icon_state = "corpsoft"
 
 // S E R B I A //

code/modules/clothing/under/color.dm

@@ -3,6 +3,7 @@
 
 /obj/item/clothing/under/color/black
 	name = "black jumpsuit"
+	desc = " A generic set of black spacer coveralls."
 	initial_name = "black jumpsuit"
 	icon_state = "black"
 	item_state = "bl_suit"
@@ -24,6 +25,7 @@
 
 /obj/item/clothing/under/color/grey
 	name = "grey jumpsuit"
+	desc = "...Just plain grey spacer coveralls, and such..."
 	initial_name = "grey jumpsuit"
 	icon_state = "grey"
 	item_state = "gy_suit"
@@ -55,6 +57,7 @@
 
 /obj/item/clothing/under/color/white
 	name = "white jumpsuit"
+	desc = "A set of generic coveralls in white."
 	initial_name = "white jumpsuit"
 	icon_state = "white"
 	item_state = "w_suit"

code/modules/clothing/under/miscellaneous.dm

@@ -204,6 +204,12 @@ obj/item/clothing/under/leisure/pullover
 	icon_state = "pullover"
 	item_state = "pullover"
 
+/obj/item/clothing/under/leisure/joe
+	name = "red casual suit"
+	desc = "A salmon colored casual suit for office workers."
+	icon_state = "joe"
+	item_state = "joe"
+
 obj/item/clothing/under/neon
 	name = "green neon tracksuit"
 	desc = "A tracksuit lined with green neon fibers. Slightly luminescent."