diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm
index 84e3bb893dd..5c4006ad900 100644
--- a/code/modules/clothing/spacesuits/rig/suits/combat.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm
@@ -1,6 +1,6 @@
 /obj/item/rig/combat
 	name = "combat hardsuit control module"
-	desc = "A sleek and dangerous hardsuit for active combat."
+	desc = "A sleek and dangerous hardsuit for active combat. This one is a Stellar Corporate Conglomerate design in color scheme and make."
 	icon_state = "combat_rig"
 	suit_type = "combat hardsuit"
 	armor = list(
@@ -40,7 +40,7 @@
 
 /obj/item/rig/military
 	name = "military hardsuit control module"
-	desc = "A powerful hardsuit designed for military operations."
+	desc = "A powerful hardsuit designed for military operations. This is coated in Solarian military colors."
 	icon_state = "military_rig"
 	suit_type = "military hardsuit"
 	armor = list(
diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm
index 9ec99723b72..1ee53080951 100644
--- a/code/modules/clothing/spacesuits/rig/suits/ert.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm
@@ -10,6 +10,7 @@
 	emp_protection = 35
 	helm_type = /obj/item/clothing/head/helmet/space/rig/ert
 	req_access = list(access_cent_specops)
+	species_restricted = list(BODYTYPE_SKRELL,BODYTYPE_HUMAN)
 	armor = list(
 		melee = ARMOR_MELEE_MAJOR,
 		bullet = ARMOR_BALLISTIC_PISTOL,
@@ -112,30 +113,6 @@
 		)
 	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL
 
-/obj/item/rig/ert/janitor
-	name = "ERT-J suit control module"
-	desc = "A suit worn by the janitoral division of an Emergency Response Team. Has purple highlights. Less armored than security the variant, but offers full radiation protection."
-	suit_type = "ERT janitor"
-	icon_state = "ert_janitor_rig"
-	initial_modules = list(
-		/obj/item/rig_module/ai_container,
-		/obj/item/rig_module/maneuvering_jets,
-		/obj/item/rig_module/fabricator/sign,
-		/obj/item/rig_module/grenade_launcher/cleaner,
-		/obj/item/rig_module/device/decompiler,
-		/obj/item/rig_module/actuators
-		)
-	armor = list(
-		melee = ARMOR_MELEE_MAJOR,
-		bullet = ARMOR_BALLISTIC_PISTOL,
-		laser = ARMOR_LASER_SMALL,
-		energy = ARMOR_ENERGY_SMALL,
-		bomb = ARMOR_BOMB_PADDED,
-		bio = ARMOR_BIO_SHIELDED,
-		rad = ARMOR_RAD_SHIELDED
-	)
-	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL
-
 /obj/item/rig/ert/assetprotection
 	name = "heavy asset protection suit control module"
 	desc = "A heavy suit worn by the highest level of Asset Protection, don't mess with the person wearing this. Armored and space ready."
diff --git a/code/modules/ghostroles/spawner/human/responseteams/nt_ert.dm b/code/modules/ghostroles/spawner/human/responseteams/nt_ert.dm
index 1e6e0b1ac30..ef28ac6951d 100644
--- a/code/modules/ghostroles/spawner/human/responseteams/nt_ert.dm
+++ b/code/modules/ghostroles/spawner/human/responseteams/nt_ert.dm
@@ -6,6 +6,7 @@
 	max_count = 2
 	outfit = /datum/outfit/admin/ert/nanotrasen
 	mob_name_prefix = "Tpr. "
+	possible_species = list(SPECIES_HUMAN, SPECIES_SKRELL)
 	spawnpoints = list("NTERTSpawn")
 
 /datum/ghostspawner/human/ert/nanotrasen/specialist
@@ -27,5 +28,4 @@
 	short_name = "ntlead"
 	desc = "The leader of the Nanotrasen Phoenix ERT."
 	max_count = 1
-	mob_name_prefix = "L/Tpr. "
-	possible_species = list(SPECIES_HUMAN, SPECIES_SKRELL)
\ No newline at end of file
+	mob_name_prefix = "L/Tpr. "
\ No newline at end of file
diff --git a/html/changelogs/kyres1-#11204.yml b/html/changelogs/kyres1-#11204.yml
new file mode 100644
index 00000000000..9be9b0d90ec
--- /dev/null
+++ b/html/changelogs/kyres1-#11204.yml
@@ -0,0 +1,43 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Kyres1
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - tweak: "Resprites all NT-ERT suits, with the exception of the now deleted J-ERT suit."
+  - tweak: "Restricts NT-ERT suits to Skrell/Human."
+  - tweak: "Resprites the combat RIG suit from Robotics."
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 23008d9483c..cac7cda096d 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi
index 222ba3e9e8d..33e9cef9d38 100644
Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 3979beb2203..cc748f562c4 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/rig_back.dmi b/icons/mob/rig_back.dmi
index dc63de0f1a7..087012c907a 100644
Binary files a/icons/mob/rig_back.dmi and b/icons/mob/rig_back.dmi differ
diff --git a/icons/mob/species/machine/gloves.dmi b/icons/mob/species/machine/gloves.dmi
index ea46f99bdfb..2e1e6b19f59 100644
Binary files a/icons/mob/species/machine/gloves.dmi and b/icons/mob/species/machine/gloves.dmi differ
diff --git a/icons/mob/species/machine/helmet.dmi b/icons/mob/species/machine/helmet.dmi
index 004b978fb9e..7d483607177 100644
Binary files a/icons/mob/species/machine/helmet.dmi and b/icons/mob/species/machine/helmet.dmi differ
diff --git a/icons/mob/species/machine/shoes.dmi b/icons/mob/species/machine/shoes.dmi
index 1ae52cb24c3..240060dcf88 100644
Binary files a/icons/mob/species/machine/shoes.dmi and b/icons/mob/species/machine/shoes.dmi differ
diff --git a/icons/mob/species/machine/suit.dmi b/icons/mob/species/machine/suit.dmi
index c907674a949..ea0e4af00fc 100644
Binary files a/icons/mob/species/machine/suit.dmi and b/icons/mob/species/machine/suit.dmi differ
diff --git a/icons/mob/species/skrell/helmet.dmi b/icons/mob/species/skrell/helmet.dmi
index 06fc43a07f4..59a15406ae1 100644
Binary files a/icons/mob/species/skrell/helmet.dmi and b/icons/mob/species/skrell/helmet.dmi differ
diff --git a/icons/mob/species/tajaran/gloves.dmi b/icons/mob/species/tajaran/gloves.dmi
index 71fb0b9d43a..9bd3b695ee6 100644
Binary files a/icons/mob/species/tajaran/gloves.dmi and b/icons/mob/species/tajaran/gloves.dmi differ
diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi
index 5eaa3567f23..54e93f09c0f 100644
Binary files a/icons/mob/species/tajaran/helmet.dmi and b/icons/mob/species/tajaran/helmet.dmi differ
diff --git a/icons/mob/species/tajaran/shoes.dmi b/icons/mob/species/tajaran/shoes.dmi
index 332ca6ed648..699ecc4f2d6 100644
Binary files a/icons/mob/species/tajaran/shoes.dmi and b/icons/mob/species/tajaran/shoes.dmi differ
diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/species/tajaran/suit.dmi
index d01646d819d..48165a5ba53 100644
Binary files a/icons/mob/species/tajaran/suit.dmi and b/icons/mob/species/tajaran/suit.dmi differ
diff --git a/icons/mob/species/unathi/gloves.dmi b/icons/mob/species/unathi/gloves.dmi
index 7d2b10d7ca3..351d0912f2e 100644
Binary files a/icons/mob/species/unathi/gloves.dmi and b/icons/mob/species/unathi/gloves.dmi differ
diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/species/unathi/helmet.dmi
index b326a601754..4bdecc57645 100644
Binary files a/icons/mob/species/unathi/helmet.dmi and b/icons/mob/species/unathi/helmet.dmi differ
diff --git a/icons/mob/species/unathi/shoes.dmi b/icons/mob/species/unathi/shoes.dmi
index ccd93a8e43f..1420825fe44 100644
Binary files a/icons/mob/species/unathi/shoes.dmi and b/icons/mob/species/unathi/shoes.dmi differ
diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/species/unathi/suit.dmi
index 529f60f529c..a3f76b2dd90 100644
Binary files a/icons/mob/species/unathi/suit.dmi and b/icons/mob/species/unathi/suit.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index a98805a11d4..797bf69929d 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 2439d73ac4c..e0767a3db1a 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index a98da540e7b..47ddef29b79 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index a708f812c2d..1860a44dffa 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index d868f85ca6d..20e96863689 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/rig_modules.dmi b/icons/obj/rig_modules.dmi
index c12cae6e9c9..05c31d139cb 100644
Binary files a/icons/obj/rig_modules.dmi and b/icons/obj/rig_modules.dmi differ
diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm
index abf7d46e6a1..7c6baa2931b 100644
--- a/maps/exodus/exodus-2_centcomm.dmm
+++ b/maps/exodus/exodus-2_centcomm.dmm
@@ -15248,8 +15248,6 @@
 /area/centcom/control)
 "aXR" = (
 /obj/structure/table/rack,
-/obj/item/rig/ert/janitor,
-/obj/item/rig/ert/janitor,
 /turf/unsimulated/floor{
 	icon_state = "dark"
 	},