Merge pull request #1630 from mqole/adminassist

port command & cargo trainee roles from deltav

Resources/Locale/en-US/_DV/job/job-description.ftl

@@ -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.

Resources/Locale/en-US/_DV/job/job-names.ftl

@@ -0,0 +1,2 @@
+job-name-supply-assistant = Supply Assistant
+job-name-admin-assistant = Administrative Assistant

Resources/Locale/en-US/_DV/job/job-supervisors.ftl

@@ -0,0 +1 @@
+job-supervisors-command = all command staff

Resources/Locale/en-US/_DV/paper/stamp-component.ftl

@@ -0,0 +1 @@
+stamp-component-stamped-name-admin-assistant = Administrative Assistant

Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl

@@ -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

Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml

@@ -3,6 +3,13 @@
   name: job-name-cargotech
   description: job-description-cargotech
   playTimeTracker: JobCargoTechnician
+  # Begin DeltaV modifications - Add time requirement to cargo tech
+  # Uncomment once ready to deploy Supply Assistant
+  #requirements:
+  #- !type:DepartmentTimeRequirement
+  #  department: Cargo
+  #  time: 21600 # 6 hrs ~3 shifts.
+  # End DeltaV modifications
   startingGear: CargoTechGear
   icon: "JobIconCargoTechnician"
   supervisors: job-supervisors-qm

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -8,6 +8,7 @@
   - Courier # Imp
   - Quartermaster
   - SalvageSpecialist
+  #- SupplyAssistant # DeltaV - Uncomment once ready to deploy.
 
 - 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
   primary: false
   weight: 100
 

Resources/Prototypes/_DV/Catalog/Fills/Lockers/command.yml

@@ -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

Resources/Prototypes/_DV/Entities/Clothing/Ears/headsets.yml

@@ -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

Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml

@@ -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

Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -8,3 +8,14 @@
     sprite: _DV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
   - type: Clothing
     sprite: _DV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
+
+- 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: _DV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi

Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml

@@ -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

Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml

@@ -14,3 +14,37 @@
       enum.PdaVisuals.PdaType:
         !type:String
         pda-syndi-agent
+
+- type: entity
+  parent: CargoPDA
+  id: SupplyAssistantPDA
+  name: supply assistant PDA
+  description: It smells like cardboard.
+  components:
+  - type: Pda
+    id: SupplyAssistantIDCard
+
+- type: entity
+  parent: BasePDA
+  id: AdminAssistantPDA
+  name: administrative assistant PDA
+  description: Theres pen scribbles all over the edges, and a few sticky notes stuck on it.
+  components:
+  - type: Pda
+    id: AdminAssistantIDCard
+    penSlot:
+      startingItem: LuxuryPen
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+  - type: Appearance
+    appearanceDataInit:
+      enum.PdaVisuals.PdaType:
+        !type:String
+        pda-admin-assistant
+  - type: PdaBorderColor
+    borderColor: "#4992b4"
+  - type: Icon
+    sprite: Objects/Devices/pda.rsi
+    state: pda-admin-assistant

Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml

@@ -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

Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml

@@ -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

Resources/Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml

@@ -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

Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml

@@ -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"]]

Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_assistant.yml

@@ -0,0 +1,9 @@
+- type: loadout
+  id: LightBrownJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitColorLightBrown
+
+- type: loadout
+  id: LightBrownJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtColorLightBrown

Resources/Prototypes/_DV/Loadouts/Jobs/Command/administrative_assistant.yml

@@ -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

Resources/Prototypes/_DV/Loadouts/Miscellaneous/wintercoats.yml

@@ -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