From b490a46aee5057ce84bc8202eae4ec3bac09d056 Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Tue, 2 Jan 2024 19:15:29 +1100
Subject: [PATCH] Remove salvage mobs being able to be ghost roles. (#23355)

add
---
 .../Prototypes/Entities/Mobs/NPCs/space.yml   | 34 +------------------
 .../Entities/Mobs/NPCs/spacetick.yml          |  8 -----
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 9d63f4717103..5df535116130 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: basic
   id: MobSpaceBasic
   parent: SimpleSpaceMobBase
@@ -110,20 +110,12 @@
     interactFailureString: petting-failure-bear
     interactSuccessSound:
       path: /Audio/Animals/sloth_squeak.ogg
-  - type: GhostRole
-    prob: 0.25
-    name: ghost-role-information-space-bear-name
-    description: ghost-role-information-space-bear-description
 
 - type: entity
   id: MobBearSpaceSalvage
   parent: MobBearSpace
   suffix: "Salvage Ruleset"
   components:
-  - type: GhostRole
-    prob: 0.25
-    name: ghost-role-information-salvage-bear-name
-    description: ghost-role-information-salvage-bear-description
   - type: SalvageMobRestrictions
 
 - type: entity
@@ -181,20 +173,12 @@
     interfaces:
     - key: enum.StrippingUiKey.Key
       type: StrippableBoundUserInterface
-  - type: GhostRole
-    prob: 0.25
-    name: ghost-role-information-space-kangaroo-name
-    description: ghost-role-information-space-kangaroo-description
 
 - type: entity
   id: MobKangarooSpaceSalvage
   parent: MobKangarooSpace
   suffix: "Salvage Ruleset"
   components:
-  - type: GhostRole
-    prob: 0.25
-    name: ghost-role-information-salvage-kangaroo-name
-    description: ghost-role-information-salvage-kangaroo-description
   - type: SalvageMobRestrictions
 
 - type: entity
@@ -276,10 +260,6 @@
     color: "#4faffb"
   - type: NoSlip
   - type: IgnoreSpiderWeb
-  - type: GhostRole
-    prob: 0.30
-    name: ghost-role-information-space-spider-name
-    description: ghost-role-information-space-spider-description
   - type: Speech
     speechVerb: Arachnid
 
@@ -288,10 +268,6 @@
   parent: MobSpiderSpace
   suffix: "Salvage Ruleset"
   components:
-  - type: GhostRole
-    prob: 0.30
-    name: ghost-role-information-salvage-spider-name
-    description: ghost-role-information-salvage-spider-description
   - type: SalvageMobRestrictions
 
 - type: entity
@@ -377,10 +353,6 @@
       radius: 1.1
       energy: 1.5
       color: "#4faffb"
-    - type: GhostRole
-      prob: 0.25
-      name: ghost-role-information-space-cobra-name
-      description: ghost-role-information-space-cobra-description
     - type: Stealth
       enabledOnDeath: false
       maxVisibility: 1.2
@@ -393,8 +365,4 @@
   parent: MobCobraSpace
   suffix: "Salvage Ruleset"
   components:
-    - type: GhostRole
-      prob: 0.25
-      name: ghost-role-information-salvage-cobra-name
-      description: ghost-role-information-salvage-cobra-description
     - type: SalvageMobRestrictions
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
index 5f87c4c6a9b1..3521af272511 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -74,11 +74,6 @@
           Quantity: 5
   - type: MeleeChemicalInjector
     solution: melee
-  - type: GhostRole
-    prob: 0.33
-    makeSentient: true
-    name: ghost-role-information-space-tick-name
-    description: ghost-role-information-space-tick-description
   - type: GhostTakeoverAvailable
   - type: ReplacementAccent
     accent: genericAggressive
@@ -91,9 +86,6 @@
   parent: MobTick
   suffix: "Salvage Ruleset"
   components:
-  - type: GhostRole
-    name: ghost-role-information-salvage-tick-name
-    description: ghost-role-information-salvage-tick-description
   - type: GhostTakeoverAvailable
   - type: SalvageMobRestrictions