Чинит ИКСы и войды для ксеносов (#3251)

mods/hardsuits/code/rigs.dm

@@ -1,6 +1,6 @@
 /obj/item/clothing/head/helmet/space/rig/command/exploration/New()
 	. = ..()
-	species_restricted |= list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_TAJARA,SPECIES_UNATHI,SPECIES_IPC)
+	species_restricted |= list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_TAJARA,SPECIES_UNATHI,SPECIES_IPC/*,SPECIES_RESOMI*/) // нужны спрайты резоми (или не нужны, это хеви HCM)
 	sprite_sheets ^= list(
 		SPECIES_SKRELL,
 		SPECIES_UNATHI
@@ -9,23 +9,23 @@
 		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)
+	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_TAJARA,SPECIES_UNATHI,SPECIES_IPC/*,SPECIES_RESOMI*/)
 	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)
+	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_TAJARA,SPECIES_UNATHI,SPECIES_IPC/*,SPECIES_RESOMI*/)
 	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)
+	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_TAJARA,SPECIES_UNATHI,SPECIES_IPC/*,SPECIES_RESOMI*/)
 	icon_state = "command_exp_rig"
 	sprite_sheets = list(
 		SPECIES_UNATHI = 'mods/hardsuits/icons/rigs/onmob_feet_solgov_unathi.dmi'

mods/hardsuits/code/void.dm

@@ -170,7 +170,7 @@
 				SPECIES_HUMAN = 'maps/torch/icons/mob/onmob_head_solgov.dmi',
 				SPECIES_UNATHI = 'mods/hardsuits/icons/voidsuits/onmob_head_unathi.dmi',
 				SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_head_resomi.dmi',
-				SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/helmet.dmi',				
+				SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/helmet.dmi',
 				SPECIES_SKRELL = 'maps/torch/icons/mob/skrell/onmob_head_solgov_skrell.dmi'
 				)
 		),
@@ -230,6 +230,141 @@
 	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/mining
+	name = "Mining"
+
+/singleton/item_modifier/space_suit/mining/Initialize()
+	. = ..()
+	var/helmet_setup = type_setups[/obj/item/clothing/head/helmet/space]
+	helmet_setup[SETUP_NAME] = "mining voidsuit helmet"
+	helmet_setup[SETUP_ICON_STATE] = "rig0-mining"
+	helmet_setup[SETUP_ITEM_STATE] = "mining_helm"
+	helmet_setup[SETUP_SPECIES_OBJ] = list(
+		SPECIES_RESOMI = 'packs/infinity/icons/obj/clothing/species/resomi/obj_head_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/obj/hats.dmi'
+	)
+	helmet_setup[SETUP_SPECIES_ONMOB] = list(
+		SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_head_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/helmet.dmi'
+	)
+
+	var/suit_setup = type_setups[/obj/item/clothing/suit/space/void]
+	suit_setup[SETUP_NAME] = "mining voidsuit"
+	suit_setup[SETUP_ICON_STATE] = "rig-mining"
+	suit_setup[SETUP_ITEM_STATE_SLOTS] = list(
+			slot_l_hand_str = "mining_voidsuit",
+			slot_r_hand_str = "mining_voidsuit"
+		)
+	suit_setup[SETUP_SPECIES_OBJ] = list(
+		SPECIES_RESOMI = 'packs/infinity/icons/obj/clothing/species/resomi/obj_suit_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/obj/suits.dmi'
+	)
+	suit_setup[SETUP_SPECIES_ONMOB] = list(
+		SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_suit_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/suit.dmi'
+	)
+
+
+
+/singleton/item_modifier/space_suit/salvage //нет спрайтов для таяр и резоми тут, подайте спрайтов христа ради ;-;
+	name = "Salvage"
+
+/*/singleton/item_modifier/space_suit/salvage/Initialize()
+	. = ..()
+	var/helmet_setup = type_setups[/obj/item/clothing/head/helmet/space]
+	helmet_setup[SETUP_NAME] = "salvage voidsuit helmet"
+	helmet_setup[SETUP_ICON_STATE] = "rig0-salvage"
+	helmet_setup[SETUP_ITEM_STATE] = "salvage_helm"
+	helmet_setup[SETUP_SPECIES_OBJ] = list(
+		SPECIES_RESOMI = 'packs/infinity/icons/obj/clothing/species/resomi/obj_head_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/obj/hats.dmi'
+	) //пути уже заранее заготовлены, если кто-то захочет докинуть спрайты сальваж войда ксеноте
+	helmet_setup[SETUP_SPECIES_ONMOB] = list(
+		SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_head_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/helmet.dmi'
+	)
+
+	var/suit_setup = type_setups[/obj/item/clothing/suit/space/void]
+	suit_setup[SETUP_NAME] = "salvage voidsuit"
+	suit_setup[SETUP_ICON_STATE] = "rig-salvage"
+	suit_setup[SETUP_SPECIES_OBJ] = list(
+		SPECIES_RESOMI = 'packs/infinity/icons/obj/clothing/species/resomi/obj_suit_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/obj/suits.dmi'
+	)
+	suit_setup[SETUP_SPECIES_ONMOB] = list(
+		SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_suit_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/suit.dmi'
+	)
+*/
+
+/singleton/item_modifier/space_suit/science
+	name = "Science"
+
+/singleton/item_modifier/space_suit/science/Initialize()
+	. = ..()
+	var/helmet_setup = type_setups[/obj/item/clothing/head/helmet/space]
+	helmet_setup[SETUP_NAME] = "excavation voidsuit helmet"
+	helmet_setup[SETUP_ICON_STATE] = "rig0-excavation"
+	helmet_setup[SETUP_ITEM_STATE] = "excavation-helm"
+	helmet_setup[SETUP_SPECIES_OBJ] = list(
+		SPECIES_RESOMI = 'packs/infinity/icons/obj/clothing/species/resomi/obj_head_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/obj/hats.dmi'
+	)
+	helmet_setup[SETUP_SPECIES_ONMOB] = list(
+		SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_head_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/helmet.dmi'
+	)
+
+	var/suit_setup = type_setups[/obj/item/clothing/suit/space/void]
+	suit_setup[SETUP_NAME] = "excavation voidsuit"
+	suit_setup[SETUP_ICON_STATE] = "rig-excavation"
+	suit_setup[SETUP_ITEM_STATE_SLOTS] = list(
+			slot_l_hand_str = "excavation_voidsuit",
+			slot_r_hand_str = "excavation_voidsuit"
+		)
+	suit_setup[SETUP_SPECIES_OBJ] = list(
+		SPECIES_RESOMI = 'packs/infinity/icons/obj/clothing/species/resomi/obj_suit_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/obj/suits.dmi'
+	)
+	suit_setup[SETUP_SPECIES_ONMOB] = list(
+		SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_suit_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/suit.dmi'
+	)
+
+/singleton/item_modifier/space_suit/mercenary
+	name = "Mercenary"
+
+/singleton/item_modifier/space_suit/mercenary/Initialize()
+	. = ..()
+	var/helmet_setup = type_setups[/obj/item/clothing/head/helmet/space]
+	helmet_setup[SETUP_NAME] = "blood-red voidsuit helmet"
+	helmet_setup[SETUP_ICON_STATE] = "rig0-syndie"
+	helmet_setup[SETUP_ITEM_STATE] = "syndie_helm"
+	helmet_setup[SETUP_SPECIES_OBJ] = list(
+		SPECIES_RESOMI = 'packs/infinity/icons/obj/clothing/species/resomi/obj_head_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/obj/hats.dmi'
+	)
+	helmet_setup[SETUP_SPECIES_ONMOB] = list(
+		SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_head_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/helmet.dmi'
+	)
+
+	var/suit_setup = type_setups[/obj/item/clothing/suit/space/void]
+	suit_setup[SETUP_NAME] = "blood-red voidsuit"
+	suit_setup[SETUP_ICON_STATE] = "rig-syndie"
+	suit_setup[SETUP_ITEM_STATE_SLOTS] = list(
+			slot_l_hand_str = "syndie_voidsuit",
+			slot_r_hand_str = "syndie_voidsuit"
+		)
+	suit_setup[SETUP_SPECIES_OBJ] = list(
+		SPECIES_RESOMI = 'packs/infinity/icons/obj/clothing/species/resomi/obj_suit_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/obj/suits.dmi'
+	)
+	suit_setup[SETUP_SPECIES_ONMOB] = list(
+		SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_suit_resomi.dmi',
+		SPECIES_TAJARA = 'mods/tajara/icons/sprite_sheets/suit.dmi'
+	)
+
 #undef SETUP_NAME
 #undef SETUP_OBJ_SHEET
 #undef SETUP_ONMOB_SHEET

mods/tajara/code/clothing/clothing.dm

@@ -109,7 +109,7 @@
 	. = ..()
 	LAZYSET(sprite_sheets, SPECIES_TAJARA, 'mods/tajara/icons/sprite_sheets/hands.dmi')
 
-
+/*
 /obj/item/clothing/head/helmet/space/void/engineering/alt/Initialize()
 	. = ..()
 	LAZYSET(sprite_sheets, SPECIES_TAJARA, 'mods/tajara/icons/sprite_sheets/helmet.dmi')
@@ -126,18 +126,16 @@
 /obj/item/clothing/suit/space/void/security/alt/Initialize()
 	. = ..()
 	LAZYSET(sprite_sheets, SPECIES_TAJARA, 'mods/tajara/icons/sprite_sheets/suit.dmi')
-
+*/
 /obj/item/clothing/head/helmet/space/void/Initialize()
 	. = ..()
 	LAZYSET(sprite_sheets, SPECIES_TAJARA, 'mods/tajara/icons/sprite_sheets/helmet.dmi')
 	LAZYSET(sprite_sheets_obj, SPECIES_TAJARA, 'mods/tajara/icons/sprite_sheets/obj/hats.dmi')
-	LAZYADD(species_restricted, list(SPECIES_TAJARA))
 
 /obj/item/clothing/suit/space/void/Initialize()
 	. = ..()
 	LAZYSET(sprite_sheets, SPECIES_TAJARA, 'mods/tajara/icons/sprite_sheets/suit.dmi')
 	LAZYSET(sprite_sheets_obj, SPECIES_TAJARA, 'mods/tajara/icons/sprite_sheets/obj/suits.dmi')
-	LAZYADD(species_restricted, list(SPECIES_TAJARA))
 
 /obj/item/clothing/suit/space/rig/Initialize()
 	. = ..()

mods/utility_items/_utility_items_includes.dm

@@ -40,4 +40,6 @@
 #include "code/changed_sprite.dm"
 #include "code/rndloadout.dm"
 #include "code/dls_loadout.dm"
+#include "code/xeno_voids_and_rigs.dm"
+
 #endif