diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 91d8d51801..a8406e3b12 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -66,7 +66,7 @@ if(adjusted == NORMAL_STYLE) . += mutable_appearance('icons/effects/blood.dmi', "shoeblood", color = blood_DNA_to_color()) else - . += mutable_appearance('modular_citadel/icons/mob/digishoes.dmi', "shoeblood", color = blood_DNA_to_color()) + . += mutable_appearance('icons/mob/feet_digi.dmi', "shoeblood", color = blood_DNA_to_color()) /obj/item/clothing/shoes/equipped(mob/user, slot) . = ..() diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index fa6b01415e..b77a8e9e96 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -958,14 +958,7 @@ /obj/item/clothing/suit/space/hardsuit/lavaknight/worn_overlays(isinhands = FALSE, icon_file) . = ..() if(!isinhands) - var/mutable_appearance/energy_overlay - if(taurmode == SNEK_TAURIC) - energy_overlay = mutable_appearance('modular_citadel/icons/mob/taur_naga.dmi', "knight_cydonia_overlay", ABOVE_LIGHTING_LAYER) - else if(taurmode == PAW_TAURIC) - energy_overlay = mutable_appearance('modular_citadel/icons/mob/taur_canine.dmi', "knight_cydonia_overlay", ABOVE_LIGHTING_LAYER) - else - energy_overlay = mutable_appearance(icon_file, "knight_cydonia_overlay", ABOVE_LIGHTING_LAYER) - + var/mutable_appearance/energy_overlay = mutable_appearance(icon_file, "knight_cydonia_overlay", ABOVE_LIGHTING_LAYER) energy_overlay.plane = ABOVE_LIGHTING_LAYER energy_overlay.color = energy_color . += energy_overlay diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 5e22c30292..ae69d5dc90 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -126,7 +126,7 @@ There are several things that need to be remembered: var/alt_worn = U.alternate_worn_icon if(!U.force_alternate_icon && U.mutantrace_variation && U.suit_style == DIGITIGRADE_SUIT_STYLE) - alt_worn = 'modular_citadel/icons/mob/uniform_digi.dmi' + alt_worn = 'icons/mob/uniform_digi.dmi' var/mutable_appearance/uniform_overlay @@ -306,7 +306,7 @@ There are several things that need to be remembered: update_observer_view(shoes,1) if(S.mutantrace_variation) if(S.adjusted == ALT_STYLE) - S.alternate_worn_icon = 'modular_citadel/icons/mob/digishoes.dmi' + S.alternate_worn_icon = 'icons/mob/feet_digi.dmi' else S.alternate_worn_icon = null var/t_state = shoes.item_state @@ -352,7 +352,7 @@ There are several things that need to be remembered: var/obj/item/clothing/head/H = head if(H.mutantrace_variation) if(H.muzzle_var == ALT_STYLE) - H.alternate_worn_icon = 'modular_citadel/icons/mob/muzzled_helmet.dmi' + H.alternate_worn_icon = 'icons/mob/head_muzzled.dmi' else H.alternate_worn_icon = null @@ -412,17 +412,17 @@ There are several things that need to be remembered: if(!item_level_support && !S.force_alternate_icon) if(S.mutantrace_variation) //Just make sure we've got this checked too if(S.taurmode == NOT_TAURIC && S.adjusted == ALT_STYLE) //are we not a taur, but we have Digitigrade legs? Run this check first, then. - S.alternate_worn_icon = 'modular_citadel/icons/mob/suit_digi.dmi' + S.alternate_worn_icon = 'icons/mob/suit_digi.dmi' else S.alternate_worn_icon = null if(S.tauric == TRUE) //Are we a suit with tauric mode possible? if(S.taurmode == SNEK_TAURIC) - S.alternate_worn_icon = 'modular_citadel/icons/mob/taur_naga.dmi' + S.alternate_worn_icon = 'icons/mob/taur_naga.dmi' if(S.taurmode == PAW_TAURIC) - S.alternate_worn_icon = 'modular_citadel/icons/mob/taur_canine.dmi' + S.alternate_worn_icon = 'icons/mob/taur_canine.dmi' if(S.taurmode == NOT_TAURIC && S.adjusted == ALT_STYLE) - S.alternate_worn_icon = 'modular_citadel/icons/mob/suit_digi.dmi' + S.alternate_worn_icon = 'icons/mob/suit_digi.dmi' else if(S.taurmode == NOT_TAURIC && S.adjusted == NORMAL_STYLE) S.alternate_worn_icon = null @@ -470,7 +470,7 @@ There are several things that need to be remembered: remove_overlay(FACEMASK_LAYER) if(M.mutantrace_variation) if(M.muzzle_var == ALT_STYLE) - M.alternate_worn_icon = 'modular_citadel/icons/mob/muzzled_mask.dmi' + M.alternate_worn_icon = 'icons/mob/mask_muzzled.dmi' else M.alternate_worn_icon = null diff --git a/modular_citadel/icons/mob/digishoes.dmi b/icons/mob/feet_digi.dmi similarity index 100% rename from modular_citadel/icons/mob/digishoes.dmi rename to icons/mob/feet_digi.dmi diff --git a/modular_citadel/icons/mob/muzzled_helmet.dmi b/icons/mob/head_muzzled.dmi similarity index 100% rename from modular_citadel/icons/mob/muzzled_helmet.dmi rename to icons/mob/head_muzzled.dmi diff --git a/modular_citadel/icons/mob/muzzled_mask.dmi b/icons/mob/mask_muzzled.dmi similarity index 100% rename from modular_citadel/icons/mob/muzzled_mask.dmi rename to icons/mob/mask_muzzled.dmi diff --git a/modular_citadel/icons/mob/suit_digi.dmi b/icons/mob/suit_digi.dmi similarity index 100% rename from modular_citadel/icons/mob/suit_digi.dmi rename to icons/mob/suit_digi.dmi diff --git a/modular_citadel/icons/mob/taur_canine.dmi b/icons/mob/taur_canine.dmi similarity index 100% rename from modular_citadel/icons/mob/taur_canine.dmi rename to icons/mob/taur_canine.dmi diff --git a/modular_citadel/icons/mob/taur_hooved.dmi b/icons/mob/taur_hooved.dmi similarity index 100% rename from modular_citadel/icons/mob/taur_hooved.dmi rename to icons/mob/taur_hooved.dmi diff --git a/modular_citadel/icons/mob/taur_naga.dmi b/icons/mob/taur_naga.dmi similarity index 100% rename from modular_citadel/icons/mob/taur_naga.dmi rename to icons/mob/taur_naga.dmi diff --git a/modular_citadel/icons/mob/uniform_digi.dmi b/icons/mob/uniform_digi.dmi similarity index 100% rename from modular_citadel/icons/mob/uniform_digi.dmi rename to icons/mob/uniform_digi.dmi diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm index 11dbb4dc80..d32fd78a44 100644 --- a/modular_citadel/code/modules/custom_loadout/custom_items.dm +++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm @@ -2,7 +2,7 @@ //For custom items. // Unless there's a digitigrade version make sure you add mutantrace_variation = NO_MUTANTRACE_VARIATION to all clothing/under and shoes - Pooj -// Digitigrade stuff is uniform_digi.dmi and digishoes.dmi in modular_citadel/icons/mob +// Digitigrade stuff is uniform_digi.dmi and digishoes.dmi in icons/mob /obj/item/custom/ceb_soap name = "Cebutris' Soap" diff --git a/modular_citadel/icons/mob/mask.dmi b/modular_citadel/icons/mob/mask.dmi deleted file mode 100644 index 788bfc0447..0000000000 Binary files a/modular_citadel/icons/mob/mask.dmi and /dev/null differ