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
..
alien_claw.yml
announcements.yml
arcade.yml	Arcade machine improvements (#24200)	2024-03-28 17:28:45 +11:00
artifact.yml
atmospherics.yml
bike_horn.yml
body_fall.yml
broken_device.yml	Syndicate teleporter (#376)	2024-09-16 11:09:57 +03:00
bureaucracy.yml
church_bell.yml
clownrecorder.yml
deathgasp.yml	"Death gasp" for a moth (#28409)	2024-06-03 14:48:01 -04:00
desceration.yml
destruction.yml
dice.yml
disease.yml
drink_close_sounds.yml
drink_open_sounds.yml
emotes.yml	Void's Applause (#34591)	2025-01-31 01:10:35 +01:00
expeditions.yml	New Salvage song: Deadline (#27707)	2024-05-06 13:51:33 +10:00
explosion.yml
fence_rattle.yml
food.yml
footsteps.yml	New borg sounds (#27205)	2024-04-28 21:38:31 -07:00
fox.yml	added a bunch more fox noises (#27578)	2024-05-02 14:35:10 +02:00
gasp.yml	Remake gasp popup to emote (#27736)	2024-05-28 19:56:41 -04:00
generator.yml
generic_hit.yml
gib.yml
gun_impacts.yml
gun_sounds.yml
hit_impacts.yml
ian_bark.yml
keyboard.yml
lighter_sounds.yml
lobby.yml	немного музыки в лобби	2024-12-25 04:06:43 +03:00
NukeMusic.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-02 21:12:06 +03:00
punching.yml
radiation.yml
rubber_chicken.yml	Rubber chicken toy (#29637)	2024-09-16 01:57:53 +02:00
sadtrombone.yml
screams.yml	Plants scream mutation now have more scream variety (#30862)	2024-08-16 22:09:25 -04:00
shuttle.yml
skub.yml
sparks.yml
storage_rustle.yml
tools.yml
toy_squeak.yml
traits.yml
tray.yml
troll.yml	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
whistle.yml