Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ports seven new moth wings, fluff and one body marking. #203

Merged
merged 1 commit into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 132 additions & 20 deletions modular_iris/code/modules/mob/dead/new_player/sprite_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -162,29 +162,141 @@
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon_state = "hair_deathhawk"

//tails
/datum/sprite_accessory/tails/iris
key = "tail"
generic = "Tail"
organ_type = /obj/item/organ/tail
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/tails.dmi'
relevent_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
genetic = TRUE

/datum/sprite_accessory/tails/iris/mammal
icon_state = "none"
recommended_species = list(SPECIES_MAMMAL,SPECIES_HUMAN, SPECIES_SYNTH, SPECIES_HUMANOID, SPECIES_GHOUL)
organ_type = /obj/item/organ/tail/fluffy/no_wag
color_src = USE_MATRIXED_COLORS

/datum/sprite_accessory/tails/iris/mammal/teshari
recommended_species = list(SPECIES_TESHARI)

//teshari
/datum/sprite_accessory/tails/iris/mammal/teshari/damaged
/datum/sprite_accessory/tails/mammal/teshari/damaged
name = "Teshari (Damaged)"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/tails.dmi'
icon_state = "teshari_damaged"

/datum/sprite_accessory/tails/iris/mammal/teshari/stubby
/datum/sprite_accessory/tails/mammal/teshari/stubby
name = "Teshari (Stubby)"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/tails.dmi'
icon_state = "teshari_stubby"

//moth wings - apparently Nova uses /datum/sprite_accessory/wings/moth/ and not /datum/sprite_accessory/moth_wings/

/datum/sprite_accessory/wings/moth/twilight
name = "Moth (Twilight)"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_wings.dmi'
icon_state = "twilight"

/datum/sprite_accessory/wings/moth/metamorphosis
name = "Moth (Metamorphosis)"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_wings.dmi'
icon_state = "metamorphosis"

/datum/sprite_accessory/wings/moth/maple
name = "Moth (Maple)"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_wings.dmi'
icon_state = "maple"

/datum/sprite_accessory/wings/moth/tetractys
name = "Moth (Tetractys)"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_wings.dmi'
icon_state = "tetractys"

/datum/sprite_accessory/wings/moth/aspen
name = "Moth (Aspen)"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_wings.dmi'
icon_state = "aspen"

/datum/sprite_accessory/wings/moth/bluespace
name = "Moth (Bluespace)"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_wings.dmi'
icon_state = "bluespace"

/datum/sprite_accessory/wings/moth/tundra
name = "Moth (Tundra)"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_wings.dmi'
icon_state = "tundra"

//antennae
/datum/sprite_accessory/moth_antennae/twilight
name = "Twilight"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_antennae.dmi'
icon_state = "twilight"

/datum/sprite_accessory/moth_antennae/metamorphosis_p
name = "Metamorphosis (Pink)"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_antennae.dmi'
icon_state = "metamorphosis_p"

/datum/sprite_accessory/moth_antennae/metamorphosis_b
name = "Metamorphosis (Blue)"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_antennae.dmi'
icon_state = "metamorphosis_b"

/datum/sprite_accessory/moth_antennae/maple
name = "Maple"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_antennae.dmi'
icon_state = "maple"

/datum/sprite_accessory/moth_antennae/tetractys
name = "Tetractys"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_antennae.dmi'
icon_state = "tetractys"

/datum/sprite_accessory/moth_antennae/aspen
name = "Aspen"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_antennae.dmi'
icon_state = "aspen"

/datum/sprite_accessory/moth_antennae/bluespace
name = "Bluespace"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_antennae.dmi'
icon_state = "bluespace"

/datum/sprite_accessory/moth_antennae/tundra
name = "Tundra"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_antennae.dmi'
icon_state = "tundra"

// moth fluff

/datum/sprite_accessory/fluff/moth/twilight
name = "Twilight"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_fluff.dmi'
icon_state = "twilight"

/datum/sprite_accessory/fluff/moth/metamorphosis
name = "Metamorphosis"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_fluff.dmi'
icon_state = "metamorphosis"

/datum/sprite_accessory/fluff/moth/maple
name = "Maple"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_fluff.dmi'
icon_state = "metamorphosis"

/datum/sprite_accessory/fluff/moth/tetractys
name = "Tetractys"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_fluff.dmi'
icon_state = "tetractys"

/datum/sprite_accessory/fluff/moth/aspen
name = "Aspen"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_fluff.dmi'
icon_state = "aspen"

/datum/sprite_accessory/fluff/moth/bluespace
name = "Bluespace"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_fluff.dmi'
icon_state = "bluespace"

/datum/sprite_accessory/fluff/moth/tundra
name = "Tundra"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_fluff.dmi'
icon_state = "tundra"

/datum/sprite_accessory/fluff/moth/mega_fluff
name = "Mega Fluff"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_fluff.dmi'
icon_state = "megafluff"

// moth marking - Nova uses /datum/body_marking/moth/ instead of /datum/sprite_accessory/moth_markings/

/datum/body_marking/moth/tundra
name = "Tundra"
icon = 'modular_iris/master_files/icons/mob/sprite_accessory/moth_markings.dmi'
icon_state = "tundra"

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/datum/body_marking_set/moth/tundra
name = "Tundra"
body_marking_list = list("Tundra")
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6629,6 +6629,7 @@
#include "modular_iris\modules\customization\modules\client\augment\organs.dm"
#include "modular_iris\modules\customization\modules\clothing\head\costume.dm"
#include "modular_iris\modules\customization\modules\clothing\under\costume.dm"
#include "modular_iris\modules\customization\modules\mob\dead\new_player\body_markings\body_marking_sets.dm"
#include "modular_iris\modules\emotes\code\iris_laugh_datums.dm"
#include "modular_iris\modules\farsighted\farsighted.dm"
#include "modular_iris\modules\GAGS\greyscale_configs.dm"
Expand Down
Loading