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

Janitor Locker #583

Merged
merged 22 commits into from
Jan 9, 2024
Merged

Janitor Locker #583

merged 22 commits into from
Jan 9, 2024

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Nov 15, 2023

About the PR

Janitor locker added.
Janitor Magboots (To be used in expo rewards table)

Why / Balance

Space janitor

Technical details

Added all the required gear for a janitor captain

Media

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

Breaking changes

N/A

Changelog
🆑 SungYandy

  • add: NT Provided the janitors with fancy new lockers, coming to your ships soon.

Copy link
Contributor

github-actions bot commented Nov 15, 2023

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

Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi

State Old New Status
equipped-FEET Added
icon-on Added
icon Added
inhand-left Added
inhand-right Added
on-equipped-FEET Added
on-inhand-left Added
on-inhand-right Added

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

State Old New Status
janitor Added
janitor_door Added
janitor_open Added
sparking Added

Edit: diff updated after c07f729

@dvir001 dvir001 marked this pull request as draft November 15, 2023 15:18
@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Nov 15, 2023
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Dec 12, 2023
@dvir001 dvir001 changed the title Janitor Captain Locker Janitor Locker Jan 7, 2024
@dvir001 dvir001 marked this pull request as ready for review January 7, 2024 12:46
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Jan 7, 2024
@dvir001
Copy link
Contributor Author

dvir001 commented Jan 7, 2024

I reworked this into a normal locker with more style for janitors, actual lock on it to be used for heavy duty cleaning operations.

@Cheackraze
Copy link
Member

your rsi is broke

@dvir001
Copy link
Contributor Author

dvir001 commented Jan 7, 2024

your rsi is broke

Done

@Cheackraze Cheackraze merged commit c020d54 into new-frontiers-14:master Jan 9, 2024
11 of 13 checks passed
FrontierATC added a commit that referenced this pull request Jan 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants