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

# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml

Resources/Prototypes/Recipes/Crafting/bots.yml

@@ -62,3 +62,16 @@
   icon:
     sprite: Mobs/Silicon/Bots/mimebot.rsi
     state: mimebot
+
+- type: construction
+  name: supplybot
+  id: supplybot
+  graph: SupplyBot
+  startNode: start
+  targetNode: bot
+  category: construction-category-utilities
+  objectType: Item
+  description: This bot can be loaded with cargo to make deliveries.
+  icon:
+    sprite: Mobs/Silicon/Bots/supplybot.rsi
+    state: supplybot

Resources/Prototypes/Recipes/Lathes/clothing.yml

@@ -217,6 +217,22 @@
     Cloth: 300
     Durathread: 100
 
+- type: latheRecipe
+  id: ClothingUniformJumpsuitCMOTurtle
+  result: ClothingUniformJumpsuitCMOTurtle
+  completetime: 4
+  materials:
+    Cloth: 300
+    Durathread: 100
+
+- type: latheRecipe
+  id: ClothingUniformJumpskirtCMOTurtle
+  result: ClothingUniformJumpskirtCMOTurtle
+  completetime: 4
+  materials:
+    Cloth: 300
+    Durathread: 100
+
 - type: latheRecipe
   id: ClothingUniformJumpsuitDetective
   result: ClothingUniformJumpsuitDetective