diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 09c2b8bda5..3bd85af225 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -165,7 +165,7 @@ namespace Content.Client.Entry _clientPreferencesManager.Initialize(); _euiManager.Initialize(); _voteManager.Initialize(); - _userInterfaceManager.SetDefaultTheme(_configManager.GetCVar(CCVars.UIDefaultInterfaceTheme)); + _userInterfaceManager.SetDefaultTheme("SS14DefaultTheme"); _userInterfaceManager.SetActiveTheme(_configManager.GetCVar(CVars.InterfaceTheme)); _documentParsingManager.Initialize(); _titleWindowManager.Initialize(); diff --git a/Content.Server/_CP14/GameTicking/Rules/CP14CommonObjectivesRule.cs b/Content.Server/_CP14/GameTicking/Rules/CP14CommonObjectivesRule.cs index 5ec5f61745..76550df5da 100644 --- a/Content.Server/_CP14/GameTicking/Rules/CP14CommonObjectivesRule.cs +++ b/Content.Server/_CP14/GameTicking/Rules/CP14CommonObjectivesRule.cs @@ -4,6 +4,7 @@ using Content.Server._CP14.StationCommonObjectives; using Content.Server.GameTicking; using Content.Server.GameTicking.Rules; using Content.Server.Mind; +using Content.Shared.GameTicking; using Content.Shared.GameTicking.Components; using Content.Shared.Mind; using Content.Shared.Objectives.Components; diff --git a/Content.Server/_CP14/GameTicking/Rules/CP14PersonalObjectivesRule.cs b/Content.Server/_CP14/GameTicking/Rules/CP14PersonalObjectivesRule.cs index 6c2f9aeffc..f6e419d7a5 100644 --- a/Content.Server/_CP14/GameTicking/Rules/CP14PersonalObjectivesRule.cs +++ b/Content.Server/_CP14/GameTicking/Rules/CP14PersonalObjectivesRule.cs @@ -3,6 +3,7 @@ using Content.Server._CP14.GameTicking.Rules.Components; using Content.Server.GameTicking; using Content.Server.GameTicking.Rules; using Content.Server.Mind; +using Content.Shared.GameTicking; using Content.Shared.GameTicking.Components; using Content.Shared.Objectives.Components; using Content.Shared.Objectives.Systems; diff --git a/Content.Server/_CP14/StealArea/CP14StealAreaAutoJobConnectSystem.cs b/Content.Server/_CP14/StealArea/CP14StealAreaAutoJobConnectSystem.cs index 5458d7e760..4ef4c277d6 100644 --- a/Content.Server/_CP14/StealArea/CP14StealAreaAutoJobConnectSystem.cs +++ b/Content.Server/_CP14/StealArea/CP14StealAreaAutoJobConnectSystem.cs @@ -1,7 +1,7 @@ using Content.Server._CP14.StationCommonObjectives; -using Content.Server.GameTicking; using Content.Server.Mind; using Content.Server.Objectives.Components; +using Content.Shared.GameTicking; using Content.Shared.Roles.Jobs; using Robust.Server.Player; using Robust.Shared.Prototypes; diff --git a/Content.Shared/CCVar/CCVars.Shuttle.cs b/Content.Shared/CCVar/CCVars.Shuttle.cs index f66fe9ca59..5300bff0b3 100644 --- a/Content.Shared/CCVar/CCVars.Shuttle.cs +++ b/Content.Shared/CCVar/CCVars.Shuttle.cs @@ -23,7 +23,7 @@ public sealed partial class CCVars /// Whether the arrivals shuttle is enabled. /// public static readonly CVarDef ArrivalsShuttles = - CVarDef.Create("shuttle.arrivals", true, CVar.SERVERONLY); + CVarDef.Create("shuttle.arrivals", false, CVar.SERVERONLY); //CP14 arrivals disabled /// /// The map to use for the arrivals station. @@ -152,7 +152,7 @@ public sealed partial class CCVars /// Whether the emergency shuttle is enabled or should the round just end. /// public static readonly CVarDef EmergencyShuttleEnabled = - CVarDef.Create("shuttle.emergency", true, CVar.SERVERONLY); + CVarDef.Create("shuttle.emergency", false, CVar.SERVERONLY); //CP14 Emergency disabled /// /// The percentage of time passed from the initial call to when the shuttle can no longer be recalled. diff --git a/Content.Shared/CCVar/CCVars.Tips.cs b/Content.Shared/CCVar/CCVars.Tips.cs index 61e6342061..f0d286ae1f 100644 --- a/Content.Shared/CCVar/CCVars.Tips.cs +++ b/Content.Shared/CCVar/CCVars.Tips.cs @@ -14,7 +14,7 @@ public sealed partial class CCVars /// The dataset prototype to use when selecting a random tip. /// public static readonly CVarDef TipsDataset = - CVarDef.Create("tips.dataset", "Tips"); + CVarDef.Create("tips.dataset", "CP14Tips"); /// /// The number of seconds between each tip being displayed when the round is not actively going diff --git a/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl index 9d0919d102..2d1dc30bda 100644 --- a/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl +++ b/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl @@ -73,3 +73,4 @@ station-beacon-tools = Tools station-beacon-disposals = Disposals station-beacon-cryosleep = Cryosleep station-beacon-escape-pod = Escape Pod +station-beacon-vox = Vox Break Room \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml index 19eab391ac..836ce7ff14 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml @@ -639,3 +639,11 @@ components: - type: NavMapBeacon defaultText: station-beacon-escape-pod + +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconVox + suffix: Vox + components: + - type: NavMapBeacon + defaultText: station-beacon-vox