From 6cacf275e06812d34a24183e265d8814dce0abbd Mon Sep 17 00:00:00 2001 From: fox Date: Sun, 13 Oct 2024 22:16:46 +0300 Subject: [PATCH] More cleanup --- Content.Server/Mail/MailCommands.cs | 2 +- .../VendingMachines/Inventories/courierdrobe.yml | 14 +++++++------- .../DeltaV/Entities/Objects/Specific/Mail/mail.yml | 1 - .../Objects/Specific/Mail/mail_civilian.yml | 1 - 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Content.Server/Mail/MailCommands.cs b/Content.Server/Mail/MailCommands.cs index 124db2f325c..74c8a421780 100644 --- a/Content.Server/Mail/MailCommands.cs +++ b/Content.Server/Mail/MailCommands.cs @@ -108,7 +108,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args) mailComponent.IsFragile = isFragile; mailComponent.IsPriority = isPriority; - mailComponent.IsLarge = isLarge; //Frontier Mail + mailComponent.IsLarge = isLarge; mailSystem.SetupMail(mailUid, teleporterComponent, recipient.Value); diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/courierdrobe.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/courierdrobe.yml index fbbec89a269..778b3725858 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/courierdrobe.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/courierdrobe.yml @@ -7,10 +7,10 @@ CourierBag: 2 ClothingHeadsetCargo: 2 ClothingOuterWinterCargo: 2 - ClothingUniformMailCarrier: 2 # Nyanotrasen - Mail Carrier old gear - ClothingUniformSkirtMailCarrier: 2 # Nyanotrasen - Mail Carrier old gear - ClothingHeadMailCarrier: 2 # Nyanotrasen - Mail Carrier old gear - MailBag: 2 # Nyanotrasen - Mail Carrier old gear - ClothingOuterWinterCoatMail: 2 # Nyanotrasen - Mail Carrier old gear - WeaponMailLake: 2 # Frontier Mail Port - BoxMailCapsulePrimed: 4 # Frontier Mail Port + ClothingUniformMailCarrier: 2 + ClothingUniformSkirtMailCarrier: 2 + ClothingHeadMailCarrier: 2 + MailBag: 2 + ClothingOuterWinterCoatMail: 2 + WeaponMailLake: 2 + BoxMailCapsulePrimed: 4 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml index 25b7ec40803..6f96930078b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml @@ -1,5 +1,4 @@ # DeltaV Mail - - type: entity noSpawn: true parent: BaseMail diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_civilian.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_civilian.yml index aea3131daeb..19a1ee3c536 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_civilian.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_civilian.yml @@ -1,5 +1,4 @@ # Frontier Mail - - type: entity noSpawn: true parent: BaseMailLarge