Merge pull request #1158 from walksanatora/corgi-inventory

switch borgis and smart-corgi to use upstream's version and cleanup b…

Author: Happyrobot33

Resources/Prototypes/Body/Prototypes/Animal/borgi.yml

@@ -21,20 +21,10 @@
     revertOnCrit: true
     revertOnDeath: true
 
-- type: polymorph
-  id: CorgiMorph
-  configuration:
-    entity: SmartCorgi
-    forced: false
-    inventory: Drop
-    transferName: true
-    revertOnCrit: false
-    revertOnDeath: false
-    allowRepeatedMorphs: false
 - type: polymorph
   id: PermanentCorgiMorph
   configuration:
-    entity: SmartCorgi
+    entity: MobCorgiSmart
     forced: true
     inventory: Drop
     transferName: true

…plates/smartcorgi_inventory_template.yml …plates/smartcorgi_inventory_template.ymlResources/Prototypes/_StarLight/InventoryTemplates/smartcorgi_inventory_template.yml renamed to Resources/Prototypes/InventoryTemplates/smartcorgi_inventory_template.yml Resources/Prototypes/_StarLight/InventoryTemplates/smartcorgi_inventory_template.yml renamed to Resources/Prototypes/InventoryTemplates/smartcorgi_inventory_template.yml

@@ -10,7 +10,7 @@
     - SubwooferBorgiChassis
     - BaseStationBorgiChassis
     - StationBorgiChassis
-    - SmartCorgi
+    - MobCorgiSmart
 
 - type: entity
   parent: RehydratableAnimalCube
@@ -20,4 +20,4 @@
   components:
   - type: Rehydratable
     possibleSpawns:
-    - ShadowBorgiChassis
+    - ShadowBorgiChassis

Resources/Prototypes/Polymorphs/polymorph.yml

@@ -1,23 +1,16 @@
 - type: entity
   abstract: true
-  parent: MobAdmemeCorgi
+  parent: MobCorgiSmart
   id: BaseBorgiChassis
   save: false
   components:
   - type: RandomMetadata
     nameSegments:
     - NamesBorgi
   - type: ShowJobIcons
-  - type: Reactive
-    groups:
-      Acidic: [Touch]
   - type: DamageOnHighSpeedImpact
-    damage:
-      types:
-        Blunt: 5
     soundHit:
       collection: MetalThud
-  - type: CombatMode
   - type: Instrument # All borgi have an instrument, however only a few can access it
     allowPercussion: false
     handheld: false
@@ -41,33 +34,8 @@
       map: ["enum.BorgVisualLayers.LightStatus"]
       shader: unshaded
       visible: false
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.35
-        density: 50
-        mask:
-        - MobMask
-        layer:
-        - MobLayer
-  - type: RotationVisuals
-    defaultRotation: 90
-    horizontalRotation: 180
-  - type: MobState
-    allowedStates:
-    - Alive
-    - Critical
-    - Dead
   - type: MobThresholds
-    thresholds:
-      0: Alive
-      100: Critical
-      200: Dead
     showOverlays: false
-    allowRevives: true
   - type: Destructible
     thresholds:
     - trigger:
@@ -121,14 +89,6 @@
     - CanPilot
     - AnomalyHost
     - DoorBumpOpener
-  - type: Storage
-    clickInsert: false
-    openOnActivate: false
-    grid:
-    - 0,0,3,3
-    maxItemSize: Huge
-  - type: Body
-    prototype: BodySmartCorgi
   - type: ActivatableUI
     key: enum.BorgUiKey.Key
   - type: SiliconLawBound
@@ -137,16 +97,6 @@
   - type: ActionGrant
     actions:
     - ActionViewLaws
-  - type: InteractionPopup
-    interactSuccessString: petting-success-dog
-    interactFailureString: petting-failure-generic
-    interactSuccessSpawn: EffectHearts
-    interactSuccessSound:
-      path: /Audio/Animals/small_dog_bark_happy.ogg
-  - type: Inventory
-    speciesId: dog
-    templateId: smartpetborgi
-    # Borg chassis, to accept MMI and posibrain
   - type: BorgChassis
     maxModules: 4
     moduleWhitelist: