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

Add the cargo assistant job and spawner #2453

Merged
merged 13 commits into from
Dec 21, 2024

Conversation

Radezolid
Copy link
Contributor

@Radezolid Radezolid commented Dec 15, 2024

About the PR

This role is meant to be a learner role for logistics. It spawns with a Logistics 101 guidebook in their pocket like other learning roles. This role makes the cargo tech the non-entry level role now and so I put time requirements on it.

Note: This won't add the job yet nor it limits the cargo tech time. Once it's mapped on every map we can just toggle it.

Why / Balance

This is meant to act as a easy way to recognize newbies from regular tecchies, like TA with an Engie. It also acts as a barrier from new players from being able to order stuff + it doesn't get salvage access on skeleton crew (Although I doubt this will stop any raiders with a toolbox).

Technical details

YAML, locale and some sprites changes.

Media

image
image
image
image
image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Hopefully nothing.

Changelog

No CL.

@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi size/S 16-63 lines labels Dec 15, 2024
Copy link
Contributor

github-actions bot commented Dec 15, 2024

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

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

State Old New Status
pda-interntech Modified
pda-cargo-assistant Added

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

State Old New Status
CargoAssistant Added

Resources/Textures/DeltaV/Markers/jobs.rsi

State Old New Status
cargoassistant Added

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

State Old New Status
idcargoassistant Added

Edit: diff updated after 4283458

@github-actions github-actions bot added size/M 64-255 lines and removed size/S 16-63 lines labels Dec 15, 2024
@Radezolid Radezolid marked this pull request as ready for review December 16, 2024 01:52
@Radezolid Radezolid requested review from a team as code owners December 16, 2024 01:52
@Radezolid Radezolid changed the title Add the cargo assistant role Add the cargo assistant job and spawner Dec 16, 2024
@Lyndomen
Copy link
Contributor

Requesting a hold on merging this, even when it's completely done. We're strategizing a small logistics change, and don't want to have our mappers duplicate work in adding spawners and stuff.

This is certainly great, and 100% where we want to go in the future, this is just one of a few changes that should go sequentially

@Colin-Tel Colin-Tel added the S: Do Not Merge Don't merge this yet label Dec 17, 2024
@Lyndomen
Copy link
Contributor

Under Direction review, 22 hours

@Radezolid
Copy link
Contributor Author

Under Direction review, 22 hours

Hell yeah, preferential treatment, two hours less than usual.

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 S: Merge Conflict Fix your PR! label Dec 19, 2024
Signed-off-by: Radezolid <snappednexus@gmail.com>
@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Dec 19, 2024
@Lyndomen
Copy link
Contributor

I'm thinking the go live of this will be to merge this, get maps updated and update playtime recs on the same day

@Radezolid
Copy link
Contributor Author

I'm thinking the go live of this will be to merge this, get maps updated and update playtime recs on the same day

That might require either coordination of the whole maps mantainers or getting permission from them and just doing it in one PR.

@Lyndomen
Copy link
Contributor

I'm thinking the go live of this will be to merge this, get maps updated and update playtime recs on the same day

That might require either coordination of the whole maps mantainers or getting permission from them and just doing it in one PR.

I'm not really sure how else to do it tbh, but yeah it's gonna be a pain

deltanedas
deltanedas previously approved these changes Dec 20, 2024
@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Dec 20, 2024
Copy link
Contributor

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

Signed-off-by: Radezolid <snappednexus@gmail.com>
@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Dec 20, 2024
@Colin-Tel Colin-Tel removed the S: Do Not Merge Don't merge this yet label Dec 21, 2024
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.

cool, awesome, hoo-ray!!

@Colin-Tel Colin-Tel merged commit 6a74aa3 into DeltaV-Station:master Dec 21, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/M 64-255 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants