Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-27-04-2024-displacement-upstream

# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

Resources/Prototypes/Recipes/Construction/Graphs/clothing/quiver.yml

@@ -0,0 +1,19 @@
+- type: constructionGraph
+  id: Quiver
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: Quiver
+      steps:
+      - material: Cable
+        amount: 2
+        doAfter: 1
+      - material: Cloth
+        amount: 5
+        doAfter: 2
+      - material: WoodPlank
+        amount: 1
+        doAfter: 2
+  - node: Quiver
+    entity: ClothingBeltQuiver

Resources/Prototypes/Recipes/Construction/clothing.yml

@@ -106,4 +106,15 @@
   category: construction-category-clothing
   description: A pair of sunglasses, modified to have a built-in security HUD.
   icon: { sprite: Clothing/Eyes/Glasses/secglasses.rsi, state: icon }
-  objectType: Item
+  objectType: Item
+
+- type: construction
+  name: quiver
+  id: ClothingBeltQuiver
+  graph: Quiver
+  startNode: start
+  targetNode: Quiver
+  category: construction-category-clothing
+  description: Can hold up to 15 arrows, and fits snug around your waist.
+  icon: { sprite: Clothing/Belt/quiver.rsi, state: icon }
+  objectType: Item

Resources/Prototypes/Recipes/Lathes/devices.yml

@@ -76,7 +76,7 @@
     Steel: 100
     Plastic: 200
     Glass: 100
-    
+
 - type: latheRecipe
   id: SignallerAdvanced
   result: RemoteSignallerAdvanced
@@ -175,6 +175,14 @@
     Plasma: 1500
     Uranium: 150
 
+- type: latheRecipe
+  id: ClothingMaskWeldingGas
+  result: ClothingMaskWeldingGas
+  completetime: 3
+  materials:
+    Steel: 600
+    Glass: 200
+
 - type: latheRecipe
   id: WeaponForceGun
   result: WeaponForceGun