Vigers Ray 4c5854ea7b Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Resources/Audio/Machines/attributions.yml # Resources/Locale/en-US/_strings/administration/smites.ftl # Resources/Locale/en-US/_strings/reagents/frostoil.ftl # Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/migration.yml		2025-02-04 04:18:31 +03:00
..
_Sunrise	Loadout new, part 1 (#862)	2025-01-27 01:01:29 +03:00
Ambience	Новый антагонист: Вампиры (#560)	2024-10-31 19:06:01 +03:00
Animals	added a bunch more fox noises (#27578)	2024-05-02 14:35:10 +02:00
Announcements	Фикс звуков	2024-11-29 05:47:37 +03:00
Effects	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-02-04 04:18:31 +03:00
Expedition	Update license of deadline.ogg (#27715)	2024-05-06 15:26:18 +10:00
Items	Added pricegun sound (#34119)	2025-01-02 17:46:13 +01:00
Lobby	убрал title3.ogg	2024-06-13 16:43:29 +03:00
Machines	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-02-04 04:18:31 +03:00
Magic	Void's Applause (#34591)	2025-01-31 01:10:35 +01:00
Mecha	Exosuit: Ripley (#12668)	2022-12-10 11:05:39 -06:00
MidiCustom	Added new Microphone instrument style "Kweh" (#32848)	2024-10-17 12:57:42 +11:00
Misc	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-30 13:26:32 +03:00
StationEvents	remove nukemass song (#34066)	2025-01-01 17:27:50 +01:00
UserInterface	Add UI click sounds (#22410)	2023-12-29 15:43:36 +11:00
Voice	Fixes tailthump breaking positional audio by making it mono (#33092)	2024-10-31 22:30:58 +01:00
Weapons	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-20 05:46:59 +03:00