Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync

# Conflicts:
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/Traits/TraitSystem.cs
#	Content.Shared/CCVar/CCVars.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/box.yml
#	Resources/Maps/core.yml

Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept, potato1234x and deltanedas at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, snail by IproduceWidgets (github) and Kezu (discord)",
+  "copyright": "Taken from tgstation and modified by Swept, potato1234x and deltanedas at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, snail by IproduceWidgets (github) and Kezu (discord), anomalymeat/cooked by august-sun",
   "size": {
     "x": 32,
     "y": 32
@@ -200,6 +200,12 @@
     },
     {
       "name": "rouny-cooked"
+    },
+    {
+      "name": "anomalymeat"
+    },
+    {
+      "name": "anomalymeat-cooked"
     }
   ]
 }

Resources/Textures/Objects/Magic/magicactions.rsi/meta.json

@@ -25,8 +25,11 @@
     {
       "name": "magicmissile"
     },
+    {
+      "name": "jaunt"
+    },
     {
       "name": "gib"
     }
   ]
-}
+}

Resources/Textures/Objects/Misc/id_cards.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github)",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json

@@ -0,0 +1,62 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by SpaceRox1244",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-alt-1"
+        },
+        {
+            "name": "mag-alt-2"
+        },
+        {
+            "name": "mag-alt-3"
+        },
+        {
+            "name": "mag-alt-4"
+        },
+        {
+            "name": "lethal"
+        },
+        {
+            "name": "beanbag"
+        },
+        {
+            "name": "slug"
+        },
+        {
+            "name": "incendiary"
+        },
+        {
+            "name": "practice"
+        },
+        {
+            "name": "uranium"
+        },
+        {
+            "name": "flare"
+        },
+        {
+            "name": "tranquilizer"
+        }
+    ]
+}

Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json

@@ -1,14 +1,17 @@
 {
   "version": 1,
   "license": "CC0-1.0",
-  "copyright": "Design and inhands by ricemar (discord) and icon by EmoGarbage404 (github)",
+  "copyright": "Design, inhands, and storage sprite by SpaceRox1244 (github) and icon by EmoGarbage404 (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "icon"
+        "name": "icon"
+    },
+    {
+        "name":  "storage"
     },
     {
       "name": "inhand-left",