Skip to content

Devil Antag - Mindshield no long stops deals #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SyaoranFox merged 5 commits into from
Mar 22, 2026
Merged

Devil Antag - Mindshield no long stops deals #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8fb8f4
Disables Mindshields stopping devil deals
Raikyr0 Mar 1, 2026
97b111e
Update captain.yml
Raikyr0 Mar 1, 2026
5b94002
Merge branch 'Floof-Station:master' into DealWithTheDevil
Raikyr0 Mar 1, 2026
bd2251a
Update chaplain.yml
Raikyr0 Mar 1, 2026
7a3b591
Merge branch 'Floof-Station:master' into DealWithTheDevil
Raikyr0 Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,12 +243,13 @@ public bool IsUserValid(EntityUid user, out string failReason)
return false;
}

if (HasComp<MindShieldComponent>(user)
&& !HasComp<DevilComponent>(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<MindShieldComponent>(user)
// && !HasComp<DevilComponent>(user))
//{
// failReason = Loc.GetString("devil-contract-mind-shielded-failed");
// return false;
//}

if (HasComp<PossessedComponent>(user))
{
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Command/captain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading