diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml
index 6df0488e28f..39ec468f8d2 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml
@@ -501,3 +501,183 @@
     tags:
     - Trash
     - BorgServiceTorso
+
+# peace parts
+- type: entity
+  id: LeftArmBorgPeace
+  parent: BaseBorgArmLeft
+  name: peace cyborg left arm
+  components:
+    - type: Sprite
+      state: peace_l_arm
+    - type: Icon
+      state: peace_l_arm
+    - type: Tag
+      tags:
+        - Trash
+        - BorgArm
+        - BorgPeaceLArm
+
+- type: entity
+  id: RightArmBorgPeace
+  parent: BaseBorgArmRight
+  name: peace cyborg right arm
+  components:
+    - type: Sprite
+      state: peace_r_arm
+    - type: Icon
+      state: peace_r_arm
+    - type: Tag
+      tags:
+        - Trash
+        - BorgArm
+        - BorgPeaceRArm
+
+- type: entity
+  id: LeftLegBorgPeace
+  parent: BaseBorgLegLeft
+  name: peace cyborg left leg
+  components:
+    - type: Sprite
+      state: peace_l_leg
+    - type: Icon
+      state: peace_l_leg
+    - type: Tag
+      tags:
+        - Trash
+        - BorgLeg
+        - BorgPeaceLLeg
+
+- type: entity
+  id: RightLegBorgPeace
+  parent: BaseBorgLegRight
+  name: peace cyborg right leg
+  components:
+    - type: Sprite
+      state: peace_r_leg
+    - type: Icon
+      state: peace_r_leg
+    - type: Tag
+      tags:
+        - Trash
+        - BorgLeg
+        - BorgPeaceRLeg
+
+- type: entity
+  id: HeadBorgPeace
+  parent: BaseBorgHead
+  name: peace cyborg head
+  components:
+    - type: Sprite
+      state: peace_head
+    - type: Icon
+      state: peace_head
+    - type: Tag
+      tags:
+        - Trash
+        - BorgHead
+        - BorgPeaceHead
+
+- type: entity
+  id: TorsoBorgPeace
+  parent: BaseBorgTorso
+  name: peace cyborg torso
+  components:
+    - type: Sprite
+      state: peace_chest
+    - type: Icon
+      state: peace_chest
+    - type: Tag
+      tags:
+        - Trash
+        - BorgPeaceTorso
+        
+# clown parts
+- type: entity
+  id: LeftArmBorgClown
+  parent: BaseBorgArmLeft
+  name: clown cyborg left arm
+  components:
+    - type: Sprite
+      state: peace_l_arm
+    - type: Icon
+      state: peace_l_arm
+    - type: Tag
+      tags:
+        - Trash
+        - BorgArm
+        - BorgClownLArm
+
+- type: entity
+  id: RightArmBorgClown
+  parent: BaseBorgArmRight
+  name: clown cyborg right arm
+  components:
+    - type: Sprite
+      state: peace_r_arm
+    - type: Icon
+      state: peace_r_arm
+    - type: Tag
+      tags:
+        - Trash
+        - BorgArm
+        - BorgClownRArm
+
+- type: entity
+  id: LeftLegBorgClown
+  parent: BaseBorgLegLeft
+  name: clown cyborg left leg
+  components:
+    - type: Sprite
+      state: peace_l_leg
+    - type: Icon
+      state: peace_l_leg
+    - type: Tag
+      tags:
+        - Trash
+        - BorgLeg
+        - BorgClownLLeg
+
+- type: entity
+  id: RightLegBorgClown
+  parent: BaseBorgLegRight
+  name: clown cyborg right leg
+  components:
+    - type: Sprite
+      state: peace_r_leg
+    - type: Icon
+      state: peace_r_leg
+    - type: Tag
+      tags:
+        - Trash
+        - BorgLeg
+        - BorgClownRLeg
+
+- type: entity
+  id: HeadBorgClown
+  parent: BaseBorgHead
+  name: clown cyborg head
+  components:
+    - type: Sprite
+      state: peace_head
+    - type: Icon
+      state: peace_head
+    - type: Tag
+      tags:
+        - Trash
+        - BorgHead
+        - BorgClownHead
+
+- type: entity
+  id: TorsoBorgClown
+  parent: BaseBorgTorso
+  name: clown cyborg torso
+  components:
+    - type: Sprite
+      state: peace_chest
+    - type: Icon
+      state: peace_chest
+    - type: Tag
+      tags:
+        - Trash
+        - BorgClownTorso
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
index 9261e06ea2a..018883d236e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
@@ -166,6 +166,54 @@
         whitelist:
           tags:
             - BorgJanitorTorso
+      peace_l_arm+o:
+        whitelist:
+          tags:
+            - BorgPeaceLArm
+      peace_r_arm+o:
+        whitelist:
+          tags:
+            - BorgPeaceRArm
+      peace_l_leg+o:
+        whitelist:
+          tags:
+            - BorgPeaceLLeg
+      peace_r_leg+o:
+        whitelist:
+          tags:
+            - BorgPeaceRLeg
+      peace_head+o:
+        whitelist:
+          tags:
+            - BorgPeaceHead
+      peace_chest+o:
+        whitelist:
+          tags:
+            - BorgPeaceTorso
+      clown_l_arm+o:
+        whitelist:
+          tags:
+            - BorgClownLArm
+      clown_r_arm+o:
+        whitelist:
+          tags:
+            - BorgClownRArm
+      clown_l_leg+o:
+        whitelist:
+          tags:
+            - BorgClownLLeg
+      clown_r_leg+o:
+        whitelist:
+          tags:
+            - BorgClownRLeg
+      clown_head+o:
+        whitelist:
+          tags:
+            - BorgClownHead
+      clown_chest+o:
+        whitelist:
+          tags:
+            - BorgClownTorso
   - type: ContainerContainer
     containers:
       part-container: !type:Container
@@ -212,6 +260,20 @@
       - BorgMiningRLeg
       - BorgMiningHead
       - BorgMiningTorso
+      peace:
+      - BorgPeaceLArm
+      - BorgPeaceRArm
+      - BorgPeaceLLeg
+      - BorgPeaceRLeg
+      - BorgPeaceHead
+      - BorgPeaceTorso
+      clown:
+      - BorgClownLArm
+      - BorgClownRArm
+      - BorgClownLLeg
+      - BorgClownRLeg
+      - BorgClownHead
+      - BorgClownTorso
   - type: Construction
     graph: Cyborg
     node: start
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index a0490fa15ac..d61acb713e0 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -146,6 +146,42 @@
 
 - type: Tag
   id: BorgMedicalTorso
+  
+- type: Tag
+  id: BorgPeaceHead
+
+- type: Tag
+  id: BorgPeaceLArm
+
+- type: Tag
+  id: BorgPeaceLLeg
+
+- type: Tag
+  id: BorgPeaceRArm
+
+- type: Tag
+  id: BorgPeaceRLeg
+
+- type: Tag
+  id: BorgPeaceTorso
+  
+- type: Tag
+  id: BorgClownHead
+
+- type: Tag
+  id: BorgClownLArm
+
+- type: Tag
+  id: BorgClownLLeg
+
+- type: Tag
+  id: BorgClownRArm
+
+- type: Tag
+  id: BorgClownRLeg
+
+- type: Tag
+  id: BorgClownTorso
 
 - type: Tag
   id: BorgMiningHead