diff --git a/code/game/sound.dm b/code/game/sound.dm index 29c471f06e9d..d63e4a1b0c18 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -324,6 +324,8 @@ S = pick('sound/effects/alien_resin_move1.ogg','sound/effects/alien_resin_move2.ogg') if("alien_talk") S = pick('sound/voice/alien_talk.ogg','sound/voice/alien_talk2.ogg','sound/voice/alien_talk3.ogg') + if("larva_talk") + S = pick('sound/voice/larva_talk1.ogg','sound/voice/larva_talk2.ogg','sound/voice/larva_talk3.ogg','sound/voice/larva_talk4.ogg') if("hiss_talk") S = pick('sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg') if("alien_growl") diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm index a3e856c7fc67..8dc427e2c55e 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm @@ -37,6 +37,7 @@ crit_health = -25 gib_chance = 25 mob_size = MOB_SIZE_SMALL + speaking_noise = "larva_talk" base_actions = list( /datum/action/xeno_action/onclick/xeno_resting, /datum/action/xeno_action/watch_xeno, diff --git a/html/changelogs/AutoChangeLog-pr-6439.yml b/html/changelogs/AutoChangeLog-pr-6439.yml new file mode 100644 index 000000000000..606fddc29b51 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6439.yml @@ -0,0 +1,5 @@ +author: "Blundir" +delete-after: True +changes: + - soundadd: "larva talking sounds" + - imageadd: "larva moving sprites, tweak of standing ones" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6493.yml b/html/changelogs/AutoChangeLog-pr-6493.yml deleted file mode 100644 index 57d67e75aca3..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6493.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "HeresKozmos" -delete-after: True -changes: - - maptweak: "Filled in a hole in the map." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6494.yml b/html/changelogs/AutoChangeLog-pr-6494.yml deleted file mode 100644 index cf50283ef6a2..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6494.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "HeresKozmos" -delete-after: True -changes: - - maptweak: "Fixed an area in the easter egg section of Sorokyne" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6507.yml b/html/changelogs/AutoChangeLog-pr-6507.yml deleted file mode 100644 index 7153d4e603a2..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6507.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kiVts" -delete-after: True -changes: - - code_imp: "Prevented potential unintended behavior with research upgrade items on initialize" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6555.yml b/html/changelogs/AutoChangeLog-pr-6555.yml deleted file mode 100644 index ed55fd0f3534..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6555.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "coldironwarrior" -delete-after: True -changes: - - spellcheck: "fixed a few typos in the xeno bioscan announcement" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6558.yml b/html/changelogs/AutoChangeLog-pr-6558.yml deleted file mode 100644 index bc921a138301..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6558.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "private-tristan" -delete-after: True -changes: - - qol: "Facehuggers no longer show as having any plasma" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6565.yml b/html/changelogs/AutoChangeLog-pr-6565.yml deleted file mode 100644 index 26ed76a815cf..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6565.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Drathek" -delete-after: True -changes: - - bugfix: "Fixed a crash in the Hotkey menu when searching by key when filtered" - - bugfix: "Fixed/Added support for various keys (e.g. keypad and media keys)" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6569.yml b/html/changelogs/AutoChangeLog-pr-6569.yml deleted file mode 100644 index 991b2ab3fadc..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6569.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Git-Nivrak" -delete-after: True -changes: - - bugfix: "Fixes being able to draw weapons when knocked down" \ No newline at end of file diff --git a/html/changelogs/archive/2024-06.yml b/html/changelogs/archive/2024-06.yml index e43d1aa00938..4075db8b6a2c 100644 --- a/html/changelogs/archive/2024-06.yml +++ b/html/changelogs/archive/2024-06.yml @@ -240,3 +240,19 @@ iloveloopers: - balance: Custom research chemicals with an intensityfire above or equal to 50 will now burn white. +2024-06-28: + Drathek: + - bugfix: Fixed a crash in the Hotkey menu when searching by key when filtered + - bugfix: Fixed/Added support for various keys (e.g. keypad and media keys) + Git-Nivrak: + - bugfix: Fixes being able to draw weapons when knocked down + HeresKozmos: + - maptweak: Filled in a hole in the map. + - maptweak: Fixed an area in the easter egg section of Sorokyne + coldironwarrior: + - spellcheck: fixed a few typos in the xeno bioscan announcement + kiVts: + - code_imp: Prevented potential unintended behavior with research upgrade items + on initialize + private-tristan: + - qol: Facehuggers no longer show as having any plasma diff --git a/icons/mob/xenos/larva.dmi b/icons/mob/xenos/larva.dmi index d07dad82ed29..72cfb7b4e318 100644 Binary files a/icons/mob/xenos/larva.dmi and b/icons/mob/xenos/larva.dmi differ diff --git a/sound/voice/larva_talk1.ogg b/sound/voice/larva_talk1.ogg new file mode 100644 index 000000000000..8e8a212d4dde Binary files /dev/null and b/sound/voice/larva_talk1.ogg differ diff --git a/sound/voice/larva_talk2.ogg b/sound/voice/larva_talk2.ogg new file mode 100644 index 000000000000..e59f0e693259 Binary files /dev/null and b/sound/voice/larva_talk2.ogg differ diff --git a/sound/voice/larva_talk3.ogg b/sound/voice/larva_talk3.ogg new file mode 100644 index 000000000000..c784490fffa9 Binary files /dev/null and b/sound/voice/larva_talk3.ogg differ diff --git a/sound/voice/larva_talk4.ogg b/sound/voice/larva_talk4.ogg new file mode 100644 index 000000000000..cbb9b01d2418 Binary files /dev/null and b/sound/voice/larva_talk4.ogg differ