forked from space-wizards/space-station-14
-
-
Notifications
You must be signed in to change notification settings - Fork 90
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
port command & cargo trainee roles from deltav #1630
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
af3c128
port command & cargo trainee roles from deltav
mqole 34653c8
fix your fence with sticky tape
mqole 64c44bc
clean your teeth with bubble gum
mqole da6ce3d
brush your hair with a toothbrush
mqole 1de7b0a
fry an egg on a slippery dip
mqole ca027dd
bellyflop into a pizza
mqole 3d8baee
surely. surely this time
mqole 1bd7705
rename to logistics & give brown jumpsuits
mqole aa1a105
piskun ctrl + f
mqole 35262fa
renaming Again
mqole df52c69
(i become the joker)
mqole 3a9cb7f
AGONY. AGONY. AGONY
mqole File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
job-description-supply-assistant = Learn the basics of the cargo department, deliver crates and take buy orders from the rest of the station. | ||
job-description-admin-assistant = Assist command in their day-to-day activities, grab the captain a coffee, answer faxes in the bridge. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
job-name-supply-assistant = Supply Assistant | ||
job-name-admin-assistant = Administrative Assistant |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
job-supervisors-command = all command staff |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
stamp-component-stamped-name-admin-assistant = Administrative Assistant |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,14 @@ | ||
loadout-group-chemistry-gloves = Chemist gloves | ||
loadout-group-supply-assistant-head = Supply Assistant head | ||
loadout-group-supply-assistant-jumpsuit = Supply Assistant jumpsuit | ||
loadout-group-supply-assistant-backpack = Supply Assistant backpack | ||
loadout-group-supply-assistant-outerclothing = Supply Assistant outer clothing | ||
loadout-group-supply-assistant-shoes = Supply Assistant shoes | ||
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-headset = Administrative Assistant headset | ||
loadout-group-admin-assistant-shoes = Administrative Assistant shoes | ||
loadout-group-admin-assistant-gloves = Administrative Assistant gloves |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ | |
- Courier # Imp | ||
- Quartermaster | ||
- SalvageSpecialist | ||
#- SupplyAssistant # DeltaV - Uncomment once ready to deploy. | ||
Comment on lines
8
to
+11
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. uncomment |
||
|
||
- type: department | ||
id: Civilian | ||
|
@@ -74,6 +75,7 @@ | |
- ERTSecurity | ||
- ERTEngineer | ||
- DeathSquad | ||
#- AdministrativeAssistant # Delta V - Uncomment once ready to deploy. Administrative Assistant, see Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. uncomment |
||
primary: false | ||
weight: 100 | ||
|
||
|
20 changes: 20 additions & 0 deletions
20
Resources/Prototypes/_DV/Catalog/Fills/Lockers/command.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
- type: entityTable | ||
id: AdministrativeAssistantLockerFill | ||
table: !type:AllSelector | ||
children: | ||
- id: DrinkCoffeeJug # Gotta keep command awake during the greenshifts | ||
- id: BoxFolderBlue | ||
- id: ClothingUniformJumpsuitAdminAssistant | ||
- id: ClothingUniformJumpskirtAdminAssistant | ||
- id: ClothingHeadsetAltAdminAssistant | ||
- id: AdminAssistantIDCard | ||
|
||
- type: entity | ||
parent: LockerAdministrativeAssistant | ||
id: LockerAdministrativeAssistantFilled | ||
suffix: Filled | ||
components: | ||
- type: EntityTableContainerFill | ||
containers: | ||
entity_storage: !type:NestedSelector | ||
tableId: AdministrativeAssistantLockerFill |
25 changes: 25 additions & 0 deletions
25
Resources/Prototypes/_DV/Entities/Clothing/Ears/headsets.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
- type: entity | ||
parent: ClothingHeadset | ||
id: ClothingHeadsetAdminAssistant | ||
name: adminstrative assistant headset | ||
description: A headset used by the administrative assistant. | ||
components: | ||
- type: ContainerFill | ||
containers: | ||
key_slots: | ||
- EncryptionKeyCommand | ||
- EncryptionKeyCommon | ||
- type: Sprite | ||
sprite: _DV/Clothing/Ears/Headsets/adminassistant.rsi | ||
- type: Clothing | ||
sprite: _DV/Clothing/Ears/Headsets/adminassistant.rsi | ||
|
||
- type: entity | ||
parent: ClothingHeadsetAdminAssistant | ||
id: ClothingHeadsetAltAdminAssistant | ||
name: adminstrative assistant over-ear headset | ||
components: | ||
- type: Sprite | ||
state: icon_alt | ||
- type: Clothing | ||
equippedPrefix: alt |
10 changes: 10 additions & 0 deletions
10
Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
- type: entity | ||
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: _DV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi | ||
- type: Clothing | ||
sprite: _DV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
- type: entity | ||
parent: SpawnPointJobBase | ||
id: SpawnPointLogisticsAssistant | ||
name: supply assistant | ||
components: | ||
- type: SpawnPoint | ||
job_id: CargoTechnician # Change to SupplyAssistant once it's mapped on every map | ||
- type: Sprite | ||
layers: | ||
- state: green | ||
- sprite: _DV/Markers/jobs.rsi | ||
state: supplyassistant | ||
|
||
- type: entity | ||
parent: SpawnPointJobBase | ||
id: SpawnPointAdminAssistant | ||
name: administrative assistant | ||
components: | ||
- type: SpawnPoint | ||
job_id: AdministrativeAssistant | ||
- type: Sprite | ||
layers: | ||
- state: green | ||
- sprite: _DV/Markers/jobs.rsi | ||
state: adminassistant |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
- type: entity | ||
id: BookLogistics | ||
parent: BaseGuidebook | ||
name: logistics 101 | ||
description: A Nanotrasen guide book for a supply assistant still in training. | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: paper | ||
- state: cover_strong | ||
color: "#785214" | ||
- state: decor_wingette | ||
color: "#a8741e" | ||
- state: decor_spine | ||
color: "#a8741e" | ||
- state: icon_diamond | ||
- state: icon_text3 | ||
color: "#ffffff" | ||
- type: GuideHelp | ||
guides: | ||
- Cargo | ||
- Salvage |
27 changes: 27 additions & 0 deletions
27
Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
- type: entity | ||
parent: IDCardStandard | ||
id: SupplyAssistantIDCard | ||
name: supply assistant ID card | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: default | ||
- sprite: _DV/Objects/Misc/id_cards.rsi | ||
state: idsupplyassistant | ||
- type: PresetIdCard | ||
job: SupplyAssistant | ||
|
||
- type: entity | ||
parent: IDCardStandard | ||
id: AdminAssistantIDCard | ||
name: administrative assistant ID card | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: silver | ||
- sprite: _DV/Objects/Misc/id_cards.rsi | ||
state: idadminassistant | ||
- type: Item | ||
heldPrefix: silver | ||
- type: PresetIdCard | ||
job: AdministrativeAssistant |
13 changes: 13 additions & 0 deletions
13
Resources/Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
- type: entity | ||
parent: RubberStampBase | ||
id: RubberStampAdminAssistant | ||
name: administrative assistant rubber stamp | ||
suffix: DO NOT MAP | ||
components: | ||
- type: Stamp | ||
stampedName: stamp-component-stamped-name-admin-assistant | ||
stampedColor: "#4191f2" | ||
stampState: "paper_stamp-admin-assistant" | ||
- type: Sprite | ||
sprite: _DV/Objects/Misc/stamps.rsi | ||
state: stamp-admin-assistant |
13 changes: 13 additions & 0 deletions
13
Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
- type: entity | ||
parent: LockerBaseSecure | ||
id: LockerAdministrativeAssistant | ||
name: administrative assistant's locker | ||
components: | ||
- type: Sprite | ||
sprite: _DV/Structures/Storage/closet.rsi | ||
- type: EntityStorageVisuals | ||
stateBaseClosed: admin_assist | ||
stateDoorOpen: admin_assist_open | ||
stateDoorClosed: admin_assist_door | ||
- type: AccessReader | ||
access: [["Command"]] |
9 changes: 9 additions & 0 deletions
9
Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
- type: loadout | ||
id: LightBrownJumpsuit | ||
equipment: | ||
jumpsuit: ClothingUniformJumpsuitColorLightBrown | ||
|
||
- type: loadout | ||
id: LightBrownJumpskirt | ||
equipment: | ||
jumpsuit: ClothingUniformJumpskirtColorLightBrown |
30 changes: 30 additions & 0 deletions
30
Resources/Prototypes/_DV/Loadouts/Jobs/Command/administrative_assistant.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
# Jumpsuit | ||
- type: loadout | ||
id: AdminAssistantJumpsuit | ||
equipment: | ||
jumpsuit: ClothingUniformJumpsuitAdminAssistant | ||
|
||
- type: loadout | ||
id: AdminAssistantJumpskirt | ||
equipment: | ||
jumpsuit: ClothingUniformJumpskirtAdminAssistant | ||
|
||
- type: loadout | ||
id: AdminAssistantHeadset | ||
equipment: | ||
ears: ClothingHeadsetAdminAssistant | ||
|
||
- type: loadout | ||
id: AdminAssistantAltHeadset | ||
equipment: | ||
ears: ClothingHeadsetAltAdminAssistant | ||
|
||
- type: loadout | ||
id: BlackGloves | ||
equipment: | ||
gloves: ClothingHandsGlovesColorBlack | ||
|
||
- type: loadout | ||
id: WhiteGloves | ||
equipment: | ||
gloves: ClothingHandsGlovesColorWhite |
59 changes: 59 additions & 0 deletions
59
Resources/Prototypes/_DV/Loadouts/Miscellaneous/wintercoats.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
- type: loadout | ||
id: WinterCoatBrown | ||
equipment: | ||
outerClothing: ClothingOuterWinterColorBrown | ||
|
||
- type: loadout | ||
id: WinterCoatBlack | ||
equipment: | ||
outerClothing: ClothingOuterWinterColorBlack | ||
|
||
- type: loadout | ||
id: WinterCoatGray | ||
equipment: | ||
outerClothing: ClothingOuterWinterColorGray | ||
|
||
- type: loadout | ||
id: WinterCoatWhite | ||
equipment: | ||
outerClothing: ClothingOuterWinterColorWhite | ||
|
||
- type: loadout | ||
id: WinterCoatBlue | ||
equipment: | ||
outerClothing: ClothingOuterWinterColorBlue | ||
|
||
- type: loadout | ||
id: WinterCoatRed | ||
equipment: | ||
outerClothing: ClothingOuterWinterColorRed | ||
|
||
- type: loadout | ||
id: WinterCoatGreen | ||
equipment: | ||
outerClothing: ClothingOuterWinterColorGreen | ||
|
||
- type: loadout | ||
id: WinterCoatOrange | ||
equipment: | ||
outerClothing: ClothingOuterWinterColorOrange | ||
|
||
- type: loadout | ||
id: WinterCoatYellow | ||
equipment: | ||
outerClothing: ClothingOuterWinterColorYellow | ||
|
||
- type: loadout | ||
id: WinterCoatLightBrown | ||
equipment: | ||
outerClothing: ClothingOuterWinterColorLightBrown | ||
|
||
- type: loadout | ||
id: WinterCoatPurple | ||
equipment: | ||
outerClothing: ClothingOuterWinterColorPurple | ||
|
||
- type: loadout | ||
id: WinterCoat | ||
equipment: | ||
outerClothing: ClothingOuterWinterCoat |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be uncommented...??? if this is an actual trainee role then it should be like other trainee roles and have the normal job be gated behind department time
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh my god im fucking stupid i know why you had this commented now
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
well its probably fine if this gets uncommented either way, we have enough cargo heads to keep the department from being depopulated