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/Clothing/Head/Hats/warden.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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, texture edited by TeaMaki (On github TeaMakiNL)",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Multiple/towel.rsi/meta.json

@@ -0,0 +1,40 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation12 at commit https://github.com/Baystation12/Baystation12/commit/c5dc6953e6e1fde87c2ded60038144f1d21fbd48",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+	{
+	  "name": "iconstripe"
+	},
+	{
+	  "name": "NTmono"
+	},
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+	{
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.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/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github), modified by KingFroozy (github) for ss14",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by KingFroozy (github) for space station 14",
+  "copyright": "Modified from https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi by KingFroozy (github) for space station 14",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.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/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github), modified by KingFroozy (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
@@ -10,17 +10,10 @@
     {
       "name": "icon"
     },
-    {
-      "name": "s"
-    },
     {
       "name": "equipped-INNERCLOTHING",
       "directions": 4
     },
-    {
-      "name": "s-equipped-INNERCLOTHING",
-      "directions": 4
-    },
     {
       "name": "equipped-INNERCLOTHING-monkey",
       "directions": 4

Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi and modified by KingFroozy (github) for space station 14",
+  "copyright": "Modified from https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi by KingFroozy (github) for space station 14",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json

@@ -9,6 +9,99 @@
     "states": [
         {
             "name": "state-laws"
+        },
+        {
+            "name": "no-action"
+        },
+        {
+            "name":"tool-module"
+        },
+        {
+            "name":"wire-module"
+        },
+        {
+            "name":"gps-module"
+        },
+        {
+            "name":"extinguisher-module"
+        },
+        {
+            "name":"geiger-module"
+        },
+        {
+            "name":"rcd-module"
+        },
+        {
+            "name":"adv-tools-module"
+        },
+        {
+            "name":"construction-module"
+        },
+        {
+            "name":"appraisal-module"
+        },
+        {
+            "name":"grappling-module"
+        },
+        {
+            "name":"mining-module"
+        },
+        {
+            "name":"light-replacer-module"
+        }, 
+        {
+            "name":"cleaning-module"
+        },
+        {
+            "name":"adv-cleaning-module"
+        },
+        {
+            "name":"diagnosis-module"
+        },
+        {
+            "name":"treatment-module"
+        },
+        {
+            "name":"adv-diagnosis-module"
+        },
+        {
+            "name":"defib-module"
+        },
+        {
+            "name":"node-scanner-module"
+        },
+        {
+            "name":"anomaly-module"
+        },
+        {
+            "name":"service-module"
+        },
+        {
+            "name":"musical-module"
+        },
+        {
+            "name":"gardening-module"
+        },
+        {
+            "name":"harvesting-module"
+        },
+        {
+            "name":"clowning-module"
+        },
+        {
+            "name":"syndicate-weapon-module"
+        },
+        {
+            "name":"syndicate-operative-module"
+        },
+        {
+            "name":"syndicate-esword-module"
+        },
+        {
+            "name":"syndicate-l6c-module"
+        },
+        {
+            "name":"syndicate-martyr-module"
         }
     ]
 }

Resources/Textures/Interface/Emotes/attributions.yml

@@ -120,3 +120,8 @@
   license: "CC-BY-SA-3.0"
   copyright: "Created by Sarahon"
   source: "https://github.com/Sarahon"
+
+- files: ["tailslap.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by Sarahon"
+  source: "https://github.com/Sarahon"

Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by PixelTheKermit (github) for SS14",
+  "copyright": "Made by PixelTheKermit (github) for SS14, inhands by mubururu_ (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -14,7 +14,23 @@
       "name": "eyeball-r"
     },
     {
-      "name": "tongue"
+      "name": "eyeballs-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "eyeballs-inhand-right",
+      "directions": 4
+    },
+    {
+        "name": "tongue"
+    },
+    {
+      "name": "heart-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "heart-inhand-right",
+      "directions": 4
     },
     {
       "name": "heart-on",
@@ -42,6 +58,14 @@
     {
       "name": "stomach"
     },
+    {
+      "name": "stomach-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "stomach-inhand-right",
+      "directions": 4
+    },
     {
       "name": "web-gland"
     }

Resources/Textures/Mobs/Species/Diona/organs.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/commit/38051f45d3b26bd31f6e292239f43adb36ff01fe",
+  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/commit/38051f45d3b26bd31f6e292239f43adb36ff01fe lungs and inhands by mubururu_ (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,14 @@
     {
       "name": "brain"
     },
+    {
+      "name": "brain-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "brain-inhand-right",
+      "directions": 4
+    },
     {
       "name": "ears"
     },
@@ -19,8 +27,27 @@
     {
       "name": "eyeball-r"
     },
+    {
+      "name": "lungs"
+    },
+    {
+      "name": "lungs-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "lungs-inhand-right",
+      "directions": 4
+    },
     {
       "name": "stomach"
+    },
+    {
+      "name": "stomach-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "stomach-inhand-right",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json

@@ -1,80 +1,128 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af",
+  "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af, inhands by mubururu_ (github)",
   "size": {
     "x": 32,
     "y": 32
   },
-  "states": [
-    {
-      "name": "appendix"
-    },
-    {
-      "name": "appendix-inflamed"
-    },
-    {
-      "name": "brain"
-    },
-    {
-      "name": "brain-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "brain-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "ears"
-    },
-    {
-      "name": "eyeball-l"
-    },
-    {
-      "name": "eyeball-r"
-    },
-    {
-      "name": "heart-off"
-    },
-    {
-      "name": "heart-on",
-      "delays": [
-        [
-          0.6,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "kidney-l"
-    },
-    {
-      "name": "kidney-r"
-    },
-    {
-      "name": "liver"
-    },
-    {
-      "name": "lung-l"
-    },
-    {
-      "name": "lung-r"
-    },
-    {
-      "name": "stomach"
-    },
-    {
-      "name": "tongue"
-    },
-    {
-      "name": "muscle"
-    },
-    {
-      "name": "nerve"
-    },
-    {
-      "name": "vessel"
-    }
-  ]
+    "states": [
+        {
+            "name": "appendix"
+        },
+        {
+            "name": "appendix-inflamed"
+        },
+        {
+            "name": "brain"
+        },
+        {
+            "name": "brain-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "brain-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "ears"
+        },
+        {
+            "name": "eyeballs-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "eyeballs-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "eyeball-l"
+        },
+        {
+            "name": "eyeball-r"
+        },
+        {
+            "name": "heart-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "heart-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "heart-off"
+        },
+        {
+            "name": "heart-on",
+            "delays": [
+                [
+                    0.6,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "kidneys-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "kidneys-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "kidney-l"
+        },
+        {
+            "name": "kidney-r"
+        },
+        {
+            "name": "liver"
+        },
+        {
+            "name": "liver-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "liver-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "lungs-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "lungs-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "lung-l"
+        },
+        {
+            "name": "lung-r"
+        },
+        {
+            "name": "stomach"
+        },
+        {
+            "name": "stomach-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "stomach-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "tongue"
+        },
+        {
+            "name": "muscle"
+        },
+        {
+            "name": "nerve"
+        },
+        {
+            "name": "vessel"
+        }
+    ]
 }