Science Uniform Resprites - Removes overrides, updates Digi sprites (#…

…767) * Removes overrides (Yes, the RD jumpsuit was technically an override, an icon from another codebase in place of TG ones...) * removes all my old and redundant comments THIS SHOULD BE IMPLIED!!! * Removes extremely dated and unsalvagable 'robo_sleek' uniform (and some missed stuff from the overrides) * sprite updates!! yahoo!! * these are actually redundant, all of these SHOULD be linking to TG's file. * fix research_director/alt missing a digi, and (hopefully) fixes CI * updates the obj icons (I Forgor)
Fluffy-Frontier · Feb 5, 2024 · ce32bc6 · ce32bc6
1 parent dc85592
commit ce32bc6
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 85 deletions.
diff --git a/modular_nova/master_files/code/modules/clothing/clothing_variation_overrides/under.dm b/modular_nova/master_files/code/modules/clothing/clothing_variation_overrides/under.dm
@@ -53,9 +53,6 @@
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
 	gets_cropped_on_taurs = FALSE
 
-/obj/item/clothing/under/rank/rnd/research_director/alt
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
 /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
 	gets_cropped_on_taurs = FALSE

diff --git a/modular_nova/master_files/code/modules/clothing/under/jobs/cargo.dm b/modular_nova/master_files/code/modules/clothing/under/jobs/cargo.dm
@@ -1,5 +1,5 @@
 /obj/item/clothing/under/rank/cargo
-	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/cargo_digi.dmi' // Anything that was in the cargo.dmi, should be in the cargo_digi.dmi
+	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/cargo_digi.dmi'
 
 /obj/item/clothing/under/rank/cargo/tech/nova
 	icon = 'modular_nova/master_files/icons/obj/clothing/under/cargo.dmi'

diff --git a/modular_nova/master_files/code/modules/clothing/under/jobs/centcom.dm b/modular_nova/master_files/code/modules/clothing/under/jobs/centcom.dm
@@ -2,7 +2,7 @@
 //Try to keep them all a subtype of centcom/nova, for file sorting and balance - all faction representatives should have the same/similarly armored uniforms
 
 /obj/item/clothing/under/rank/centcom
-	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/centcom_digi.dmi'	// Anything that was in the rnd.dmi, should be in the rnd_digi.dmi
+	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/centcom_digi.dmi'
 
 /obj/item/clothing/under/rank/centcom/nova
 	icon = 'modular_nova/master_files/icons/obj/clothing/under/centcom.dmi'

diff --git a/modular_nova/master_files/code/modules/clothing/under/jobs/civilian/civilian.dm b/modular_nova/master_files/code/modules/clothing/under/jobs/civilian/civilian.dm
@@ -1,5 +1,5 @@
 /obj/item/clothing/under/rank/civilian
-	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/civilian_digi.dmi' //Anything that was in TG's civilian.dmi, should be in our civilian_digi.dmi
+	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/civilian_digi.dmi'
 
 /obj/item/clothing/under/rank/civilian/lawyer // Lawyers' suits are in TG's suits.dmi
 	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/suits_digi.dmi'

diff --git a/modular_nova/master_files/code/modules/clothing/under/jobs/civilian/suits.dm b/modular_nova/master_files/code/modules/clothing/under/jobs/civilian/suits.dm
@@ -1,6 +1,6 @@
 
 /obj/item/clothing/under/suit
-	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/suits_digi.dmi' //Anything that was in TG's suits.dmi, should be in our suits_digi.dmi
+	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/suits_digi.dmi'
 
 /obj/item/clothing/under/suit/nova
 	icon = 'modular_nova/master_files/icons/obj/clothing/under/suits.dmi'

diff --git a/modular_nova/master_files/code/modules/clothing/under/jobs/command.dm b/modular_nova/master_files/code/modules/clothing/under/jobs/command.dm
@@ -1,5 +1,5 @@
 /obj/item/clothing/under/rank/captain
-	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/command_digi.dmi' //Anything that was in TG's captain.dmi, should be in our command_digi.dmi
+	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/command_digi.dmi'
 	//NOTE - TG uses "captain.dmi"; because we have a few non-captain items going in here for ease of access, this will just be "command.dmi"
 
 /obj/item/clothing/under/rank/captain/nova

diff --git a/modular_nova/master_files/code/modules/clothing/under/jobs/engineering.dm b/modular_nova/master_files/code/modules/clothing/under/jobs/engineering.dm
@@ -1,5 +1,5 @@
 /obj/item/clothing/under/rank/engineering
-	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/engineering_digi.dmi' // Anything that was in the engineering.dmi, should be in the engineering_digi.dmi
+	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/engineering_digi.dmi'
 
 /obj/item/clothing/under/rank/engineering/engineer/nova
 	icon = 'modular_nova/master_files/icons/obj/clothing/under/engineering.dmi'

diff --git a/modular_nova/master_files/code/modules/clothing/under/jobs/medical.dm b/modular_nova/master_files/code/modules/clothing/under/jobs/medical.dm
@@ -1,5 +1,5 @@
 /obj/item/clothing/under/rank/medical
-	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/medical_digi.dmi'	// Anything that was in the medical.dmi, should be in the medical_digi.dmi
+	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/medical_digi.dmi'
 
 /obj/item/clothing/under/rank/medical/doctor/nova
 	icon = 'modular_nova/master_files/icons/obj/clothing/under/medical.dmi'

diff --git a/modular_nova/master_files/code/modules/clothing/under/jobs/rnd.dm b/modular_nova/master_files/code/modules/clothing/under/jobs/rnd.dm
@@ -1,20 +1,23 @@
-/*
- *	RESEARCH DIRECTOR
- */
 /obj/item/clothing/under/rank/rnd
-	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/rnd_digi.dmi'	// Anything that was in the rnd.dmi, should be in the rnd_digi.dmi
+	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/rnd_digi.dmi'
+
+/obj/item/clothing/under/rank/rnd/research_director/alt
+	greyscale_config_worn_digi = /datum/greyscale_config/buttondown_slacks/worn/digi
 
 /obj/item/clothing/under/rank/rnd/scientist/nova
 	icon = 'modular_nova/master_files/icons/obj/clothing/under/rnd.dmi'
 	worn_icon = 'modular_nova/master_files/icons/mob/clothing/under/rnd.dmi'
+	icon_state = null //debug item
 
 /obj/item/clothing/under/rank/rnd/roboticist/nova
 	icon = 'modular_nova/master_files/icons/obj/clothing/under/rnd.dmi'
 	worn_icon = 'modular_nova/master_files/icons/mob/clothing/under/rnd.dmi'
+	icon_state = null //debug item
 
 /obj/item/clothing/under/rank/rnd/research_director/nova
 	icon = 'modular_nova/master_files/icons/obj/clothing/under/rnd.dmi'
 	worn_icon = 'modular_nova/master_files/icons/mob/clothing/under/rnd.dmi'
+	icon_state = null //debug item
 
 /*
  *	GENETICIST (TO-DO)
@@ -38,7 +41,6 @@
 /*
  *	SCIENTIST
  */
-
 /obj/item/clothing/under/rank/rnd/scientist/nova/utility
 	name = "science utility uniform"
 	desc = "A utility uniform worn by NT-certified Science staff."
@@ -57,65 +59,10 @@
 	icon_state = "hl_scientist"
 	can_adjust = FALSE
 
-/*
- *	ROBOTICIST
- */
-
-/obj/item/clothing/under/rank/rnd/roboticist/nova/sleek
-	name = "sleek roboticst jumpsuit"
-	desc = "A sleek version of the roboticist uniform, complete with amber sci-fi stripes."
-	icon_state = "robosleek"
-	can_adjust = FALSE
-
 /*
  *	RESEARCH DIRECTOR
  */
-
-/obj/item/clothing/under/rank/rnd/research_director/nova/jumpsuit
-	name = "research director's jumpsuit"
-	desc = "A shiny nano-weave uniform for those holding the title of \"Research Director\". Its fabric provides minor protection from biological contaminants."
-	icon_state = "director_jumpsuit"
-	can_adjust = TRUE
-	alt_covers_chest = TRUE
-
-/obj/item/clothing/under/rank/rnd/research_director/nova/jumpsuit/skirt // I know this seems wrong, but its for consistency sake; its the skirt version OF the jumpsuit
-	name = "research director's jumpskirt"
-	icon_state = "director_jumpskirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	dying_key = DYE_REGISTRY_JUMPSKIRT
-	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
 /obj/item/clothing/under/rank/rnd/research_director/nova/imperial //Rank pins of the Major General
 	desc = "An off-white naval suit over black pants, with a rank badge denoting the Officer of the Internal Science Division. It's a peaceful life."
 	name = "research director's naval jumpsuit"
 	icon_state = "imprd"
-
-/*
-*	OVERRIDES
-*	ORION TODO: look over these when TG finishes their science resprites (any day now...)
-*/
-
-/obj/item/clothing/under/rank/rnd/scientist
-	icon = 'modular_nova/master_files/icons/obj/clothing/under/rnd.dmi'
-	worn_icon = 'modular_nova/master_files/icons/mob/clothing/under/rnd.dmi'
-	icon_state = "science_new"
-
-/obj/item/clothing/under/rank/rnd/scientist/skirt
-	icon_state = "sciwhite_skirt_new"
-
-/obj/item/clothing/under/rank/rnd/roboticist
-	icon = 'modular_nova/master_files/icons/obj/clothing/under/rnd.dmi'
-	worn_icon = 'modular_nova/master_files/icons/mob/clothing/under/rnd.dmi'
-	icon_state = "robotics_new"
-
-/obj/item/clothing/under/rank/rnd/roboticist/skirt
-	icon_state = "robotics_skirt_new"
-
-/obj/item/clothing/under/rank/rnd/geneticist
-	icon = 'modular_nova/master_files/icons/obj/clothing/under/rnd.dmi'
-	worn_icon = 'modular_nova/master_files/icons/mob/clothing/under/rnd.dmi'
-	icon_state = "genetics_new"
-
-/obj/item/clothing/under/rank/rnd/geneticist/skirt
-	icon_state = "geneticswhite_skirt_new"
diff --git a/modular_nova/master_files/code/modules/clothing/under/jobs/security.dm b/modular_nova/master_files/code/modules/clothing/under/jobs/security.dm
@@ -1,5 +1,5 @@
 /obj/item/clothing/under/rank/security
-	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/security_digi.dmi' // Anything that was in the security.dmi, should be in the security_digi.dmi
+	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/security_digi.dmi'
 
 /obj/item/clothing/under/rank/security/nova
 	icon = 'modular_nova/master_files/icons/obj/clothing/under/security.dmi'

diff --git a/modular_nova/master_files/code/modules/clothing/under/syndicate.dm b/modular_nova/master_files/code/modules/clothing/under/syndicate.dm
@@ -3,7 +3,7 @@
 #define RESKIN_SYNDIE "Syndicate Red"
 
 /obj/item/clothing/under/syndicate
-	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/syndicate_digi.dmi' // Anything that was in the syndicate.dmi, should be in the syndicate_digi.dmi
+	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/under/syndicate_digi.dmi'
 
 /obj/item/clothing/under/syndicate/nova
 	icon = 'modular_nova/master_files/icons/obj/clothing/under/syndicate.dmi'

diff --git a/modular_nova/master_files/icons/mob/clothing/under/rnd.dmi b/modular_nova/master_files/icons/mob/clothing/under/rnd.dmi
diff --git a/modular_nova/master_files/icons/mob/clothing/under/rnd_digi.dmi b/modular_nova/master_files/icons/mob/clothing/under/rnd_digi.dmi
diff --git a/modular_nova/master_files/icons/obj/clothing/under/rnd.dmi b/modular_nova/master_files/icons/obj/clothing/under/rnd.dmi
diff --git a/modular_nova/modules/command_vendor/code/vending.dm b/modular_nova/modules/command_vendor/code/vending.dm
@@ -98,8 +98,6 @@
 		/obj/item/clothing/under/rank/rnd/research_director/alt = 1,
 		/obj/item/clothing/under/rank/rnd/research_director/turtleneck = 1,
 		/obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt = 1,
-		/obj/item/clothing/under/rank/rnd/research_director/nova/jumpsuit = 1,
-		/obj/item/clothing/under/rank/rnd/research_director/nova/jumpsuit/skirt = 1,
 		/obj/item/clothing/under/rank/rnd/research_director/nova/imperial = 1,
 		/obj/item/clothing/neck/cloak/rd = 1,
 		/obj/item/clothing/neck/mantle/rdmantle = 1,

diff --git a/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm
@@ -164,16 +164,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/
 	name = "Ridiculous Scientist Outfit"
 	item_path = /obj/item/clothing/under/rank/rnd/scientist/nova/hlscience
 
-/datum/loadout_item/under/jumpsuit/rd_jumpsuit
-	name = "Research Director's Jumpsuit"
-	item_path = /obj/item/clothing/under/rank/rnd/research_director/nova/jumpsuit
-	restricted_roles = list(JOB_RESEARCH_DIRECTOR)
-
-/datum/loadout_item/under/jumpsuit/rd_jumpskirt
-	name = "Research Director's Jumpskirt"
-	item_path = /obj/item/clothing/under/rank/rnd/research_director/nova/jumpsuit/skirt
-	restricted_roles = list(JOB_RESEARCH_DIRECTOR)
-
 /datum/loadout_item/under/jumpsuit/cargo
 	name = "Cargo Technician's Jumpsuit"
 	item_path = /obj/item/clothing/under/rank/cargo/tech

diff --git a/modular_nova/modules/modular_vending/code/wardrobes.dm b/modular_nova/modules/modular_vending/code/wardrobes.dm
@@ -56,7 +56,6 @@
 /obj/machinery/vending/wardrobe/robo_wardrobe
 	products_nova = list(
 		/obj/item/clothing/head/beret/science/fancy/robo = 2,
-		/obj/item/clothing/under/rank/rnd/roboticist/nova/sleek = 2,
 		/obj/item/tank/internals/anesthetic = 2,
 		/obj/item/clothing/mask/breath = 2,
 		/obj/item/reagent_containers/cup/bottle/morphine = 2,