Resprites/restricts ERT hardsuits+combat hardsuit (#11204)

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(

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."

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)
+	mob_name_prefix = "L/Tpr. "

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."

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"
 	},