NPC/silicon.yml cleaning (#19731)

Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml

@@ -110,121 +110,72 @@
   - type: GuideHelp
     guides:
     - Robotics
+  - type: Speech
+    speechVerb: Robotic
+  - type: TypingIndicator
+    proto: robot
     
 - type: entity
-  parent: MobSiliconBase
+  parent: [ MobSiliconBase, BaseVehicle]
+  id: MobSiliconBaseVehicle # for vehicles
+  abstract: true
+  components:
+  - type: NoSlip
+  - type: GhostTakeoverAvailable
+  - type: GhostRole
+    makeSentient: true
+  - type: UnpoweredFlashlight
+    toggleAction:
+      name: action-name-toggle-light
+      description: action-description-toggle-light
+      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
+      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
+      event: !type:ToggleActionEvent
+  - type: PointLight
+    enabled: false
+    radius: 3.5
+    softness: 2
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+    
+- type: entity
+  parent: MobSiliconBaseVehicle
   id: MobTaxiBot
   name: taxibot
   description: Give a ride?
   components:
-  - type: NoSlip
   - type: Sprite
-    drawdepth: Mobs
     sprite: Mobs/Silicon/Bots/taxibot.rsi
     layers:
     - state: taxibot
       map: ["enum.VehicleVisualLayers.AutoAnimate"]
-    noRot: true
-  - type: IntrinsicRadioReceiver
-  - type: ActiveRadio
-    channels:
-    - Common
   - type: GhostRole
-    makeSentient: true
     name: ghost-role-information-taxibot-name
     description: ghost-role-information-taxibot-description
-  - type: GhostTakeoverAvailable
-  - type: MovementSpeedModifier
-    weightlessModifier: 0
-    acceleration: 2
-    friction: 2
-    frictionNoInput: 6
-    baseWalkSpeed: 3
-    baseSprintSpeed: 6
   - type: Strap
     buckleOffset: "0, 0"
     maxBuckleDistance: 1
-  - type: Speech
-    speechVerb: Robotic
-  - type: AmbientSound
-    sound: "/Audio/Effects/Vehicle/vehicleengineidle.ogg"
-    range: 10
-    volume: -10
-    enabled: true
   - type: Construction
     graph: TaxiBot
     node: bot
-  - type: UnpoweredFlashlight
-    toggleAction:
-      name: action-name-toggle-light
-      description: action-description-toggle-light
-      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
-      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
-      event: !type:ToggleActionEvent
-  - type: PointLight
-    enabled: false
-    radius: 3.5
-    softness: 2
-    mask: /Textures/Effects/LightMasks/cone.png
-    autoRot: true
-  - type: TypingIndicator
-    proto: robot
 
 - type: entity
-  parent: MobSiliconBase
+  parent: MobSiliconBaseVehicle
   id: MobSupplyBot
   name: supplybot
   description: Delivers cargo!
   components:
-  - type: NoSlip
   - type: Sprite
-    drawdepth: Mobs
     sprite: Mobs/Silicon/Bots/supplybot.rsi
     layers:
     - state: supplybot
       map: ["enum.VehicleVisualLayers.AutoAnimate"]
-    noRot: true
-  - type: IntrinsicRadioReceiver
-  - type: ActiveRadio
-    channels:
-    - Common
   - type: GhostRole
-    makeSentient: true
     name: ghost-role-information-supplybot-name
     description: ghost-role-information-supplybot-description
-  - type: GhostTakeoverAvailable
-  - type: MovementSpeedModifier
-    weightlessModifier: 0
-    acceleration: 2
-    friction: 2.2
-    frictionNoInput: 6.5
-    baseWalkSpeed: 3
-    baseSprintSpeed: 6
-  - type: AmbientSound
-    sound: "/Audio/Effects/Vehicle/vehicleengineidle.ogg"
-    range: 10
-    volume: -10
-    enabled: true
-  - type: Speech
-    speechVerb: Robotic
   - type: Construction
     graph: SupplyBot
     node: bot
-  - type: UnpoweredFlashlight
-    toggleAction:
-      name: action-name-toggle-light
-      description: action-description-toggle-light
-      icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
-      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
-      event: !type:ToggleActionEvent
-  - type: PointLight
-    enabled: false
-    radius: 3.5
-    softness: 2
-    mask: /Textures/Effects/LightMasks/cone.png
-    autoRot: true
-  - type: TypingIndicator
-    proto: robot
   - type: Storage
     capacity: 250
   - type: UserInterface
@@ -246,7 +197,6 @@
     sound:
       collection: BikeHorn
   - type: Sprite
-    drawdepth: Mobs
     sprite: Mobs/Silicon/Bots/honkbot.rsi
     state: honkbot
   - type: Slippery
@@ -295,11 +245,7 @@
     sound:
       collection: CluwneHorn
   - type: Sprite
-    drawdepth: Mobs
-    sprite: Mobs/Silicon/Bots/honkbot.rsi
     state: jonkbot
-  - type: Slippery
-    launchForwardsMultiplier: 2
   - type: Construction
     graph: JonkBot
     node: bot
@@ -328,7 +274,6 @@
   description: The creep of automation now threatening space janitors.
   components:
   - type: Sprite
-    drawdepth: Mobs
     sprite: Mobs/Silicon/Bots/cleanbot.rsi
     state: cleanbot
   - type: Construction
@@ -385,11 +330,8 @@
     emergencyMed: SpaceDrugs
     emergencyMedAmount: 25
   - type: Sprite
-    drawdepth: Mobs
     sprite: Mobs/Silicon/Bots/medibot.rsi
     state: medibot
-  - type: Speech
-    speechVerb: Robotic
   - type: HTN
     rootTask:
       task: MedibotCompound
@@ -417,7 +359,6 @@
     - key: enum.StrippingUiKey.Key
       type: StrippableBoundUserInterface
   - type: Sprite
-    drawdepth: Mobs
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: mimebot

Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml

@@ -2,19 +2,12 @@
   id: BaseVehicle
   save: false
   abstract: true
-  name: Vehicle
   components:
-  - type: Strap
-    buckleOffset: "0.10, 0.36"
-    maxBuckleDistance: 1
   - type: AmbientSound
     sound: "/Audio/Effects/Vehicle/vehicleengineidle.ogg"
     range: 10
     volume: -10
     enabled: false
-  - type: InputMover
-  - type: InteractionOutline
-  - type: Vehicle
   - type: MovementSpeedModifier
     weightlessModifier: 0
     acceleration: 2
@@ -22,24 +15,6 @@
     frictionNoInput: 6
     baseWalkSpeed: 4.5
     baseSprintSpeed: 6
-  - type: Tag
-  - type: Pullable
-  - type: Physics
-    bodyType: KinematicController
-  - type: Clickable
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.4
-        density: 360
-        restitution: 0.0
-        mask:
-        - MobMask
-        layer:
-        - TableLayer
-  - type: Appearance
   - type: Repairable
     fuelcost: 20
     doAfterDelay: 20
@@ -64,6 +39,36 @@
         sound:
           path: /Audio/Effects/metalbreak.ogg
       - !type:ExplodeBehavior
+  
+- type: entity
+  parent: BaseVehicle
+  id: BaseVehicleRideable
+  abstract: true
+  name: Vehicle
+  components:
+  - type: Strap
+    buckleOffset: "0.10, 0.36"
+    maxBuckleDistance: 1
+  - type: InputMover
+  - type: InteractionOutline
+  - type: Vehicle
+  - type: Pullable
+  - type: Physics
+    bodyType: KinematicController
+  - type: Clickable
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.4
+        density: 360
+        restitution: 0.0
+        mask:
+        - MobMask
+        layer:
+        - TableLayer
+  - type: Appearance
   - type: ItemSlots
     slots:
       key_slot: #this slot name is important
@@ -79,10 +84,9 @@
   - type: StaticPrice
     price: 750 # Grand Theft Auto.
 
-
 - type: entity
   id: VehicleJanicart
-  parent: BaseVehicle
+  parent: BaseVehicleRideable
   name: janicart
   description: The janitor's trusty steed.
   components:
@@ -172,7 +176,7 @@
 
 - type: entity
   id: VehicleSecway
-  parent: BaseVehicle
+  parent: BaseVehicleRideable
   name: secway
   description: The future of transportation. Popularized by St. James, the patron saint of security officers and internet forum moderators.
   components:
@@ -219,7 +223,7 @@
             volume: -3
 
 - type: entity
-  parent: BaseVehicle
+  parent: BaseVehicleRideable
   id: VehicleATV
   name: ATV
   description: All-Tile Vehicle.
@@ -274,7 +278,7 @@
 
 - type: entity
   id: VehicleSyndicateSegway
-  parent: BaseVehicle
+  parent: BaseVehicleRideable
   name: syndicate segway
   description: Be an enemy of the corporation, in style.
   components:
@@ -316,7 +320,7 @@
               volume: -3
 
 - type: entity
-  parent: BaseVehicle
+  parent: BaseVehicleRideable
   id: VehicleSkeletonMotorcycle
   name: skeleton motorcycle
   description: Bad to the Bone.
@@ -369,7 +373,7 @@
 
 - type: entity
   id: VehicleUnicycle
-  parent: [BaseVehicle, BaseFoldable, BaseItem]
+  parent: [BaseVehicleRideable, BaseFoldable, BaseItem]
   name: unicycle
   description: It only has one wheel!
   components:
@@ -429,7 +433,7 @@
 
 - type: entity
   id: VehicleWheelchair
-  parent: [BaseVehicle, BaseFoldable, BaseItem]
+  parent: [BaseVehicleRideable, BaseFoldable, BaseItem]
   name: Wheelchair
   description: A chair with big wheels. It looks like you can move in these on your own.
   components: