From 678584eb2f742213645f8cc712252b13f355161d Mon Sep 17 00:00:00 2001 From: BlackMajor Date: Thu, 21 Apr 2022 01:40:12 +1200 Subject: [PATCH] ironing out icon conflicts --- .../objects/items/weapons/taskmanager_ch.dm | 14 +-- .../spacesuits/rig/suits/station_ch.dm | 66 +++++----- .../silicon/robot/dogborg/dog_sleeper_vr.dm | 4 +- .../silicon/robot/robot_modules/station_ch.dm | 4 +- .../silicon/robot/robot_modules/station_vr.dm | 4 +- .../subtypes/animal/passive/armadillo_ch.dm | 4 +- .../new_player/sprite_accessories_extra_ch.dm | 60 ++++----- .../new_player/sprite_accessories_taur_ch.dm | 6 +- .../mob/new_player/sprite_accessories_vr.dm | 12 +- .../species/station/protean/protean_rig.dm | 116 +++++++++--------- .../icons}/mob/feet_ch.dmi | Bin 11 files changed, 145 insertions(+), 145 deletions(-) rename {icons => modular_chomp/icons}/mob/feet_ch.dmi (100%) diff --git a/code/game/objects/items/weapons/taskmanager_ch.dm b/code/game/objects/items/weapons/taskmanager_ch.dm index 8d3ef847e4..f5209cacc6 100644 --- a/code/game/objects/items/weapons/taskmanager_ch.dm +++ b/code/game/objects/items/weapons/taskmanager_ch.dm @@ -1,7 +1,7 @@ /obj/item/weapon/taskmanager name = "Task Manager" desc = "A high-tech tool used to pull surplus items from offsite storage. Select a department to begin! Has a five minute cooldown between successful uses" - icon = 'icons/mob/dogborg_ch.dmi' + icon = 'modular_chomp/icons/mob/dogborg_ch.dmi' icon_state = "taskmanager" item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_vr.dmi', @@ -23,12 +23,12 @@ var/ready = 1 var/list/scannables = list() var/list/scanned = list() - var/static/image/radial_image_bridge = image(icon = 'icons/mob/radial_ch.dmi', icon_state = "bridge") - var/static/image/radial_image_engineering = image(icon= 'icons/mob/radial_ch.dmi', icon_state = "eng") - var/static/image/radial_image_medical = image(icon = 'icons/mob/radial_ch.dmi', icon_state = "medbay") - var/static/image/radial_image_science = image(icon = 'icons/mob/radial_ch.dmi', icon_state = "sci") - var/static/image/radial_image_service = image(icon = 'icons/mob/radial_ch.dmi', icon_state = "bar") - var/static/image/radial_image_security = image(icon = 'icons/mob/radial_ch.dmi', icon_state = "armory") + var/static/image/radial_image_bridge = image(icon = 'modular_chomp/icons/mob/radial_ch.dmi', icon_state = "bridge") + var/static/image/radial_image_engineering = image(icon= 'modular_chomp/icons/mob/radial_ch.dmi', icon_state = "eng") + var/static/image/radial_image_medical = image(icon = 'modular_chomp/icons/mob/radial_ch.dmi', icon_state = "medbay") + var/static/image/radial_image_science = image(icon = 'modular_chomp/icons/mob/radial_ch.dmi', icon_state = "sci") + var/static/image/radial_image_service = image(icon = 'modular_chomp/icons/mob/radial_ch.dmi', icon_state = "bar") + var/static/image/radial_image_security = image(icon = 'modular_chomp/icons/mob/radial_ch.dmi', icon_state = "armory") /obj/item/weapon/taskmanager/proc/check_menu(mob/living/user) if(!istype(user)) diff --git a/code/modules/clothing/spacesuits/rig/suits/station_ch.dm b/code/modules/clothing/spacesuits/rig/suits/station_ch.dm index 818c8bdbda..7e532e8f38 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station_ch.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station_ch.dm @@ -1,7 +1,7 @@ //Hardsuits /obj/item/weapon/rig/ch //Some blank bs desc = "This is a dev item and should not be spawned." - default_mob_icon = 'icons/mob/rig_back_ch.dmi' + default_mob_icon = 'modular_chomp/icons/mob/rig_back_ch.dmi' chest_type = /obj/item/clothing/suit/space/rig/ch helm_type = /obj/item/clothing/head/helmet/space/rig/ch glove_type = /obj/item/clothing/gloves/gauntlets/rig/ch @@ -78,7 +78,7 @@ /obj/item/clothing/head/helmet/space/rig/ch sprite_sheets = list( - SPECIES_HUMAN = 'icons/mob/head_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', @@ -115,7 +115,7 @@ /obj/item/clothing/suit/space/rig/ch sprite_sheets = list( - SPECIES_HUMAN = 'icons/mob/spacesuit_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', @@ -152,21 +152,21 @@ /obj/item/clothing/gloves/gauntlets/rig/ch 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( @@ -189,21 +189,21 @@ /obj/item/clothing/shoes/magboots/rig/ch 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( diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index 7c56df6e93..54fca8d569 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -714,7 +714,7 @@ /obj/item/device/dogborg/sleeper/command //Command borg belly //CHOMP addition name = "Bluespace Filing Belly" desc = "A mounted bluespace storage unit for carrying paperwork" - icon = 'icons/mob/dogborg_ch.dmi' + icon = 'modular_chomp/icons/mob/dogborg_ch.dmi' icon_state = "sleeperd" injection_chems = null compactor = TRUE @@ -745,7 +745,7 @@ /obj/item/device/dogborg/sleeper/compactor/honkborg name = "Jiggles Von Hungertron" desc = "You've heard of Giggles Von Honkerton for the back, now get ready for Jiggles Von Hungertron for the front." - icon = 'icons/mob/dogborg_ch.dmi' + icon = 'modular_chomp/icons/mob/dogborg_ch.dmi' icon_state = "clowngut" recycles = FALSE diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_ch.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_ch.dm index c506e6856c..36cbca3565 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_ch.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_ch.dm @@ -77,8 +77,8 @@ B.water = water src.modules += B - R.icon = 'icons/mob/widerobot_ch.dmi' - R.wideborg_dept = 'icons/mob/widerobot_ch.dmi' + R.icon = 'modular_chomp/icons/mob/widerobot_ch.dmi' + R.wideborg_dept = 'modular_chomp/icons/mob/widerobot_ch.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' R.ui_style_vr = TRUE R.pixel_x = -16 diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index 4a40782e44..147c289b73 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -1029,8 +1029,8 @@ B.water = water src.modules += B - R.icon = 'icons/mob/widerobot_ch.dmi' - R.wideborg_dept = 'icons/mob/widerobot_ch.dmi' + R.icon = 'modular_chomp/icons/mob/widerobot_ch.dmi' + R.wideborg_dept = 'modular_chomp/icons/mob/widerobot_ch.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' R.ui_style_vr = TRUE R.pixel_x = -16 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo_ch.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo_ch.dm index 0e3d3e8d0e..c08c0a3989 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo_ch.dm @@ -5,7 +5,7 @@ tt_desc = "Dasypus novemcinctus" //faction = "mexico" //They are from Mexico. //Amusing but this prompts aggression from crew-aligned mobs. - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' icon_state = "armadillo" item_state = "armadillo_rest" icon_living = "armadillo" @@ -49,7 +49,7 @@ var/obj/item/clothing/head/hat = null // The hat the armadillo may be wearing. -//Hat simulator stolen from slime code. +//Hat simulator stolen from slime code. /mob/living/simple_mob/animal/passive/armadillo/Destroy() if(hat) drop_hat() diff --git a/code/modules/mob/new_player/sprite_accessories_extra_ch.dm b/code/modules/mob/new_player/sprite_accessories_extra_ch.dm index 9dc52c6a45..c3f6f79377 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra_ch.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra_ch.dm @@ -214,8 +214,8 @@ //TFF 16/1/20 - Cotton hair backport /datum/sprite_accessory/hair/ch - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' /datum/sprite_accessory/hair/ch/cotton name = "Cotton" icon_state = "hair_cotton" @@ -228,99 +228,99 @@ // Extra colorable options for Vox /datum/sprite_accessory/hair/vox_afro_color name = "Vox Afro, Colorable" - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' icon_state = "hair_vox_afro" species_allowed = list(SPECIES_VOX) /datum/sprite_accessory/hair/vox_crestedquills_color name = "Vox Crested Quills, Colorable" - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' icon_state = "hair_vox_crestedquills" species_allowed = list(SPECIES_VOX) /datum/sprite_accessory/hair/vox_empquills_color name = "Vox Emperor Quills, Colorable" - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' icon_state = "hair_vox_emperorquills" species_allowed = list(SPECIES_VOX) /datum/sprite_accessory/hair/vox_hairhorns_color name = "Vox Hair Horns, Colorable" - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' icon_state = "hair_vox_horns" species_allowed = list(SPECIES_VOX) /datum/sprite_accessory/hair/vox_keelquills_color name = "Vox Keel Quills, Colorable" - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' icon_state = "hair_vox_keelquills" species_allowed = list(SPECIES_VOX) /datum/sprite_accessory/hair/vox_keetquills_color name = "Vox Keet Quills, Colorable" - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' icon_state = "hair_vox_keetquills" species_allowed = list(SPECIES_VOX) /datum/sprite_accessory/hair/vox_kingly_color name = "Vox Kingly Quills, Colorable" - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' icon_state = "hair_vox_kingly" species_allowed = list(SPECIES_VOX) /datum/sprite_accessory/hair/vox_mohawk_color name = "Vox Mohawk, Colorable" - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' icon_state = "hair_vox_mohawk" species_allowed = list(SPECIES_VOX) /datum/sprite_accessory/hair/vox_nights_color name = "Vox Night Quills, Colorable" - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' icon_state = "hair_vox_nights" species_allowed = list(SPECIES_VOX) /datum/sprite_accessory/hair/vox_razorclipped_color name = "Vox Razor Clipped, Colorable" - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' icon_state = "hair_vox_razorclipped" species_allowed = list(SPECIES_VOX) /datum/sprite_accessory/hair/vox_razor_color name = "Vox Razor, Colorable" - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' icon_state = "hair_vox_razor" species_allowed = list(SPECIES_VOX) /datum/sprite_accessory/hair/vox_shortquills_color name = "Vox Short Quills, Colorable" - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' icon_state = "hair_vox_shortquills" species_allowed = list(SPECIES_VOX) /datum/sprite_accessory/hair/vox_tielquills_color name = "Vox Tiel Quills, Colorable" - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' icon_state = "hair_vox_tielquills" species_allowed = list(SPECIES_VOX) /datum/sprite_accessory/hair/vox_yasuquills_color name = "Vox Yasu Quills, Colorable" - icon = 'icons/mob/human_face_ch.dmi' - icon_add = 'icons/mob/human_face_ch_add.dmi' + icon = 'modular_chomp/icons/mob/human_face_ch.dmi' + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi' icon_state = "hair_vox_yasu" species_allowed = list(SPECIES_VOX) diff --git a/code/modules/mob/new_player/sprite_accessories_taur_ch.dm b/code/modules/mob/new_player/sprite_accessories_taur_ch.dm index e5a520522c..57e087fe11 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur_ch.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur_ch.dm @@ -35,8 +35,8 @@ /datum/sprite_accessory/tail/taur/ch/naga/alt name = "Naga alt (Taur)" icon_state = "naga_alt_s" - suit_sprites = 'icons/mob/taursuits_naga_ch.dmi' - + suit_sprites = 'modular_chomp/icons/mob/taursuits_naga_ch.dmi' + msg_owner_help_walk = "You carefully slither around %prey." msg_prey_help_walk = "%owner's huge tail slithers past beside you!" @@ -69,7 +69,7 @@ name = "Naga dual-color alt (Taur)" icon_state = "naga_alt_s" extra_overlay = "naga_alt_markings" - suit_sprites = 'icons/mob/taursuits_naga_ch.dmi' + suit_sprites = 'modular_chomp/icons/mob/taursuits_naga_ch.dmi' /datum/sprite_accessory/tail/taur/ch/horse/scoli name = "Scolipede (Taur)" diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 8c2b8ea43a..ec7d7d7079 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -406,24 +406,24 @@ /datum/sprite_accessory/hair/xeno_head_queen_color name = "Queen dome" - icon = 'icons/mob/human_face_ch.dmi'//chompstation edit - icon_add = 'icons/mob/human_face_ch_add.dmi'//chompstation edit + icon = 'modular_chomp/icons/mob/human_face_ch.dmi'//chompstation edit + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi'//chompstation edit icon_state = "cxeno_queen" species_allowed = list(SPECIES_XENOHYBRID) gender = NEUTER /datum/sprite_accessory/hair/xeno_head_hunter_color name = "Hunter dome" - icon = 'icons/mob/human_face_ch.dmi'//chompstation edit - icon_add = 'icons/mob/human_face_ch_add.dmi'//chompstation edit + icon = 'modular_chomp/icons/mob/human_face_ch.dmi'//chompstation edit + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi'//chompstation edit icon_state = "cxeno_hunter" species_allowed = list(SPECIES_XENOHYBRID) gender = NEUTER /datum/sprite_accessory/hair/xeno_head_praetorian_color name = "Praetorian dome" - icon = 'icons/mob/human_face_ch.dmi'//chompstation edit - icon_add = 'icons/mob/human_face_ch_add.dmi'//chompstation edit + icon = 'modular_chomp/icons/mob/human_face_ch.dmi'//chompstation edit + icon_add = 'modular_chomp/icons/mob/human_face_ch_add.dmi'//chompstation edit icon_state = "cxeno_praetorian" species_allowed = list(SPECIES_XENOHYBRID) gender = NEUTER diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm index 4182c91cb4..3e0fa1e6db 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm @@ -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( diff --git a/icons/mob/feet_ch.dmi b/modular_chomp/icons/mob/feet_ch.dmi similarity index 100% rename from icons/mob/feet_ch.dmi rename to modular_chomp/icons/mob/feet_ch.dmi