Merge branch 'master' into caustic-marine-armor

cmss13-devs · Jul 3, 2024 · 16f668e · 16f668e
2 parents 2cfec82 + bbae238
commit 16f668e
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 0 deletions.
diff --git 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
@@ -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/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml
@@ -0,0 +1,4 @@
+2024-07-03:
+  Blundir:
+  - soundadd: larva talking sounds
+  - imageadd: larva moving sprites, tweak of standing ones
diff --git a/icons/mob/xenos/larva.dmi b/icons/mob/xenos/larva.dmi
diff --git a/sound/voice/larva_talk1.ogg b/sound/voice/larva_talk1.ogg
diff --git a/sound/voice/larva_talk2.ogg b/sound/voice/larva_talk2.ogg
diff --git a/sound/voice/larva_talk3.ogg b/sound/voice/larva_talk3.ogg
diff --git a/sound/voice/larva_talk4.ogg b/sound/voice/larva_talk4.ogg