Skip to content

Commit

Permalink
[Modular] Adjusts mutant modsuit icon handling, adds digi/muzzle vari…
Browse files Browse the repository at this point in the history
…ants of some missing them (#189)

* split \mob\mod.dmi into a mod_clothing and mod_module file as TG has

* it'd probably help for the module file to link to the module dmi

* rename this icon state since the test failed
  • Loading branch information
OrionTheFox authored and FFMirrorBot committed Jan 6, 2024
1 parent bd0f3ed commit 2e18608
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions modular_nova/master_files/code/modules/mod/mod_clothes.dm
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// MODsuit-related overrides for our digitigrade sprites and such
/obj/item/clothing/head/mod
supports_variations_flags = CLOTHING_SNOUTED_VARIATION
worn_icon_muzzled = 'modular_nova/master_files/icons/mob/mod.dmi'
worn_icon_muzzled = 'modular_nova/master_files/icons/mob/clothing/modsuit/mod_clothing_mutant.dmi'
worn_icon_better_vox = 'modular_nova/modules/better_vox/icons/clothing/mod.dmi'

/obj/item/clothing/suit/mod
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
worn_icon_digi = 'modular_nova/master_files/icons/mob/mod.dmi'
worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/modsuit/mod_clothing_mutant.dmi'
worn_icon_better_vox = 'modular_nova/modules/better_vox/icons/clothing/mod.dmi'

/obj/item/clothing/gloves/mod
Expand All @@ -15,7 +15,7 @@

/obj/item/clothing/shoes/mod
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
worn_icon_digi = 'modular_nova/master_files/icons/mob/mod.dmi'
worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/modsuit/mod_clothing_mutant.dmi'
worn_icon_better_vox = 'modular_nova/modules/better_vox/icons/clothing/mod.dmi'

/obj/item/mod/control
Expand Down
4 changes: 2 additions & 2 deletions modular_nova/master_files/code/modules/mod/modules/_module.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
icon_to_use = worn_icon_vox

if(suit_supports_variations_flags && (supports_variations_flags & CLOTHING_DIGITIGRADE_VARIATION))
icon_to_use = 'modular_nova/master_files/icons/mob/mod.dmi'
icon_to_use = 'modular_nova/master_files/icons/mob/clothing/modsuit/mod_modules_mutant.dmi'
icon_state_to_use = "[module_icon_state]_digi"

var/add_overlay = TRUE
Expand All @@ -78,7 +78,7 @@
. += module_icon

if(has_head_sprite)
icon_to_use = 'modular_nova/master_files/icons/mob/mod.dmi'
icon_to_use = 'modular_nova/master_files/icons/mob/clothing/modsuit/mod_modules_mutant.dmi'
icon_state_to_use = "[module_icon_state]_head"

if(suit_supports_variations_flags && (supports_variations_flags & CLOTHING_SNOUTED_VARIATION))
Expand Down
Binary file not shown.
Binary file not shown.
Binary file removed modular_nova/master_files/icons/mob/mod.dmi
Binary file not shown.

0 comments on commit 2e18608

Please sign in to comment.