Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync

# Conflicts:
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml

Resources/Prototypes/Body/Parts/silicon.yml

@@ -29,7 +29,7 @@
 - type: entity
   id: BaseBorgArmLeft
   parent: PartSilicon
-  name: left cyborg arm
+  name: cyborg left arm
   abstract: true
   components:
   - type: BodyPart
@@ -43,7 +43,7 @@
 - type: entity
   id: BaseBorgArmRight
   parent: PartSilicon
-  name: right cyborg arm
+  name: cyborg right arm
   abstract: true
   components:
   - type: BodyPart
@@ -57,7 +57,7 @@
 - type: entity
   id: BaseBorgLegLeft
   parent: PartSilicon
-  name: left cyborg leg
+  name: cyborg left leg
   abstract: true
   components:
   - type: BodyPart
@@ -71,7 +71,7 @@
 - type: entity
   id: BaseBorgLegRight
   parent: PartSilicon
-  name: right cyborg leg
+  name: cyborg right leg
   abstract: true
   components:
   - type: BodyPart