Ed 6174713383 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-27-04-2024-displacement-upstream ...

# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

2024-04-27 10:45:35 +03:00

..

_CP14

Работа для кузнеца (#80)

2024-04-12 21:09:54 +03:00

Ambience

New salvage expedition ambience. (#25983)

2024-03-11 17:56:01 +11:00

Animals

Diona Nymphs & Splitting (#24630)

2024-02-16 18:54:44 -08:00

Announcements

convert license.txt to attributions.yml (#21585)

2023-11-11 13:19:26 -07:00

Effects

Added Chopsticks (#27298)

2024-04-26 22:39:32 +10:00

Items

Add ability to shake fizzy drinks so they spray in peoples' faces (#25574)

2024-04-18 11:49:58 +10:00

Jukebox

Add new jukebox song. (#27074)

2024-04-19 19:41:32 -04:00

Lobby

Fix mispell of Atomic Amnesia MMX author (#24657)

2024-01-28 21:46:32 +11:00

Machines

Upstream, Yay (#27)

2024-04-03 10:33:34 +03:00

Magic

Adds Hellspawn (Nar'Sie demon mob) (#20291)

2024-01-04 05:53:15 -07:00

Mecha

Exosuit: Ripley (#12668)

2022-12-10 11:05:39 -06:00

MidiCustom

Cleanup pAI synth instrument in soundfont (#10836)

2022-08-25 20:16:01 -07:00

Misc

Add Ratvar (#24958)

2024-02-23 04:42:00 +03:00

StationEvents

New Nukie Song (#25765)

2024-03-09 12:44:54 +11:00

UserInterface

Add UI click sounds (#22410)

2023-12-29 15:43:36 +11:00

Voice

Reduce clown snore volume (#27012)

2024-04-16 20:48:38 +02:00

Weapons

Upstream, Yay (#27)

2024-04-03 10:33:34 +03:00