ironing out icon conflicts

This commit is contained in:
BlackMajor
2022-04-21 01:40:12 +12:00
parent f2a8beec0f
commit 678584eb2f
11 changed files with 145 additions and 145 deletions
@@ -108,21 +108,21 @@
//Backend stuff to make the sprites work. Copied and pasted from rig_pieces_vr.dm, but added ch to everything. Only reason for this to be touched is to add or remove species. This might just need to go in a new file named rig_pieces_ch.dm.
/obj/item/clothing/head/helmet/space/rig/protean
sprite_sheets = list(
SPECIES_HUMAN = 'icons/mob/head_ch.dmi',
SPECIES_TAJ = 'icons/mob/species/tajaran/helmet_ch.dmi',
SPECIES_SKRELL = 'icons/mob/species/skrell/helmet_ch.dmi',
SPECIES_UNATHI = 'icons/mob/species/unathi/helmet_ch.dmi',
SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet_ch.dmi',
SPECIES_AKULA = 'icons/mob/species/akula/helmet_ch.dmi',
SPECIES_SERGAL = 'icons/mob/species/sergal/helmet_ch.dmi',
SPECIES_NEVREAN = 'icons/mob/species/sergal/helmet_ch.dmi',
SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/helmet_ch.dmi',
SPECIES_ZORREN_HIGH = 'icons/mob/species/fox/helmet_ch.dmi',
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet_ch.dmi',
SPECIES_PROMETHEAN = 'icons/mob/species/skrell/helmet_ch.dmi',
SPECIES_HUMAN = 'modular_chomp/icons/mob/head_ch.dmi',
SPECIES_TAJ = 'modular_chomp/icons/mob/species/tajaran/helmet_ch.dmi',
SPECIES_SKRELL = 'modular_chomp/icons/mob/species/skrell/helmet_ch.dmi',
SPECIES_UNATHI = 'modular_chomp/icons/mob/species/unathi/helmet_ch.dmi',
SPECIES_XENOHYBRID = 'modular_chomp/icons/mob/species/unathi/helmet_ch.dmi',
SPECIES_AKULA = 'modular_chomp/icons/mob/species/akula/helmet_ch.dmi',
SPECIES_SERGAL = 'modular_chomp/icons/mob/species/sergal/helmet_ch.dmi',
SPECIES_NEVREAN = 'modular_chomp/icons/mob/species/sergal/helmet_ch.dmi',
SPECIES_VULPKANIN = 'modular_chomp/icons/mob/species/vulpkanin/helmet_ch.dmi',
SPECIES_ZORREN_HIGH = 'modular_chomp/icons/mob/species/fox/helmet_ch.dmi',
SPECIES_FENNEC = 'modular_chomp/icons/mob/species/vulpkanin/helmet_ch.dmi',
SPECIES_PROMETHEAN = 'modular_chomp/icons/mob/species/skrell/helmet_ch.dmi',
SPECIES_TESHARI = 'icons/inventory/head/mob_ch_teshari.dmi',
SPECIES_VASILISSAN = 'icons/mob/species/skrell/helmet_ch.dmi',
SPECIES_VOX = 'icons/mob/species/vox/head_ch.dmi'
SPECIES_VASILISSAN = 'modular_chomp/icons/mob/species/skrell/helmet_ch.dmi',
SPECIES_VOX = 'modular_chomp/icons/mob/species/vox/head_ch.dmi'
)
sprite_sheets_obj = list(
@@ -145,21 +145,21 @@
/obj/item/clothing/suit/space/rig/protean
sprite_sheets = list(
SPECIES_HUMAN = 'icons/mob/spacesuit_ch.dmi',
SPECIES_TAJ = 'icons/mob/species/tajaran/suit_ch.dmi',
SPECIES_SKRELL = 'icons/mob/species/skrell/suit_ch.dmi',
SPECIES_UNATHI = 'icons/mob/species/unathi/suit_ch.dmi',
SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit_ch.dmi',
SPECIES_AKULA = 'icons/mob/species/akula/suit_ch.dmi',
SPECIES_SERGAL = 'icons/mob/species/sergal/suit_ch.dmi',
SPECIES_NEVREAN = 'icons/mob/species/sergal/suit_ch.dmi',
SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/suit_ch.dmi',
SPECIES_ZORREN_HIGH = 'icons/mob/species/fox/suit_ch.dmi',
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit_ch.dmi',
SPECIES_PROMETHEAN = 'icons/mob/species/skrell/suit_ch.dmi',
SPECIES_HUMAN = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_TAJ = 'modular_chomp/icons/mob/species/tajaran/suit_ch.dmi',
SPECIES_SKRELL = 'modular_chomp/icons/mob/species/skrell/suit_ch.dmi',
SPECIES_UNATHI = 'modular_chomp/icons/mob/species/unathi/suit_ch.dmi',
SPECIES_XENOHYBRID = 'modular_chomp/icons/mob/species/unathi/suit_ch.dmi',
SPECIES_AKULA = 'modular_chomp/icons/mob/species/akula/suit_ch.dmi',
SPECIES_SERGAL = 'modular_chomp/icons/mob/species/sergal/suit_ch.dmi',
SPECIES_NEVREAN = 'modular_chomp/icons/mob/species/sergal/suit_ch.dmi',
SPECIES_VULPKANIN = 'modular_chomp/icons/mob/species/vulpkanin/suit_ch.dmi',
SPECIES_ZORREN_HIGH = 'modular_chomp/icons/mob/species/fox/suit_ch.dmi',
SPECIES_FENNEC = 'modular_chomp/icons/mob/species/vulpkanin/suit_ch.dmi',
SPECIES_PROMETHEAN = 'modular_chomp/icons/mob/species/skrell/suit_ch.dmi',
SPECIES_TESHARI = 'icons/inventory/suit/mob_ch_teshari.dmi',
SPECIES_VASILISSAN = 'icons/mob/species/skrell/suit_ch.dmi',
SPECIES_VOX = 'icons/mob/species/vox/suit_ch.dmi'
SPECIES_VASILISSAN = 'modular_chomp/icons/mob/species/skrell/suit_ch.dmi',
SPECIES_VOX = 'modular_chomp/icons/mob/species/vox/suit_ch.dmi'
)
sprite_sheets_obj = list(
@@ -182,21 +182,21 @@
/obj/item/clothing/gloves/gauntlets/rig/protean
sprite_sheets = list(
SPECIES_HUMAN = 'icons/mob/hands_ch.dmi',
SPECIES_TAJ = 'icons/mob/hands_ch.dmi',
SPECIES_SKRELL = 'icons/mob/hands_ch.dmi',
SPECIES_UNATHI = 'icons/mob/hands_ch.dmi',
SPECIES_XENOHYBRID = 'icons/mob/hands_ch.dmi',
SPECIES_AKULA = 'icons/mob/hands_ch.dmi',
SPECIES_SERGAL = 'icons/mob/hands_ch.dmi',
SPECIES_NEVREAN = 'icons/mob/hands_ch.dmi',
SPECIES_VULPKANIN = 'icons/mob/hands_ch.dmi',
SPECIES_ZORREN_HIGH = 'icons/mob/hands_ch.dmi',
SPECIES_FENNEC = 'icons/mob/hands_ch.dmi',
SPECIES_PROMETHEAN = 'icons/mob/hands_ch.dmi',
SPECIES_TESHARI = 'icons/mob/hands_ch.dmi',
SPECIES_VASILISSAN = 'icons/mob/hands_ch.dmi',
SPECIES_VOX = 'icons/mob/species/vox/gloves_ch.dmi'
SPECIES_HUMAN = 'modular_chomp/icons/mob/hands_ch.dmi',
SPECIES_TAJ = 'modular_chomp/icons/mob/hands_ch.dmi',
SPECIES_SKRELL = 'modular_chomp/icons/mob/hands_ch.dmi',
SPECIES_UNATHI = 'modular_chomp/icons/mob/hands_ch.dmi',
SPECIES_XENOHYBRID = 'modular_chomp/icons/mob/hands_ch.dmi',
SPECIES_AKULA = 'modular_chomp/icons/mob/hands_ch.dmi',
SPECIES_SERGAL = 'modular_chomp/icons/mob/hands_ch.dmi',
SPECIES_NEVREAN = 'modular_chomp/icons/mob/hands_ch.dmi',
SPECIES_VULPKANIN = 'modular_chomp/icons/mob/hands_ch.dmi',
SPECIES_ZORREN_HIGH = 'modular_chomp/icons/mob/hands_ch.dmi',
SPECIES_FENNEC = 'modular_chomp/icons/mob/hands_ch.dmi',
SPECIES_PROMETHEAN = 'modular_chomp/icons/mob/hands_ch.dmi',
SPECIES_TESHARI = 'modular_chomp/icons/mob/hands_ch.dmi',
SPECIES_VASILISSAN = 'modular_chomp/icons/mob/hands_ch.dmi',
SPECIES_VOX = 'modular_chomp/icons/mob/species/vox/gloves_ch.dmi'
)
sprite_sheets_obj = list(
@@ -219,21 +219,21 @@
/obj/item/clothing/shoes/magboots/rig/protean
sprite_sheets = list(
SPECIES_HUMAN = 'icons/mob/feet_ch.dmi',
SPECIES_TAJ = 'icons/mob/feet_ch.dmi',
SPECIES_SKRELL = 'icons/mob/feet_ch.dmi',
SPECIES_UNATHI = 'icons/mob/feet_ch.dmi',
SPECIES_XENOHYBRID = 'icons/mob/feet_ch.dmi',
SPECIES_AKULA = 'icons/mob/feet_ch.dmi',
SPECIES_SERGAL = 'icons/mob/feet_ch.dmi',
SPECIES_NEVREAN = 'icons/mob/feet_ch.dmi',
SPECIES_VULPKANIN = 'icons/mob/feet_ch.dmi',
SPECIES_ZORREN_HIGH = 'icons/mob/feet_ch.dmi',
SPECIES_FENNEC = 'icons/mob/feet_ch.dmi',
SPECIES_PROMETHEAN = 'icons/mob/feet_ch.dmi',
SPECIES_TESHARI = 'icons/mob/feet_ch.dmi',
SPECIES_VASILISSAN = 'icons/mob/feet_ch.dmi',
SPECIES_VOX = 'icons/mob/species/vox/shoes_ch.dmi'
SPECIES_HUMAN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_TAJ = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_SKRELL = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_UNATHI = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_XENOHYBRID = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_AKULA = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_SERGAL = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_NEVREAN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_VULPKANIN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_ZORREN_HIGH = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_FENNEC = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_PROMETHEAN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_TESHARI = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_VASILISSAN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_VOX = 'modular_chomp/icons/mob/species/vox/shoes_ch.dmi'
)
sprite_sheets_obj = list(