Morb0 1b513f0c1a Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/workflows/publish.yml # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Zombies/ZombieSystem.Transform.cs # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/fland.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Textures/Tiles/attributions.yml		2023-08-29 05:58:14 +03:00
..
alien_claw.yml	More kinds of benos (#8849)	2022-06-18 13:33:41 +10:00
announcements.yml	Add two more reboot themes (#19219)	2023-08-18 23:58:44 +10:00
artifact.yml	add artifact sound effects (#17792)	2023-07-03 21:14:27 +10:00
atmospherics.yml
bike_horn.yml	Toy Box filled with toys (ready for merge) (#16252)	2023-06-03 13:31:47 +10:00
body_fall.yml
clownrecorder.yml	Adds the clown recorder (Clown fix) (#15074)	2023-04-06 20:06:52 -06:00
desceration.yml
dice.yml
disease.yml	Adds Bananium (#14663)	2023-04-29 15:38:09 +10:00
drink_open_sounds.yml
emotes.yml	Emotion (#17187)	2023-06-08 16:22:02 +10:00
explosion.yml
fence_rattle.yml	Chain link fencing (#18956)	2023-08-11 00:16:25 +10:00
food.yml
footsteps.yml	Behonker and Clown Spider (ready for merge) (#16678)	2023-06-15 12:47:36 +10:00
generator.yml	Portable Generator Rework (#19302)	2023-08-25 11:40:42 -07:00
generic_hit.yml	Port boxer from Nyano (#9080)	2022-07-26 18:34:19 -07:00
gib.yml	Basic bleeding mechanics (#6710)	2022-02-17 15:00:41 -07:00
glassbreak.yml
gun_sounds.yml	Bullet flyby sounds (#8317)	2022-05-21 01:04:47 -07:00
ian_bark.yml	[Entity] Add Ian's Backpack (#15519)	2023-04-19 01:40:25 -06:00
impacts.yml	More robust bullet impact sounds (#8325)	2022-05-22 18:23:37 +10:00
keyboard.yml	All computers play the keyboard sound + small research client cleanup (#7312)	2022-04-08 14:17:05 -07:00
lighter_sounds.yml	Lighters (#5836)	2021-12-21 18:20:32 +01:00
lobby.yml	Title2 lobby music (#1160)	2023-07-19 13:47:04 +03:00
NukeMusic.yml	Use new sound collection for nuke music	2023-04-29 15:02:06 +03:00
punching.yml	Punching and melee hitsounds now have unique SoundCollections (#5748)	2021-12-11 16:12:40 -07:00
radiation.yml	Events/RadiationStorm: Fancy radiation shader & SFX (#5612)	2021-12-01 13:21:17 -07:00
sadtrombone.yml	Implanters and Subdermal Implants (#11840)	2022-11-20 17:49:37 +11:00
screams.yml	Cluwne smite (#13367)	2023-03-06 11:09:24 -08:00
shuttle.yml	Shuttle impact sounds (#11099)	2022-10-04 16:00:44 +11:00
skub.yml	Re-adds skub noise [Not april fools] (#14978)	2023-03-31 15:25:46 +11:00
sparks.yml
storage_rustle.yml
tools.yml
toy_squeak.yml
traits.yml	New Traits (#13763)	2023-03-04 23:44:13 -04:00
tray.yml	Important fix for table climbing (#10803)	2022-08-25 23:41:37 +10:00
troll.yml	Remove among us noise from game (#16589)	2023-05-18 23:44:23 -06:00