Mothership Core Prototype Cleanup (#40410)

* I cannot escape bodysystem no matter how hard I try

* Move 2 things

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

diff --git a/Resources/Prototypes/Body/Prototypes/Specific/mothershipcore.yml b/Resources/Prototypes/Body/Prototypes/Specific/mothershipcore.yml
deleted file mode 100644 (file)
index 234f950..0000000
--- a/Resources/Prototypes/Body/Prototypes/Specific/mothershipcore.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-- type: body
-  id: MothershipCoreBody
-  name: "core"
-  root: torso
-  slots:
-    torso:
-      part: TorsoBorg
-      connections:
-      - right2hand
-      - right1hand
-      - left1hand
-      - left2hand
-    left1hand:
-      part: LeftArmBorg
-    left2hand:
-      part: LeftArmBorg
-    right1hand:
-      part: RightArmBorg
-    right2hand:
-      part: RightArmBorg

diff --git a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
index 1d989a462c615ef55ae931cfb9e60817e79d07c6..fc15fe0c0b55f1fade6d2731c342056ef3963010 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
@@ -5,9 +5,7 @@
   - Omnitool
 
 - type: entity
-  parent:
-  - BaseMachinePowered
-  - BaseMob
+  parent: [ BaseControllable, BaseMachinePowered ]
   id: MothershipCore
   name: mothership core
   description: A sentient machine that can produce Xenoborgs. Without this the Xenoborgs are doomed.
@@ -163,9 +161,21 @@
   - type: NpcFactionMember
     factions:
     - Xenoborg
-  - type: Body
-    prototype: MothershipCoreBody
   - type: Hands
+    hands:
+      hand_right1:
+        location: Right
+      hand_right2:
+        location: Right
+      hand_left1:
+        location: Left
+      hand_left2:
+        location: Left
+    sortedHands:
+    - hand_right1
+    - hand_right2
+    - hand_left1
+    - hand_left2
   # - type: Puller # use the conveyor
   - type: Eye
     drawFov: false

diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index a0b2da3975410bce0f4337703935cb3cc52bc711..e2e918152a584c55ebbd722dc7ae9270545b2de6 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -1,17 +1,14 @@
-# The progenitor. This should only container the most basic components possible.
-# Only put things on here if every mob *must* have it. This includes ghosts.
+# The literal bare minimum needed to be a controllable mob. Cannot move but can interact.
 - type: entity
-  save: false
-  id: BaseMob
   abstract: true
+  save: false
+  id: BaseControllable
   components:
   - type: Sprite
     noRot: true
     drawdepth: Mobs
-  - type: MobCollision
   - type: GravityAffected
   - type: Physics
-    bodyType: KinematicController
   - type: Fixtures
     fixtures:
       fix1:
@@ -25,11 +22,8 @@
         - MobLayer
   - type: Clickable
   - type: InteractionOutline
-  - type: InputMover
   - type: Input
     context: "human"
-  - type: LagCompensation
-  - type: MobMover
   - type: Actions
   - type: Alerts
   - type: Appearance
@@ -42,10 +36,24 @@
   - type: ContentEye
   - type: CameraRecoil
   - type: MindContainer
-  - type: MovementSpeedModifier
   - type: RequireProjectileTarget
     active: False
-  - type: StunVisuals
+
+# The progenitor. This should only container the most basic components possible.
+# Only put things on here if every mob *must* have it. This includes ghosts.
+- type: entity
+  abstract: true
+  save: false
+  parent: BaseControllable
+  id: BaseMob
+  components:
+  - type: MobCollision
+  - type: Physics
+    bodyType: KinematicController
+  - type: InputMover
+  - type: MobMover
+  - type: MovementSpeedModifier
+  - type: LagCompensation
 
 - type: entity
   save: false
@@ -102,6 +110,7 @@
       - !type:VomitBehavior
   - type: RadiationReceiver
   - type: Stamina
+  - type: StunVisuals
   - type: MobState
   - type: MobThresholds
     thresholds: