Skip to content

Commit

Permalink
the final polishening cont'd, ft. wing icons
Browse files Browse the repository at this point in the history
  • Loading branch information
CliffracerX committed Sep 19, 2024
1 parent 45b6c6e commit a094a67
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 23 deletions.
Binary file modified modular_doppler/enterprise_resource_planning/icons/mob/breasts.dmi
View file
Binary file not shown.
Binary file modified modular_doppler/enterprise_resource_planning/icons/mob/breasts_skintone.dmi
View file
Binary file not shown.
40 changes: 20 additions & 20 deletions modular_doppler/modular_customization/preferences/tail.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@

/datum/preference/choiced/lizard_tail/icon_for(value)
var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_lizard[value]
return generate_tail_icon(chosen_tail)
return generate_back_icon(chosen_tail, "tail")

// Cat
/datum/preference/choiced/tail_human // it's a lie
Expand All @@ -148,7 +148,7 @@

/datum/preference/choiced/tail_human/icon_for(value)
var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_human[value]
return generate_tail_icon(chosen_tail)
return generate_back_icon(chosen_tail, "tail")

// Dog
/datum/preference/choiced/dog_tail
Expand Down Expand Up @@ -178,7 +178,7 @@

/datum/preference/choiced/dog_tail/icon_for(value)
var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_dog[value]
return generate_tail_icon(chosen_tail)
return generate_back_icon(chosen_tail, "tail")

// Fox
/datum/preference/choiced/fox_tail
Expand Down Expand Up @@ -208,7 +208,7 @@

/datum/preference/choiced/fox_tail/icon_for(value)
var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_fox[value]
return generate_tail_icon(chosen_tail)
return generate_back_icon(chosen_tail, "tail")

// Bunny
/datum/preference/choiced/bunny_tail
Expand Down Expand Up @@ -238,7 +238,7 @@

/datum/preference/choiced/bunny_tail/icon_for(value)
var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_bunny[value]
return generate_tail_icon(chosen_tail)
return generate_back_icon(chosen_tail, "tail")

// Mouse
/datum/preference/choiced/mouse_tail
Expand Down Expand Up @@ -268,7 +268,7 @@

/datum/preference/choiced/mouse_tail/icon_for(value)
var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_mouse[value]
return generate_tail_icon(chosen_tail)
return generate_back_icon(chosen_tail, "tail")

// Bird
/datum/preference/choiced/bird_tail
Expand Down Expand Up @@ -298,7 +298,7 @@

/datum/preference/choiced/bird_tail/icon_for(value)
var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_bird[value]
return generate_tail_icon(chosen_tail)
return generate_back_icon(chosen_tail, "tail")

// Monkey
/datum/preference/choiced/monkey_tail
Expand All @@ -322,7 +322,7 @@

/datum/preference/choiced/monkey_tail/icon_for(value)
var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_monkey[value]
return generate_tail_icon(chosen_tail)
return generate_back_icon(chosen_tail, "tail")

// Deer
/datum/preference/choiced/deer_tail
Expand Down Expand Up @@ -352,7 +352,7 @@

/datum/preference/choiced/deer_tail/icon_for(value)
var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_deer[value]
return generate_tail_icon(chosen_tail)
return generate_back_icon(chosen_tail, "tail")

// Fish
/datum/preference/choiced/fish_tail
Expand Down Expand Up @@ -382,7 +382,7 @@

/datum/preference/choiced/fish_tail/icon_for(value)
var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_fish[value]
return generate_tail_icon(chosen_tail)
return generate_back_icon(chosen_tail, "tail")

// Bug
/datum/preference/choiced/bug_tail
Expand Down Expand Up @@ -412,7 +412,7 @@

/datum/preference/choiced/bug_tail/icon_for(value)
var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_bug[value]
return generate_tail_icon(chosen_tail)
return generate_back_icon(chosen_tail, "tail")

// Synth
/datum/preference/choiced/synth_tail
Expand Down Expand Up @@ -442,7 +442,7 @@

/datum/preference/choiced/synth_tail/icon_for(value)
var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_synth[value]
return generate_tail_icon(chosen_tail)
return generate_back_icon(chosen_tail, "tail")

// Humanoid
/datum/preference/choiced/humanoid_tail
Expand Down Expand Up @@ -472,31 +472,31 @@

/datum/preference/choiced/humanoid_tail/icon_for(value)
var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_humanoid[value]
return generate_tail_icon(chosen_tail)
return generate_back_icon(chosen_tail, "tail")


/// Proc to gen that icon
// We don't wanna copy paste this
/datum/preference/choiced/proc/generate_tail_icon(chosen_tail)
/datum/preference/choiced/proc/generate_back_icon(chosen_tail, key)
var/datum/sprite_accessory/sprite_accessory = chosen_tail
var/icon/final_icon = icon('icons/mob/human/bodyparts_greyscale.dmi', "human_chest_m", NORTH)

if (sprite_accessory.icon_state != "none")
var/icon/markings_icon_1 = icon(sprite_accessory.icon, "m_tail_[sprite_accessory.icon_state]_BEHIND", NORTH)
var/icon/markings_icon_1 = icon(sprite_accessory.icon, "m_[key]_[sprite_accessory.icon_state]_BEHIND", NORTH)
markings_icon_1.Blend(COLOR_RED, ICON_MULTIPLY)
var/icon/markings_icon_2 = icon(sprite_accessory.icon, "m_tail_[sprite_accessory.icon_state]_BEHIND_2", NORTH)
var/icon/markings_icon_2 = icon(sprite_accessory.icon, "m_[key]_[sprite_accessory.icon_state]_BEHIND_2", NORTH)
markings_icon_2.Blend(COLOR_VIBRANT_LIME, ICON_MULTIPLY)
var/icon/markings_icon_3 = icon(sprite_accessory.icon, "m_tail_[sprite_accessory.icon_state]_BEHIND_3", NORTH)
var/icon/markings_icon_3 = icon(sprite_accessory.icon, "m_[key]_[sprite_accessory.icon_state]_BEHIND_3", NORTH)
markings_icon_3.Blend(COLOR_BLUE, ICON_MULTIPLY)
final_icon.Blend(markings_icon_1, ICON_OVERLAY)
final_icon.Blend(markings_icon_2, ICON_OVERLAY)
final_icon.Blend(markings_icon_3, ICON_OVERLAY)
// front breaker
var/icon/markings_icon_1_f = icon(sprite_accessory.icon, "m_tail_[sprite_accessory.icon_state]_FRONT", NORTH)
var/icon/markings_icon_1_f = icon(sprite_accessory.icon, "m_[key]_[sprite_accessory.icon_state]_FRONT", NORTH)
markings_icon_1_f.Blend(COLOR_RED, ICON_MULTIPLY)
var/icon/markings_icon_2_f = icon(sprite_accessory.icon, "m_tail_[sprite_accessory.icon_state]_FRONT_2", NORTH)
var/icon/markings_icon_2_f = icon(sprite_accessory.icon, "m_[key]_[sprite_accessory.icon_state]_FRONT_2", NORTH)
markings_icon_2_f.Blend(COLOR_VIBRANT_LIME, ICON_MULTIPLY)
var/icon/markings_icon_3_f = icon(sprite_accessory.icon, "m_tail_[sprite_accessory.icon_state]_FRONT_3", NORTH)
var/icon/markings_icon_3_f = icon(sprite_accessory.icon, "m_[key]_[sprite_accessory.icon_state]_FRONT_3", NORTH)
markings_icon_3_f.Blend(COLOR_BLUE, ICON_MULTIPLY)
final_icon.Blend(markings_icon_1_f, ICON_OVERLAY)
final_icon.Blend(markings_icon_2_f, ICON_OVERLAY)
Expand Down
4 changes: 1 addition & 3 deletions modular_doppler/modular_customization/preferences/wings.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,7 @@

/datum/preference/choiced/wings/icon_for(value)
var/datum/sprite_accessory/wings = SSaccessories.wings_list_more[value]
var/icon/final_icon = icon(wings.icon, "m_wings_[wings.icon_state]_BEHIND")
final_icon.Blend(icon(wings.icon, "m_wings_[wings.icon_state]_FRONT"), ICON_OVERLAY)
return final_icon
return generate_back_icon(wings, "wings")

// Moth Wings
/datum/preference/choiced/moth_wings
Expand Down

0 comments on commit a094a67

Please sign in to comment.