Morb0 804c99fcc5 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Shared/CCVar/CCVars.cs # Resources/Prototypes/Datasets/Names/borg.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml # Resources/Prototypes/SoundCollections/lobby.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/Textures/Structures/Piping/disposal.rsi/meta.json # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/steel.png		2023-11-22 20:22:45 +03:00
..
Ambience	Sound Effect For Emagged Borgs (#21451)	2023-11-20 10:36:25 -05:00
Animals	Cak Upgrade (#21678)	2023-11-16 01:12:56 -07:00
Announcements	Fix yml source	2023-11-14 19:29:26 +03:00
Corvax	Title2 lobby music (#1160)	2023-07-19 13:47:04 +03:00
Effects	Update attributions	2023-11-14 17:34:22 +03:00
Items	Roller Skates fixes (#21542)	2023-11-08 18:43:27 -07:00
Lobby	Add missing song names (#18432)	2023-08-02 19:36:59 +10:00
Machines	convert license.txt to attributions.yml in Machines (#21586)	2023-11-12 10:20:13 +11:00
Magic	Convert other attributions in Resources/Audio (#21609)	2023-11-12 16:14:26 -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	AME and PA make a warning sound to admins when overloaded along with the warning text (#21267)	2023-11-17 21:18:37 -06:00
StationEvents	Use new sound collection for nuke music	2023-04-29 15:02:06 +03:00
Voice	Update lizard vocalizations (#21750)	2023-11-19 14:51:56 -08:00
Weapons	Fix attributions license format	2023-11-08 17:41:09 +03:00