Skip to content

Commit

Permalink
Snouts, tails, ears for acradors (#4627)
Browse files Browse the repository at this point in the history
* Snouts, tails, ears for acradors

* A little fix

* A trick to skip conflict

* Snouts merge fix
  • Loading branch information
Kush1Push1 authored and StealsThePRs committed Dec 13, 2024
1 parent 0e45c2a commit e169679
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 14 deletions.
Binary file not shown.
Binary file modified modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi
Binary file not shown.
Binary file modified modular_nova/master_files/icons/mob/sprite_accessory/tails.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,38 @@
icon_state = "acrador_long"
name = "Acrador (Long)"

/datum/sprite_accessory/ears/acrador/long/alt_1
name = "Acrador Long (Alt 1)"
icon_state = "acrador_long_alt_1"

/datum/sprite_accessory/ears/acrador/long/alt_2
name = "Acrador Long (Alt 2)"
icon_state = "acrador_long_alt_2"

/datum/sprite_accessory/ears/acrador/long/alt_3
name = "Acrador Long (Alt 3)"
icon_state = "acrador_long_alt_3"

/datum/sprite_accessory/ears/acrador/long/alt_4
name = "Acrador Long (Alt 4)"
icon_state = "acrador_long_alt_4"

/datum/sprite_accessory/ears/acrador/short
icon_state = "acrador_short"
name = "Acrador (Short)"

/datum/sprite_accessory/ears/acrador/short/alt_1
name = "Acrador (Short) (Alt 1)"
icon_state = "acrador_short_alt_1"

/datum/sprite_accessory/ears/acrador/short/alt_2
name = "Acrador (Short) (Alt 2)"
icon_state = "acrador_short_alt_2"

/datum/sprite_accessory/ears/acrador/short/alt_3
name = "Acrador (Short) (Alt 3)"
icon_state = "acrador_short_alt_3"

/datum/sprite_accessory/ears/acrador/short/alt_4
name = "Acrador (Short) (Alt 4)"
icon_state = "acrador_short_alt_4"
Original file line number Diff line number Diff line change
Expand Up @@ -494,31 +494,43 @@
flags_for_organ = NONE

/datum/sprite_accessory/snouts/acrador
icon = 'modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi'
color_src = USE_MATRIXED_COLORS
name = "Acrador (Short)"
icon_state = "acrador_short"

/datum/sprite_accessory/snouts/acrador_1
icon = 'modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi'
icon_state = "acrador_short"
color_src = USE_MATRIXED_COLORS

/datum/sprite_accessory/snouts/acrador/normal_1
name = "Acrador 1 (Normal)"
icon_state = "acrador_1"

/datum/sprite_accessory/snouts/acrador_2
icon = 'modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi'
color_src = USE_MATRIXED_COLORS
/datum/sprite_accessory/snouts/acrador/normal_2
name = "Acrador 2 (Normal)"
icon_state = "acrador_2"

/datum/sprite_accessory/snouts/acrador_3
icon = 'modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi'
color_src = USE_MATRIXED_COLORS
/datum/sprite_accessory/snouts/acrador/normal_3
name = "Acrador 3 (Normal)"
icon_state = "acrador_3"

/datum/sprite_accessory/snouts/acrador_4
icon = 'modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi'
color_src = USE_MATRIXED_COLORS
/datum/sprite_accessory/snouts/acrador/normal_4
name = "Acrador 4 (Normal)"
icon_state = "acrador_4"

/datum/sprite_accessory/snouts/acrador/normal_1/alt
name = "Acrador (Short) (Alt)"
icon_state = "acrador_short_alt"

/datum/sprite_accessory/snouts/acrador/normal_1/alt
name = "Acrador 1 (Normal) (Alt)"
icon_state = "acrador_1_alt"

/datum/sprite_accessory/snouts/acrador/normal_2/alt
name = "Acrador 2 (Normal) (Alt)"
icon_state = "acrador_2_alt"

/datum/sprite_accessory/snouts/acrador/normal_3/alt
name = "Acrador 3 (Normal) (Alt)"
icon_state = "acrador_3_alt"

/datum/sprite_accessory/snouts/acrador/normal_4/alt
name = "Acrador 4 (Normal) (Alt)"
icon_state = "acrador_4_alt"
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,26 @@
name = "Tentacle"
icon_state = "tentacle"

/datum/sprite_accessory/tails/mammal/acrador
name = "Acrador (Narrow)"
icon_state = "acrador_1"

/datum/sprite_accessory/tails/mammal/acrador/normal
name = "Acrador (Medium)"
icon_state = "acrador_2"

/datum/sprite_accessory/tails/mammal/acrador/big
name = "Acrador (Big)"
icon_state = "acrador_3"

/datum/sprite_accessory/tails/mammal/wagging/acrador
name = "Acrador (Narrow and Long)"
icon_state = "acrador_4"

/datum/sprite_accessory/tails/mammal/wagging/acrador/femine_very_long
name = "Acrador (Narrow and Very Long)"
icon_state = "acrador_5"

/*
* TESHARI
*/
Expand Down

0 comments on commit e169679

Please sign in to comment.