diff --git a/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs index 9c17022e462..205630e5a10 100644 --- a/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs +++ b/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs @@ -83,7 +83,7 @@ protected override void FrameUpdate(FrameEventArgs args) if (_respawnTime is null || _gameTiming.CurTime > _respawnTime) { GhostRespawnButton.Text = Loc.GetString("ghost-gui-respawn-button-allowed"); - GhostRespawnButton.Disabled = false; + GhostRespawnButton.Disabled = true; //true сменить на false. true для ивента } else { diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/bailiff.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/bailiff.yml index 5ad85e94238..6b8fa88992e 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/bailiff.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/bailiff.yml @@ -5,7 +5,7 @@ playTimeTracker: JobWarden requirements: - !type:OverallPlaytimeRequirement - time: 108000 # 30 hours + time: 108000000 # 30 hours - !type:DepartmentTimeRequirement department: Security time: 64800 # 18 hours diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/brigmedic.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/brigmedic.yml index bbcdc3bd68b..5054ac9c451 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/brigmedic.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/brigmedic.yml @@ -5,7 +5,7 @@ playTimeTracker: JobBrigmedic requirements: - !type:OverallPlaytimeRequirement - time: 43200 # 12 hours + time: 43200000 # 12 hours - !type:DepartmentTimeRequirement department: Security time: 21600 # 6 hours diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/cadet.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/cadet.yml index e76f668c85d..797deb925aa 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/cadet.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/cadet.yml @@ -5,7 +5,7 @@ playTimeTracker: JobSecurityCadet requirements: - !type:OverallPlaytimeRequirement - time: 21600 # 6 hours + time: 21600000 # 6 hours - !type:DepartmentTimeRequirement department: Security time: 64800 # 18 hours @@ -35,4 +35,4 @@ - Flash - MagazinePistol - MagazinePistolRubber - - FrontierUplinkCoin10 \ No newline at end of file + - FrontierUplinkCoin10 diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/deputy.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/deputy.yml index 0e63d3f021a..4f9d9122d9f 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/deputy.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/deputy.yml @@ -5,7 +5,7 @@ playTimeTracker: JobSecurityOfficer requirements: - !type:OverallPlaytimeRequirement - time: 43200 # 12 hours + time: 43200000 # 12 hours - !type:DepartmentTimeRequirement department: Security time: 21600 # 6 hours @@ -37,4 +37,4 @@ - Flash - MagazinePistol - MagazinePistolRubber - - FrontierUplinkCoin10 \ No newline at end of file + - FrontierUplinkCoin10 diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/detectivenf.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/detectivenf.yml index a8a5c676b3f..5b583fae3cc 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/detectivenf.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/detectivenf.yml @@ -5,7 +5,7 @@ playTimeTracker: JobDetective requirements: - !type:OverallPlaytimeRequirement - time: 43200 # 12 hours + time: 43200000 # 12 hours - !type:DepartmentTimeRequirement department: Security time: 21600 # 6 hours diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/public_affairs.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/public_affairs.yml index d2f09faf3ee..b1985c4c0d6 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/public_affairs.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/public_affairs.yml @@ -5,7 +5,7 @@ playTimeTracker: JobPublicAffairsLiaison requirements: - !type:OverallPlaytimeRequirement - time: 43200 # 12 hours + time: 43200000 # 12 hours - !type:DepartmentTimeRequirement department: Security time: 21600 # 6 hours diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/senior_officer.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/senior_officer.yml index 5d567587961..e2e6bb62ec0 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/senior_officer.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/senior_officer.yml @@ -5,7 +5,7 @@ playTimeTracker: JobSeniorOfficer requirements: - !type:OverallPlaytimeRequirement - time: 108000 # 30 hours + time: 1080000000 # 30 hours - !type:DepartmentTimeRequirement department: Security time: 43200 # 18 hours diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/sheriff.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/sheriff.yml index c9d38bc0025..7c6fe24d5ff 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/sheriff.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/sheriff.yml @@ -5,7 +5,7 @@ playTimeTracker: JobHeadOfSecurity requirements: - !type:OverallPlaytimeRequirement - time: 129600 # 36 hours + time: 129600000 # 36 hours - !type:DepartmentTimeRequirement department: Security time: 86400 # 24 hours @@ -60,4 +60,4 @@ - DoorRemoteNfsd - BaseSecurityUplinkRadioSheriff - ClothingNeckNfsdBadgeSheriff - - RubberStampSheriff \ No newline at end of file + - RubberStampSheriff diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml index 6d1ce6357b8..bfa96ecedfa 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml @@ -5,7 +5,7 @@ playTimeTracker: JobPirate requirements: - !type:OverallPlaytimeRequirement - time: 86400 # 24 hours + time: 86400000 # 24 hours - !type:DepartmentTimeRequirement department: Security time: 10800 # 3 hrs diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml index 4d3edd1f81a..fb9b8a25935 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml @@ -5,7 +5,7 @@ playTimeTracker: JobPirateCaptain requirements: - !type:OverallPlaytimeRequirement - time: 172800 # 48 hours + time: 172800000 # 48 hours - !type:RoleTimeRequirement role: JobSeniorOfficer time: 10800 # 3 hours diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml index 6139ef57c31..e9449529179 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml @@ -5,7 +5,7 @@ playTimeTracker: JobPirateFirstMate requirements: - !type:OverallPlaytimeRequirement - time: 129600 # 36 hours + time: 129600000 # 36 hours - !type:DepartmentTimeRequirement department: Security time: 10800 # 3 hours