diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_teshari.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_teshari.png index aec29b7c0c8..e9161a8da75 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_teshari.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_teshari.png differ diff --git a/modular_skyrat/master_files/icons/mob/sprite_accessory/ears.dmi b/modular_skyrat/master_files/icons/mob/sprite_accessory/ears.dmi index 54e049b77b2..381aaca8e20 100644 Binary files a/modular_skyrat/master_files/icons/mob/sprite_accessory/ears.dmi and b/modular_skyrat/master_files/icons/mob/sprite_accessory/ears.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/sprite_accessory/hair.dmi b/modular_skyrat/master_files/icons/mob/sprite_accessory/hair.dmi index f9da1b563de..ead43fd5975 100644 Binary files a/modular_skyrat/master_files/icons/mob/sprite_accessory/hair.dmi and b/modular_skyrat/master_files/icons/mob/sprite_accessory/hair.dmi differ diff --git a/modular_skyrat/modules/bodyparts/code/teshari_bodyparts.dm b/modular_skyrat/modules/bodyparts/code/teshari_bodyparts.dm index e75685fa444..d651f8921d0 100644 --- a/modular_skyrat/modules/bodyparts/code/teshari_bodyparts.dm +++ b/modular_skyrat/modules/bodyparts/code/teshari_bodyparts.dm @@ -10,7 +10,7 @@ limb_id = SPECIES_TESHARI brute_modifier = TESHARI_BRUTE_MODIFIER burn_modifier = TESHARI_BURN_MODIFIER - head_flags = HEAD_EYESPRITES|HEAD_EYECOLOR|HEAD_EYEHOLES|HEAD_DEBRAIN + head_flags = HEAD_EYESPRITES|HEAD_EYECOLOR|HEAD_EYEHOLES|HEAD_DEBRAIN|HEAD_HAIR /obj/item/bodypart/head/mutant/teshari/Initialize(mapload) worn_ears_offset = new( diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm index f311c66cc49..ad1c0b8b283 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm @@ -282,6 +282,10 @@ name = "Teshari Regular" icon_state = "teshari_regular" +/datum/sprite_accessory/ears/mutant/teshari/regularalt + name = "Teshari Regular Alt" + icon_state = "teshari_feathers_regalt" + /datum/sprite_accessory/ears/mutant/teshari/feathers_bushy name = "Teshari Feathers Bushy" icon_state = "teshari_feathers_bushy" @@ -336,11 +340,6 @@ icon_state = "teshari_feathers_backstrafe" color_src = USE_ONE_COLOR -/datum/sprite_accessory/ears/mutant/teshari/feathers_thinmohawk - name = "Teshari Feathers Thin Mohawk" - icon_state = "teshari_feathers_thinmohawk" - color_src = USE_ONE_COLOR - /datum/sprite_accessory/ears/mutant/teshari/feathers_thin name = "Teshari Feathers Thin" icon_state = "teshari_feathers_thin" diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/hair.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/hair.dm index 695e7310f3f..3c84b2adfda 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/hair.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/hair.dm @@ -647,6 +647,14 @@ name = "Upwards" icon_state = "hair_upwards" +/datum/sprite_accessory/hair/skyrat/tesharimohawk + name = "Teshari Mohawk" + icon_state = "hair_teshmohawk" + +/datum/sprite_accessory/hair/skyrat/tesharimohawkalt + name = "Teshari Mohawk Alt" + icon_state = "hair_teshmohawkalt" + // Facial hair /datum/sprite_accessory/facial_hair/skyrat diff --git a/modular_skyrat/modules/emote_panel/code/emote_panel.dm b/modular_skyrat/modules/emote_panel/code/emote_panel.dm index be2b0e4259f..8564123a4c2 100644 --- a/modular_skyrat/modules/emote_panel/code/emote_panel.dm +++ b/modular_skyrat/modules/emote_panel/code/emote_panel.dm @@ -148,7 +148,10 @@ /mob/living/proc/emote_moo, /mob/living/proc/emote_honk1, /mob/living/proc/emote_mggaow, - /mob/living/proc/emote_slowclap + /mob/living/proc/emote_slowclap, + /mob/living/proc/emote_teshchirp, + /mob/living/proc/emote_teshsqueak, + /mob/living/proc/emote_teshtrill, ) all_emotes += skyrat_living_emotes @@ -897,6 +900,21 @@ set category = "Emotes+" usr.emote("bellow", intentional = TRUE) +/mob/living/proc/emote_teshchirp() + set name = "> Tesh Chirp" + set category = "Emotes+" + usr.emote("teshchirp", intentional = TRUE) + +/mob/living/proc/emote_teshsqueak() + set name = "> Tesh Squeak" + set category = "Emotes+" + usr.emote("teshsqueak", intentional = TRUE) + +/mob/living/proc/emote_teshtrill() + set name = "> Tesh Trill" + set category = "Emotes+" + usr.emote("teshtrill", intentional = TRUE) + // code\modules\mob\living\brain\emote.dm /mob/living/brain/proc/emote_alarm() diff --git a/modular_skyrat/modules/emotes/code/emotes.dm b/modular_skyrat/modules/emotes/code/emotes.dm index f7a690feb6a..19f28373b2a 100644 --- a/modular_skyrat/modules/emotes/code/emotes.dm +++ b/modular_skyrat/modules/emotes/code/emotes.dm @@ -564,3 +564,27 @@ emote_type = EMOTE_AUDIBLE vary = TRUE sound = 'modular_skyrat/modules/emotes/sound/voice/mggaow.ogg' + +/datum/emote/living/teshchirp + key = "teshchirp" + key_third_person = "chirps!" + message = "chirps!" + emote_type = EMOTE_AUDIBLE + vary = TRUE + sound = 'modular_skyrat/modules/emotes/sound/voice/teshchirp.ogg' // Credits to Virgo Station for the files. + +/datum/emote/living/teshsqueak + key = "teshsqueak" + key_third_person = "squeaks!" + message = "squeaks!" + emote_type = EMOTE_AUDIBLE + vary = TRUE + sound = 'modular_skyrat/modules/emotes/sound/voice/teshsqueak.ogg' // Credits to Virgo Station for the files. + +/datum/emote/living/teshtrill + key = "teshtrill" + key_third_person = "trills!" + message = "trills!" + emote_type = EMOTE_AUDIBLE + vary = TRUE + sound = 'modular_skyrat/modules/emotes/sound/voice/teshtrill.ogg' // Credits to Virgo Station for the files. diff --git a/modular_skyrat/modules/emotes/sound/voice/teshchirp.ogg b/modular_skyrat/modules/emotes/sound/voice/teshchirp.ogg new file mode 100644 index 00000000000..0f6be2fa3a8 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/voice/teshchirp.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/voice/teshsqueak.ogg b/modular_skyrat/modules/emotes/sound/voice/teshsqueak.ogg new file mode 100644 index 00000000000..1b363009632 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/voice/teshsqueak.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/voice/teshtrill.ogg b/modular_skyrat/modules/emotes/sound/voice/teshtrill.ogg new file mode 100644 index 00000000000..607ed47df87 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/voice/teshtrill.ogg differ