diff --git a/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs b/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs index 702a93205a0..8aa852891a0 100644 --- a/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs +++ b/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs @@ -243,12 +243,13 @@ public bool IsUserValid(EntityUid user, out string failReason) return false; } - if (HasComp(user) - && !HasComp(user)) - { - failReason = Loc.GetString("devil-contract-mind-shielded-failed"); - return false; - } + // Euphoria - Changed so Mindshield don't stop devil deals as the company doesn't own your soul + //if (HasComp(user) + // && !HasComp(user)) + //{ + // failReason = Loc.GetString("devil-contract-mind-shielded-failed"); + // return false; + //} if (HasComp(user)) { diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 6ea13afbc4e..00b681f6dcf 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -15,8 +15,8 @@ - !type:AddComponentSpecial components: - type: BibleUser #Lets them heal with bibles - - type: Condemned - soulOwnedNotDevil: true # This just means they won't suffer the effects of being condemned, while still not being able to sell their soul. - Goobstation + #- type: Condemned + # soulOwnedNotDevil: true # This just means they won't suffer the effects of being condemned, while still not being able to sell their soul. - Goobstation - type: PsionicBonusChance # DeltaV - makes it more likely to become psionic. multiplier: 3 diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 23ef3f418e4..72b2d9bc375 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -37,8 +37,8 @@ - type: CommandStaff - type: PsionicBonusChance # DeltaV - makes it more likely to become psionic. flatBonus: 0.025 - - type: Condemned # Goobstation - Nanotrasen owns your soul pal. - soulOwnedNotDevil: true + #- type: Condemned # Goobstation - Nanotrasen owns your soul pal. + # soulOwnedNotDevil: true - type: startingGear id: CaptainGear