Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Maps/oasis.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/audio.yml

Resources/Textures/Interface/Misc/ai_hud.rsi/meta.json

@@ -0,0 +1,37 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d170a410d40eec4fc19fe5eb8d561d58a0902082",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "electrified",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "apc_hacked",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Mobs/Animals/reindeer_buck.rsi/meta.json

@@ -0,0 +1,52 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Deer by Calciumtrice, usable under Creative Commons Attribution 3.0 license, from https://opengameart.org/content/deer, edited by IProduceWidgets (github)",
+  "states": [
+    {
+      "name": "reindeer_buck",
+      "directions": 4,
+      "delays": [
+        [
+          1,
+          0.2,
+          0.2,
+          0.2,
+		  0.2
+        ],
+        [
+          1,
+          0.2,
+          0.2,
+          0.2,
+		  0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+		  1
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          1
+        ]
+      ]
+    },
+	{
+	  "name": "reindeer_buck_still",
+	  "directions": 4
+	},
+    {
+      "name": "reindeer_buck_dead"
+    }
+  ]
+}

Resources/Textures/Mobs/Animals/reindeer_doe.rsi/meta.json

@@ -0,0 +1,52 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Deer by Calciumtrice, usable under Creative Commons Attribution 3.0 license, from https://opengameart.org/content/deer, edited by IProduceWidgets (github)",
+  "states": [
+    {
+      "name": "reindeer_doe",
+      "directions": 4,
+      "delays": [
+        [
+          1,
+          0.2,
+          0.2,
+          0.2,
+		  0.2
+        ],
+        [
+          1,
+          0.2,
+          0.2,
+          0.2,
+		  0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+		  1
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          1
+        ]
+      ]
+    },
+	{
+	  "name": "reindeer_doe_still",
+	  "directions": 4
+	},
+    {
+      "name": "reindeer_doe_dead"
+    }
+  ]
+}

Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc, derelict sprites modified by GoldenCan(GitHub).",
   "states": [
     {
       "name": "clown",
@@ -23,6 +23,26 @@
       "name": "clown_l",
       "directions": 4
     },
+    {
+      "name": "derelict",
+      "directions": 4
+    },
+    {
+      "name": "derelict_e",
+      "directions": 4
+    },
+    {
+      "name": "derelict_e_r",
+      "directions": 4
+    },
+    {
+      "name": "derelict_icon",
+      "directions": 1
+    },
+    {
+      "name": "derelict_l",
+      "directions": 4
+    },
     {
       "name": "engineer",
       "directions": 4

Resources/Textures/Objects/Devices/gates.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "or.png originally created by Kevin Zheng, 2022. All are modified by deltanedas (github) for SS14, 2024.",
+  "copyright": "or.png originally created by Kevin Zheng, 2022. All are modified by deltanedas (github) for SS14, 2024. Sprites logic_a logic_b logic_o were made by 0tito (github) for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -13,6 +13,15 @@
     {
       "name": "logic"
     },
+    {
+       "name":  "logic_o"
+    },
+    {
+       "name":  "logic_b"
+    },
+    {
+      "name":  "logic_a"
+    },
     {
       "name": "or"
     },

Resources/Textures/Objects/Materials/hide.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/88d236d5c91e9a57e103957555c2e9a8c63b68fa/icons/obj/stacks/organic.dmi",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/88d236d5c91e9a57e103957555c2e9a8c63b68fa/icons/obj/stacks/organic.dmi. Inhands by mubururu_ (github).",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,14 @@
     {
       "name": "goliath_hide"
     },
+    {
+      "name": "goliathhide-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "goliathhide-inhand-right",
+      "directions": 4
+    },
     {
       "name": "goliath_hide_2"
     },
@@ -17,4 +25,4 @@
       "name": "goliath_hide_3"
     }
   ]
-}
+}

Resources/Textures/Objects/Materials/materials.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/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base.",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base. Bananium, cardboard, corgihide, cloth, cotton, pyrotton, bones and durathread inhands by mubururu_ (github).",
   "size": {
     "x": 32,
     "y": 32
@@ -16,6 +16,14 @@
     {
       "name": "bananium"
     },
+    {
+      "name": "bananium-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "bananium-inhand-right",
+      "directions": 4
+    },
     {
       "name": "bananium_1"
     },
@@ -36,6 +44,14 @@
     {
       "name": "cardboard"
     },
+    {
+      "name": "cardboard-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "cardboard-inhand-right",
+      "directions": 4
+    },
     {
       "name": "cardboard_2"
     },
@@ -48,6 +64,14 @@
     {
       "name": "cloth"
     },
+    {
+      "name": "cloth-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "cloth-inhand-right",
+      "directions": 4
+    },
     {
       "name": "cloth_2"
     },
@@ -57,9 +81,25 @@
     {
       "name": "corgihide"
     },
+    {
+      "name": "corgihide-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "corgihide-inhand-right",
+      "directions": 4
+    },
     {
       "name": "cotton"
     },
+    {
+      "name": "cotton-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "cotton-inhand-right",
+      "directions": 4
+    },
     {
       "name": "cotton_2"
     },
@@ -69,6 +109,14 @@
     {
       "name": "pyrotton"
     },
+    {
+      "name": "pyrotton-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "pyrotton-inhand-right",
+      "directions": 4
+    },
     {
       "name": "pyrotton_2"
     },
@@ -95,6 +143,14 @@
     {
       "name": "durathread"
     },
+    {
+      "name": "durathread-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "durathread-inhand-right",
+      "directions": 4
+    },
     {
       "name": "durathread_2"
     },
@@ -160,6 +216,14 @@
     {
       "name": "bones"
     },
+    {
+      "name": "bones-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "bones-inhand-right",
+      "directions": 4
+    },
     {
       "name": "bones_2"
     },

Resources/Textures/Objects/Materials/ore.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-NC-SA-3.0",
-  "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd",
+  "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd. Inhands by mubururu_ (github).",
   "size": {
     "x": 32,
     "y": 32
@@ -10,32 +10,112 @@
     {
       "name": "bananium"
     },
+    {
+      "name": "bananium-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "bananium-inhand-right",
+      "directions": 4
+    },
     {
       "name": "gold"
     },
+    {
+      "name": "gold-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "gold-inhand-right",
+      "directions": 4
+    },
     {
       "name": "iron"
     },
+    {
+      "name": "iron-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "iron-inhand-right",
+      "directions": 4
+    },
     {
       "name": "uranium"
     },
+    {
+      "name": "uranium-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "uranium-inhand-right",
+      "directions": 4
+    },
     {
       "name": "plasma"
     },
+    {
+      "name": "plasma-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "plasma-inhand-right",
+      "directions": 4
+    },
     {
       "name": "spacequartz"
     },
+    {
+      "name": "spacequartz-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "spacequartz-inhand-right",
+      "directions": 4
+    },
     {
       "name": "silver"
     },
+    {
+      "name": "silver-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "silver-inhand-right",
+      "directions": 4
+    },
     {
       "name": "coal"
     },
+    {
+      "name": "coal-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "coal-inhand-right",
+      "directions": 4
+    },
     {
       "name": "salt"
     },
+    {
+      "name": "salt-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "salt-inhand-right",
+      "directions": 4
+    },
     {
       "name": "diamond"
+    },
+    {
+      "name": "diamond-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "diamond-inhand-right",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Materials/parts.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/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Inhands by mubururu_ (github).",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,14 @@
     {
       "name": "rods"
     },
+    {
+      "name": "rods-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "rods-inhand-right",
+      "directions": 4
+    },
     {
       "name": "rods_2"
     },

Resources/Textures/Objects/Materials/silk.rsi/meta.json

@@ -1,12 +1,20 @@
 {
   "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},
   "states":
   [
     {
-      "name": "icon"
+        "name": "icon"
+    },
+    {
+        "name": "silk-inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "silk-inhand-right",
+        "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/meta.json

@@ -63,6 +63,20 @@
     {
       "name": "wand-inhand-right",
 	  "directions": 4
+    },
+    {
+      "name": "locker"
+    },
+    {
+      "name": "locker-effect"
+    },
+    {
+      "name": "locker-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "locker-inhand-left",
+      "directions": 4
     }
   ]
-}
+}

Resources/Textures/Structures/Machines/electric_grill.rsi/meta.json

@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 1,
   "license": "CC0-1.0",
   "copyright": "Original base by deltanedas (github) for SS14. Resprited by (DISCORD)@ps3moira#9488",
   "size": {

Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from  at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b.     poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi.     originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460,     poster63_contraband by discord foboscheshir_,     poster52_legit by SlamBamActionman",
+  "copyright": "Taken from  at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b.     poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi.     originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460,     poster63_contraband by discord foboscheshir_,     poster52_legit by SlamBamActionman,     poster53_legit and the original version by @RCOI on discord.",
   "size": {
     "x": 32,
     "y": 32
@@ -384,6 +384,9 @@
     {
       "name": "poster52_legit"
     },
+    {
+      "name": "poster53_legit"
+    },
     {
       "name": "random_legit"
     },