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

Big mail carrier update #1120

Merged
merged 8 commits into from
Mar 25, 2024

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Mar 15, 2024

About the PR

Made the mail carrier use its own mail access.
Upgrade the mail room on frontier.
Moved the mail truck to a private mail man shipyard.
Added the mail locker
Added mail altar and crafting (Not mapped but can be build)
Added mail hud (Just cosmetic for now)
Added the Clippy backpack (Just like Ian one, in mail locker)
Updated the mail man headset to have service key in it (Allow talking with the rest of the frontier work force)

Added the Clurger, a burger made from Clippy (You monster)

Added the mail carrier ERT.

All ERT roles are now whitelist

Changed the security breaching hammer to also fit the suit storage just like the fireaxe.
Added emergency double air tank, since there was only an oxygen and nitrogen one and it was needed for new mail ERT
Added emergency double air tank to canister tanks vend.

Why / Balance

Mail care

Technical details

.yml
With some c# edits.

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame,

image

Breaking changes

N/A

Changelog
🆑 dvir01

  • tweak: Mail room upgraded.

Copy link
Contributor

github-actions bot commented Mar 15, 2024

RSI Diff Bot; head commit d0d47f1 merging into 2457bc9
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Markers/jobs.rsi

State Old New Status
mailcarrier Modified

Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi

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

Resources/Textures/_NF/Clothing/Back/Backpacks/ertmailcarrier.rsi

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

Resources/Textures/_NF/Clothing/Eyes/Hud/mail.rsi

State Old New Status
equipped-EYES Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hardsuits/ERThelmets/ertmailcarrier.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET Added
on-equipped-HELMET Added

Resources/Textures/_NF/Clothing/Head/Helmets/ert_mailcarrier.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmailcarrier.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/ert_mailcarrier.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Markers/jobs.rsi

State Old New Status
ertmailcarrier Added
ertmailcarriereva Added

Resources/Textures/_NF/Objects/Consumable/Food/burger.rsi

State Old New Status
clurger Added
inhand-left Added
inhand-right Added
plate Added

Resources/Textures/_NF/Objects/Misc/id_cards.rsi

State Old New Status
ert_mailcarrier Added
gold Added

Resources/Textures/_NF/Objects/Tanks/emergency_double_air.rsi

State Old New Status
equipped-BELT Added
equipped-SUITSTORAGE-cat Added
equipped-SUITSTORAGE-chicken Added
equipped-SUITSTORAGE-dog Added
equipped-SUITSTORAGE-fox Added
equipped-SUITSTORAGE-hamster Added
equipped-SUITSTORAGE-kangaroo Added
equipped-SUITSTORAGE-pig Added
equipped-SUITSTORAGE-pitbull Added
equipped-SUITSTORAGE-possum Added
equipped-SUITSTORAGE-puppy Added
equipped-SUITSTORAGE-sloth Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Structures/Furniture/Altars/Gods/convertaltar.rsi

State Old New Status
lightning Added
mail Added

Resources/Textures/_NF/Structures/Storage/closet.rsi

State Old New Status
mail Added
mail_door Added
mail_open Added

Edit: diff updated after d0d47f1

@dvir001 dvir001 marked this pull request as ready for review March 16, 2024 21:39
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Mar 16, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Mar 18, 2024
@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Mar 18, 2024
@Cheackraze
Copy link
Member

i think the only thing this needs is special mail door sprites tbh

@dvir001
Copy link
Contributor Author

dvir001 commented Mar 18, 2024

i think the only thing this needs is special mail door sprites tbh

This can be done at a later time, as ill need to ask for more sprites from artists

@Cheackraze Cheackraze merged commit f3dc06c into new-frontiers-14:master Mar 25, 2024
13 checks passed
FrontierATC added a commit that referenced this pull request Mar 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C# FTL Map-Outpost Map - Outpost Map-Shuttle Map - Shuttle Sprites Status: Needs Review This PR is awaiting reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants