diff --git a/Content.Server/GameTicking/Commands/ForceMapCommand.cs b/Content.Server/GameTicking/Commands/ForceMapCommand.cs index 5d2191fb52..5677ff4b8f 100644 --- a/Content.Server/GameTicking/Commands/ForceMapCommand.cs +++ b/Content.Server/GameTicking/Commands/ForceMapCommand.cs @@ -29,6 +29,12 @@ namespace Content.Server.GameTicking.Commands var gameMap = IoCManager.Resolve(); var name = args[0]; + if (!gameMap.TrySelectMapIfEligible(name)) + { + shell.WriteLine($"No eligible map exists with name {name}."); + return; + } + _configurationManager.SetCVar(CCVars.GameMap, name); shell.WriteLine(Loc.GetString("forcemap-command-success", ("map", name))); } diff --git a/Content.Shared/Examine/ExamineSystemShared.Group.cs b/Content.Shared/Examine/ExamineSystemShared.Group.cs index bd284f321c..22aeeeeab8 100644 --- a/Content.Shared/Examine/ExamineSystemShared.Group.cs +++ b/Content.Shared/Examine/ExamineSystemShared.Group.cs @@ -1,3 +1,4 @@ +using Content.Shared.Ghost; using Content.Shared.Verbs; using Robust.Shared.Utility; @@ -14,6 +15,8 @@ namespace Content.Shared.Examine base.Initialize(); SubscribeLocalEvent>(OnGroupExamineVerb); + + _ghostQuery = GetEntityQuery(); } /// diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs index 8831213c35..4100b07483 100644 --- a/Content.Shared/Examine/ExamineSystemShared.cs +++ b/Content.Shared/Examine/ExamineSystemShared.cs @@ -3,6 +3,7 @@ using System.Globalization; using System.Linq; using System.Text; using Content.Shared.Eye.Blinding.Components; +using Content.Shared.Ghost; using Content.Shared.Interaction; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; @@ -44,6 +45,8 @@ namespace Content.Shared.Examine protected const float ExamineBlurrinessMult = 2.5f; + private EntityQuery _ghostQuery; + /// /// Creates a new examine tooltip with arbitrary info. /// @@ -54,6 +57,10 @@ namespace Content.Shared.Examine if (IsClientSide(entity)) return true; + // Ghosts can see everything. + if (_ghostQuery.HasComp(examiner)) + return true; + // check if the mob is in critical or dead if (MobStateSystem.IsIncapacitated(examiner)) return false; diff --git a/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs b/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs index f997621907..4e6ebb23d2 100644 --- a/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs +++ b/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs @@ -1,17 +1,17 @@ using Robust.Shared.Audio; -namespace Content.Shared.Sound.Components -{ - /// - /// Base sound emitter which defines most of the data fields. - /// Accepts both single sounds and sound collections. - /// - public abstract partial class BaseEmitSoundComponent : Component - { - public static readonly AudioParams DefaultParams = AudioParams.Default.WithVolume(-2f); +namespace Content.Shared.Sound.Components; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("sound", required: true)] - public SoundSpecifier? Sound; - } +/// +/// Base sound emitter which defines most of the data fields. +/// Accepts both single sounds and sound collections. +/// +public abstract partial class BaseEmitSoundComponent : Component +{ + public static readonly AudioParams DefaultParams = AudioParams.Default.WithVolume(-2f); + + [AutoNetworkedField] + [ViewVariables(VVAccess.ReadWrite)] + [DataField(required: true)] + public SoundSpecifier? Sound; } diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 52f0dd8974..27fca87738 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: BITTERLYNX - changes: - - message: Rodents are more visually pleasing to burn - type: Fix - - message: mothroach and hammy also more visually pleasing to burn - type: Fix - id: 6314 - time: '2024-04-06T04:41:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26758 - author: Plykiya changes: - message: You can now carefully walk over glass shards and D4. @@ -3838,3 +3829,10 @@ id: 6813 time: '2024-06-23T19:33:12.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/24799 +- author: PJB3005 + changes: + - message: Ghosts can now examine details on objects from any range. + type: Tweak + id: 6814 + time: '2024-06-24T15:36:53.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29404