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

Logistics Dept #24

Merged
merged 22 commits into from
Sep 21, 2023
Merged

Logistics Dept #24

merged 22 commits into from
Sep 21, 2023

Conversation

FluffiestFloof
Copy link
Contributor

@FluffiestFloof FluffiestFloof commented Sep 17, 2023

Will conflict with my other PR about jobs.

About the PR

Replaces every mention of Cargo as a dept to Logistics (except cargo shuttle, cargo shuttle computer etc)
Replaces every mention of Quartermaster into Head of Logistics.

  • Adds the Mail Carrier as a Courier back.

Why / Balance

Technical details

The reason the MailBag is an item of size 121 is because I inspired myself of the BooksBag.

Media

Breaking changes

Changelog

🆑

  • add: Added the Courier, the Mail Carrier's cousin.
  • tweak: Cargo Department is now the Logistics Department

That's a lot of changes damn
Might replace logitech back to cargotech
@github-actions github-actions bot added the Changes: YML Changes any yml files label Sep 17, 2023
the funny was reverted
They do things
@github-actions
Copy link
Contributor

github-actions bot commented Sep 17, 2023

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

Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi

State Old New Status
nyanoMailCarrier Added

Resources/Textures/DeltaV/Markers/jobs.rsi

State Old New Status
nyanomailcarrier Added

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

State Old New Status
equipped-BELT Added
id_overlay Added
insert_overlay Added
light_overlay Added
pda-mailcarrier Added

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

State Old New Status
nyanomailcarrier Added

Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi

State Old New Status
broken Added
normal-unshaded Added
off Added
panel Added

Edit: diff updated after 1030bfd

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Sep 19, 2023
@github-actions
Copy link
Contributor

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

Signed-off-by: Fluffiest Floofers <[email protected]>
@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Sep 19, 2023
@FluffiestFloof FluffiestFloof marked this pull request as ready for review September 19, 2023 14:48
FluffiestFloof and others added 12 commits September 19, 2023 17:04
grammar check

Signed-off-by: Colin-Tel <[email protected]>
grammar check

Signed-off-by: Colin-Tel <[email protected]>
grammar check

Signed-off-by: Colin-Tel <[email protected]>
what do you think

Signed-off-by: Colin-Tel <[email protected]>
This reverts commit 9d95d51.
This reverts commit a6142b7.
This reverts commit 1d5665a.
small reversion

Signed-off-by: Colin-Tel <[email protected]>
Copy link
Contributor

@Colin-Tel Colin-Tel left a comment

Choose a reason for hiding this comment

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

Looks good!

@Colin-Tel Colin-Tel enabled auto-merge (squash) September 21, 2023 04:23
@Colin-Tel Colin-Tel merged commit 0ba68b4 into DeltaV-Station:master Sep 21, 2023
25 of 26 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Sep 21, 2023
@FluffiestFloof FluffiestFloof deleted the logidept branch September 21, 2023 08:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants