Skip to content
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

Feat: Port All Delta-V Mail Improvements #1011

Merged
merged 14 commits into from
Oct 13, 2024

Conversation

Mnemotechnician
Copy link
Contributor

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

image

image

image

image

image

image


Changelog

🆑

  • 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.

portfiend and others added 7 commits October 5, 2024 18:28
* 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 (#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 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>
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files labels Oct 5, 2024
@SimpleStation14 SimpleStation14 changed the title Port all delta-v mail improvements Port All Delta-V Mail Improvements Oct 5, 2024
Copy link
Contributor

github-actions bot commented Oct 5, 2024

RSI Diff Bot; head commit 017b5a6 merging into 8ba95f3
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi

State Old New Status
cart-mail Added

Resources/Textures/Objects/Misc/mail_capsule.rsi

State Old New Status
icon-cash Added
icon-empty Added
icon-food Added
icon-mail Added
spent Added

Resources/Textures/Objects/Specific/Mail/mail_large.rsi

State Old New Status
broken Added
fragile Added
icon Added
inhand-left Added
inhand-right Added
locked Added
priority Added
priority_inactive Added
trash Added

Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi

State Old New Status
bolt-open Added
equipped-BACKPACK Added
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 017b5a6

@FoxxoTrystan FoxxoTrystan requested review from a team, VMSolidus, FoxxoTrystan, DEATHB4DEFEAT, Peptide90, Pspritechologist and OldDanceJacket and removed request for a team October 6, 2024 02:45
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Oct 6, 2024
@FoxxoTrystan FoxxoTrystan added Size: 3-Medium For medium issues/PRs Priority: 3-Medium Needs to be resolved at some point Type: Port Brings something to here from another codebase labels Oct 6, 2024
Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's simply too many to count here, but everything in this PR needs to be moved out of specific fork namespaces, and down into the core namespace.

@dvir001
Copy link
Contributor

dvir001 commented Oct 9, 2024

The code on frontier side have fixups for the mail and also mail app that might be missing from DeltaV right now.

@Mnemotechnician
Copy link
Contributor Author

There's simply too many to count here, but everything in this PR needs to be moved out of specific fork namespaces, and down into the core namespace.

ugh, remind me like on Saturday maybe...

@Mnemotechnician Mnemotechnician changed the title Port All Delta-V Mail Improvements Feat: Port All Delta-V Mail Improvements Oct 13, 2024
Content.Server/Nyanotrasen/Mail/MailCommands.cs Outdated Show resolved Hide resolved
Content.Server/Nyanotrasen/Mail/MailCommands.cs Outdated Show resolved Hide resolved
Content.Server/Nyanotrasen/Mail/MailSystem.cs Outdated Show resolved Hide resolved
Content.Server/Nyanotrasen/Mail/MailSystem.cs Outdated Show resolved Hide resolved
Content.Server/Nyanotrasen/Mail/MailSystem.cs Outdated Show resolved Hide resolved
Content.Server/Nyanotrasen/Mail/MailSystem.cs Outdated Show resolved Hide resolved
Content.Server/Nyanotrasen/Mail/MailSystem.cs Outdated Show resolved Hide resolved
@VMSolidus
Copy link
Member

Probably going to merge this after the last batch of requested changes are made.

@Mnemotechnician
Copy link
Contributor Author

Inshalla; nynanotrasen, delta-v and frontier mail code is now merged

@VMSolidus
Copy link
Member

Inshalla; nynanotrasen, delta-v and frontier mail code is now merged

Fuck yea

@VMSolidus VMSolidus merged commit 6a815ba into Simple-Station:master Oct 13, 2024
13 checks passed
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
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files Priority: 3-Medium Needs to be resolved at some point Size: 3-Medium For medium issues/PRs Status: Needs Review Someone please review this Type: Port Brings something to here from another codebase
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants