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
..
auto_emotes.yml	Debuff Zombies AT LAST!(#315)	2024-08-24 07:45:16 -04:00
disease_emotes.yml	Remove duplicate from diasses emotes	2024-08-22 07:48:28 +03:00
speech_emote_sounds.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-02-04 04:18:31 +03:00
speech_emotes.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-02-04 04:18:31 +03:00
speech_sounds.yml	Add bleating accent to goats (#34273)	2025-01-08 02:00:20 +01:00
speech_verbs.yml	Add bleating accent to goats (#34273)	2025-01-08 02:00:20 +01:00