Loads of Sprite Improvements (#8333)

* newshit * woops, needs a touchup * grammarchange (firefox is pedantic) * shit woops * Update code/modules/clothing/under/miscellaneous.dm Co-authored-by: KIROV#6255 <[email protected]> * Update code/modules/clothing/under/miscellaneous.dm Co-authored-by: KIROV#6255 <[email protected]> * Update code/modules/clothing/under/jobs/medsci.dm Co-authored-by: KIROV#6255 <[email protected]> * Update code/modules/clothing/under/jobs/civilian.dm Co-authored-by: KIROV#6255 <[email protected]> * Update code/modules/clothing/under/jobs/civilian.dm Co-authored-by: KIROV#6255 <[email protected]> * Update code/modules/clothing/suits/jobs.dm Co-authored-by: KIROV#6255 <[email protected]> * Update code/modules/client/preference_setup/loadout/lists/uniforms.dm Co-authored-by: KIROV#6255 <[email protected]> * Update code/modules/client/preference_setup/loadout/lists/uniforms.dm Co-authored-by: KIROV#6255 <[email protected]> * Update code/modules/clothing/suits/jobs.dm Co-authored-by: KIROV#6255 <[email protected]> * Update code/modules/clothing/suits/jobs.dm Co-authored-by: KIROV#6255 <[email protected]> * Update code/modules/clothing/suits/jobs.dm Co-authored-by: KIROV#6255 <[email protected]> * Update code/modules/clothing/suits/jobs.dm Co-authored-by: KIROV#6255 <[email protected]> * Update code/modules/clothing/under/jobs/civilian.dm Co-authored-by: KIROV#6255 <[email protected]> * Reverting Kirov's Shit Kirov, everything you said about formatting was the exact OPPOSITE of the status quo. Also fixes the viro uniform btw --------- Co-authored-by: KIROV#6255 <[email protected]>
discordia-space · Oct 13, 2023 · e7ca418 · e7ca418
1 parent e50fb2a
commit e7ca418
Show file tree

Hide file tree

Showing 22 changed files with 77 additions and 28 deletions.
diff --git a/code/game/objects/effects/spawners/corpsespawner.dm b/code/game/objects/effects/spawners/corpsespawner.dm
@@ -197,7 +197,8 @@
 		/obj/item/clothing/suit/storage/hazardvest,
 		/obj/item/clothing/suit/storage/hazardvest/orange,
 		/obj/item/clothing/suit/storage/hazardvest/black,
-		/obj/item/clothing/suit/storage/cargo_jacket/old,
+		/obj/item/clothing/suit/storage/cargo_jacket/black/old,
+		/obj/item/clothing/suit/storage/cargo_jacket/black,
 		/obj/item/clothing/suit/storage/toggle/bomber,
 		/obj/item/clothing/suit/storage/toggle/hoodie/black,
 		/obj/item/clothing/suit/storage/toggle/windbreaker,

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -6,7 +6,8 @@
 
 /obj/structure/closet/secure_closet/personal/cargotech/populate_contents()
 	new /obj/item/clothing/under/rank/cargotech(src)
-	new /obj/item/clothing/suit/storage/cargo_jacket/old(src)
+	new /obj/item/clothing/suit/storage/cargo_jacket/black/old(src)
+	new /obj/item/clothing/suit/storage/cargo_jacket/black(src)
 	new /obj/item/clothing/suit/storage/cargo_jacket(src)
 	new /obj/item/clothing/shoes/color/black(src)
 	new /obj/item/device/radio/headset/headset_cargo(src)

diff --git a/code/modules/client/preference_setup/loadout/lists/footwear.dm b/code/modules/client/preference_setup/loadout/lists/footwear.dm
@@ -41,6 +41,7 @@
 	..()
 	var/lacey = list(
 		"Standard"			=	/obj/item/clothing/shoes/reinforced,
+		"Leather"			=	/obj/item/clothing/shoes/leather,
 		"Service"			=	/obj/item/clothing/shoes/reinforced/ironhammer
 	)
 	gear_tweaks += new /datum/gear_tweak/path(lacey)
@@ -53,10 +54,6 @@
 	display_name = "shoes, dress"
 	path = /obj/item/clothing/shoes/reinforced*/
 
-/datum/gear/shoes/leather
-	display_name = "shoes, leather"
-	path = /obj/item/clothing/shoes/leather
-
 /datum/gear/shoes/rainbow
 	display_name = "shoes, rainbow"
 	path = /obj/item/clothing/shoes/color/rainbow
@@ -73,8 +70,9 @@
 /datum/gear/shoes/color_presets/New()
 	..()
 	var/shoes = list(
-		"White"			=	/obj/item/clothing/shoes/color/white,
 		"Black"			=	/obj/item/clothing/shoes/color/black,
+		"White"			=	/obj/item/clothing/shoes/color/white,
+		"Grey"			= 	/obj/item/clothing/shoes/color/grey,
 		"Brown"			=	/obj/item/clothing/shoes/color/brown,
 		"Red"			=	/obj/item/clothing/shoes/color/red,
 		"Orange"		=	/obj/item/clothing/shoes/color/orange,

diff --git a/code/modules/client/preference_setup/loadout/lists/gloves.dm b/code/modules/client/preference_setup/loadout/lists/gloves.dm
@@ -10,6 +10,11 @@
 	path = /obj/item/clothing/gloves/thick
 	cost = 3
 
+/datum/gear/gloves/leather
+	display_name = "gloves, leather"
+	path = /obj/item/clothing/gloves/botanic_leather
+	cost = 3
+
 /datum/gear/gloves/rainbow
 	display_name = "gloves, rainbow"
 	path = /obj/item/clothing/gloves/color/rainbow

diff --git a/code/modules/client/preference_setup/loadout/lists/suits.dm b/code/modules/client/preference_setup/loadout/lists/suits.dm
@@ -133,3 +133,14 @@
 /datum/gear/suit/bomj
 	display_name = "bomj coat"
 	path = /obj/item/clothing/suit/storage/bomj
+
+/datum/gear/suit/guild/black
+	display_name = "black guild coat"
+	path = /obj/item/clothing/suit/storage/cargo_jacket/black
+	allowed_roles = list(JOBS_CARGO)
+
+/datum/gear/suit/guild/black/old
+	display_name = "old black guild coat"
+	path = /obj/item/clothing/suit/storage/cargo_jacket/black/old
+	allowed_roles = list(JOBS_CARGO)
+
diff --git a/code/modules/client/preference_setup/loadout/lists/uniforms.dm b/code/modules/client/preference_setup/loadout/lists/uniforms.dm
@@ -1,13 +1,9 @@
 // Uniform slot
 /datum/gear/uniform
-	display_name = "blazer, blue"
-	path = /obj/item/clothing/under/blazer
-	slot = slot_w_uniform
-	sort_category = "Uniforms and Casual Dress"
-
-/datum/gear/uniform/kilt
 	display_name = "kilt"
 	path = /obj/item/clothing/under/kilt
+	slot = slot_w_uniform
+	sort_category = "Uniforms and Casual Dress"
 
 /datum/gear/uniform/jumpsuit/rainbow
 	display_name = "jumpsuit, rainbow"
@@ -25,6 +21,10 @@
 		"White"			=	/obj/item/clothing/under/color/white,
 		"Grey"			=	/obj/item/clothing/under/color/grey,
 		"Orange"		=	/obj/item/clothing/under/color/orange,
+		"Blue"			=	/obj/item/clothing/under/color/blue,
+		"Yellow"		= 	/obj/item/clothing/under/color/yellow,
+		"Red"			=	/obj/item/clothing/under/color/red,
+		"Janitor"		=	/obj/item/clothing/under/rank/janitor,
 		"Crewman"		= 	/obj/item/clothing/under/rank/crewman
 	)
 	gear_tweaks += new /datum/gear_tweak/path(jumpsuit)
@@ -34,6 +34,14 @@
 	flags = GEAR_HAS_COLOR_SELECTION
 	path = /obj/item/clothing/under/color/white
 
+/datum/gear/uniform/hydroponics
+	display_name = "hydroponist uniform"
+	path = /obj/item/clothing/under/rank/hydroponics
+
+/datum/gear/uniform/virology
+	display_name = "virologist uniform"
+	path = /obj/item/clothing/under/rank/virologist
+
 /datum/gear/uniform/leisure
 	display_name = "leisure suits"
 	path = /obj/item/clothing/under/leisure
@@ -44,7 +52,8 @@
 		"Brown Jacket" 			=	 /obj/item/clothing/under/leisure,
 		"White Blazer" 			=	 /obj/item/clothing/under/leisure/white,
 		"Patterned Pullover" 	=	 /obj/item/clothing/under/leisure/pullover,
-		"Business Casual"		=	 /obj/item/clothing/under/leisure/joe
+		"Business Casual, blue"	=	 /obj/item/clothing/under/leisure/casual/blue,
+		"Business Casual, red"	=	 /obj/item/clothing/under/leisure/joe
 	)
 	gear_tweaks += new /datum/gear_tweak/path(leisure)
 
@@ -175,6 +184,7 @@
 		"ash" 			=	 /obj/item/clothing/under/grey,
 		"charcoal" 		=	 /obj/item/clothing/under/black,
 		"black formal" 	=	 /obj/item/clothing/under/tuxedo,
+		"tailcoat"		=	 /obj/item/clothing/under/blazer,
 		"tuxedo" 		=	 /obj/item/clothing/under/assistantformal
 	)
 	gear_tweaks += new /datum/gear_tweak/path(suits)

diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
@@ -60,6 +60,7 @@
 	name = "black cap"
 	initial_name = "black cap"
 	desc = "A simple baseball cap in a tasteful black color."
+	icon_state = "blacksoft"
 
 /obj/item/clothing/head/soft/orange
 	name = "orange cap"

diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
@@ -14,6 +14,10 @@
 	name = "black shoes"
 	icon_state = "black"
 
+/obj/item/clothing/shoes/color/grey
+	name = "grey shoes"
+	icon_state = "grey"
+
 /obj/item/clothing/shoes/color/white
 	name = "white shoes"
 	icon_state = "white"

diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
@@ -41,7 +41,7 @@
 //Guild Technician
 /obj/item/clothing/suit/storage/cargo_jacket
 	name = "guild technician jacket"
-	desc = "Stylish jacket lined with pockets. It seems to have a little protection from physical harm."
+	desc = "An orange and grey jacket, a hybrid of a hazard vest and a proper jacket."
 	icon_state = "cargo_jacket"
 	item_state = "cargo_jacket"
 	blood_overlay_type = "coat"
@@ -56,11 +56,11 @@
 		rad = 0
 	)
 
-/obj/item/clothing/suit/storage/cargo_jacket/old
+/obj/item/clothing/suit/storage/cargo_jacket/black
 	name = "black guild technician jacket"
-	desc = "Stylish jacket lined with pockets. It seems to have a little protection from physical harm. This one is done in dark black color."
-	icon_state = "cargo_jacket_old"
-	item_state = "cargo_jacket_old"
+	desc = "A black stylish jacket. Used by guild technicians."
+	icon_state = "cargo_jacket_black"
+	item_state = "cargo_jacket_black"
 	blood_overlay_type = "coat"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	style_coverage = COVERS_TORSO|COVERS_UPPER_ARMS
@@ -73,10 +73,16 @@
 		rad = 0
 	)
 
+/obj/item/clothing/suit/storage/cargo_jacket/black/old
+	name = "old guild technician jacket"
+	desc = "An older version of the guild tech coat, still used occasionally."
+	icon_state = "cargo_jacket_old"
+	item_state = "cargo_jacket_old"
+
 //Merchant
 /obj/item/clothing/suit/storage/qm_coat
 	name = "guild merchant coat"
-	desc = "An ideal choice for a smuggler. This coat seems have good impact resistance, and is made from resistant and expensive materials."
+	desc = "A grungy brown coat, perfect for a smuggler."
 	icon_state = "qm_coat"
 	item_state = "qm_coat"
 	blood_overlay_type = "coat"
@@ -91,6 +97,12 @@
 	)
 	siemens_coefficient = 0.8
 
+/*/obj/item/clothing/suit/storage/qm_coat/old
+	name = "old brown guild coat"
+	desc = "One of the old merchant coat designs, passed down to technicians after it fell out of fashion."
+	icon_state = "qm_coat_old"
+	item_state = "qm_coat_old"*/
+
 //Botanist
 /obj/item/clothing/suit/apron
 	name = "apron"

diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
@@ -25,8 +25,8 @@
 	item_state = "b_suit"
 
 /obj/item/clothing/under/rank/cargotech
-	name = "cargo worker's jumpsuit"
-	desc = "A pair of jeans and turtleneck worn by the cargo workers."
+	desc = "A pair of jeans and turtleneck worn by the guild workers."
+	name = "guild worker's uniform"
 	icon_state = "cargotech"
 	item_state = "lb_suit"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -88,14 +88,14 @@
 	item_state = "b_suit"
 
 /obj/item/clothing/under/rank/hydroponics
-	desc = "A jumpsuit designed to protect against minor plant-related hazards."
+	desc = "A jumpsuit from the Bradhaanata Agroponics 'Farm Yourself' kit."
 	name = "botanist's jumpsuit"
 	icon_state = "hydroponics"
 	item_state = "g_suit"
 	permeability_coefficient = 0.50
 
 /obj/item/clothing/under/rank/janitor
-	desc = "It's the official uniform of the ship's janitor."
+	desc = "An ancient janitorial jumpsuit."
 	name = "janitor's jumpsuit"
 	icon_state = "janitor"
 	item_state = "janitor"

diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
@@ -64,8 +64,8 @@
 	)
 
 /obj/item/clothing/under/rank/virologist
-	desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
-	name = "moebius virologist's jumpsuit"
+	desc = "An old green shirt and khakis, originally worn by the Moebius Virology Division, now it is discarded in maintenance after their disbandment."
+	name = "moebius virologist's uniform"
 	icon_state = "virology"
 	item_state = "w_suit"
 	permeability_coefficient = 0.50

diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
@@ -157,8 +157,8 @@
 
 
 /obj/item/clothing/under/blazer
-	name = "blue blazer"
-	desc = "A bold but yet conservative outfit, red corduroys, navy blazer and a tie."
+	name = "black tailcoat"
+	desc = "A bold, yet conservative outfit; red slacks and almost Victorian style tailcoat."
 	icon_state = "blue_blazer"
 	item_state = "blue_blazer"
 
@@ -210,6 +210,12 @@ obj/item/clothing/under/leisure/pullover
 	icon_state = "joe"
 	item_state = "joe"
 
+/obj/item/clothing/under/leisure/casual/blue
+	name = "blue casual suit"
+	desc = "An qqua colored casual suit for office workers."
+	icon_state = "business_blue"
+	item_state = "business_blue"
+
 obj/item/clothing/under/neon
 	name = "green neon tracksuit"
 	desc = "A tracksuit lined with green neon fibers. Slightly luminescent."

diff --git a/icons/inventory/feet/icon.dmi b/icons/inventory/feet/icon.dmi
diff --git a/icons/inventory/feet/mob.dmi b/icons/inventory/feet/mob.dmi
diff --git a/icons/inventory/hands/icon.dmi b/icons/inventory/hands/icon.dmi
diff --git a/icons/inventory/hands/mob.dmi b/icons/inventory/hands/mob.dmi
diff --git a/icons/inventory/suit/icon.dmi b/icons/inventory/suit/icon.dmi
diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi
diff --git a/icons/inventory/suit/mob_fem.dmi b/icons/inventory/suit/mob_fem.dmi
diff --git a/icons/inventory/uniform/icon.dmi b/icons/inventory/uniform/icon.dmi
diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi
diff --git a/icons/inventory/uniform/mob_fem.dmi b/icons/inventory/uniform/mob_fem.dmi