-
Notifications
You must be signed in to change notification settings - Fork 414
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Does all the under the hood changes to mail components before I EVEN start thinking about MailSystem * Mail Handheld Rapid Parcel Delivery System (#974) * Mail RPDS * removed sizes, more items go in capsules * fixed error * capsule resprite, added it to service techfab * Update after upstream merge * glass * Update frontier.yml * tag fix --------- Co-authored-by: Dvir <dvirf01@gmail.com> * Mail Buff (#1473) * MailUp * Update base_mail.yml * Update base_mail.yml * Update MailTeleporterComponent.cs * Update MailComponent.cs * Update base_mail.yml * Update base_mail.yml * Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml Sure Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Mail table rework (#1477) * Mail table, system for smoke prank * Format mail messages * DelayedItemSystem cleanup, more mail table entries * More mail table entries * Remove hoverbike from mail pool * Add large mail. FIXME: mail_large.rsi has no copyright info * Default mail isLarge to false, comment cleanup * More mail types * Add optional large mail flag to admin mailto cmd * mail_large copyright * admin cmd fix, new mail types, const cleanup * Mail: new components, weighting, a few new items * Fix merge conflict, add placeholder pipebomb mail * Format mail text, separate sword mail from knives * Mail: fix exp. welder ID, split up Dan's cigs * Fourth muffin, decrease captain's sabre chance * yaml fixes * Add ShowJobIcons component to mail hud * Reorganize mail items, add build-a-buddy mail * Build-a-Buddy fixes, slime & vulp versions, text * Reptillian->Reptilian * More signatures, label necrosol bottle, bigger emp * lowercase i * extra premium cigars, premium liquors * Cleanup * Fixups And Edits * Remove kendo hakama, jabroni comment, fix cigars * Platinum cigars, fix sprites * fix premium absinthe ID * Remove cyberpen, add BibleUserImplanter, ATV mail Also adjusts weights for TacticalMaid (missing a zero), Restraints (cut in half) * kendo mail order, more mail comments * Remove Nyano mail lists & parcels, move into _NF/ * True to true, cigars aren't fragile --------- Co-authored-by: Dvir <dvirf01@gmail.com> Co-authored-by: Whatstone <whatstone3@gmail.com> * Kills accidentally cherrypicked platinum cig, makes mail be sorted into 5 ymls again * THE MAIL TABLE!!!!! AHHHHHHHHHHHHHHHHHHHH * NUKES two UNNECCESSARY RANDOMLY PASTED BRACKETS FUCK YOU BUILD ERROR !!! EAT SHIT * a semicolon for good measure Adei versus the one silly * Fuck is this? Why is it in my mail? * Pro forgot values for two of the engineering mails :skull: * First pass to fix various mail bugs + editing of papers * obliterates a random S in a C# file, also returns the mail teleporter to how it was * Nukes the platinum cigar's YAML Since there's no intent for it to spawn in the mail, might as well. * Milon's Review Does some shit to the mail / courierdrobe and gets rid of string keys. Thanks Milon * Milon's Review 2, Electric Boogaloo * Various YAML fixes as I try to satisfy the Linter and fail * Fixes Mail.yml / If I get rid of the EMP china lake does it fix things? Let's find out! * Cleans up more C# at Milon's behest * TORTUGAAAAAAAAAAAAAAAAAAAA!!!! Why is this mapped in? * Revert "TORTUGAAAAAAAAAAAAAAAAAAAA!!!!" This reverts commit b1d415a. * Migrations * Does a bit more fixing * Update Resources/Locale/en-US/_NF/mail/mail.ftl Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Adeinitas <147965189+adeinitas@users.noreply.github.com> * Update Resources/Locale/en-US/nyanotrasen/Mail/mail.ftl Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Adeinitas <147965189+adeinitas@users.noreply.github.com> * Fixes Mail Capsule / Creates frontierMigrations Blame Velcro for frontierMigrations. * Update Resources/Migrations/deltaMigrations.yml Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Adeinitas <147965189+adeinitas@users.noreply.github.com> * Rewords that one fucking comment I made 2 months ago about MIT / AGPL * Just gives the delayed smoke prank and delayed EMP effects the instant effect sprites * Where the fuck are these random curly braces from?? * An attempt to satisfy the Yaml Linter * Revert "Update Resources/Locale/en-US/nyanotrasen/Mail/mail.ftl" This reverts commit 0ee3869. * Revert "Update Resources/Locale/en-US/_NF/mail/mail.ftl" This reverts commit 29129df. * Mail FTL fixes / I think I know what the linter wants * will this sprite be valid pretty please? * Does a first pass on noSpawn for all mails. ANOTHER COMMIT FOR THE PILE. * Unfucks noSpawn from the mail prototypes --------- Signed-off-by: Adeinitas <147965189+adeinitas@users.noreply.github.com> Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Whatstone <whatstone3@gmail.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
- Loading branch information
7 people
authored
Sep 2, 2024
1 parent
14e6342
commit 952f368
Showing
57 changed files
with
3,481 additions
and
1,003 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| namespace Content.Server.Mail | ||
| { | ||
| /// <summary> | ||
| /// A placeholder for another entity, spawned when dropped or placed in someone's hands. | ||
| /// Useful for storing instant effect entities, e.g. smoke, in the mail. | ||
| /// </summary> | ||
| [RegisterComponent] | ||
| public sealed partial class DelayedItemComponent : Component | ||
| { | ||
| /// <summary> | ||
| /// The entity to replace this when opened or dropped. | ||
| /// </summary> | ||
| [DataField] | ||
| public string Item = "None"; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| using Content.Shared.Damage; | ||
| using Content.Shared.Hands; | ||
| using Robust.Shared.Containers; | ||
|
|
||
| namespace Content.Server.Mail | ||
| { | ||
| /// <summary> | ||
| /// A placeholder for another entity, spawned when taken out of a container, with the placeholder deleted shortly after. | ||
| /// Useful for storing instant effect entities, e.g. smoke, in the mail. | ||
| /// </summary> | ||
| public sealed class DelayedItemSystem : EntitySystem | ||
| { | ||
| public override void Initialize() | ||
| { | ||
| base.Initialize(); | ||
|
|
||
| SubscribeLocalEvent<DelayedItemComponent, DropAttemptEvent>(OnDropAttempt); | ||
| SubscribeLocalEvent<DelayedItemComponent, GotEquippedHandEvent>(OnHandEquipped); | ||
| SubscribeLocalEvent<DelayedItemComponent, DamageChangedEvent>(OnDamageChanged); | ||
| SubscribeLocalEvent<DelayedItemComponent, EntGotRemovedFromContainerMessage>(OnRemovedFromContainer); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// EntGotRemovedFromContainerMessage handler - spawn the intended entity after removed from a container. | ||
| /// </summary> | ||
| private void OnRemovedFromContainer(EntityUid uid, DelayedItemComponent component, ContainerModifiedMessage args) | ||
| { | ||
| Spawn(component.Item, Transform(uid).Coordinates); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// GotEquippedHandEvent handler - destroy the placeholder. | ||
| /// </summary> | ||
| private void OnHandEquipped(EntityUid uid, DelayedItemComponent component, EquippedHandEvent args) | ||
| { | ||
| EntityManager.DeleteEntity(uid); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// OnDropAttempt handler - destroy the placeholder. | ||
| /// </summary> | ||
| private void OnDropAttempt(EntityUid uid, DelayedItemComponent component, DropAttemptEvent args) | ||
| { | ||
| EntityManager.DeleteEntity(uid); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// OnDamageChanged handler - item has taken damage (e.g. inside the envelope), spawn the intended entity outside of any container and delete the placeholder. | ||
| /// </summary> | ||
| private void OnDamageChanged(EntityUid uid, DelayedItemComponent component, DamageChangedEvent args) | ||
| { | ||
| Spawn(component.Item, Transform(uid).Coordinates); | ||
| EntityManager.DeleteEntity(uid); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| namespace Content.Server.Mail | ||
| { | ||
| /// <summary> | ||
| /// A set of localized strings related to mail entities | ||
| /// </summary> | ||
| public struct MailEntityStrings | ||
| { | ||
| public string NameAddressed; | ||
| public string DescClose; | ||
| public string DescFar; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Constants related to mail. | ||
| /// </summary> | ||
| public sealed class MailConstants : EntitySystem | ||
| { | ||
| /// <summary> | ||
| /// Locale strings related to small parcels. | ||
| /// <summary> | ||
| public static readonly MailEntityStrings Mail = new() | ||
| { | ||
| NameAddressed = "mail-item-name-addressed", | ||
| DescClose = "mail-desc-close", | ||
| DescFar = "mail-desc-far" | ||
| }; | ||
|
|
||
| /// <summary> | ||
| /// Locale strings related to large packages. | ||
| /// <summary> | ||
| public static readonly MailEntityStrings MailLarge = new() | ||
| { | ||
| NameAddressed = "mail-large-item-name-addressed", | ||
| DescClose = "mail-large-desc-close", | ||
| DescFar = "mail-large-desc-far" | ||
| }; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| mail-large-item-name-unaddressed = package | ||
| mail-large-item-name-addressed = package ({$recipient}) | ||
| mail-large-desc-far = A large package. | ||
| mail-large-desc-close = A large package addressed to {CAPITALIZE($name)}, {$job}. Last known location: {$station}. | ||
| ### Frontier: mailtestbulk | ||
| command-mailtestbulk = Sends one of each type of parcel to a given mail teleporter. Implicitly calls mailnow. | ||
| command-mailtestbulk-help = Usage: {$command} <teleporter_id> | ||
| command-mailtestbulk-success = Success! All mail teleporters will be delivering another round of mail soon. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # 2024-08-22 - Frontier Mail - Add more to these when they come up as mapped. Part of the Frontier Mail port, blame Tortuga. | ||
| MailPAI: MailNFPAI |
Oops, something went wrong.