-
Notifications
You must be signed in to change notification settings - Fork 414
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Frontier Mail #1652
Frontier Mail #1652
Conversation
…start thinking about MailSystem
* 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>
* 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>
RSI Diff Bot; head commit 813e771 merging into 28859af Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi
Resources/Textures/_NF/Objects/Specific/Mail/mail_large.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi
|
You probably missing some of the mail related PR's from our side. |
I'm draft PRing this because I intend on working on it again. It's 2 months old. I gave up on it because the frontier mail table PR closed and I was having trouble cherrypicking specific shit from that. |
* 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>
FUCK YOU BUILD ERROR !!! EAT SHIT
Adei versus the one silly
Okay, I think this is complete enough to be opened and reviewed, but not merged whatsoever. The one thing it seems to be continuing to throw up whenever I open my devenv and test things is the platinum cigar's RSI, even though I exploded the cigar and it's gone. Look in at your own peril - I definitely need more eyes on this because there's just so many mistakes and there may or may not be things I either forgot to add from the frontier mail PR or things that break when opened. |
Since there's no intent for it to spawn in the mail, might as well.
Wow, the linter has came for me, and it's throwing fucking hard punches. Jesus christ. |
Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs
Outdated
Show resolved
Hide resolved
Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs
Outdated
Show resolved
Hide resolved
Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs
Outdated
Show resolved
Hide resolved
Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml
Outdated
Show resolved
Hide resolved
Does some shit to the mail / courierdrobe and gets rid of string keys. Thanks Milon
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Haven't looked at the yaml mail tables but I trust these are fine.
Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml
Outdated
Show resolved
Hide resolved
All checks have passed, and with that, I think I'm finally done. Sorry for the commit spam, now an actual maint can review this and merge. |
ANOTHER COMMIT FOR THE PILE.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nospawn: true
is obsolete and will be completely removed soon, should be replaced with categories: [ HideSpawnMenu ]
, which isn't needed because it's inhereted from BaseMail.
FUCK |
Okay, now this is Really Actually the end of me commit spamming this, trust. |
Don't need Velcro's insight because it's not a direct map change, anymore. Velcro, you're still free to look though, but the adding you to the PR was accidental |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm Fox, and this is my favourite PR on the Repo.
Tests pass, Milon nods, the fish man weeps silently somewhere
# Description Showing some love to our hard-working couriers. This cherry-picks the following PRs from delta-v: - DeltaV-Station/Delta-v#1472 - Adds a MailMetrics PDA cartridge for couriers and the LO - DeltaV-Station/Delta-v#1652 - Ports mail tweaks from frontier to delta-v, adding large packages, RPDs (mail cannons), and more mail - DeltaV-Station/Delta-v#1788 - Adding a couple more packages - DeltaV-Station/Delta-v#1925 - Fixing the non-functional "last known location" part of mail descriptions Some mail items, such as the opporozidone syringe and rainbow joints/blunts, had to be disabled because we don't have them (yet?) <details><summary><h1>Media</h1></summary> <p>       </p> </details> --- # Changelog :cl: - add: The Courier and Logistics Officer now have a new program in their PDA for tracking mail delivery performance, including earnings and percent of packages opened, damaged, or expired. - add: The list of possible mail packages has been greately expanded, and now includes large parcels. - add: The CourierDrobe now offers a rapid mail delivery device, along with capsules for it. --------- Signed-off-by: Adeinitas <147965189+adeinitas@users.noreply.github.com> Co-authored-by: portfiend <109661617+portfiend@users.noreply.github.com> Co-authored-by: byte <50130120+huckleton@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-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> Co-authored-by: Milon <plmilonpl@gmail.com>
more than likely this is just because of invalid loadouts
About the PR
Fixes #1031, sort of.
Ports changes made to mail that have been made by Frontier, that clean up the code of the mail system nicely by tweaking C#. Needs to be tested a bit more, but seems to run smoothly for the most part.
What this PR does:
Some things that need to be done later, out of the scope of this PR maybe:
Why / Balance
Mail is old, and Frontier made some nice changes to mail, and I want the courier to be able to shoot people with the mail china lake.
Furthermore, mail can be used to combat people meta-ing certain items like syndie clothes if you put those in the mail.
Technical details
Changes MailSystem C#, creates an entirely new mail table that shares a load of stuff with Frontier, creates frontierMigrations. Mostly C#, YAML, and I guess map changes because frontierMigrations.
Media
Requirements
Breaking changes
Changelog
🆑 Whatstone, dvir001, ErhardSteinhauer, Adeinitas