diff --git a/Content.Server/Nyanotrasen/Mail/Components/MailComponent.cs b/Content.Server/Nyanotrasen/Mail/Components/MailComponent.cs index dba91a3e563..0f1bef40277 100644 --- a/Content.Server/Nyanotrasen/Mail/Components/MailComponent.cs +++ b/Content.Server/Nyanotrasen/Mail/Components/MailComponent.cs @@ -75,7 +75,7 @@ public sealed partial class MailComponent : SharedMailComponent /// The amount that cargo will be awarded for delivering this mail. /// [DataField("bounty")] - public int Bounty = 750; + public int Bounty = 7500; // Frontier 750<7500 /// /// Penalty if the mail is destroyed. diff --git a/Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs b/Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs index cec1f845121..73cd6d93b4f 100644 --- a/Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs +++ b/Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs @@ -12,10 +12,10 @@ public sealed partial class MailTeleporterComponent : Component // Not starting accumulator at 0 so mail carriers have some deliveries to make shortly after roundstart. [DataField("accumulator")] - public float Accumulator = 285f; + public float Accumulator = 1995f; // Frontier 285*7=1995 [DataField("teleportInterval")] - public TimeSpan TeleportInterval = TimeSpan.FromMinutes(5); + public TimeSpan TeleportInterval = TimeSpan.FromMinutes(35); /// /// The sound that's played when new mail arrives. @@ -72,7 +72,7 @@ public sealed partial class MailTeleporterComponent : Component /// What's the bonus for delivering a fragile package intact? /// [DataField("fragileBonus")] - public int FragileBonus = 200; + public int FragileBonus = 2000; // Frontier 200<2000 /// /// What's the malus for failing to deliver a fragile package? @@ -91,13 +91,13 @@ public sealed partial class MailTeleporterComponent : Component /// if not delivered? /// [DataField("priorityDuration")] - public TimeSpan priorityDuration = TimeSpan.FromMinutes(15); + public TimeSpan priorityDuration = TimeSpan.FromMinutes(45); // Frontier 15<45 /// /// What's the bonus for delivering a priority package on time? /// [DataField("priorityBonus")] - public int PriorityBonus = 500; + public int PriorityBonus = 5000; // Frontier 500<5000 /// /// What's the malus for failing to deliver a priority package? diff --git a/Content.Server/Nyanotrasen/Mail/MailSystem.cs b/Content.Server/Nyanotrasen/Mail/MailSystem.cs index ffb173acdf4..8169e1e06b0 100644 --- a/Content.Server/Nyanotrasen/Mail/MailSystem.cs +++ b/Content.Server/Nyanotrasen/Mail/MailSystem.cs @@ -230,8 +230,8 @@ private void OnAfterInteractUsing(EntityUid uid, MailComponent component, AfterI return; } - //_popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward", ("bounty", component.Bounty)), uid, args.User); - _popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward"), uid, args.User); // Frontier - Remove the mention of station income + _popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward", ("bounty", component.Bounty)), uid, args.User); + //_popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward"), uid, args.User); // Frontier - Remove the mention of station income component.IsProfitable = false; diff --git a/Resources/Locale/en-US/nyanotrasen/mail.ftl b/Resources/Locale/en-US/nyanotrasen/mail.ftl index 36d5ec771d2..99dc2431fdd 100644 --- a/Resources/Locale/en-US/nyanotrasen/mail.ftl +++ b/Resources/Locale/en-US/nyanotrasen/mail.ftl @@ -9,7 +9,7 @@ mail-desc-priority = The anti-tamper lock's [color=yellow]yellow priority tape[/ mail-desc-priority-inactive = The anti-tamper lock's [color=#886600]yellow priority tape[/color] is inactive. mail-unlocked = Anti-tamper system unlocked. mail-unlocked-by-emag = Anti-tamper system *BZZT*. -mail-unlocked-reward = Anti-tamper system unlocked. +mail-unlocked-reward = Anti-tamper system unlocked. {$bounty} spesos have been added to Frontier account. mail-penalty-lock = ANTI-TAMPER LOCK BROKEN. STATION BANK ACCOUNT PENALIZED BY {$credits} SPESOS. mail-penalty-fragile = INTEGRITY COMPROMISED. STATION BANK ACCOUNT PENALIZED BY {$credits} SPESOS. mail-penalty-expired = DELIVERY PAST DUE. STATION BANK ACCOUNT PENALIZED BY {$credits} SPESOS. diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml index b2ed0955602..90b8ee15ff2 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml @@ -5,7 +5,8 @@ name: mail-item-name-unaddressed components: - type: Item - size: Normal +# size: Normal # Frontier + storedRotation: -90 - type: Mail - type: AccessReader - type: Sprite @@ -19,8 +20,8 @@ map: ["enum.MailVisualLayers.FragileStamp"] visible: false - map: ["enum.MailVisualLayers.JobStamp"] - scale: 0.5, 0.5 - offset: 0.275, 0.2 + scale: 0.8, 0.8 # Frontier 0.5<0.8 + offset: 0.225, 0.165 # Frontier (0.275, 0.2)<(0.225, 0.165) - state: locked map: ["enum.MailVisualLayers.Lock"] - state: priority @@ -92,7 +93,7 @@ damage: types: Blunt: 10 - - type: CargoSellBlacklist + - type: CargoSellBlacklist # Frontier - type: Food # Frontier - Moth food requiresSpecialDigestion: true - type: SolutionContainerManager