Merge pull request #1295 from dvir001/2024-04-29-MailNo

No mail for pirates
new-frontiers-14 · Apr 29, 2024 · 07ba168 · 07ba168
2 parents b2d2b8c + e1c6927
commit 07ba168
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/Content.Server/Nyanotrasen/Mail/Components/MailDisabledComponent.cs b/Content.Server/Nyanotrasen/Mail/Components/MailDisabledComponent.cs
@@ -0,0 +1,6 @@
+namespace Content.Server.Mail.Components
+{
+    [RegisterComponent]
+    public sealed partial class MailDisabledComponent : Component
+    {}
+}
diff --git a/Content.Server/Nyanotrasen/Mail/MailSystem.cs b/Content.Server/Nyanotrasen/Mail/MailSystem.cs
@@ -74,6 +74,7 @@ public sealed class MailSystem : EntitySystem
         [Dependency] private readonly ItemSystem _itemSystem = default!;
         [Dependency] private readonly MindSystem _mindSystem = default!;
         [Dependency] private readonly MetaDataSystem _metaDataSystem = default!;
+        [Dependency] private readonly IEntityManager _entManager = default!; // Frontier
 
         private ISawmill _sawmill = default!;
 
@@ -579,6 +580,12 @@ public bool TryGetMailRecipientForReceiver(MailReceiverComponent receiver, [NotN
                     return false;
                 }
 
+                if (_entManager.TryGetComponent<MailDisabledComponent>(receiver.Owner, out var antag))
+                {
+                    recipient = null;
+                    return false;
+                }
+
                 var accessTags = access.Tags;
 
                 var mayReceivePriorityMail = !(_mindSystem.GetMind(receiver.Owner) == null);

diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml
@@ -15,6 +15,9 @@
   accessGroups:
   - GeneralAccess
   special:
+  - !type:AddComponentSpecial
+    components:
+    - type: MailDisabled
   - !type:AddImplantSpecial
     implants: [ FreelanceTrackingImplant ]
 

diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml
@@ -16,6 +16,9 @@
   accessGroups:
   - GeneralAccess
   special:
+  - !type:AddComponentSpecial
+    components:
+    - type: MailDisabled
   - !type:AddImplantSpecial
     implants: [ FreelanceTrackingImplant ]
 

diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml
@@ -8,14 +8,17 @@
     - !type:OverallPlaytimeRequirement
       time: 129600 # Frontier - 36 hours
   startingGear: NFPirateFirstMateGear
-  canBeAntag: true
   alwaysUseSpawner: true
+  canBeAntag: true
   icon: "JobIconMercenary" 
   supervisors: job-supervisors-hire
   setPreference: true
   accessGroups:
   - GeneralAccess
   special:
+  - !type:AddComponentSpecial
+    components:
+    - type: MailDisabled
   - !type:AddImplantSpecial
     implants: [ FreelanceTrackingImplant ]