diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml index fa5e80ee2f..121b68fdf3 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml @@ -4,27 +4,17 @@ description: job-description-admin-assistant playTimeTracker: JobLPPАdjutant # JobAdminAssistant # LPP Адъю трекер requirements: - - !type:DepartmentTimeRequirement + - !type:CharacterAgeRequirement + min: 25 + max: 80 + - !type:CharacterDepartmentTimeRequirement department: Engineering - min: 10800 # 3 hours - - !type:DepartmentTimeRequirement - department: Logistics - min: 10800 # 3 hours - - !type:DepartmentTimeRequirement + min: 36000 + - !type:CharacterDepartmentTimeRequirement department: Medical - min: 10800 # 3 hours - - !type:DepartmentTimeRequirement - department: Civilian - min: 10800 # 3 hours - - !type:DepartmentTimeRequirement - department: Security - min: 10800 # 3 hours - - !type:DepartmentTimeRequirement - department: Justice - min: 10800 # 3 hours - - !type:DepartmentTimeRequirement - department: Epistemics - min: 10800 # 3 hours + min: 36000 + - !type:CharacterOverallTimeRequirement + min: 72000 startingGear: AdminAssistantGear icon: "JobIconAdminAssitant" supervisors: job-supervisors-command @@ -61,8 +51,10 @@ id: AdminAssistantGear equipment: jumpsuit: ClothingUniformJumpsuitAdminAssistant - id: AdminAssistantPDA - ears: ClothingHeadsetAdminAssist + back: ClothingBackpackHOPFilled + neck: LPPADJUCloak + id: LPPAdjutantPDA + ears: ClothingHeadsetCommand shoes: ClothingShoesLeather socks: LPPClothingUnderSocksNormBlue underwear: LPPBoxerBlue diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml index 782163f83c..daed70454a 100644 --- a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml @@ -7,5 +7,5 @@ - type: playTimeTracker id: JobCourier -- type: playTimeTracker - id: JobAdminAssistant \ No newline at end of file +# - type: playTimeTracker # LPP It's JobLPPАdjutant +# id: JobAdminAssistant diff --git a/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/jobs.yml index 4c6b187181..9b1c18f274 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/jobs.yml @@ -1,14 +1,14 @@ -# - type: entity -# id: LPPAdjutantSpawn -# parent: SpawnPointJobBase -# name: adjutant spawn -# components: -# - type: SpawnPoint -# job_id: LPPAdjutant -# - type: Sprite -# layers: -# - state: green -# - state: hop +- type: entity + id: LPPAdjutantSpawn + parent: SpawnPointJobBase + name: adjutant spawn + components: + - type: SpawnPoint + job_id: AdministrativeAssistant # LPPAdjutant # Появился AdministrativeAssistant + - type: Sprite + layers: + - state: green + - state: hop - type: entity id: LPPSpawnSecPilot diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml index b4cf6e4437..270f7728be 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml @@ -37,17 +37,23 @@ - type: HealthAnalyzer scanDelay: 1.2 -# - type: entity -# parent: BasePDA -# id: LPPAdjutantPDA -# name: adjutant PDA -# description: Adjutant PDA. -# components: -# - type: Pda -# id: LPPAdjutantIDCard -# state: pda-clear -# - type: Icon -# state: pda-clear +- type: entity + parent: BasePDA + id: LPPAdjutantPDA + name: adjutant PDA + description: Adjutant PDA. + components: + - type: Pda + id: AdminAssistantIDCard # LPPAdjutantIDCard + state: pda-clear + - type: Icon + state: pda-clear + - type: CartridgeLoader + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - NanoChatCartridge - type: entity parent: BasePDA diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml index f98a70a5cd..26ae98afd4 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml @@ -27,21 +27,21 @@ groups: - AllAccess -# - type: entity -# parent: IDCardStandard -# id: LPPAdjutantIDCard -# name: adjutant ID card -# components: -# - type: Sprite -# layers: -# - state: default -# - state: departmenthead -# color: "#1B67A5" -# - state: subdepartment -# color: "#1B67A5" -# - state: idheadofpersonnel -# - type: PresetIdCard -# job: LPPAdjutant +- type: entity + parent: IDCardStandard + id: LPPAdjutantIDCard + name: adjutant ID card + components: + - type: Sprite + layers: + - state: default + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: idheadofpersonnel + - type: PresetIdCard + job: LPPAdjutant - type: entity parent: IDCardStandard