diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index c3a9af3917..c7efde0b36 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -303,7 +303,9 @@ /datum/sprite_accessory/tail/taur/naga/alt_3c name = "Naga alt style tri-color (Taur)" - suit_sprites = 'icons/mob/taursuits_naga.dmi' //TODO: PORT CHOMPS NAGA_ALT AND MAKE THESE NAGA_ALT. + suit_sprites = 'icons/mob/taursuits_naga_alt_ch.dmi' //TODO: PORT CHOMPS NAGA_ALT AND MAKE THESE NAGA_ALT. //CHOMPStation Edit + vore_tail_sprite_variant = "Naga3Piece" //CHOMPStation Add + fullness_icons = 1 //CHOMPStation Add icon_state = "altnaga_s" extra_overlay = "altnaga_markings" extra_overlay2 = "altnaga_stripes" diff --git a/code/modules/mob/new_player/sprite_accessories_wing.dm b/code/modules/mob/new_player/sprite_accessories_wing.dm index ef0ac6df84..463588dbca 100644 --- a/code/modules/mob/new_player/sprite_accessories_wing.dm +++ b/code/modules/mob/new_player/sprite_accessories_wing.dm @@ -278,13 +278,11 @@ /datum/sprite_accessory/wing/teshbee name = "Teshari bee wings" desc = "" - icon = 'icons/mob/human_races/sprite_accessories/wings.dmi' icon_state = "beewings_tesh" /datum/sprite_accessory/wing/teshdragonfly name = "Teshari dragonfly wings" desc = "" - icon = 'icons/mob/human_races/sprite_accessories/wings.dmi' icon_state = "dragonfly_tesh" /datum/sprite_accessory/wing/snail_shell @@ -298,7 +296,6 @@ /datum/sprite_accessory/wing/sectdrone_wing //We should some day make a variable to make some wings not be able to fly name = "Sect drone wings (To use with bodytype marking)" desc = "" - icon = 'icons/mob/human_races/sprite_accessories/wings.dmi' icon_state = "sectdrone_wing" do_colouration = 1 color_blend_mode = ICON_MULTIPLY @@ -387,11 +384,244 @@ color_blend_mode = ICON_MULTIPLY extra_overlay = "kaiju_spikes_a_glow" +/datum/sprite_accessory/wing/cyberangel + name = "Cyber angel wing (colorable)" + desc = "" + icon_state = "cyber_angel" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/wing/bat_purpley + name = "bat wings, purple" + desc = "" + icon_state = "bat-purple" + +/datum/sprite_accessory/wing/dragon2 + name = "Dragon wings, large, colorable" + desc = "" + icon_state = "dragon_2" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "dragon_2_mark" + +/datum/sprite_accessory/wing/snagc + name = "xenomorph backplate, colorable" + desc = "" + icon_state = "csnag-backplate" + do_colouration = 1 + +/datum/sprite_accessory/wing/snagc2 + name = "xenomorph backplate, colorable 2" + desc = "" + icon_state = "csnag-backplate-2" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/wing/xeno_queen + name = "xenomorph backplate (queen)" + desc = "" + icon_state = "xeno_queen" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/wing/snail + name = "Snail shell" + desc = "" + icon_state = "snail_shell_new" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/wing/xeno_standard_backplate + name = "Xenomorph backplate (standard)" + desc = "" + icon_state = "xeno_standard" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/wing/xeno_royal_backplate + name = "Xenomorph backplate (royal)" + desc = "" + icon_state = "xeno_royal" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/wing/xeno_down_backplate + name = "Xenomorph backplate (down)" + desc = "" + icon_state = "xeno_down" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/wing/cloakwings + name = "Cloaking Moth Wings with Eyes (Colorable)" + desc = "" + icon_state = "cloakmoth" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "cloakmoth_eyes" + +/datum/sprite_accessory/wing/jet_wing + name = "Aeromorph Jet Wings (Colorable)" + desc = "" + icon_state = "jet_wing" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "jet_wing_1" + extra_overlay2 = "jet_wing_2" + +/datum/sprite_accessory/wing/mothwings_clockwork + name = "Moth Wings (Clockwork)" + desc = "" + icon_state = "mothwings_clockwork" + +/datum/sprite_accessory/wing/mothwings_monarch + name = "Moth Wings (Monarch)" + desc = "" + icon_state = "mothwings_monarch" + +/datum/sprite_accessory/wing/mothwings_luna + name = "Moth Wings (Luna)" + desc = "" + icon_state = "mothwings_luna" + +/datum/sprite_accessory/wing/mothwings_atlas + name = "Moth Wings (Atlas)" + desc = "" + icon_state = "mothwings_atlas" + +/datum/sprite_accessory/wing/mothwings_plain + name = "Moth Wings (Plain)" + desc = "" + icon_state = "mothwings_plain" + +/datum/sprite_accessory/wing/mothwings_redish + name = "Moth Wings (Redish)" + desc = "" + icon_state = "mothwings_redish" + +/datum/sprite_accessory/wing/mothwings_royal + name = "Moth Wings (Royal)" + desc = "" + icon_state = "mothwings_royal" + +/datum/sprite_accessory/wing/mothwings_gothic + name = "Moth Wings (Gothic)" + desc = "" + icon_state = "mothwings_gothic" + +/datum/sprite_accessory/wing/mothwings_lovers + name = "Moth Wings (Lovers)" + desc = "" + icon_state = "mothwings_lovers" + +/datum/sprite_accessory/wing/mothwings_whitefly + name = "Moth Wings (Whitefly)" + desc = "" + icon_state = "mothwings_whitefly" + +/datum/sprite_accessory/wing/mothwings_burntoff + name = "Moth Wings (Burnt Off)" + desc = "" + icon_state = "mothwings_burntoff" + +/datum/sprite_accessory/wing/mothwings_firewatch + name = "Moth Wings (Firewatch)" + desc = "" + icon_state = "mothwings_firewatch" + +/datum/sprite_accessory/wing/mothwings_deathhhead + name = "Moth Wings (Deathhead)" + desc = "" + icon_state = "mothwings_deathhead" + +/datum/sprite_accessory/wing/mothwings_poison + name = "Moth Wings (Poison)" + desc = "" + icon_state = "mothwings_poison" + +/datum/sprite_accessory/wing/mothwings_ragged + name = "Moth Wings (Ragged)" + desc = "" + icon_state = "mothwings_ragged" + +/datum/sprite_accessory/wing/mothwings_moonfly + name = "Moth Wings (Moonfly)" + desc = "" + icon_state = "mothwings_moonfly" + +/datum/sprite_accessory/wing/mothwings_snow + name = "Moth Wings (Snow)" + desc = "" + icon_state = "mothwings_snow" + +/datum/sprite_accessory/wing/mothwings_angel + name = "Moth Wings (angel)" + desc = "" + icon_state = "mothwings_angel" + +/datum/sprite_accessory/wing/mothwings_no_antennae_colorable + name = "Moth Wings (Colorable)" + desc = "" + icon_state = "mothwings_no_antennae_color" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/wing/mothwings_luna_colorable + name = "Moth Wings (Luna, Colorable)" + desc = "" + icon_state = "mothwings_luna_colorable" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/wing/sect_drone_alt + name = "Sect drone wings Alt. (To use with bodytype marking)" + desc = "" + icon = 'icons/mob/human_races/sprite_accessories/wings64.dmi' + icon_state = "sectdrone_wing_alt" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + wing_offset = 16 + +/datum/sprite_accessory/wing/sect_drone_alt_nomark + name = "Sect drone wings Alt." + desc = "" + icon = 'icons/mob/human_races/sprite_accessories/wings64.dmi' + icon_state = "sectdrone_wing_alt_nomark" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + wing_offset = 16 + +/datum/sprite_accessory/wing/taurdragon + name = "Taur wings (Draconian)" + desc = "" + icon = 'icons/mob/human_races/sprite_accessories/wings64.dmi' + icon_state = "taurdrake_wing" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + wing_offset = 16 + +/datum/sprite_accessory/wing/large_harpy_wings_ch + name = "Harpy arm-wings(Large)" + desc = "" + icon = 'icons/mob/human_races/sprite_accessories/wings64.dmi' + icon_state = "Harpy_wings" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + wing_offset = 16 + +/datum/sprite_accessory/wing/sloogshell + name = "Sloog shell" + desc = "" + icon = 'icons/mob/human_races/sprite_accessories/wings64.dmi' + icon_state = "sloogshell" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + wing_offset = 16 + /* //exclusive wings // CHOMPRemove Start /datum/sprite_accessory/wing/kara name = "Pterokara wings" desc = "" - icon = 'icons/mob/human_races/sprite_accessories/wings.dmi' icon_state = "feathered_kara" ckeys_allowed = list("satinisle") diff --git a/icons/mob/human_races/sprite_accessories/wings.dmi b/icons/mob/human_races/sprite_accessories/wings.dmi index 4cd3ec25ce..60702e484a 100644 Binary files a/icons/mob/human_races/sprite_accessories/wings.dmi and b/icons/mob/human_races/sprite_accessories/wings.dmi differ diff --git a/modular_chomp/icons/mob/human_races/sprite_accessories/wings64.dmi b/icons/mob/human_races/sprite_accessories/wings64.dmi similarity index 100% rename from modular_chomp/icons/mob/human_races/sprite_accessories/wings64.dmi rename to icons/mob/human_races/sprite_accessories/wings64.dmi diff --git a/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm b/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm deleted file mode 100644 index 60b997e901..0000000000 --- a/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm +++ /dev/null @@ -1,4 +0,0 @@ -/datum/sprite_accessory/tail/taur/naga/alt_3c // Dirty readjustment of the suit_sprites path for experimentation because I dunno a better way to do this. - suit_sprites = 'icons/mob/taursuits_naga_alt_ch.dmi' - vore_tail_sprite_variant = "Naga3Piece" - fullness_icons = 1 diff --git a/modular_chomp/code/modules/mob/new_player/sprite_accessories_wing.dm b/modular_chomp/code/modules/mob/new_player/sprite_accessories_wing.dm deleted file mode 100644 index 35dc52ba0e..0000000000 --- a/modular_chomp/code/modules/mob/new_player/sprite_accessories_wing.dm +++ /dev/null @@ -1,269 +0,0 @@ -/datum/sprite_accessory/wing/snagc - name = "xenomorph backplate, colorable" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "csnag-backplate" - do_colouration = 1 - -/datum/sprite_accessory/wing/snagc2 - name = "xenomorph backplate, colorable 2" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "csnag-backplate-2" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/wing/xeno_queen - name = "xenomorph backplate (queen)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "xeno_queen" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/wing/teshbee - name = "Teshari bee wings" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "beewings_tesh" - -/datum/sprite_accessory/wing/teshdragonfly - name = "Teshari dragonfly wings" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "dragonfly_tesh" - -/datum/sprite_accessory/wing/snail //We should some day make a variable to make some wings not be able to fly - name = "Snail shell" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "snail_shell" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/wing/dragon2 - name = "Dragon wings, large, colorable" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "dragon_2" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "dragon_2_mark" - -/datum/sprite_accessory/wing/cloakwings - name = "Cloaking Moth Wings with Eyes (Colorable)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "cloakmoth" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "cloakmoth_eyes" - -/datum/sprite_accessory/wing/jet_wing - name = "Aeromorph Jet Wings (Colorable)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "jet_wing" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "jet_wing_1" - extra_overlay2 = "jet_wing_2" - -/datum/sprite_accessory/wing/mothwings_clockwork - name = "Moth Wings (Clockwork)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_clockwork" - -/datum/sprite_accessory/wing/mothwings_monarch - name = "Moth Wings (Monarch)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_monarch" - -/datum/sprite_accessory/wing/mothwings_luna - name = "Moth Wings (Luna)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_luna" - -/datum/sprite_accessory/wing/mothwings_luna_colorable - name = "Moth Wings (Luna, Colorable)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_luna_colorable" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/wing/mothwings_atlas - name = "Moth Wings (Atlas)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_atlas" - -/datum/sprite_accessory/wing/mothwings_plain - name = "Moth Wings (Plain)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_plain" - -/datum/sprite_accessory/wing/mothwings_redish - name = "Moth Wings (Redish)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_redish" - -/datum/sprite_accessory/wing/mothwings_royal - name = "Moth Wings (Royal)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_royal" - -/datum/sprite_accessory/wing/mothwings_gothic - name = "Moth Wings (Gothic)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_gothic" - -/datum/sprite_accessory/wing/mothwings_lovers - name = "Moth Wings (Lovers)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_lovers" - -/datum/sprite_accessory/wing/mothwings_whitefly - name = "Moth Wings (Whitefly)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_whitefly" - -/datum/sprite_accessory/wing/mothwings_burntoff - name = "Moth Wings (Burnt Off)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_burntoff" - -/datum/sprite_accessory/wing/mothwings_firewatch - name = "Moth Wings (Firewatch)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_firewatch" - -/datum/sprite_accessory/wing/mothwings_deathhhead - name = "Moth Wings (Deathhead)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_deathhead" - -/datum/sprite_accessory/wing/mothwings_poison - name = "Moth Wings (Poison)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_poison" - -/datum/sprite_accessory/wing/mothwings_ragged - name = "Moth Wings (Ragged)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_ragged" - -/datum/sprite_accessory/wing/mothwings_moonfly - name = "Moth Wings (Moonfly)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_moonfly" - -/datum/sprite_accessory/wing/mothwings_snow - name = "Moth Wings (Snow)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_snow" - -/datum/sprite_accessory/wing/mothwings_angel - name = "Moth Wings (angel)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_angel" - -/datum/sprite_accessory/wing/mothwings_no_antennae_colorable - name = "Moth Wings (Colorable)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "mothwings_no_antennae_color" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/// XENO BACKPLATES /// - -/datum/sprite_accessory/wing/xeno_standard_backplate - name = "Xenomorph backplate (standard)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "xeno_standard" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/wing/xeno_royal_backplate - name = "Xenomorph backplate (royal)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "xeno_royal" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/wing/xeno_down_backplate - name = "Xenomorph backplate (down)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi' - icon_state = "xeno_down" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -// -// x64 Wings below this point. -// - -/datum/sprite_accessory/wing/sect_drone_alt - name = "Sect drone wings Alt. (To use with bodytype marking)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings64.dmi' - icon_state = "sectdrone_wing_alt" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - wing_offset = 16 - -/datum/sprite_accessory/wing/sect_drone_alt_nomark - name = "Sect drone wings Alt." - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings64.dmi' - icon_state = "sectdrone_wing_alt_nomark" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - wing_offset = 16 - -/datum/sprite_accessory/wing/taurdragon - name = "Taur wings (Draconian)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings64.dmi' - icon_state = "taurdrake_wing" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - wing_offset = 16 - -/datum/sprite_accessory/wing/large_harpy_wings_ch - name = "Harpy arm-wings(Large)" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings64.dmi' - icon_state = "Harpy_wings" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - wing_offset = 16 - -/datum/sprite_accessory/wing/sloogshell - name = "Sloog shell" - desc = "" - icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings64.dmi' - icon_state = "sloogshell" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - wing_offset = 16 diff --git a/modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi b/modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi deleted file mode 100644 index 74ad2058e3..0000000000 Binary files a/modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi and /dev/null differ diff --git a/vorestation.dme b/vorestation.dme index 11cb0a69a6..4cb8ec5d01 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -5079,8 +5079,6 @@ #include "modular_chomp\code\modules\mob\new_player\sprite_accessories_ear.dm" #include "modular_chomp\code\modules\mob\new_player\sprite_accessories_extra.dm" #include "modular_chomp\code\modules\mob\new_player\sprite_accessories_tail.dm" -#include "modular_chomp\code\modules\mob\new_player\sprite_accessories_taur.dm" -#include "modular_chomp\code\modules\mob\new_player\sprite_accessories_wing.dm" #include "modular_chomp\code\modules\organs\organ_icon.dm" #include "modular_chomp\code\modules\organs\internal\malignant\malignant.dm" #include "modular_chomp\code\modules\overmap\dynamic_sector.dm"