diff --git a/baystation12.dme b/baystation12.dme
index 664b7c698d649..3c5b7da512759 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -3365,5 +3365,6 @@
 #include "mods\_master_files\code\modules\power\gravitygenerator.dm"
 #include "mods\_master_files\maps\mapsystem\maps.dm"
 #include "mods\_master_files\maps\sierra\sierra_ranks.dm"
+#include "mods\_master_files\maps\sierra\items\rigs.dm"
 #include "~code\global_init.dm"
 // END_INCLUDE
diff --git a/code/game/machinery/suit_cycler_units.dm b/code/game/machinery/suit_cycler_units.dm
index 2bf84428ae815..c1294c4535c11 100644
--- a/code/game/machinery/suit_cycler_units.dm
+++ b/code/game/machinery/suit_cycler_units.dm
@@ -2,7 +2,10 @@
 	name = "engineering suit cycler"
 	model_text = "Engineering"
 	req_access = list(access_construction)
-	available_modifications = list(/singleton/item_modifier/space_suit/engineering, /singleton/item_modifier/space_suit/atmos)
+	 // [SIERRA-EDIT] - HARDSUITS - Костюмы со спрайтами Инфинити
+	 // available_modifications = list(/singleton/item_modifier/space_suit/engineering, /singleton/item_modifier/space_suit/atmos) // SIERRA-EDIT - ORIGINAL
+	available_modifications = list(/singleton/item_modifier/space_suit/sierra/engineering, /singleton/item_modifier/space_suit/sierra/atmos)
+	 // [/SIERRA-EDIT]
 	species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI)
 
 /obj/machinery/suit_cycler/mining
@@ -30,6 +33,10 @@
 	model_text = "Security"
 	req_access = list(access_security)
 	available_modifications = list(/singleton/item_modifier/space_suit/security)
+	 // [SIERRA-EDIT] - HARDSUITS - Костюмы со спрайтами Инфинити
+	 // available_modifications = list(/singleton/item_modifier/space_suit/security) // SIERRA-EDIT - ORIGINAL
+	available_modifications = list(/singleton/item_modifier/space_suit/sierra/security, /singleton/item_modifier/space_suit/sierra/security/alt)
+	 // [/SIERRA-EDIT]
 	species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI)
 
 /obj/machinery/suit_cycler/security/alt
@@ -54,5 +61,8 @@
 	name = "pilot suit cycler"
 	model_text = "Pilot"
 	req_access = list(access_mining_office)
-	available_modifications = list(/singleton/item_modifier/space_suit/pilot)
+	 // [SIERRA-EDIT] - HARDSUITS - Костюмы со спрайтами Инфинити
+	 // available_modifications = list(/singleton/item_modifier/space_suit/pilot) // SIERRA-EDIT - ORIGINAL
+	available_modifications = list(/singleton/item_modifier/space_suit/sierra/pilot)
+	 // [/SIERRA-EDIT]
 	species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI)
diff --git a/maps/sierra/items/machinery.dm b/maps/sierra/items/machinery.dm
index b4649ac9c02d6..cba1a39d04802 100644
--- a/maps/sierra/items/machinery.dm
+++ b/maps/sierra/items/machinery.dm
@@ -1,2 +1,2 @@
 /obj/machinery/suit_cycler/medical/alt
-	available_modifications = list(/singleton/item_modifier/space_suit/sol/medical)
+	available_modifications = list(/singleton/item_modifier/space_suit/sol/sierra/medical)
diff --git a/maps/sierra/machinery/machinery.dm b/maps/sierra/machinery/machinery.dm
index ab10ea0370a8f..7d5139c485209 100644
--- a/maps/sierra/machinery/machinery.dm
+++ b/maps/sierra/machinery/machinery.dm
@@ -44,7 +44,7 @@
 	name = "Exploration suit cycler"
 	model_text = "Exploration"
 	req_access = list(access_explorer)
-	available_modifications = list(/singleton/item_modifier/space_suit/sol/explorer)
+	available_modifications = list(/singleton/item_modifier/space_suit/sol/sierra/exploration)
 
 /obj/machinery/suit_cycler/pilot
 	req_access = list(access_explorer) //because unathi version of expeditonary suit it shit
diff --git a/mods/_master_files/maps/sierra/items/rigs.dm b/mods/_master_files/maps/sierra/items/rigs.dm
new file mode 100644
index 0000000000000..992ce83480ed0
--- /dev/null
+++ b/mods/_master_files/maps/sierra/items/rigs.dm
@@ -0,0 +1,4 @@
+/obj/item/rig/exploration
+	chest_type = /obj/item/clothing/suit/space/rig/command/exploration
+	boot_type = /obj/item/clothing/shoes/magboots/rig/command/exploration
+	glove_type = /obj/item/clothing/gloves/rig/command/exploration
diff --git a/mods/global_modpacks.dm b/mods/global_modpacks.dm
index e1b315679ea35..e84976dd74ca1 100644
--- a/mods/global_modpacks.dm
+++ b/mods/global_modpacks.dm
@@ -9,6 +9,7 @@
 #include "gliding/_gliding.dme"
 #include "gravity_generator/_gravity_generator.dme"
 #include "hairs_ports/_hairs_ports.dme"
+#include "hardsuits/_hardsuits.dme"
 #include "sprite_accessories/_sprite_accessories.dme"
 #include "jukebox_tapes/_jukebox_tapes.dme"
 #include "loadout_items/_loadout_items.dme"
diff --git a/mods/hardsuits/README.md b/mods/hardsuits/README.md
new file mode 100644
index 0000000000000..1972247aeae18
--- /dev/null
+++ b/mods/hardsuits/README.md
@@ -0,0 +1,87 @@
+
+#### Список PRов:
+
+- https://github.com/SierraBay/SierraBay12/pull/1717
+<!--
+  Ссылки на PRы, связанные с модом:
+  - Создание
+  - Большие изменения
+-->
+
+<!-- Название мода. Не важно на русском или на английском. -->
+## Hardsuits
+
+ID мода: HARDSUITS
+<!--
+  Название модпака прописными буквами, СОЕДИНЁННЫМИ_ПОДЧЁРКИВАНИЕМ,
+  которое ты будешь использовать для обозначения файлов.
+-->
+
+### Описание мода
+
+Порт спрайтов и функционала костюмов ВКД и ИКС, доступных на Infinity
+- Добавляет более качественные спрайты войдсьютов и ИКС для унати
+- Добавляет спрайты ИКС ЛЭКа для унати, таяра, скреллов
+<!--
+  Что он делает, что добавляет: что, куда, зачем и почему - всё здесь.
+  А также любая полезная информация.
+-->
+
+### Изменения *кор кода*
+
+- `code/game/machinery/suit_cycler_units.dm`:
+  - `/obj/machinery/suit_cycler/engineering/var/available_modifications`
+  - `/obj/machinery/suit_cycler/security/var/available_modifications`
+  - `/obj/machinery/suit_cycler/pilot/var/available_modifications`
+<!--
+  Если вы редактировали какие-либо процедуры или переменные в кор коде,
+  они должны быть указаны здесь.
+  Нужно указать и файл, и процедуры/переменные.
+
+  Изменений нет - напиши "Отсутствуют"
+-->
+
+### Оверрайды
+
+- `mods/_master_files/maps/sierra/items/rigs.dm`:
+  - `/obj/item/rig/exploration/var/chest_type`
+  - `/obj/item/rig/exploration/var/boot_type`
+  - `/obj/item/rig/exploration/var/glove_type`
+
+<!--
+  Если ты добавлял новый модульный оверрайд, его нужно указать здесь.
+  Здесь указываются оверрайды в твоём моде и папке `_master_files`
+
+  Изменений нет - напиши "Отсутствуют"
+-->
+
+### Дефайны
+
+Отсутствуют
+<!--
+  Если требовалось добавить какие-либо дефайны, укажи файлы,
+  в которые ты их добавил, а также перечисли имена.
+  И то же самое, если ты используешь дефайны, определённые другим модом.
+
+  Не используешь - напиши "Отсутствуют"
+-->
+
+### Используемые файлы, не содержащиеся в модпаке
+
+- `packs/infinity/icons/obj/clothing/species/erosan/hats.dmi`
+- `packs/infinity/icons/obj/clothing/species/erosan/suits.dmi`
+<!--
+  Будь то немодульный файл или модульный файл, который не содержится в папке,
+  принадлежащей этому конкретному моду, он должен быть упомянут здесь.
+  Хорошими примерами являются иконки или звуки, которые используются одновременно
+  несколькими модулями, или что-либо подобное.
+-->
+
+### Авторы:
+
+UEDHighCommand
+<!--
+  Здесь находится твой никнейм
+  Если работал совместно - никнеймы тех, кто помогал.
+  В случае порта чего-либо должна быть ссылка на источник.
+-->
diff --git a/mods/hardsuits/_hardsuits.dm b/mods/hardsuits/_hardsuits.dm
new file mode 100644
index 0000000000000..54a06bdb31308
--- /dev/null
+++ b/mods/hardsuits/_hardsuits.dm
@@ -0,0 +1,4 @@
+/singleton/modpack/modpack_hardsuits
+	name = "Костюмы ВКД"
+	desc = "Портирование спрайтов и функционала костюмов ВКД и ИКС, доступных на Infinity"
+	author = "UEDHighCommand"
diff --git a/mods/hardsuits/_hardsuits.dme b/mods/hardsuits/_hardsuits.dme
new file mode 100644
index 0000000000000..9a8e47590a415
--- /dev/null
+++ b/mods/hardsuits/_hardsuits.dme
@@ -0,0 +1,9 @@
+#ifndef MODPACK_HARDSUITS
+#define MODPACK_HARDSUITS
+
+#include "_hardsuits.dm"
+
+#include "code/void.dm"
+#include "code/rigs.dm"
+
+#endif
diff --git a/mods/hardsuits/code/rigs.dm b/mods/hardsuits/code/rigs.dm
new file mode 100644
index 0000000000000..c7e4953ea365b
--- /dev/null
+++ b/mods/hardsuits/code/rigs.dm
@@ -0,0 +1,32 @@
+/obj/item/clothing/head/helmet/space/rig/command/exploration/New()
+	. = ..()
+	species_restricted |= list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_TAJARA,SPECIES_UNATHI,SPECIES_IPC)
+	sprite_sheets ^= list(
+		SPECIES_SKRELL,
+		SPECIES_UNATHI
+	)
+	sprite_sheets |= list(
+		SPECIES_SKRELL = 'mods/hardsuits/icons/rigs/onmob_head_solgov_skrell.dmi',
+		SPECIES_UNATHI = 'mods/hardsuits/icons/rigs/onmob_head_solgov_unathi.dmi'
+	)
+		
+/obj/item/clothing/suit/space/rig/command/exploration
+	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_TAJARA,SPECIES_UNATHI,SPECIES_IPC)
+	icon_state = "command_exp_rig"
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/hardsuits/icons/rigs/onmob_suit_solgov_unathi.dmi'
+	)
+		
+/obj/item/clothing/gloves/rig/command/exploration
+	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_TAJARA,SPECIES_UNATHI,SPECIES_IPC)
+	icon_state = "command_exp_rig"
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/hardsuits/icons/rigs/onmob_hands_solgov_unathi.dmi'
+	)
+		
+/obj/item/clothing/shoes/magboots/rig/command/exploration
+	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_TAJARA,SPECIES_UNATHI,SPECIES_IPC)
+	icon_state = "command_exp_rig"
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/hardsuits/icons/rigs/onmob_feet_solgov_unathi.dmi'
+	)
diff --git a/mods/hardsuits/code/void.dm b/mods/hardsuits/code/void.dm
new file mode 100644
index 0000000000000..2b8e389ce2d3c
--- /dev/null
+++ b/mods/hardsuits/code/void.dm
@@ -0,0 +1,224 @@
+#define SETUP_NAME "name"
+#define SETUP_OBJ_SHEET "icon"
+#define SETUP_ONMOB_SHEET "item_icons"
+#define SETUP_ICON_STATE "icon_state"
+#define SETUP_ITEM_STATE "item_state"
+#define SETUP_ITEM_STATE_SLOTS "item_state_slots"
+#define SETUP_SPECIES_OBJ "sprite_sheets_obj"
+#define SETUP_SPECIES_ONMOB "sprite_sheets"
+
+
+/singleton/item_modifier/space_suit/sierra
+	name = "Standard, NT"
+	type_setups = list(
+		/obj/item/clothing/head/helmet/space = list(
+			SETUP_NAME = "voidsuit helmet",
+			SETUP_OBJ_SHEET = 'icons/obj/clothing/obj_head.dmi',
+			SETUP_ONMOB_SHEET = list(slot_wear_suit_str = 'icons/mob/onmob/onmob_head.dmi'),
+			SETUP_ICON_STATE = "void",
+			SETUP_SPECIES_OBJ = list(
+				SPECIES_HUMAN = 'icons/obj/clothing/obj_head.dmi',
+				SPECIES_UNATHI = 'packs/infinity/icons/obj/clothing/species/erosan/hats.dmi',
+				SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/obj_head_skrell.dmi'
+				),
+			SETUP_SPECIES_ONMOB = list(
+				SPECIES_HUMAN = 'icons/mob/onmob/onmob_head.dmi',
+				SPECIES_UNATHI = 'mods/hardsuits/icons/voidsuits/onmob_head_unathi.dmi',
+				SPECIES_SKRELL = 'icons/mob/species/skrell/onmob_head_skrell.dmi'
+				)
+		),
+		/obj/item/clothing/suit/space/void = list(
+			SETUP_NAME = "voidsuit",
+			SETUP_OBJ_SHEET = 'icons/obj/clothing/obj_suit.dmi',
+			SETUP_ONMOB_SHEET = list(slot_wear_suit_str = 'icons/mob/onmob/onmob_suit.dmi'),
+			SETUP_ICON_STATE = "void",
+			SETUP_SPECIES_OBJ = list(
+				SPECIES_HUMAN = 'icons/obj/clothing/obj_suit.dmi',
+				SPECIES_UNATHI = 'packs/infinity/icons/obj/clothing/species/erosan/suits.dmi',
+				SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/obj_suit_skrell.dmi'
+				),
+			SETUP_SPECIES_ONMOB = list(
+				SPECIES_HUMAN = 'icons/mob/onmob/onmob_suit.dmi',
+				SPECIES_UNATHI = 'mods/hardsuits/icons/voidsuits/onmob_suit_unathi.dmi',
+				SPECIES_SKRELL = 'icons/mob/onmob/onmob_suit.dmi'
+				)
+		)
+	)
+
+
+/singleton/item_modifier/space_suit/sierra/engineering
+	name = "Engineering, NT"
+
+/singleton/item_modifier/space_suit/sierra/engineering/Initialize()
+	. = ..()
+	var/helmet_setup = type_setups[/obj/item/clothing/head/helmet/space]
+	helmet_setup[SETUP_NAME] = "engineering voidsuit helmet"
+	helmet_setup[SETUP_ICON_STATE] = "rig0-engineering"
+	helmet_setup[SETUP_ITEM_STATE] = "eng_helm"
+
+	var/suit_setup = type_setups[/obj/item/clothing/suit/space/void]
+	suit_setup[SETUP_NAME] = "engineering voidsuit"
+	suit_setup[SETUP_ICON_STATE] = "rig-engineering"
+	suit_setup[SETUP_ITEM_STATE_SLOTS] = list(
+			slot_l_hand_str = "eng_voidsuit",
+			slot_r_hand_str = "eng_voidsuit"
+		)
+
+
+/singleton/item_modifier/space_suit/sierra/security
+	name = "Security, NT"
+
+/singleton/item_modifier/space_suit/sierra/security/Initialize()
+	. = ..()
+	var/helmet_setup = type_setups[/obj/item/clothing/head/helmet/space]
+	helmet_setup[SETUP_NAME] = "security voidsuit helmet"
+	helmet_setup[SETUP_ICON_STATE] = "rig0-sec"
+	helmet_setup[SETUP_ITEM_STATE] = "sec_helm"
+
+	var/suit_setup = type_setups[/obj/item/clothing/suit/space/void]
+	suit_setup[SETUP_NAME] = "security voidsuit"
+	suit_setup[SETUP_ICON_STATE] = "rig-sec"
+	suit_setup[SETUP_ITEM_STATE_SLOTS] = list(
+			slot_l_hand_str = "sec_voidsuit",
+			slot_r_hand_str = "sec_voidsuit"
+		)
+
+
+/singleton/item_modifier/space_suit/sierra/security/alt
+	name = "Security, Riot"
+
+/singleton/item_modifier/space_suit/sierra/security/alt/Initialize()
+	. = ..()
+	var/helmet_setup = type_setups[/obj/item/clothing/head/helmet/space]
+	helmet_setup[SETUP_NAME] = "riot security voidsuit helmet"
+	helmet_setup[SETUP_ICON_STATE] = "rig0-secalt"
+	helmet_setup[SETUP_ITEM_STATE] = "secalt_helm"
+
+	var/suit_setup = type_setups[/obj/item/clothing/suit/space/void]
+	suit_setup[SETUP_NAME] = "riot security voidsuit"
+	suit_setup[SETUP_ICON_STATE] = "rig-secalt"
+
+
+/singleton/item_modifier/space_suit/sierra/atmos
+	name = "Atmos, NT"
+
+/singleton/item_modifier/space_suit/sierra/atmos/Initialize()
+	. = ..()
+	var/helmet_setup = type_setups[/obj/item/clothing/head/helmet/space]
+	helmet_setup[SETUP_NAME] = "atmospherics voidsuit helmet"
+	helmet_setup[SETUP_ICON_STATE] = "rig0-atmos"
+	helmet_setup[SETUP_ITEM_STATE] = "atmos_helm"
+
+	var/suit_setup = type_setups[/obj/item/clothing/suit/space/void]
+	suit_setup[SETUP_NAME] = "atmospherics voidsuit"
+	suit_setup[SETUP_ICON_STATE] = "rig-atmos"
+	suit_setup[SETUP_ITEM_STATE_SLOTS] = list(
+			slot_l_hand_str = "atmos_voidsuit",
+			slot_r_hand_str = "atmos_voidsuit"
+		)
+
+
+/singleton/item_modifier/space_suit/sierra/pilot
+	name = "Pilot, NT"
+
+/singleton/item_modifier/space_suit/sierra/pilot/Initialize()
+	. = ..()
+	var/helmet_setup = type_setups[/obj/item/clothing/head/helmet/space]
+	helmet_setup[SETUP_NAME] = "pilot voidsuit helmet"
+	helmet_setup[SETUP_ICON_STATE] = "rig0_pilot"
+	helmet_setup[SETUP_ITEM_STATE] = "pilot_helm"
+	helmet_setup[SETUP_SPECIES_OBJ][SPECIES_UNATHI] = 'mods/hardsuits/icons/voidsuits/obj_head_unathi.dmi'
+	helmet_setup[SETUP_SPECIES_OBJ][SPECIES_SKRELL] = 'mods/hardsuits/icons/voidsuits/obj_head_skrell.dmi'
+	helmet_setup[SETUP_SPECIES_ONMOB][SPECIES_SKRELL] = 'mods/hardsuits/icons/voidsuits/onmob_head_skrell.dmi'
+
+	var/suit_setup = type_setups[/obj/item/clothing/suit/space/void]
+	suit_setup[SETUP_NAME] = "pilot voidsuit"
+	suit_setup[SETUP_ICON_STATE] = "rig-pilot"
+	suit_setup[SETUP_ITEM_STATE_SLOTS] = list(
+			slot_l_hand_str = "s_suit",
+			slot_r_hand_str = "s_suit"
+		)
+	suit_setup[SETUP_SPECIES_OBJ][SPECIES_UNATHI] = 'mods/hardsuits/icons/voidsuits/obj_suit_unathi.dmi'
+	suit_setup[SETUP_SPECIES_OBJ][SPECIES_SKRELL] = 'mods/hardsuits/icons/voidsuits/obj_suit_skrell.dmi'
+	suit_setup[SETUP_SPECIES_ONMOB][SPECIES_SKRELL] = 'mods/hardsuits/icons/voidsuits/onmob_suit_skrell.dmi'
+
+/singleton/item_modifier/space_suit/sol/sierra
+	name = "Standard, SCG"
+	type_setups = list(
+		/obj/item/clothing/head/helmet/space = list(
+			SETUP_NAME = "voidsuit helmet",
+			SETUP_OBJ_SHEET = 'maps/torch/icons/obj/obj_head_solgov.dmi',
+			SETUP_ONMOB_SHEET = list(slot_head_str = 'maps/torch/icons/mob/onmob_head_solgov.dmi'),
+			SETUP_ICON_STATE = "rig_explorer",
+			SETUP_ITEM_STATE = "explorer_helm",
+			SETUP_SPECIES_OBJ = list(
+				SPECIES_HUMAN = 'maps/torch/icons/obj/obj_head_solgov.dmi',
+				SPECIES_UNATHI = 'packs/infinity/icons/obj/clothing/species/erosan/hats.dmi',
+				SPECIES_SKRELL = 'maps/torch/icons/obj/skrell/obj_head_solgov_skrell.dmi'
+				),
+			SETUP_SPECIES_ONMOB = list(
+				SPECIES_HUMAN = 'maps/torch/icons/mob/onmob_head_solgov.dmi',
+				SPECIES_UNATHI = 'mods/hardsuits/icons/voidsuits/onmob_head_unathi.dmi',
+				SPECIES_SKRELL = 'maps/torch/icons/mob/skrell/onmob_head_solgov_skrell.dmi'
+				)
+		),
+		/obj/item/clothing/suit/space/void = list(
+			SETUP_NAME = "voidsuit",
+			SETUP_OBJ_SHEET = 'maps/torch/icons/obj/obj_suit_solgov.dmi',
+			SETUP_ONMOB_SHEET = list(slot_wear_suit_str = 'maps/torch/icons/mob/onmob_suit_solgov.dmi'),
+			SETUP_ICON_STATE = "rig0_explorer",
+			SETUP_SPECIES_OBJ = list(
+				SPECIES_HUMAN = 'maps/torch/icons/obj/obj_suit_solgov.dmi',
+				SPECIES_UNATHI = 'packs/infinity/icons/obj/clothing/species/erosan/suits.dmi',
+				SPECIES_SKRELL = 'maps/torch/icons/obj/skrell/obj_suit_solgov_skrell.dmi'
+				),
+			SETUP_SPECIES_ONMOB = list(
+				SPECIES_HUMAN = 'maps/torch/icons/mob/onmob_suit_solgov.dmi',
+				SPECIES_UNATHI = 'mods/hardsuits/icons/voidsuits/onmob_suit_unathi.dmi',
+				SPECIES_SKRELL = 'maps/torch/icons/mob/skrell/onmob_suit_solgov_skrell.dmi'
+				)
+		)
+	)
+
+/singleton/item_modifier/space_suit/sol/sierra/medical
+	name = "Medical, Streamlined"
+
+/singleton/item_modifier/space_suit/sol/sierra/medical/Initialize()
+	. = ..()
+	var/helmet_setup = type_setups[/obj/item/clothing/head/helmet/space]
+	helmet_setup[SETUP_NAME] = "streamlined medical voidsuit helmet"
+	helmet_setup[SETUP_ICON_STATE] = "rig0-medicalalt"
+	helmet_setup[SETUP_ITEM_STATE] = "medicalalt_helm"
+
+	var/suit_setup = type_setups[/obj/item/clothing/suit/space/void]
+	suit_setup[SETUP_NAME] = "streamlined medical voidsuit"
+	suit_setup[SETUP_ICON_STATE] = "rig-medicalalt"
+
+/singleton/item_modifier/space_suit/sol/sierra/exploration
+	name = "Explorer, SCG"
+
+/singleton/item_modifier/space_suit/sol/sierra/exploration/Initialize()
+	. = ..()
+	var/helmet_setup = type_setups[/obj/item/clothing/head/helmet/space]
+	helmet_setup[SETUP_NAME] = "exploration voidsuit helmet"
+	helmet_setup[SETUP_ICON_STATE] = "rig0_explorer"
+	helmet_setup[SETUP_ITEM_STATE] = "explorer_helm"
+	helmet_setup[SETUP_SPECIES_OBJ][SPECIES_UNATHI] = 'mods/hardsuits/icons/voidsuits/obj_head_unathi.dmi'
+	helmet_setup[SETUP_SPECIES_OBJ][SPECIES_SKRELL] = 'mods/hardsuits/icons/voidsuits/obj_head_skrell.dmi'
+	helmet_setup[SETUP_SPECIES_ONMOB][SPECIES_SKRELL] = 'mods/hardsuits/icons/voidsuits/onmob_head_skrell.dmi'
+
+	var/suit_setup = type_setups[/obj/item/clothing/suit/space/void]
+	suit_setup[SETUP_NAME] = "exploration voidsuit"
+	suit_setup[SETUP_ICON_STATE] = "rig_explorer"
+	suit_setup[SETUP_SPECIES_OBJ][SPECIES_UNATHI] = 'mods/hardsuits/icons/voidsuits/obj_suit_unathi.dmi'
+	suit_setup[SETUP_SPECIES_OBJ][SPECIES_SKRELL] = 'mods/hardsuits/icons/voidsuits/obj_suit_skrell.dmi'
+	suit_setup[SETUP_SPECIES_ONMOB][SPECIES_SKRELL] = 'mods/hardsuits/icons/voidsuits/onmob_suit_skrell.dmi'
+
+#undef SETUP_NAME
+#undef SETUP_OBJ_SHEET
+#undef SETUP_ONMOB_SHEET
+#undef SETUP_ICON_STATE
+#undef SETUP_ITEM_STATE
+#undef SETUP_ITEM_STATE_SLOTS
+#undef SETUP_SPECIES_OBJ
+#undef SETUP_SPECIES_ONMOB
diff --git a/mods/hardsuits/icons/rigs/onmob_feet_solgov_unathi.dmi b/mods/hardsuits/icons/rigs/onmob_feet_solgov_unathi.dmi
new file mode 100644
index 0000000000000..2e2377fd30799
Binary files /dev/null and b/mods/hardsuits/icons/rigs/onmob_feet_solgov_unathi.dmi differ
diff --git a/mods/hardsuits/icons/rigs/onmob_hands_solgov_unathi.dmi b/mods/hardsuits/icons/rigs/onmob_hands_solgov_unathi.dmi
new file mode 100644
index 0000000000000..28db335cc5926
Binary files /dev/null and b/mods/hardsuits/icons/rigs/onmob_hands_solgov_unathi.dmi differ
diff --git a/mods/hardsuits/icons/rigs/onmob_head_solgov_skrell.dmi b/mods/hardsuits/icons/rigs/onmob_head_solgov_skrell.dmi
new file mode 100644
index 0000000000000..5f9c20a5506ad
Binary files /dev/null and b/mods/hardsuits/icons/rigs/onmob_head_solgov_skrell.dmi differ
diff --git a/mods/hardsuits/icons/rigs/onmob_head_solgov_unathi.dmi b/mods/hardsuits/icons/rigs/onmob_head_solgov_unathi.dmi
new file mode 100644
index 0000000000000..9f2e86430b4ef
Binary files /dev/null and b/mods/hardsuits/icons/rigs/onmob_head_solgov_unathi.dmi differ
diff --git a/mods/hardsuits/icons/rigs/onmob_suit_solgov_skrell.dmi b/mods/hardsuits/icons/rigs/onmob_suit_solgov_skrell.dmi
new file mode 100644
index 0000000000000..e99ded5760045
Binary files /dev/null and b/mods/hardsuits/icons/rigs/onmob_suit_solgov_skrell.dmi differ
diff --git a/mods/hardsuits/icons/rigs/onmob_suit_solgov_unathi.dmi b/mods/hardsuits/icons/rigs/onmob_suit_solgov_unathi.dmi
new file mode 100644
index 0000000000000..d8dafc0420034
Binary files /dev/null and b/mods/hardsuits/icons/rigs/onmob_suit_solgov_unathi.dmi differ
diff --git a/mods/hardsuits/icons/voidsuits/obj_head_skrell.dmi b/mods/hardsuits/icons/voidsuits/obj_head_skrell.dmi
new file mode 100644
index 0000000000000..bf2552ba5dedd
Binary files /dev/null and b/mods/hardsuits/icons/voidsuits/obj_head_skrell.dmi differ
diff --git a/mods/hardsuits/icons/voidsuits/obj_head_unathi.dmi b/mods/hardsuits/icons/voidsuits/obj_head_unathi.dmi
new file mode 100644
index 0000000000000..b926a13ac8289
Binary files /dev/null and b/mods/hardsuits/icons/voidsuits/obj_head_unathi.dmi differ
diff --git a/mods/hardsuits/icons/voidsuits/obj_suit_skrell.dmi b/mods/hardsuits/icons/voidsuits/obj_suit_skrell.dmi
new file mode 100644
index 0000000000000..3d1818c26581b
Binary files /dev/null and b/mods/hardsuits/icons/voidsuits/obj_suit_skrell.dmi differ
diff --git a/mods/hardsuits/icons/voidsuits/obj_suit_unathi.dmi b/mods/hardsuits/icons/voidsuits/obj_suit_unathi.dmi
new file mode 100644
index 0000000000000..efd94f459a809
Binary files /dev/null and b/mods/hardsuits/icons/voidsuits/obj_suit_unathi.dmi differ
diff --git a/mods/hardsuits/icons/voidsuits/onmob_head_skrell.dmi b/mods/hardsuits/icons/voidsuits/onmob_head_skrell.dmi
new file mode 100644
index 0000000000000..41b53f7099e33
Binary files /dev/null and b/mods/hardsuits/icons/voidsuits/onmob_head_skrell.dmi differ
diff --git a/mods/hardsuits/icons/voidsuits/onmob_head_unathi.dmi b/mods/hardsuits/icons/voidsuits/onmob_head_unathi.dmi
new file mode 100644
index 0000000000000..b530b597ee41c
Binary files /dev/null and b/mods/hardsuits/icons/voidsuits/onmob_head_unathi.dmi differ
diff --git a/mods/hardsuits/icons/voidsuits/onmob_suit_skrell.dmi b/mods/hardsuits/icons/voidsuits/onmob_suit_skrell.dmi
new file mode 100644
index 0000000000000..ec0185260bd3b
Binary files /dev/null and b/mods/hardsuits/icons/voidsuits/onmob_suit_skrell.dmi differ
diff --git a/mods/hardsuits/icons/voidsuits/onmob_suit_unathi.dmi b/mods/hardsuits/icons/voidsuits/onmob_suit_unathi.dmi
new file mode 100644
index 0000000000000..e889635a2dbb7
Binary files /dev/null and b/mods/hardsuits/icons/voidsuits/onmob_suit_unathi.dmi differ
diff --git a/mods/tajara/icons/sprite_sheets/helmet.dmi b/mods/tajara/icons/sprite_sheets/helmet.dmi
index 6519a74f039c3..d52da603d5b26 100644
Binary files a/mods/tajara/icons/sprite_sheets/helmet.dmi and b/mods/tajara/icons/sprite_sheets/helmet.dmi differ
diff --git a/mods/tajara/icons/sprite_sheets/suit.dmi b/mods/tajara/icons/sprite_sheets/suit.dmi
index e4675978ed223..bce53ea32de44 100644
Binary files a/mods/tajara/icons/sprite_sheets/suit.dmi and b/mods/tajara/icons/sprite_sheets/suit.dmi differ