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

Administrative Assistant, a new RP / Support centric "command" role #1207

Closed
wants to merge 22 commits into from

Conversation

noctyrnal
Copy link
Contributor

About the PR

Adds the Administrative Assistant role to all stations, acting as both a secretary for command and as a worker on the bridge, answering faxes , grabbing coffees for command members and so on. Intended to support command members in more menial tasks, and to provide unique RP circumstances.

Why / Balance

Makes command's life a bit easier to have a person dedicated to helping them do the small things

Technical details

None

Media

f77bc14897d700be8c36fde6fb72c6af

  • [ X ] I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑

  • add: Added the Administrative Assistant Role! Assist command in their day-to-day activities, grab the captain a coffee, answer faxes in the bridge!

@deltav-mapserver
Copy link

This PR contains new or changed maps:

  • arena.yml
  • asterisk.yml
  • edge.yml
  • hammurabi.yml
  • hive.yml
  • lighthouse.yml
  • pebble.yml
  • shoukou.yml
  • submarine.yml
  • tortuga.yml

Maps are being rendered. This comment will be updated if rendering them is done.
05/15/24 22:46

@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Map Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels May 15, 2024
Copy link
Contributor

github-actions bot commented May 15, 2024

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

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/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/Markers/jobs.rsi

State Old New Status
adminassistant Added

Resources/Textures/Objects/Misc/bureaucracy.rsi

State Old New Status
paper_stamp-admin-assistant Added

Edit: diff updated after 2dfd51c

Copy link
Contributor

@NullWanderer NullWanderer left a comment

Choose a reason for hiding this comment

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

Why does this remove courier localisation?

You shouldn't be editing maps in the same pr that introduces something, mappers should do that on their own, or if they're unavailable, it should be a seperate pr.

@noctyrnal
Copy link
Contributor Author

Why does this remove courier localisation?

Probably me misreading one of the changes in master and assuming I accidentally deleted something, I'll go undo that now

You shouldn't be editing maps in the same pr that introduces something, mappers should do that on their own, or if they're unavailable, it should be a seperate pr.

Noted

@NullWanderer
Copy link
Contributor

I see more problems, but I'll do a bigger review tomorrow

noctis makes yet another oopsie, I'll revert / fix whatevers needed after review
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

I'm also going to politely beg for you to add localistations for all the new entities <3

@NullWanderer
Copy link
Contributor

Localized entities are not a requirement and make editing more difficult. It should only be reserved for non English codebases.

@DangerRevolution
Copy link
Contributor

Localized entities are not a requirement and make editing more difficult. It should only be reserved for non English codebases.

would be nice for some of our downstreams that aren't English :)

@Timemaster99
Copy link
Contributor

By name, this is an assistant role, similar to technical assistant, research assistant, security cadet and medical intern. New players will see this and think of it as a decent role to get them used to the pressures of command before entering a position of responsibility.
That's why I motion to remove the command time requirement and whitelist. For the whitelist, I believe the purpose of that system is to keep the most influential roles to a higher standard. By itself, this role has no influence and depends on assignments from command to enact any authority (as you will not see anyone respecting the will of someone with "assistant" in their job name). As for the command time, it's unnecessary to require the role with the lowest authority in command to be in the upper echelon of experience for command roles, especially because of how attractive this role is to newer players looking to learn command.
I understand that the requirements are likely a result of the accesses granted to the role. I agree with Danger that these should be limited. Chief Engineer could benefit from AA to repair station-threatening breaches, but they are still not afforded that much power. Command access is all that's required for this role to operate normally, and since that access gives them permission to call the shuttle and make announcements, the 30 hour overall requirement is equitable. Command requirements already average ~30 hours playtime, so this is definitely enough to prevent raiders and uncommitted players.
Aside from that, I think a role to help transition players into command is a great addition. It will help new players attach to a command member of choice and learn from them, while also giving some nice interactions and roleplay for command members themselves. Great job on this PR

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 Status: Merge Conflict Fix your PR! label May 18, 2024
@github-actions github-actions bot removed the Status: Merge Conflict Fix your PR! label May 25, 2024
Also fixes the missing courier localisation because I was dumb
@github-actions github-actions bot removed the Status: Merge Conflict Fix your PR! label Jun 3, 2024
@noctyrnal
Copy link
Contributor Author

I plan on renaming this to Administrative Secretary to further get the point across that this is a support command role and not a command role designed for learning the aspects of command. I'll do this once I have everything all done as per the final review.

I accidentally left in 2 empty groups
Copy link
Contributor

@DangerRevolution DangerRevolution 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; only thing I'd say is to add empty lines at the bottom of each file for consistency; and to localise some of the new entities but those are both up to you.

Added empty lines to ends of files, moved some ftl stuff to delta v files, added nospawn to marker and rubber stamp.
@NullWanderer
Copy link
Contributor

and to localise some of the new entities

You have already been informed we don't do this several times. If you continue to give our contributors bad advice like this, you may be banned from the repository.

Copy link
Contributor

@NullWanderer NullWanderer left a comment

Choose a reason for hiding this comment

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

I still hate how stamps must be in the same upstream file. I'll look into if this is something we can change sometime

@DangerRevolution

This comment was marked as abuse.

@github-actions github-actions bot added the Status: Merge Conflict Fix your PR! label Jun 7, 2024
Copy link
Contributor

github-actions bot commented Jun 7, 2024

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

@github-actions github-actions bot removed the Status: Merge Conflict Fix your PR! label Jun 11, 2024
@noctyrnal
Copy link
Contributor Author

Should be all ready for a review now, merged to master and fixed the conflicts

Copy link
Contributor

@NullWanderer NullWanderer left a comment

Choose a reason for hiding this comment

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

The code changes look good, but this is going to go through more discussion first. Do not merge until that is done

@NullWanderer NullWanderer added Status: Do Not Merge Don't merge this yet Status: Needs Discussion Must be discussed labels Jun 12, 2024
@noctyrnal
Copy link
Contributor Author

we're so back secretary bros

@sword-of-stabbing
Copy link

This would probably be the command role I would play the most. Head of Paperwork, basically. I love bureaucracy.

@Timemaster99
Copy link
Contributor

This would probably be the command role I would play the most. Head of Paperwork, basically. I love bureaucracy.

HoP in shambles

@github-actions github-actions bot added the Status: Merge Conflict Fix your PR! label Jun 14, 2024
Copy link
Contributor

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

parent: ClothingBackpack
id: ClothingBackpackAdminAssistantFilled
name: administrative assistant's backpack
description: Its a backpack build for carrying paper.
Copy link
Contributor

Choose a reason for hiding this comment

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

*"It's", *"built"

parent: ClothingBackpackDuffel
id: ClothingBackpackDuffelAdminAssistantFilled
name: administrative assistant's duffel bag
description: Its a duffel bag build for carrying paper.
Copy link
Contributor

Choose a reason for hiding this comment

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

*"It's", *"built"

parent: ClothingBackpackSatchel
id: ClothingBackpackSatchelAdminAssistantFilled
name: administrative assistant's satchel
description: Its a satchel build for carrying paper.
Copy link
Contributor

Choose a reason for hiding this comment

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

*"It's", *"built"

- type: Sprite
sprite: Clothing/Ears/Headsets/command.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/command.rsi
Copy link
Contributor

Choose a reason for hiding this comment

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

new line here would be great x3

name: loadout-group-admin-assistant-outerclothing
minLimit: 0
loadouts:
- CaptainWintercoat
Copy link
Contributor

Choose a reason for hiding this comment

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

pretty please change this out for something else. duravest would work fine for now until your or I get to spriting a dedicated coat

description: job-description-admin-assistant
playTimeTracker: JobAdminAssistant
requirements:
- !type:DepartmentTimeRequirement
Copy link
Contributor

Choose a reason for hiding this comment

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

1984 the command time requirement

- !type:DepartmentTimeRequirement
department: Command
time: 21600 # 6 hours
- !type:OverallPlaytimeRequirement
Copy link
Contributor

Choose a reason for hiding this comment

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

set this to twenty five hours (90000) pretty please

shoes: ClothingShoesBootsLaceup
belt: BoxFolderClipboard
id: AdminAssistantPDA
ears: ClothingHeadsetAltAdminAssistant
Copy link
Contributor

Choose a reason for hiding this comment

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

newline?

@@ -15,3 +15,6 @@

- type: playTimeTracker
id: JobCourier

- type: playTimeTracker
id: JobAdminAssistant
Copy link
Contributor

Choose a reason for hiding this comment

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

new liiine

Copy link
Contributor

Choose a reason for hiding this comment

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

can we get a new PDA sprite for this pretty please??? >.<

@noctyrnal noctyrnal closed this Sep 13, 2024
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: Map Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files Status: Do Not Merge Don't merge this yet Status: Merge Conflict Fix your PR! Status: Needs Discussion Must be discussed Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants