Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-08-05-2024-upstream

# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/lobbyscreens.yml

Resources/Textures/Interface/Alerts/deflecting.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Deflecting icon by Ubaser",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "deflecting0"
+        }
+    ]
+}

Resources/Textures/Interface/Emotes/attributions.yml

@@ -0,0 +1,117 @@
+# Attempted to keep the files in alphabetical order so its easier to audit.
+# Finding individual authors is an unfeasible task. If you can reference the author please do so.
+
+- files: ["beep.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from borg_chest.png and borg_head.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["buzz.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing bee texture (0.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["buzztwo.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing bee texture (0.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["chime.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing desk bell texture (normal.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["chirp.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing nymph texture (icon.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["chitter.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from mothroach.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["clap.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["click.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing crab.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["cough.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["cry.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["deathgasp.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["honk.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing bikehorn texture (icon.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["laugh.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["ping.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["salute.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["sigh.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["snap.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["squeak.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from mouse-0.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["squish.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from blue_adult_slime.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["vocal.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["weh.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from plushie_lizard.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["whistle.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["yawn.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"