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

centcomm role tweaks #1423

Merged
merged 21 commits into from
Jan 22, 2025
Merged

Conversation

RosySaturniidae
Copy link

@RosySaturniidae RosySaturniidae commented Jan 18, 2025

Changelog

🆑

  • add: role icons for centcomm jobs
  • add: new ids/pdas for deathsquad and cburn
  • tweak: new job descriptions for deathsquad and cburn

@RosySaturniidae
Copy link
Author

theres something wrong with jobs.yml but i cannot for the life of me figure out what

@RosySaturniidae RosySaturniidae marked this pull request as ready for review January 18, 2025 23:19
@RosySaturniidae
Copy link
Author

the NT icon is updated to the proper shade of green but for whatever reason all the other jobs wont read the new icons, just reusing the NT one. im going to scream

@RosySaturniidae RosySaturniidae requested a review from mqole January 19, 2025 00:49
Copy link

@hivehum hivehum left a comment

Choose a reason for hiding this comment

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

need to checkout this and test for real later but heres your mandated anal retention review

@Darkmajia
Copy link

the changelog in the description needs amending, it needs to be add: , remove: , tweak: or fix: to show up in the in-game changelog. though i guess this doesnt really need a player-facing changelog either so shrug

@RosySaturniidae RosySaturniidae requested a review from mqole January 21, 2025 03:34
Copy link

@hivehum hivehum left a comment

Choose a reason for hiding this comment

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

approaching the finish line here

state: Nanotrasen
jobName: job-name-centcomoff
# - type: jobIcon (moved to imp)
# parent: JobIcon
Copy link

Choose a reason for hiding this comment

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

correct me if im wrong, but it looks like the only ones of these that got moved out of job.yml are JobIconNanotrasen and JobIconAdmin. which should not have been moved out of this namespace, they should stay here with the updated sprites

Copy link

Choose a reason for hiding this comment

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

i realize my ass has been contradictory bc i didnt totally understand what you were attempting to do here so ill just give actual instructions

  1. delete all these commented out jobIcons. they either were never in this file to begin with or should have never left.
  2. move the altered JobIconNanotrasen and JobIconAdmin back into this file
  3. also those are going to need imp comments since theyre altering an upstream prototype. the way you have been annotating all other upstream edits has been fantastic in the rest of this pr so keep it up

Copy link

@mqole mqole left a comment

Choose a reason for hiding this comment

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

i'll go ahead and approve the other changes so you arent waiting for my review, once hives changes have been made we shoooould (?) be good to merge. really good work on this, thanks for being so patient with requested changes lmao

Copy link

@hivehum hivehum left a comment

Choose a reason for hiding this comment

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

WE DID IT!!!!!!!!!!!

@mqole mqole merged commit 24e2ed6 into impstation:master Jan 22, 2025
5 checks passed
@RosySaturniidae RosySaturniidae deleted the centcomm-role-tweaks branch January 23, 2025 11:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants