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, a new RP / Support centric "command" role #1207

Closed
wants to merge 22 commits into from
Closed

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

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ac7cd64
file move
noctyrnal May 15, 2024
d3213d5
stamp and id
noctyrnal May 15, 2024
73cd660
trying to figure out loadout yml
noctyrnal May 15, 2024
a60726a
fixes loadout and a few borked ftls
noctyrnal May 15, 2024
f6ce8cd
Accidentally deleted courier spawn
noctyrnal May 15, 2024
95c83c4
Adds spawner to every map + updates prototypes
noctyrnal May 15, 2024
d138aec
Merge branch 'master' into admin-assist
noctyrnal May 15, 2024
14da00b
Reverts Spawns + Fixes mail courier somewhat
noctyrnal May 15, 2024
e0b34c2
merge master
noctyrnal May 25, 2024
1af9835
Merge branch 'master' into admin-assist
noctyrnal May 28, 2024
c1e0641
Review changes
noctyrnal May 28, 2024
f0bbbbb
revert engine change
noctyrnal May 28, 2024
8e5e55c
Missing courier description
noctyrnal May 28, 2024
fee1287
missing paper_stamp-signature
noctyrnal May 28, 2024
c4c0221
Review changes II
noctyrnal Jun 3, 2024
3ab16b8
Resolves loadout group conflict
noctyrnal Jun 3, 2024
7fecd5c
Merge branch 'master' into admin-assist
noctyrnal Jun 3, 2024
dcf8abd
removes outdated bureaucracy.rsi content
noctyrnal Jun 3, 2024
34acb71
Removes outdated parts of role_loadouts
noctyrnal Jun 3, 2024
42bf0ad
Review Changes III
noctyrnal Jun 3, 2024
8468231
Reverts nospawns, changes bags
noctyrnal Jun 4, 2024
2dfd51c
Merge branch 'master' into admin-assist
noctyrnal Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Locale/en-US/deltav/job/job-description.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department.
job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs.
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
job-description-admin-assistant = Assist command in their day-to-day activities, grab the captain a coffee, answer faxes in the bridge.
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/deltav/job/job-names.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
job-name-medical-borg = Medical Cyborg
job-name-courier = Courier
job-name-admin-assistant = Administrative Assistant

# Role Timers
JobAdministrativeAssistant = Administrative Assistant
1 change: 1 addition & 0 deletions Resources/Locale/en-US/deltav/job/job-supervisors.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
job-supervisors-command = all command staff
1 change: 1 addition & 0 deletions Resources/Locale/en-US/deltav/paper/stamp-component.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
stamp-component-stamped-name-admin-assistant = Administrative Assistant
6 changes: 6 additions & 0 deletions Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,9 @@ loadout-group-martial-artist-shoes = Martial Artist shoes

loadout-group-gladiator-jumpsuit = Gladiator jumpsuit
loadout-group-gladiator-outerclothing = Gladiator outer clothing

# Command
loadout-group-admin-assistant-head = Administrative Assistant head
loadout-group-admin-assistant-jumpsuit = Administrative Assistant jumpsuit
loadout-group-admin-assistant-outerclothing = Administrative Assistant outer clothing
loadout-group-admin-assistant-back = Administrative Assistant backpack
13 changes: 13 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,16 @@
contents:
- id: BoxSurvivalMedical
- id: RubberStampPsychologist

- type: entity
noSpawn: true
parent: ClothingBackpackCaptain
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
id: ClothingBackpackAdminAssistantFilled
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
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"

components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: RubberStampAdminAssistant
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved

12 changes: 12 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,15 @@
contents:
- id: BoxSurvivalMedical
- id: RubberStampPsychologist

- type: entity
noSpawn: true
parent: ClothingBackpackDuffelCaptain
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
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"

components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: RubberStampAdminAssistant
12 changes: 12 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,15 @@
contents:
- id: BoxSurvivalMedical
- id: RubberStampPsychologist

- type: entity
noSpawn: true
parent: ClothingBackpackSatchelCaptain
id: ClothingBackpackSatchelAdminAssistantFilled
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
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"

components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: RubberStampAdminAssistant
14 changes: 14 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headset_alt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- type: entity
parent: ClothingHeadsetAlt
id: ClothingHeadsetAltAdminAssistant
name: administrative assistant over-ear headset
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: ContainerFill
containers:
key_slots:
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
- EncryptionKeyCommand
- EncryptionKeyCommon
- 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

11 changes: 11 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,14 @@
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi

- type: entity
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
parent: ClothingUniformBase
id: ClothingUniformJumpskirtAdminAssistant
name: administrative assistant's jumpskirt
description: A suit worn by the Administrative Assistant. Smells of burnt coffee.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi
13 changes: 12 additions & 1 deletion Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,4 +253,15 @@
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi

noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitAdminAssistant
name: administrative assistant's jumpsuit
description: A suit worn by the Administrative Assistant. Smells of burnt coffee.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi
13 changes: 13 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,16 @@
- state: green
- sprite: DeltaV/Markers/jobs.rsi
state: courier

- type: entity
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
id: SpawnPointAdminAssistant
parent: SpawnPointJobBase
name: administrative assistant
noSpawn: true
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: SpawnPoint
job_id: AdministrativeAssistant
- type: Sprite
layers:
- state: green
- state: adminassistant
33 changes: 33 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,36 @@
- type: Icon
sprite: DeltaV/Objects/Devices/pda.rsi
state: pda-mailcarrier

- type: entity
parent: BasePDA
id: AdminAssistantPDA
name: administrative assistant PDA
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
description: Theres pen scribbles all over the edges, and a few sticky notes stuck on it.
components:
- type: Sprite
sprite: DeltaV/Objects/Devices/pda.rsi
layers:
- map: [ "enum.PdaVisualLayers.Base" ]
- state: "light_overlay"
map: [ "enum.PdaVisualLayers.Flashlight" ]
shader: "unshaded"
visible: false
- state: "id_overlay"
map: [ "enum.PdaVisualLayers.IdLight" ]
shader: "unshaded"
visible: false
- type: Pda
id: AdminAssistantIDCard
state: pda-admin-assistant
penSlot:
startingItem: LuxuryPen
priority: -1
whitelist:
tags:
- Write
- type: PdaBorderColor
borderColor: "#aa9100"
- type: Icon
sprite: DeltaV/Objects/Devices/pda.rsi
state: pda-admin-assistant
15 changes: 15 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,18 @@
state: nyanomailcarrier
- type: PresetIdCard
job: Courier

- type: entity
parent: IDCardStandard
id: AdminAssistantIDCard
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
name: administrative assistant ID card
components:
- type: Sprite
layers:
- state: silver
- sprite: DeltaV/Objects/Misc/id_cards.rsi
state: idadminassistant
- type: Item
heldPrefix: silver
- type: PresetIdCard
job: AdministrativeAssistant
15 changes: 15 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,18 @@
- type: Sprite
sprite: DeltaV/Objects/Misc/stamps.rsi
state: stamp-psychologist

- type: entity
name: administrative assistant rubber stamp
parent: RubberStampBase
id: RubberStampAdminAssistant
noSpawn: true
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
suffix: DO NOT MAP
NullWanderer marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: Stamp
stampedName: stamp-component-stamped-name-admin-assistant
stampedColor: "#4191f2"
stampState: "paper_stamp-admin-assistant"
- type: Sprite
sprite: DeltaV/Objects/Misc/stamps.rsi
state: stamp-admin-assistant
48 changes: 48 additions & 0 deletions Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/admin_assistant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Jumpsuit
- type: loadout
id: AdminAssistantJumpsuit
equipment: AdminAssistantJumpsuit

- type: startingGear
id: AdminAssistantJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitAdminAssistant

- type: loadout
id: AdminAssistantJumpskirt
equipment: AdminAssistantJumpskirt

- type: startingGear
id: AdminAssistantJumpskirt
equipment:
jumpsuit: ClothingUniformJumpskirtAdminAssistant

# Back

- type: loadout
id: AdminAssistantBackpack
equipment: AdminAssistantBackpack

- type: startingGear
id: AdminAssistantBackpack
equipment:
back: ClothingBackpackAdminAssistantFilled

- type: loadout
id: AdminAssistantSatchel
equipment: AdminAssistantSatchel

- type: startingGear
id: AdminAssistantSatchel
equipment:
back: ClothingBackpackSatchelAdminAssistantFilled

- type: loadout
id: AdminAssistantDuffel
equipment: AdminAssistantDuffel

- type: startingGear
id: AdminAssistantDuffel
equipment:
back: ClothingBackpackDuffelAdminAssistantFilled

25 changes: 25 additions & 0 deletions Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,31 @@
- BrigMedicSatchel
- BrigMedicDuffel

# Command
## Admin Assistant

- type: loadoutGroup
id: AdminAssistantJumpsuit
name: loadout-group-admin-assistant-jumpsuit
loadouts:
- AdminAssistantJumpsuit
- AdminAssistantJumpskirt

- type: loadoutGroup
id: AdminAssistantOuterClothing
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


- type: loadoutGroup
id: AdminAssistantBack
name: loadout-group-admin-assistant-back
loadouts:
- AdminAssistantBackpack
- AdminAssistantSatchel
- AdminAssistantDuffel

- type: loadoutGroup
id: Scarfs
name: loadout-group-scarfs
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,13 @@
- SecurityOuterClothing
- MedicalGloves
- Trinkets

# Command
- type: roleLoadout
id: JobAdministrativeAssistant
groups:
- AdminAssistantJumpsuit
- AdminAssistantBack
- AdminAssistantOuterClothing
- Glasses
- Trinkets
31 changes: 31 additions & 0 deletions Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
- type: job
id: AdministrativeAssistant
name: job-name-admin-assistant
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

department: Command
time: 21600 # 6 hours
- !type:OverallPlaytimeRequirement
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
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

time: 36000 # 10 hours
weight: 20
startingGear: AdminAssistantGear
icon: "JobIconAdminAssitant"
joinNotifyCrew: true
supervisors: job-supervisors-command
canBeAntag: false
access:
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved
- Command
- Maintenance
special:
- !type:AddImplantSpecial
implants: [ MindShieldImplant ]

- type: startingGear
id: AdminAssistantGear
equipment:
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?

3 changes: 3 additions & 0 deletions Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@

- type: playTimeTracker
id: JobCourier
noctyrnal marked this conversation as resolved.
Show resolved Hide resolved

- 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

7 changes: 7 additions & 0 deletions Resources/Prototypes/DeltaV/StatusEffects/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@
icon:
sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
state: MedicalBorg

- type: statusIcon
parent: JobIcon
id: JobIconAdminAssitant
icon:
sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
state: AdminAssistant
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/departments.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,5 @@
- Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
- Prisoner # Nyanotrasen - Prisoner, see Resrouces/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
- Brigmedic # DeltaV - Corpsman, see Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
- AdministrativeAssistant # Delta V - AdminAssistant, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Command/admin_assistant.yml
primary: false
Binary file added ...othing/Uniforms/Jumpskirt/admin_assistant.rsi/equipped-INNERCLOTHING-monkey.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/equipped-INNERCLOTHING.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...extures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading