From 557fd29d3bcb1f266bdbcd88fba10e74cc2bacb1 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Thu, 27 May 2021 22:41:07 -0700
Subject: [PATCH] Fix cloning machine and medical scanner pulling

---
 .../Specific/Medical/cloning_machine.yml      | 28 ++++-------------
 .../Specific/Medical/medical_scanner.yml      | 30 ++-----------------
 .../Entities/Constructible/base_machine.yml   | 30 +++++++++++++++++++
 3 files changed, 38 insertions(+), 50 deletions(-)
 create mode 100644 Resources/Prototypes/Entities/Constructible/base_machine.yml

diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml b/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml
index c96ac62bc2..4e597120e2 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml
@@ -1,20 +1,16 @@
 - type: entity
   id: CloningPod
+  parent: BaseMachine
   name: cloning pod
   description: A Cloning Pod. 50% reliable.
-  placement:
-    mode: SnapgridCenter
   components:
+  - type: CloningPod
   - type: Sprite
     netsync: false
     sprite: Constructible/Specific/Medical/cloning.rsi
     layers:
       - state: pod_0
         map: ["enum.CloningPodVisualLayers.Machine"]
-  - type: PowerReceiver
-  - type: Anchorable
-  - type: Clickable
-  - type: InteractionOutline
   - type: Physics
     bodyType: Static
     fixtures:
@@ -23,22 +19,10 @@
           bounds: "-0.5,-0.25,0.5,0.25"
       mass: 25
       layer:
-        - Opaque
-        - Impassable
-        - MobImpassable
-        - VaultImpassable
-  - type: SnapGrid
-  - type: CloningPod
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
+      - SmallImpassable
+      - Opaque
+      mask:
+      - MobMask
   - type: Appearance
     visuals:
       - type: CloningPodVisualizer
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml b/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml
index 7c7d477780..cb1e97a860 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml
@@ -1,10 +1,10 @@
 - type: entity
   id: MedicalScanner
+  parent: BaseMachine
   name: medical scanner
   description: A bulky medical scanner.
-  placement:
-    mode: SnapgridCenter
   components:
+  - type: MedicalScanner
   - type: Sprite
     netsync: false
     noRot: true
@@ -14,32 +14,6 @@
       map: ["enum.MedicalScannerVisualLayers.Machine"]
     - state: idle_unlit
       map: ["enum.MedicalScannerVisualLayers.Terminal"]
-  - type: PowerReceiver
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      mass: 25
-      layer:
-      - Impassable
-      - VaultImpassable
-  - type: SnapGrid
-  - type: Anchorable
-  - type: Pullable
-  - type: MedicalScanner
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
   - type: Appearance
     visuals:
     - type: MedicalScannerVisualizer
diff --git a/Resources/Prototypes/Entities/Constructible/base_machine.yml b/Resources/Prototypes/Entities/Constructible/base_machine.yml
new file mode 100644
index 0000000000..00f3927c80
--- /dev/null
+++ b/Resources/Prototypes/Entities/Constructible/base_machine.yml
@@ -0,0 +1,30 @@
+- type: entity
+  abstract: true
+  parent: BaseConstructible
+  id: BaseMachine
+  components:
+  - type: InteractionOutline
+  - type: Anchorable
+  - type: Pullable
+  - type: PowerReceiver
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
+      mass: 25
+      layer:
+      - MobMask
+      - Opaque
+      mask:
+      - MobMask
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]