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.

Sign up for GitHub

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

Jump to bottom

Administrative assistant #2523

Merged
merged 12 commits into from
Dec 31, 2024
Merged

Administrative assistant #2523

merged 12 commits into from
Dec 31, 2024
+531 −106

Conversation

Radezolid
Copy link
Contributor

@Radezolid Radezolid commented Dec 25, 2024 •
edited
Loading

About the PR

This role is meant for people that wish to learn how command works while also giving room for good RP, assisting with paperwork and any other general thing a command member needs help with.
They get command access and just command + common radio.
They don't need any mapping besides the spawner itself since they don't get an office and everything they will need they can get it through loadouts.
This PR it's a continuation of #1207

Why / Balance

Learner role + more RP focused command member.

Technical details

Added a new headset, ID, stamp, clothes specific to the assistant, made new loadouts for the wintercoats to be referenced in future PRs.

Media

Loadout:

Jumpsuit

image

Outer clothes

image

Shoes

image

Headset

image

Gloves

image

Backpack

image

Glasses

image

Items they will have round start without touching loadouts:

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

Nothing.

Changelog

No CL, one should be done when the spawners are mapped.

@github-actions github-actions bot added size/L 256-1023 lines Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi and removed size/L 256-1023 lines labels Dec 25, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 25, 2024 •
edited
Loading

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

Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi

State Old New Status
alt-equipped-EARS Added
equipped-EARS Added
icon Added
icon_alt Added

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi

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

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

State Old New Status
AdminAssistant Added

Resources/Textures/DeltaV/Markers/jobs.rsi

State Old New Status
adminassistant Added

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

State Old New Status
pda-admin-assistant Added

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

State Old New Status
idadminassistant Added

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

State Old New Status
stamp-admin-assistant Added

Resources/Textures/Objects/Misc/bureaucracy.rsi

State Old New Status
paper_stamp-admin-assistant Added

Edit: diff updated after 43bb912

@Radezolid
Copy link
Contributor Author

Radezolid commented Dec 26, 2024 •
edited
Loading

Having a small issue rn, that it doesn't let me check the loadouts, i am missing something and i'm not seeing what.
image
Any ideas?

@github-actions github-actions bot added the size/L 256-1023 lines label Dec 26, 2024
@Radezolid
Copy link
Contributor Author

Hey, @deltanedas any idea what might be the cause of this?

Having a small issue rn, that it doesn't let me check the loadouts, i am missing something and i'm not seeing what. image

@deltanedas
Copy link
Member

the RoleLoadoutPrototype has to have the id JobAdministrativeAssistant

@Radezolid
Copy link
Contributor Author

the RoleLoadoutPrototype has to have the id JobAdministrativeAssistant

Thanks

@Radezolid Radezolid marked this pull request as ready for review December 26, 2024 19:29
@Radezolid Radezolid requested review from a team as code owners December 26, 2024 19:29
@Lyndomen
Copy link
Contributor

3 days direction review

deltanedas
deltanedas requested changes Dec 27, 2024
View reviewed changes
Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml Outdated Show resolved Hide resolved
Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml Outdated Show resolved Hide resolved
Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml Outdated Show resolved Hide resolved
Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Roles/Jobs/departments.yml Outdated Show resolved Hide resolved
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/meta.json Show resolved Hide resolved
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/meta.json Show resolved Hide resolved
Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json Outdated Show resolved Hide resolved
@Radezolid Radezolid requested a review from deltanedas December 27, 2024 14:55
deltanedas
deltanedas previously approved these changes Dec 27, 2024
View reviewed changes
@github-actions GitHub Actions
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 29, 2024
@Radezolid
Merge branch 'master' into Administrative-Assistant
a721917 
Signed-off-by: Radezolid <snappednexus@gmail.com>
@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Dec 29, 2024
Lyndomen
Lyndomen previously approved these changes Dec 30, 2024
View reviewed changes
Copy link
Contributor

@Lyndomen Lyndomen left a comment

Choose a reason for hiding this comment

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

Approved for a test, we will be gathering feedback. I'm personally mostly concerned about the playtime reqs causing this role to not be accessible enough to serve as a learner role, but time will tell.

Side question, not sure if other roles have a guidebook entry on their role, but I think it would be nice to see for all DeltaV exclusive roles

@Radezolid
Copy link
Contributor Author

Approved for a test, we will be gathering feedback. I'm personally mostly concerned about the playtime reqs causing this role to not be accessible enough to serve as a learner role, but time will tell.

Side question, not sure if other roles have a guidebook entry on their role, but I think it would be nice to see for all DeltaV exclusive roles

I can modify the time requirements, what times do you have in mind?

@Radezolid
Copy link
Contributor Author

Hey @deltanedas whenever you can merge this please.

Lyndomen
Lyndomen reviewed Dec 30, 2024
View reviewed changes
Copy link
Contributor

@Lyndomen Lyndomen left a comment

Choose a reason for hiding this comment

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

25 hour overall playtime would be my best. That way people can actually unlock it before they unlock CE or mysta or whatever

@Radezolid
Copy link
Contributor Author

25 hour overall playtime would be my best. That way people can actually unlock it before they unlock CE or mysta or whatever

Just 25 hours, no departamental time?

@Radezolid Radezolid requested a review from Lyndomen December 30, 2024 22:47
@deltanedas deltanedas merged commit 33d14d8 into DeltaV-Station:master Dec 31, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lyndomen Lyndomen Lyndomen approved these changes

@deltanedas deltanedas deltanedas approved these changes

Assignees
No one assigned
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/L 256-1023 lines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Radezolid @deltanedas @Lyndomen