Review changes

Also fixes the missing courier localisation because I was dumb
DeltaV-Station · May 28, 2024 · c1e0641 · c1e0641
1 parent 1af9835
commit c1e0641
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 47 deletions.
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -43,5 +43,4 @@
   - type: StorageFill
     contents:
       - id: BoxSurvival
-      - id: Flash
       - id: RubberStampAdminAssistant
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
@@ -54,6 +54,34 @@
         tags:
         - Write
 
+- type: entity
+  parent: BasePDA
+  id: CourierPDA
+  name: courier PDA
+  description: Smells like unopened letters.
+  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: CourierIDCard
+    state: pda-mailcarrier
+  - type: PdaBorderColor
+    borderColor: "#e39751"
+    accentVColor: "#050c4d"
+  - type: Icon
+    sprite: DeltaV/Objects/Devices/pda.rsi
+    state: pda-mailcarrier
+
 - type: entity
   parent: BasePDA
   id: AdminAssistantPDA

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml
@@ -1,3 +1,16 @@
+- type: entity
+  parent: IDCardStandard
+  id: CourierIDCard
+  name: courier ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - sprite: DeltaV/Objects/Misc/id_cards.rsi
+      state: nyanomailcarrier
+  - type: PresetIdCard
+    job: Courier
+
 - type: entity
   parent: IDCardStandard
   id: AdminAssistantIDCard

diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml
@@ -4,64 +4,21 @@
   description: job-description-admin-assistant
   playTimeTracker: JobAdminAssistant
   requirements:
-    - !type:DepartmentTimeRequirement
-      department: Logistics
-      time: 18000 # 5 hours
-    - !type:DepartmentTimeRequirement
-      department: Engineering
-      time: 18000 # 5 hours
-    - !type:DepartmentTimeRequirement
-      department: Medical
-      time: 18000 # 5 hours
-    - !type:DepartmentTimeRequirement
-      department: Security
-      time: 18000 # 5 hours
-    - !type:DepartmentTimeRequirement
-      department: Epistemics 
-      time: 18000 # 5 hours
     - !type:DepartmentTimeRequirement
       department: Command
-      time: 108000 # 30 hours
+      time: 21600 # 6 hours
     - !type:OverallPlaytimeRequirement 
-      time: 108000 # 30 hours
+      time: 36000 # 10 hours
     - !type:WhitelistRequirement
   weight: 20
   startingGear: AdminAssistantGear
   icon: "JobIconAdminAssitant"
-  requireAdminNotify: true
   joinNotifyCrew: true
   supervisors: job-supervisors-command
   canBeAntag: false
   access:
   - Command
-  - Bar
-  - Service
   - Maintenance
-  - Janitor
-  - Theatre
-  - Kitchen
-  - Chapel
-  - Hydroponics
-  - External
-  - Cryogenics
-  - Chemistry
-  - Engineering
-  - Research
-  - Detective
-  - Salvage
-  - Security
-  - Brig
-  - Lawyer
-  - Cargo
-  - Atmospherics
-  - Medical
-  - Boxer
-  - Clown
-  - Library
-  - Mime
-  - Musician
-  - Reporter
-  - Zookeeper
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]

diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml
@@ -4,5 +4,8 @@
 - type: playTimeTracker
   id: JobMedicalBorg
 
+- type: playTimeTracker
+  id: JobCourier
+
 - type: playTimeTracker
   id: JobAdminAssistant
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -50,7 +50,6 @@
   - HeadOfSecurity
   - ResearchDirector
   - Quartermaster
-  - AdministrativeAssistant # Delta V - AdminAssistant, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Command/admin_assistant.yml
   primary: false
   weight: 100
 
@@ -116,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