Feat: Port All Delta-V Mail Improvements #1011
Merged
Conversation
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
* add MailMetricsCartridge prototype using the CrimeAssist UI until i make the courier performance ui * add sprite for mail courier cartridge * Add MailMetricUI YAYYYYY IT WORKS UI Contents pending * Mail earnings live update mailmetrics * LO can have mailmetrics too * Add rest of mail metrics Also removes some loggers * Add additional metrics to MailMetric Also fixes some bugs related to stat counting * MailMetric updates on mail added * change sprite credit name decided id rather be credited as Portfiend * display all mail numbers now * remove comment * style mailmetrics, add heading * mailmetric UI polish * fixed unopened mail counting bug oopsie * wtf is this import get out of here * move StationLogisticStats to BaseStationMail * FOUR SPACES sirry * fix: newlines * address reviews * address reviews SORRYYYY this is unexpectedly big * wtf * semicolon --------- Co-authored-by: byte <50130120+huckleton@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
* Does all the under the hood changes to mail components before I EVEN start thinking about MailSystem * Mail Handheld Rapid Parcel Delivery System (Simple-Station#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 (Simple-Station#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 (Simple-Station#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 b1d415a7be6e5193fc77424b2847ff7babdf6cfa. * 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 0ee3869d76cc7633be5fd26d303221e79ab04c77. * Revert "Update Resources/Locale/en-US/_NF/mail/mail.ftl" This reverts commit 29129df9d66079c9df0e4b1ccf5818b0cb230234. * 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>
|
RSI Diff Bot; head commit 017b5a6 merging into 8ba95f3 Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi
Resources/Textures/Objects/Misc/mail_capsule.rsi
Resources/Textures/Objects/Specific/Mail/mail_large.rsi
Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi
|
VMSolidus
requested changes
Oct 8, 2024
|
The code on frontier side have fixups for the mail and also mail app that might be missing from DeltaV right now. |
ugh, remind me like on Saturday maybe... |
VMSolidus
requested changes
Oct 13, 2024
Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs
Outdated
Show resolved
Hide resolved
Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs
Outdated
Show resolved
Hide resolved
|
Probably going to merge this after the last batch of requested changes are made. |
|
Inshalla; nynanotrasen, delta-v and frontier mail code is now merged |
Fuck yea |
VMSolidus
approved these changes
Oct 13, 2024
OldDanceJacket
approved these changes
Oct 13, 2024
Peptide90
approved these changes
Oct 13, 2024
SimpleStation14
added a commit
that referenced
this pull request
Oct 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Showing some love to our hard-working couriers.
This cherry-picks the following PRs from delta-v:
Some mail items, such as the opporozidone syringe and rainbow joints/blunts, had to be disabled because we don't have them (yet?)
Media
Changelog
🆑