Ed dbdb81381b Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/lobbyscreens.yml

2024-06-30 11:18:30 +03:00

..

_CP14

Nails, Hammer tool and construction recipe update (#249)

2024-06-16 18:31:47 +03:00

Ambience

New salvage expedition ambience. (#25983)

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

Animals

added a bunch more fox noises (#27578)

2024-05-02 14:35:10 +02:00

Announcements

Add syndicate sleeper agents random event (#27501)

2024-05-03 10:13:35 +10:00

Effects

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03:00

Expedition

Update license of deadline.ogg (#27715)

2024-05-06 15:26:18 +10:00

Items

Canes + Cane Blade for Syndicate Librarians (#25873)

2024-04-27 20:22:10 +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

Glass box fixes + Construction & Stealthy deconstruction (#25365)

2024-04-27 23:53:16 +10: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

swap siren (#29369)

2024-06-23 00:38:41 -04:00

StationEvents

Sound Station 14 like a nukie song (#29345)

2024-06-23 01:09:41 +10:00

UserInterface

Add UI click sounds (#22410)

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

Voice

New borg sounds (#27205)

2024-04-28 21:38:31 -07:00

Weapons

Upstream, Yay (#27)

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