Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream

# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Temperature/Systems/TemperatureSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs

Resources/Textures/Objects/Fun/spectrallocator.rsi/meta.json

@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Originally created by EmoGarbage404 (github) for Space Station 14, modified by Ilya246 (github) for Space Station 14.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "screen",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json

@@ -57,6 +57,15 @@
 		{
 			"name": "syringe2"
 		},
+		{
+			"name": "minisyringe1"
+		},
+		{
+			"name": "minisyringe2"
+		},
+		{
+			"name": "minisyringe3"
+		},
 		{
 		  "name": "inhand-left",
 		  "directions": 4

Resources/Textures/Objects/Tools/appraisal-tool.rsi/meta.json

@@ -1,18 +1,26 @@
 {
-   "copyright" : "Taken from https://github.com/tgstation/tgstation/blob/master/icons/obj/device.dmi state export_scanner at commit 7544e865d0771d9bd917461e9da16d301fe40fc3.",
+   "copyright" : "Taken from https://github.com/tgstation/tgstation/blob/master/icons/obj/device.dmi state export_scanner at commit 7544e865d0771d9bd917461e9da16d301fe40fc3. In-hand sprites made by obscenelytinyshark for use in SS14.",
    "license" : "CC-BY-SA-3.0",
    "size" : {
       "x" : 32,
       "y" : 32
    },
-   "states" : [
-      {
-         "name" : "icon"
-      },
-      {
-         "name": "equipped-BELT",
-         "directions": 4
-      }
-   ],
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ],
    "version" : 1
 }

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

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi , base and mag-1 by Alekshhh",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi, base and mag-1 by Alekshhh",
   "size": {
     "x": 32,
     "y": 32
@@ -16,8 +16,20 @@
     {
       "name": "mag-1"
     },
+    {
+      "name": "mag-2"
+    },
+    {
+      "name": "mag-3"
+    },
     {
       "name": "magb-1"
+    },
+    {
+      "name": "magb-2"
+    },
+    {
+      "name": "magb-3"
     }
   ]
 }

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

@@ -19,12 +19,30 @@
     {
       "name": "mag-1"
     },
+    {
+      "name": "mag-2"
+    },
+    {
+      "name": "mag-3"
+    },
     {
       "name": "magb-1"
     },
+    {
+      "name": "magb-2"
+    },
+    {
+      "name": "magb-3"
+    },
     {
       "name": "mag10-1"
     },
+    {
+      "name": "mag10-2"
+    },
+    {
+      "name": "mag10-3"
+    },
     {
       "name": "practice"
     },

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

@@ -16,9 +16,21 @@
     {
       "name": "mag-1"
     },
+    {
+      "name": "mag-2"
+    },
+    {
+      "name": "mag-3"
+    },
     {
       "name": "magb-1"
     },
+    {
+      "name": "magb-2"
+    },
+    {
+      "name": "magb-3"
+    },
     {
       "name": "incendiary"
     },

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

@@ -16,6 +16,12 @@
     {
       "name": "mag-1"
     },
+    {
+      "name": "mag-2"
+    },
+    {
+      "name": "mag-3"
+    },
     {
       "name": "cap"
     },

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

@@ -13,6 +13,9 @@
     {
       "name": "mag-1"
     },
+    {
+      "name": "mag-2"
+    },
     {
       "name": "incendiarydisplay"
     },

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

@@ -16,9 +16,21 @@
     {
       "name": "mag-1"
     },
+    {
+      "name": "mag-2"
+    },
+    {
+      "name": "mag-3"
+    },
     {
       "name": "magb-1"
     },
+    {
+      "name": "magb-2"
+    },
+    {
+      "name": "magb-3"
+    },
     {
       "name": "incendiary"
     },

Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13 at f91dfe2e0dba1b7a8b9a0fa18251340920979a62, held sprite by ScarKy0",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "syringe_gun"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    }
+  ]
+}