Skip to content

Commit

Permalink
Remove salvage mobs being able to be ghost roles. (space-wizards#23355)
Browse files Browse the repository at this point in the history
add
  • Loading branch information
UbaserB authored Jan 2, 2024
1 parent 41465b0 commit b490a46
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 41 deletions.
34 changes: 1 addition & 33 deletions Resources/Prototypes/Entities/Mobs/NPCs/space.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: entity
- type: entity
name: basic
id: MobSpaceBasic
parent: SimpleSpaceMobBase
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
8 changes: 0 additions & 8 deletions Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit b490a46

Please sign in to comment.