Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into tank-flamer-buff
Browse files Browse the repository at this point in the history
  • Loading branch information
VileBeggar committed Jul 5, 2024
2 parents 0a32c9f + e7161e3 commit 5417a95
Show file tree
Hide file tree
Showing 16 changed files with 24 additions and 29 deletions.
2 changes: 2 additions & 0 deletions code/game/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/xenomorph/castes/Larva.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions html/changelogs/AutoChangeLog-pr-6439.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
author: "Blundir"
delete-after: True
changes:
- soundadd: "larva talking sounds"
- imageadd: "larva moving sprites, tweak of standing ones"
4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-6493.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-6494.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-6507.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-6555.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-6558.yml

This file was deleted.

5 changes: 0 additions & 5 deletions html/changelogs/AutoChangeLog-pr-6565.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-6569.yml

This file was deleted.

16 changes: 16 additions & 0 deletions html/changelogs/archive/2024-06.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file modified icons/mob/xenos/larva.dmi
Binary file not shown.
Binary file added sound/voice/larva_talk1.ogg
Binary file not shown.
Binary file added sound/voice/larva_talk2.ogg
Binary file not shown.
Binary file added sound/voice/larva_talk3.ogg
Binary file not shown.
Binary file added sound/voice/larva_talk4.ogg
Binary file not shown.

0 comments on commit 5417a95

Please sign in to comment.