Merge remote-tracking branch 'origin/master'
This commit is contained in:
Vigers Ray
commit
fd5db250e3
198 changed files with 50533 additions and 25668 deletions
|
|
@ -31,6 +31,7 @@
|
|||
<CheckBox Name="JumpSoundDisableCheckBox" Text="{Loc 'ui-options-jump-sound-disable'}" />
|
||||
<CheckBox Name="VoteMusicDisableCheckBox" Text="{Loc 'ui-options-vote-music-disable'}" />
|
||||
<CheckBox Name="MuteGhostRoleNotificationCheckBox" Text="{Loc 'ui-options-mute-new-ghost-roles'}" />
|
||||
<CheckBox Name="PlayHeartbeatSound" Text="{Loc 'ui-options-play-heartbeat-sound'}" />
|
||||
|
||||
<!-- Graphics -->
|
||||
<Label Text="{Loc 'ui-options-sunrise-general-graphics'}" StyleClasses="LabelKeyText"/>
|
||||
|
|
|
|||
|
|
@ -43,6 +43,8 @@ public sealed partial class ExtraTab : Control
|
|||
Control.AddOptionCheckBox(SunriseCCVars.VoteMusicDisable, VoteMusicDisableCheckBox);
|
||||
Control.AddOptionCheckBox(SunriseCCVars.MuteGhostRoleNotification, MuteGhostRoleNotificationCheckBox);
|
||||
|
||||
Control.AddOptionCheckBox(SunriseCCVars.PlayHeartBeatSound, PlayHeartbeatSound);
|
||||
|
||||
_cfg.OnValueChanged(SunriseCCVars.LobbyBackgroundType, OnLobbyBackgroundTypeChanged, true);
|
||||
|
||||
var lobbyBackgroundTypes = new List<OptionDropDownCVar<string>.ValueOption>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
using Content.Shared._Sunrise.Heartbeat;
|
||||
using Content.Shared._Sunrise.SunriseCCVars;
|
||||
using Robust.Shared.Configuration;
|
||||
|
||||
namespace Content.Client._Sunrise.Heartbeat;
|
||||
|
||||
public sealed class HeartbeatSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly IConfigurationManager _cfg = default!;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
_cfg.OnValueChanged(SunriseCCVars.PlayHeartBeatSound, OnOptionsChanged, true);
|
||||
}
|
||||
|
||||
public override void Shutdown()
|
||||
{
|
||||
base.Shutdown();
|
||||
|
||||
_cfg.UnsubValueChanged(SunriseCCVars.PlayHeartBeatSound, OnOptionsChanged);
|
||||
}
|
||||
|
||||
private void OnOptionsChanged(bool option)
|
||||
{
|
||||
RaiseNetworkEvent(new HeartbeatOptionsChangedEvent(option));
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
using Content.Shared.Medical.CrewMonitoring;
|
||||
using Robust.Client.UserInterface;
|
||||
using System.Linq;
|
||||
using Content.Shared.Access;
|
||||
using Content.Shared.Access.Components;
|
||||
using Content.Shared.Access.Systems;
|
||||
using Content.Shared.Containers.ItemSlots;
|
||||
using Robust.Client.UserInterface;
|
||||
using Robust.Shared.Prototypes;
|
||||
using static Content.Shared.Access.Components.AccessOverriderComponent;
|
||||
using Content.Shared.Implants.Components;
|
||||
namespace Content.Client.Medical.CrewMonitoring.BSO;
|
||||
|
||||
public class BSOCrewMonitoringBoundUserInterface : BoundUserInterface
|
||||
{
|
||||
[ViewVariables]
|
||||
protected CrewMonitoringWindow? _menu;
|
||||
|
||||
public BSOCrewMonitoringBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
|
||||
{
|
||||
_accessOverriderSystem = EntMan.System<SharedAccessOverriderSystem>();
|
||||
}
|
||||
protected readonly SharedAccessOverriderSystem _accessOverriderSystem = default!;
|
||||
|
||||
protected override void Open()
|
||||
{
|
||||
base.Open();
|
||||
EntityUid? gridUid = null;
|
||||
var stationName = string.Empty;
|
||||
|
||||
if (EntMan.TryGetComponent<TransformComponent>(Owner, out var xform))
|
||||
{
|
||||
gridUid = xform.GridUid;
|
||||
|
||||
if (EntMan.TryGetComponent<MetaDataComponent>(gridUid, out var metaData))
|
||||
{
|
||||
stationName = metaData.EntityName;
|
||||
}
|
||||
}
|
||||
|
||||
_menu = this.CreateWindow<CrewMonitoringWindow>();
|
||||
_menu.Set(stationName, gridUid);
|
||||
}
|
||||
|
||||
protected override void UpdateState(BoundUserInterfaceState state)
|
||||
{
|
||||
base.UpdateState(state);
|
||||
switch (state)
|
||||
{
|
||||
case CrewMonitoringState st:
|
||||
EntMan.TryGetComponent<TransformComponent>(Owner, out var xform);
|
||||
var commandDepartmentSensors = st.Sensors
|
||||
.Where(sensor => sensor.JobDepartments.Contains("Command"))
|
||||
.ToList();
|
||||
//also ALWAYS include the trackers
|
||||
//this is jank as there isnt a direct indication of a tracker in the suit sensor status
|
||||
//so we need to check the component directly
|
||||
foreach (var sensor in st.Sensors)
|
||||
{
|
||||
//get the client entity
|
||||
var clientEntity = EntMan.GetEntity(sensor.SuitSensorUid);
|
||||
if (EntMan.TryGetComponent<SubdermalImplantComponent>(clientEntity, out var suitSensor))
|
||||
{
|
||||
commandDepartmentSensors.Add(sensor);
|
||||
}
|
||||
}
|
||||
//remove duplicates
|
||||
commandDepartmentSensors = commandDepartmentSensors.Distinct().ToList();
|
||||
_menu?.ShowSensors(commandDepartmentSensors, Owner, xform?.Coordinates);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
using Robust.Shared.Audio;
|
||||
|
||||
namespace Content.Server._Sunrise.CritHeartbeat;
|
||||
|
||||
[RegisterComponent]
|
||||
public sealed partial class CritHeartbeatComponent : Component
|
||||
{
|
||||
[DataField]
|
||||
public SoundSpecifier HeartbeatSound = new SoundPathSpecifier("/Audio/_Sunrise/Effects/heartbeat.ogg");
|
||||
|
||||
/// <summary>
|
||||
/// Чтобы выключать это для наследников в прототипах
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public bool Enabled = true;
|
||||
|
||||
public EntityUid? AudioStream;
|
||||
}
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
using Content.Shared.Damage;
|
||||
using Content.Shared.Mobs;
|
||||
using Robust.Server.Audio;
|
||||
using Robust.Shared.Audio;
|
||||
|
||||
namespace Content.Server._Sunrise.CritHeartbeat;
|
||||
|
||||
public sealed class CritHeartbeatSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly AudioSystem _audio = default!;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
SubscribeLocalEvent<CritHeartbeatComponent, MobStateChangedEvent>(OnMobStateChanged);
|
||||
SubscribeLocalEvent<CritHeartbeatComponent, DamageChangedEvent>(OnDamage);
|
||||
}
|
||||
|
||||
private void OnMobStateChanged(Entity<CritHeartbeatComponent> ent, ref MobStateChangedEvent args)
|
||||
{
|
||||
if (!ent.Comp.Enabled)
|
||||
return;
|
||||
|
||||
ent.Comp.AudioStream = args.NewMobState == MobState.Critical
|
||||
? _audio.PlayEntity(ent.Comp.HeartbeatSound, ent, ent)?.Entity
|
||||
: _audio.Stop(ent.Comp.AudioStream);
|
||||
}
|
||||
|
||||
private void OnDamage(Entity<CritHeartbeatComponent> ent, ref DamageChangedEvent args)
|
||||
{
|
||||
if (!ent.Comp.Enabled)
|
||||
return;
|
||||
|
||||
if (!Exists(ent.Comp.AudioStream))
|
||||
return;
|
||||
|
||||
var pitch = Math.Min(1, 100 / args.Damageable.TotalDamage.Float());
|
||||
|
||||
// Потому что игра говно, тут нельзя изменять аудиопарамс уже существующего звука. Поэтому я пересоздаю его заново
|
||||
// Это приводит к проигрыванию звука через неравномерные промежутки времени, но зато работает и не очень заметно
|
||||
_audio.Stop(ent.Comp.AudioStream);
|
||||
ent.Comp.AudioStream = _audio.PlayEntity(ent.Comp.HeartbeatSound, ent, ent, AudioParams.Default.WithPitchScale(pitch))?.Entity;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
using System.Numerics;
|
||||
using Content.Server.Mind;
|
||||
using Content.Server.Popups;
|
||||
using Content.Shared._Sunrise.DamageOverlay;
|
||||
using Content.Shared._Sunrise.Helpers;
|
||||
using Content.Shared.Damage;
|
||||
using Content.Shared.FixedPoint;
|
||||
using Content.Shared.GameTicking;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Player;
|
||||
using Robust.Shared.Random;
|
||||
|
|
@ -16,12 +16,11 @@ namespace Content.Server._Sunrise.DamageOverlay;
|
|||
public sealed class DamageOverlaySystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly PopupSystem _popupSystem = default!;
|
||||
[Dependency] private readonly MindSystem _mindSystem = default!;
|
||||
[Dependency] private readonly IRobustRandom _random = default!;
|
||||
[Dependency] private readonly ISharedPlayerManager _player = default!;
|
||||
|
||||
private readonly List<ICommonSession> _disabledSessions = [];
|
||||
private readonly Dictionary<ICommonSession, DamageOverlaySettings> _playerSettings = new ();
|
||||
private static readonly HashSet<ICommonSession> DisabledSessions = [];
|
||||
private static readonly Dictionary<ICommonSession, DamageOverlaySettings> PlayerSettings = new ();
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
|
|
@ -30,16 +29,24 @@ public sealed class DamageOverlaySystem : EntitySystem
|
|||
SubscribeLocalEvent<DamageOverlayComponent, DamageChangedEvent>(OnDamageChange);
|
||||
|
||||
SubscribeNetworkEvent<DamageOverlayOptionEvent>(OnDamageOverlayOption);
|
||||
|
||||
SubscribeLocalEvent<RoundRestartCleanupEvent>(_ => CleanUp());
|
||||
}
|
||||
|
||||
private async void OnDamageOverlayOption(DamageOverlayOptionEvent ev, EntitySessionEventArgs args)
|
||||
private static void CleanUp()
|
||||
{
|
||||
DisabledSessions.Clear();
|
||||
PlayerSettings.Clear();
|
||||
}
|
||||
|
||||
private static async void OnDamageOverlayOption(DamageOverlayOptionEvent ev, EntitySessionEventArgs args)
|
||||
{
|
||||
if (ev.Enabled)
|
||||
_disabledSessions.Remove(args.SenderSession);
|
||||
DisabledSessions.Remove(args.SenderSession);
|
||||
else
|
||||
_disabledSessions.Add(args.SenderSession);
|
||||
DisabledSessions.Add(args.SenderSession);
|
||||
|
||||
_playerSettings[args.SenderSession] = new DamageOverlaySettings(ev.SelfEnabled, ev.StructuresEnabled);
|
||||
PlayerSettings.TryAdd(args.SenderSession, new DamageOverlaySettings(ev.SelfEnabled, ev.StructuresEnabled));
|
||||
}
|
||||
|
||||
private void OnDamageChange(Entity<DamageOverlayComponent> ent, ref DamageChangedEvent args)
|
||||
|
|
@ -48,7 +55,7 @@ public sealed class DamageOverlaySystem : EntitySystem
|
|||
return;
|
||||
|
||||
var damageDelta = args.DamageDelta.GetTotal();
|
||||
var coords = GenerateRandomCoordinates(Transform(ent).Coordinates, ent.Comp.Radius);
|
||||
var coords = Transform(ent).Coordinates.GetRandomInRadius(ent.Comp.Radius, _random);
|
||||
|
||||
// Идея в том, что попапы должны разделяться на две большие категории: без отправителя и с ним
|
||||
// В итоге должен быть только один попап, либо тот, либо этот
|
||||
|
|
@ -58,10 +65,10 @@ public sealed class DamageOverlaySystem : EntitySystem
|
|||
// Пример: Космос, огонь и т.д.
|
||||
|
||||
|
||||
if (_mindSystem.TryGetMind(ent, out _, out var mindTarget) && _player.TryGetSessionById(mindTarget.UserId, out var sessionTarget))
|
||||
if (_player.TryGetSessionByEntity(ent, out var targetSession))
|
||||
{
|
||||
// Специально скрыл попапы с пассивной регенерацией, они скорее мешают
|
||||
TryCreatePopup(ent, damageDelta, coords, sessionTarget);
|
||||
TryCreatePopup(ent, damageDelta, coords, targetSession);
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
@ -72,27 +79,17 @@ public sealed class DamageOverlaySystem : EntitySystem
|
|||
if (args.Origin == null)
|
||||
return;
|
||||
|
||||
if (!_mindSystem.TryGetMind(args.Origin.Value, out _, out var mindOrigin) || !_player.TryGetSessionById(mindOrigin.UserId, out var sessionOrigin))
|
||||
if (!_player.TryGetSessionByEntity(args.Origin.Value, out var originSession))
|
||||
return;
|
||||
|
||||
TryCreatePopup(ent, damageDelta, coords, sessionOrigin);
|
||||
TryCreatePopup(ent, damageDelta, coords, originSession);
|
||||
}
|
||||
|
||||
private EntityCoordinates GenerateRandomCoordinates(EntityCoordinates center, float radius)
|
||||
{
|
||||
var angle = _random.NextDouble() * 2 * Math.PI;
|
||||
|
||||
var distance = _random.NextDouble() * radius;
|
||||
|
||||
var offsetX = (float)(Math.Cos(angle) * distance);
|
||||
var offsetY = (float)(Math.Sin(angle) * distance);
|
||||
|
||||
var newPosition = new Vector2(center.Position.X + offsetX, center.Position.Y + offsetY);
|
||||
|
||||
return new EntityCoordinates(center.EntityId, newPosition);
|
||||
}
|
||||
|
||||
private bool TryCreatePopup(Entity<DamageOverlayComponent> ent, FixedPoint2 damageDelta, EntityCoordinates coords, ICommonSession session, bool showHealPopup = true)
|
||||
private bool TryCreatePopup(Entity<DamageOverlayComponent> ent,
|
||||
FixedPoint2 damageDelta,
|
||||
EntityCoordinates coords,
|
||||
ICommonSession session,
|
||||
bool showHealPopup = true)
|
||||
{
|
||||
if (IsDisabledByClient(session, ent))
|
||||
return false;
|
||||
|
|
@ -111,12 +108,12 @@ public sealed class DamageOverlaySystem : EntitySystem
|
|||
return true;
|
||||
}
|
||||
|
||||
private bool IsDisabledByClient(ICommonSession session, Entity<DamageOverlayComponent> target)
|
||||
private static bool IsDisabledByClient(ICommonSession session, Entity<DamageOverlayComponent> target)
|
||||
{
|
||||
if (_disabledSessions.Contains(session))
|
||||
if (DisabledSessions.Contains(session))
|
||||
return true;
|
||||
|
||||
if (_playerSettings.TryGetValue(session, out var playerSettings))
|
||||
if (PlayerSettings.TryGetValue(session, out var playerSettings))
|
||||
{
|
||||
if (target.Comp.IsStructure && !playerSettings.StructureDamage)
|
||||
return true;
|
||||
|
|
@ -128,17 +125,9 @@ public sealed class DamageOverlaySystem : EntitySystem
|
|||
return false;
|
||||
}
|
||||
|
||||
private struct DamageOverlaySettings
|
||||
private struct DamageOverlaySettings(bool selfEnabled, bool structuresEnabled)
|
||||
{
|
||||
public readonly bool StructureDamage;
|
||||
|
||||
public readonly bool SelfDamage;
|
||||
|
||||
public DamageOverlaySettings(bool evSelfEnabled, bool evStructuresEnabled)
|
||||
{
|
||||
SelfDamage = evSelfEnabled;
|
||||
|
||||
StructureDamage = evStructuresEnabled;
|
||||
}
|
||||
public readonly bool SelfDamage = selfEnabled;
|
||||
public readonly bool StructureDamage = structuresEnabled;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
namespace Content.Server._Sunrise.Heartbeat.Components;
|
||||
|
||||
[RegisterComponent]
|
||||
public sealed partial class ActiveHeartbeatComponent : Component
|
||||
{
|
||||
[ViewVariables] public float Pitch = 1f;
|
||||
[ViewVariables] public TimeSpan NextHeartbeatCooldown = TimeSpan.FromSeconds(0.5f);
|
||||
|
||||
public TimeSpan? NextHeartbeatTime;
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
namespace Content.Server._Sunrise.Heartbeat.Components;
|
||||
|
||||
[RegisterComponent]
|
||||
public sealed partial class CritHeartbeatComponent : Component;
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
using Content.Server._Sunrise.Heartbeat.Components;
|
||||
using Content.Shared.Damage;
|
||||
using Content.Shared.Mobs;
|
||||
|
||||
namespace Content.Server._Sunrise.Heartbeat.Systems;
|
||||
|
||||
public sealed partial class HeartbeatSystem
|
||||
{
|
||||
// Минимальное и максимальное время между ударами сердца
|
||||
private const float MinimumCooldown = 0.5f;
|
||||
private const float MaximumCooldown = 3f;
|
||||
|
||||
private void OnMobStateChanged(Entity<CritHeartbeatComponent> ent, ref MobStateChangedEvent args)
|
||||
{
|
||||
if (args.NewMobState != MobState.Critical)
|
||||
{
|
||||
RemComp<ActiveHeartbeatComponent>(ent);
|
||||
return;
|
||||
}
|
||||
|
||||
var activeHeartbeat = EnsureComp<ActiveHeartbeatComponent>(ent);
|
||||
|
||||
TryCalculateCurrentState((ent.Owner, activeHeartbeat));
|
||||
SetNextTime(activeHeartbeat);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Подтягивает значения эффектов в зависимости от того, насколько игрок продамажен
|
||||
/// Чем выше урон -> тем медленнее бьется сердце и тем более глухой звук
|
||||
/// </summary>
|
||||
private void OnDamage(Entity<ActiveHeartbeatComponent> ent, ref DamageChangedEvent args)
|
||||
{
|
||||
TryCalculateCurrentState(ent, args.Damageable);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Подсчитывает нужные данные о текущем уроне тела и в зависимости от них задает нужный pitch и cooldown для сердцебиения
|
||||
/// </summary>
|
||||
/// <param name="ent"></param>
|
||||
/// <param name="damageable"></param>
|
||||
/// <returns></returns>
|
||||
private bool TryCalculateCurrentState(Entity<ActiveHeartbeatComponent> ent, DamageableComponent? damageable = null)
|
||||
{
|
||||
if (!Resolve(ent.Owner, ref damageable))
|
||||
return false;
|
||||
|
||||
var totalDamage = damageable.TotalDamage.Float();
|
||||
|
||||
var pitch = Math.Min(1f, 100f / totalDamage);
|
||||
|
||||
var excess = Math.Max(0f, totalDamage - 100f);
|
||||
var cooldownSeconds = MinimumCooldown + (excess / 100f) * (MaximumCooldown - MinimumCooldown);
|
||||
|
||||
ent.Comp.Pitch = pitch;
|
||||
ent.Comp.NextHeartbeatCooldown = TimeSpan.FromSeconds(cooldownSeconds);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
84
Content.Server/_Sunrise/Heartbeat/Systems/HeartbeatSystem.cs
Normal file
84
Content.Server/_Sunrise/Heartbeat/Systems/HeartbeatSystem.cs
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
using Content.Server._Sunrise.Heartbeat.Components;
|
||||
using Content.Shared._Sunrise.Heartbeat;
|
||||
using Content.Shared.Damage;
|
||||
using Content.Shared.GameTicking;
|
||||
using Content.Shared.Mobs;
|
||||
using Robust.Server.Audio;
|
||||
using Robust.Shared.Audio;
|
||||
using Robust.Shared.Player;
|
||||
using Robust.Shared.Timing;
|
||||
|
||||
namespace Content.Server._Sunrise.Heartbeat.Systems;
|
||||
|
||||
// TODO: Сделать возможность с помощью стетоскопа услышать сердцебиение человека
|
||||
|
||||
public sealed partial class HeartbeatSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly AudioSystem _audio = default!;
|
||||
[Dependency] private readonly ISharedPlayerManager _player = default!;
|
||||
[Dependency] private readonly IGameTiming _timing = default!;
|
||||
|
||||
private static readonly SoundSpecifier HeartbeatSound =
|
||||
new SoundPathSpecifier("/Audio/_Sunrise/Effects/heartbeat.ogg", AudioParams.Default.WithVolume(-3f));
|
||||
|
||||
private static readonly HashSet<ICommonSession> DisabledSessions = [];
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
SubscribeLocalEvent<CritHeartbeatComponent, MobStateChangedEvent>(OnMobStateChanged);
|
||||
SubscribeLocalEvent<ActiveHeartbeatComponent, DamageChangedEvent>(OnDamage);
|
||||
|
||||
SubscribeNetworkEvent<HeartbeatOptionsChangedEvent>(OnOptionsChanged);
|
||||
|
||||
SubscribeLocalEvent<RoundRestartCleanupEvent>(_ => DisabledSessions.Clear());
|
||||
}
|
||||
|
||||
public override void Update(float frameTime)
|
||||
{
|
||||
base.Update(frameTime);
|
||||
|
||||
var query = EntityQueryEnumerator<ActiveHeartbeatComponent>();
|
||||
|
||||
while (query.MoveNext(out var uid, out var activeHeartbeat))
|
||||
{
|
||||
if (_timing.CurTime < activeHeartbeat.NextHeartbeatTime)
|
||||
continue;
|
||||
|
||||
if (IsDisabledByClient(uid))
|
||||
continue;
|
||||
|
||||
_audio.PlayGlobal(HeartbeatSound, uid, AudioParams.Default.WithPitchScale(activeHeartbeat.Pitch));
|
||||
|
||||
SetNextTime(activeHeartbeat);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Устанавливает время следующего удара сердца
|
||||
/// </summary>
|
||||
private void SetNextTime(ActiveHeartbeatComponent component)
|
||||
{
|
||||
component.NextHeartbeatTime = _timing.CurTime + component.NextHeartbeatCooldown;
|
||||
}
|
||||
|
||||
private bool IsDisabledByClient(EntityUid player)
|
||||
{
|
||||
if (!_player.TryGetSessionByEntity(player, out var session))
|
||||
return true;
|
||||
|
||||
if (DisabledSessions.Contains(session))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private static void OnOptionsChanged(HeartbeatOptionsChangedEvent ev, EntitySessionEventArgs args)
|
||||
{
|
||||
if (ev.Enabled)
|
||||
DisabledSessions.Remove(args.SenderSession);
|
||||
else
|
||||
DisabledSessions.Add(args.SenderSession);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
using Content.Shared.FixedPoint;
|
||||
using Robust.Shared.Audio;
|
||||
using Robust.Shared.GameStates;
|
||||
|
||||
namespace Content.Shared.Chemistry.Components;
|
||||
|
|
@ -51,4 +52,10 @@ public sealed partial class SolutionTransferComponent : Component
|
|||
[DataField("canChangeTransferAmount")]
|
||||
[ViewVariables(VVAccess.ReadWrite)]
|
||||
public bool CanChangeTransferAmount { get; set; } = false;
|
||||
|
||||
// Sunrise added start
|
||||
[DataField]
|
||||
public SoundSpecifier? TransferSound = new SoundCollectionSpecifier("SolutionTransfer",
|
||||
AudioParams.Default.WithVolume(-5f).WithMaxDistance(3f).WithVariation(0.15f));
|
||||
// Sunrise added end
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ using Content.Shared.FixedPoint;
|
|||
using Content.Shared.Interaction;
|
||||
using Content.Shared.Popups;
|
||||
using Content.Shared.Verbs;
|
||||
using Robust.Shared.Audio.Systems;
|
||||
using Robust.Shared.Network;
|
||||
using Robust.Shared.Player;
|
||||
|
||||
|
|
@ -21,6 +22,7 @@ public sealed class SolutionTransferSystem : EntitySystem
|
|||
[Dependency] private readonly SharedPopupSystem _popup = default!;
|
||||
[Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
|
||||
[Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
|
||||
[Dependency] private readonly SharedAudioSystem _audio = default!; // Sunrise added
|
||||
|
||||
/// <summary>
|
||||
/// Default transfer amounts for the set-transfer verb.
|
||||
|
|
@ -161,10 +163,15 @@ public sealed class SolutionTransferSystem : EntitySystem
|
|||
public FixedPoint2 Transfer(EntityUid user,
|
||||
EntityUid sourceEntity,
|
||||
Entity<SolutionComponent> source,
|
||||
EntityUid targetEntity,
|
||||
Entity<SolutionTransferComponent?> targetEntity, // Sunrise edit
|
||||
Entity<SolutionComponent> target,
|
||||
FixedPoint2 amount)
|
||||
{
|
||||
// Sunrise added start
|
||||
if (!Resolve(targetEntity.Owner, ref targetEntity.Comp))
|
||||
return FixedPoint2.Zero;
|
||||
// Sunrise added end
|
||||
|
||||
var transferAttempt = new SolutionTransferAttemptEvent(sourceEntity, targetEntity);
|
||||
|
||||
// Check if the source is cancelling the transfer
|
||||
|
|
@ -202,6 +209,10 @@ public sealed class SolutionTransferSystem : EntitySystem
|
|||
var solution = _solution.SplitSolution(source, actualAmount);
|
||||
_solution.AddSolution(target, solution);
|
||||
|
||||
// Sunrise added start
|
||||
_audio.PlayPvs(targetEntity.Comp.TransferSound, targetEntity);
|
||||
// Sunrise added end
|
||||
|
||||
var ev = new SolutionTransferredEvent(sourceEntity, targetEntity, user, actualAmount);
|
||||
RaiseLocalEvent(targetEntity, ref ev);
|
||||
|
||||
|
|
|
|||
|
|
@ -62,17 +62,20 @@ public abstract class ClothingSystem : EntitySystem
|
|||
if (TryComp(slotEntity, out ClothingComponent? item) && !item.QuickEquip)
|
||||
continue;
|
||||
|
||||
if (!_invSystem.TryUnequip(userEnt, slotDef.Name, true, inventory: userEnt, checkDoafter: true))
|
||||
// Sunrise edit - убрал тихое надевание через быстрое надевание
|
||||
if (!_invSystem.TryUnequip(userEnt, slotDef.Name, false, inventory: userEnt, checkDoafter: true))
|
||||
continue;
|
||||
|
||||
if (!_invSystem.TryEquip(userEnt, toEquipEnt, slotDef.Name, true, inventory: userEnt, clothing: toEquipEnt, checkDoafter: true, triggerHandContact: true))
|
||||
// Sunrise edit - убрал тихое надевание через быстрое надевание
|
||||
if (!_invSystem.TryEquip(userEnt, toEquipEnt, slotDef.Name, false, inventory: userEnt, clothing: toEquipEnt, checkDoafter: true, triggerHandContact: true))
|
||||
continue;
|
||||
|
||||
_handsSystem.PickupOrDrop(userEnt, slotEntity.Value, handsComp: userEnt);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!_invSystem.TryEquip(userEnt, toEquipEnt, slotDef.Name, true, inventory: userEnt, clothing: toEquipEnt, checkDoafter: true, triggerHandContact: true))
|
||||
// Sunrise edit - убрал тихое надевание через быстрое надевание
|
||||
if (!_invSystem.TryEquip(userEnt, toEquipEnt, slotDef.Name, false, inventory: userEnt, clothing: toEquipEnt, checkDoafter: true, triggerHandContact: true))
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ public sealed partial class DrinkComponent : Component
|
|||
public string Solution = "drink";
|
||||
|
||||
[DataField, AutoNetworkedField]
|
||||
public SoundSpecifier UseSound = new SoundPathSpecifier("/Audio/Items/drink.ogg");
|
||||
public SoundSpecifier UseSound = new SoundCollectionSpecifier("DrinkSounds"); // Sunrise edit
|
||||
|
||||
[DataField, AutoNetworkedField]
|
||||
public FixedPoint2 TransferAmount = FixedPoint2.New(5);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
using Robust.Shared.Serialization;
|
||||
|
||||
namespace Content.Shared._Sunrise.Heartbeat;
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public sealed class HeartbeatOptionsChangedEvent(bool enabled) : EntityEventArgs
|
||||
{
|
||||
public bool Enabled { get; } = enabled;
|
||||
}
|
||||
|
|
@ -428,4 +428,11 @@ public sealed partial class SunriseCCVars : CVars
|
|||
|
||||
public static readonly CVarDef<bool> MuteGhostRoleNotification =
|
||||
CVarDef.Create("ghost.mute_role_notification", false, CVar.CLIENTONLY | CVar.ARCHIVE);
|
||||
|
||||
/*
|
||||
* Heartbeat sound
|
||||
*/
|
||||
|
||||
public static readonly CVarDef<bool> PlayHeartBeatSound =
|
||||
CVarDef.Create("heartbeat.play_sound", true, CVar.CLIENTONLY | CVar.ARCHIVE);
|
||||
}
|
||||
|
|
|
|||
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound1.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound1.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound2.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound2.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound3.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound3.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound4.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound4.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound5.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Drink/sound5.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound1.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound1.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound2.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound2.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound3.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound3.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound4.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound4.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound5.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Effects/Liquid/Transfer/sound5.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Cases/close.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Cases/close.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Cases/open.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Cases/open.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Equip/Backpacks/sound1.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Equip/Backpacks/sound1.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Equip/Gloves/sound1.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Equip/Gloves/sound1.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Equip/Helmets/sound1.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Equip/Helmets/sound1.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Equip/base_equip.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Equip/base_equip.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/GasTanks/insert.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/GasTanks/insert.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/GasTanks/remove.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/GasTanks/remove.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Backpacks/drop.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Backpacks/drop.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Backpacks/pickup.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Backpacks/pickup.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Cases/drop.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Cases/drop.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Cases/pickup.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Cases/pickup.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/GasTanks/drop.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/GasTanks/drop.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/GasTanks/pickup.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/GasTanks/pickup.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Glass/drop.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Glass/drop.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Glass/pickup.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Glass/pickup.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Helmets/drop.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Helmets/drop.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Helmets/pickup.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Helmets/pickup.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/ID/drop.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/ID/drop.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/ID/pickup.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/ID/pickup.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Leather/drop.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Leather/drop.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Leather/pickup.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Leather/pickup.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Metal/drop.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Metal/drop.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Metal/pickup.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Metal/pickup.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Plastic/drop.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Plastic/drop.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Plastic/pickup.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Plastic/pickup.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Rod/pickup.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Rod/pickup.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Shoes/drop.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Shoes/drop.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Shoes/pickup.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Shoes/pickup.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Stunbatons/pickup.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Stunbatons/pickup.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Telebatons/drop.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Telebatons/drop.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Telebatons/pickup.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Telebatons/pickup.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Wood/drop.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Wood/drop.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Items/Handling/Wood/pickup.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Items/Handling/Wood/pickup.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Structures/Closets/close.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Structures/Closets/close.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/_Sunrise/Structures/Closets/open.ogg
Normal file
BIN
Resources/Audio/_Sunrise/Structures/Closets/open.ogg
Normal file
Binary file not shown.
|
|
@ -16072,3 +16072,456 @@
|
|||
id: 1104
|
||||
time: '2025-05-05T17:38:41.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2082
|
||||
- author: Noychik
|
||||
changes:
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0448\u0430\u043D\u0441\
|
||||
\ \u0433\u0435\u043D\u0435\u0440\u0430\u0446\u0438\u0438 \u0430\u043B\u043C\u0430\
|
||||
\u0437\u043E\u0432 \u043D\u0430 \u043E\u0431\u043B\u043E\u043C\u043A\u0430\u0445"
|
||||
type: Add
|
||||
id: 1105
|
||||
time: '2025-05-06T20:01:42.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2095
|
||||
- author: KaiserMaus, Happyrobot33
|
||||
changes:
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0440\u0443\u0447\u043D\
|
||||
\u043E\u0439 \u043C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 \"\
|
||||
\u0425-02\" \u0447\u043B\u0435\u043D\u043E\u0432 \u044D\u043A\u0438\u043F\u0430\
|
||||
\u0436\u0430 \u0441 \u0442\u0440\u0435\u043A\u0435\u0440\u043E\u043C \u0434\u043B\
|
||||
\u044F \u041E\u0421\u0429."
|
||||
type: Add
|
||||
id: 1106
|
||||
time: '2025-05-07T00:28:31.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2090
|
||||
- author: ThereDrD
|
||||
changes:
|
||||
- message: "\u041B\u0430\u043C\u043F\u043E\u0447\u043A\u0438 \u0442\u0435\u043F\u0435\
|
||||
\u0440\u044C \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u044E\u0442 \u0446\
|
||||
\u0438\u0444\u0440\u044B \u0443\u0440\u043E\u043D\u0430 \u043F\u0440\u0438 \u043F\
|
||||
\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u0438 \u0443\u0440\u043E\u043D\u0430\
|
||||
, \u043A\u0430\u043A \u0438 \u043E\u0441\u0442\u0430\u043B\u044C\u043D\u044B\
|
||||
\u0435 \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u044B"
|
||||
type: Fix
|
||||
id: 1107
|
||||
time: '2025-05-07T00:26:37.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2103
|
||||
- author: Hart_ty
|
||||
changes:
|
||||
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0440\u0435\u0446\u0435\u043F\
|
||||
\u0442 \u0410\u0444\u0440\u043E\u0434\u0435\u0437\u0438\u0430\u043A\u0430."
|
||||
type: Tweak
|
||||
id: 1108
|
||||
time: '2025-05-07T00:27:49.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2087
|
||||
- author: Flesxka
|
||||
changes:
|
||||
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u0444\u0430\u043C\u0438\
|
||||
\u043B\u0438\u044F \u043F\u043B\u044E\u0448\u0435\u0432\u043E\u0439 \u0423\u0443\
|
||||
\u043D\u044B"
|
||||
type: Tweak
|
||||
- message: "\u0418\u0437\u043C\u0435\u043D\u0451\u043D \u043A\u0434 \u0430\u043A\
|
||||
\u0442\u0438\u0432\u0430\u0446\u0438\u0438 \u043F\u043B\u044E\u0448\u0435\u0432\
|
||||
\u043E\u0439 \u0423\u0443\u043D\u044B"
|
||||
type: Tweak
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0437\u0432\u0443\u043A\
|
||||
\ \u043F\u0440\u0438 \u0430\u0442\u0430\u043A\u0435 \u043F\u043B\u044E\u0448\
|
||||
\u0435\u0432\u043E\u0439 \u0423\u0443\u043D\u043E\u0439"
|
||||
type: Add
|
||||
id: 1109
|
||||
time: '2025-05-07T00:28:58.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2083
|
||||
- author: Flesxka
|
||||
changes:
|
||||
- message: "\u0421\u043C\u0430\u0439\u043B \u0441\u043D\u043E\u0432\u0430 \u0441\
|
||||
\u0442\u0430\u043B \u043F\u0440\u0435\u0434\u043C\u0435\u0442\u043E\u043C."
|
||||
type: Tweak
|
||||
id: 1110
|
||||
time: '2025-05-07T00:27:21.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2101
|
||||
- author: ThereDrD
|
||||
changes:
|
||||
- message: "\u0417\u0432\u0443\u043A \u0441\u0435\u0440\u0434\u0446\u0435\u0431\u0438\
|
||||
\u0435\u043D\u0438\u044F \u0432 \u043A\u0440\u0438\u0442\u0435 \u0442\u0435\u043F\
|
||||
\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E \u043E\u0442\u043A\u043B\u044E\
|
||||
\u0447\u0438\u0442\u044C"
|
||||
type: Tweak
|
||||
- message: "\u0417\u0432\u0443\u043A \u0441\u0435\u0440\u0434\u0446\u0435\u0431\u0438\
|
||||
\u0435\u043D\u0438\u044F \u0432 \u043A\u0440\u0438\u0442\u0435 \u0442\u0435\u043F\
|
||||
\u0435\u0440\u044C \u043F\u0440\u043E\u0438\u0433\u0440\u044B\u0432\u0430\u0435\
|
||||
\u0442\u0441\u044F"
|
||||
type: Fix
|
||||
id: 1111
|
||||
time: '2025-05-07T00:27:37.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2098
|
||||
- author: Non_stop_smetana
|
||||
changes:
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0441\u0443\u043F\
|
||||
\u0435\u0440\u043C\u0430\u0442\u0435\u0440\u0438\u044F"
|
||||
type: Add
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0434\u0435\u043F\u0430\
|
||||
\u0440\u0442\u0430\u043C\u0435\u043D\u0442 \u0421\u0429"
|
||||
type: Add
|
||||
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u044D\u043A\u043E\u043D\
|
||||
\u043E\u043C\u0438\u043A\u0430, \u0442\u0435\u043F\u0435\u0440\u044C \u043E\u043D\
|
||||
\u0430 \u0420\u0410\u0411\u041E\u0422\u0410\u0415\u0422"
|
||||
type: Tweak
|
||||
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0431\u0430\
|
||||
\u0433\u0438"
|
||||
type: Fix
|
||||
id: 1112
|
||||
time: '2025-05-07T14:17:36.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2110
|
||||
- author: Non_stop_smetana & Focstor & VladimirZ
|
||||
changes:
|
||||
- message: "\u041D\u0430 \u0431\u0430\u0440\u0440\u0430\u0442\u0440\u0438 \u0434\
|
||||
\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043A\u0440\u0430\u0441\u043A\u043E\
|
||||
\u043C\u0430\u0442."
|
||||
type: Add
|
||||
- message: "\u041D\u0430 \u0431\u0430\u0440\u0440\u0430\u0442\u0440\u0438 \u0434\
|
||||
\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0440\u0430\u0431\u043E\u0447\
|
||||
\u0430\u044F \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u043A\u0430."
|
||||
type: Add
|
||||
- message: "\u0422\u0435\u043F\u0435\u0440\u044C, \u043D\u0430 \u0431\u0430\u0440\
|
||||
\u0440\u0430\u0442\u0440\u0438 \u043E\u0431\u043D\u043E\u0432\u043B\u0451\u043D\
|
||||
\u043D\u0430\u044F \u0442\u044E\u0440\u044C\u043C\u0430, \u0441 \u0442\u0443\
|
||||
\u0440\u043D\u0438\u043A\u0435\u0442\u0430\u043C\u0438!"
|
||||
type: Add
|
||||
- message: "\u0421\u0438\u043B\u043E \u0431\u044B\u043B\u043E \u0434\u043E\u0431\
|
||||
\u0430\u0432\u043B\u0435\u043D\u043E \u043D\u0430 \u043A\u0430\u0440\u0442\u0443\
|
||||
\ \u0431\u0430\u0440\u0440\u0430\u0442\u0440\u0438."
|
||||
type: Add
|
||||
- message: "\u041D\u0430 \u0431\u0430\u0440\u0440\u0430\u0442\u0440\u0438 \u0438\
|
||||
\u0437\u043C\u0435\u043D\u0451\u043D \u0434\u0435\u043F\u0430\u0440\u0442\u0430\
|
||||
\u043C\u0435\u043D\u0442 \u0421\u0429."
|
||||
type: Tweak
|
||||
- message: "\u041D\u0430 \u0431\u0430\u0440\u0440\u0430\u0442\u0440\u0438 \u0438\
|
||||
\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043E\u0434\u0435\u044F\
|
||||
\u043B\u0430."
|
||||
type: Fix
|
||||
id: 1113
|
||||
time: '2025-05-07T16:20:21.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2112
|
||||
- author: banumbas
|
||||
changes:
|
||||
- message: "\u0411\u0438\u043E\u043A\u043E\u0434 \u0441\u0438\u043D\u0434\u0438\
|
||||
-\u043F\u0438\u0440\u043E\u0433\u043E\u043C\u0451\u0442\u0443."
|
||||
type: Add
|
||||
- message: "\u0425\u043E\u043D\u043A\u0430\u043D\u044C\u0435 \u043F\u0440\u0438\
|
||||
\ \u0433\u0435\u043D\u0435\u0440\u0430\u0446\u0438\u0438 \u043D\u043E\u0432\u043E\
|
||||
\u0433\u043E \u043F\u0438\u0440\u043E\u0433\u0430 \u0443 \u0441\u0438\u043D\u0434\
|
||||
\u0438-\u043F\u0438\u0440\u043E\u0433\u043E\u043C\u0451\u0442\u0430."
|
||||
type: Add
|
||||
- message: "\u0423\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u043E \u0432\u0440\u0435\
|
||||
\u043C\u044F \u043F\u0435\u0440\u0435\u0437\u0430\u0440\u044F\u0434\u043A\u0438\
|
||||
\ \u0441\u0438\u043D\u0434\u0438-\u043F\u0438\u0440\u043E\u0433\u043E\u043C\u0451\
|
||||
\u0442\u0430."
|
||||
type: Tweak
|
||||
- message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u043E \u043A\u043E\u043B\
|
||||
\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043F\u0438\u0440\u043E\u0433\u043E\
|
||||
\u0432 \u0432 \u0441\u0438\u043D\u0434\u0438-\u043F\u0438\u0440\u043E\u0433\u043E\
|
||||
\u043C\u0451\u0442\u0435."
|
||||
type: Tweak
|
||||
id: 1114
|
||||
time: '2025-05-12T14:36:32.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2146
|
||||
- author: iDesmond
|
||||
changes:
|
||||
- message: "\u041F\u0435\u0440\u0435\u0437\u0430\u0440\u044F\u0434\u043A\u0430 \u0441\
|
||||
\u0442\u044F\u0436\u0435\u043A \u0431\u043E\u0440\u0433\u043E\u0432 \u0443\u043C\
|
||||
\u0435\u043D\u044C\u0448\u0435\u043D\u0430 \u0441 15 \u0434\u043E 9 \u0441\u0435\
|
||||
\u043A\u0443\u043D\u0434"
|
||||
type: Tweak
|
||||
id: 1115
|
||||
time: '2025-05-12T14:36:49.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2130
|
||||
- author: iDesmond
|
||||
changes:
|
||||
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0444\u0440\u0430\u0437\
|
||||
\u044B \u0434\u043B\u044F \u0431\u0430\u043D\u043A\u043E\u043C\u0430\u0442\u0430\
|
||||
\ \u043D\u0430 \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\
|
||||
\u044E\u0449\u0438\u0435 \u0435\u043C\u0443."
|
||||
type: Tweak
|
||||
id: 1116
|
||||
time: '2025-05-12T14:35:59.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2129
|
||||
- author: Non_stop_smetana
|
||||
changes:
|
||||
- message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0435 \u043F\u043B\
|
||||
\u0430\u0437\u043C\u044B! \u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0434\
|
||||
\u0435\u043F\u0430\u0440\u0442\u0430\u043C\u0435\u043D\u0442 \u0421\u0429"
|
||||
type: Add
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043F\u043E\u0447\
|
||||
\u0442\u0430"
|
||||
type: Add
|
||||
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0431\u0440\u0438\u0433\
|
||||
, \u0442\u0435\u043F\u0435\u0440\u044C \u0442\u0430\u043C \u0431\u043E\u043B\
|
||||
\u044C\u0448\u0435 \u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u043E\u0432\
|
||||
, \u0430 \u0442\u0430\u043A\u0436\u0435 \u0434\u043E\u0431\u0430\u0432\u043B\
|
||||
\u0435\u043D\u043E \u0432\u0441\u0451 \u0434\u043B\u044F \u0433\u0435\u043D\u043F\
|
||||
\u043E\u043F \u0442\u044E\u0440\u043C\u044B."
|
||||
type: Tweak
|
||||
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u044D\u043A\
|
||||
\u043E\u043D\u043E\u043C\u0438\u043A\u0430, \u0442\u0435\u043F\u0435\u0440\u044C\
|
||||
\ \u043E\u043D\u0430 \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 \u043D\
|
||||
\u0430 \u0434\u0430\u043D\u043D\u043E\u0439 \u043A\u0430\u0440\u0442\u0435"
|
||||
type: Fix
|
||||
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0441\u0442\
|
||||
\u0430\u0440\u044B\u0435 \u0431\u0430\u0433\u0438"
|
||||
type: Fix
|
||||
id: 1117
|
||||
time: '2025-05-12T14:37:54.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2115
|
||||
- author: agranomys
|
||||
changes:
|
||||
- message: "\u0425\u0440\u0430\u043D\u0438\u043B\u0438\u0449\u0435 EVA \u0431\u044B\
|
||||
\u043B\u043E \u043F\u0435\u0440\u0435\u043C\u0435\u0449\u0435\u043D\u043E \u0431\
|
||||
\u043B\u0438\u0436\u0435 \u043A \u043E\u0442\u0431\u044B\u0442\u0438\u044E,\
|
||||
\ \u0430 \u0442\u0430\u043A\u0436\u0435 \u0443\u0432\u0435\u043B\u0438\u0447\
|
||||
\u0435\u043D\u043E \u0432 2 \u0440\u0430\u0437\u0430 \u043D\u0430 \u0441\u0442\
|
||||
\u0430\u043D\u0446\u0438\u0438 loop."
|
||||
type: Tweak
|
||||
- message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043D\u0430 \u0441\u0442\u0430\
|
||||
\u043D\u0446\u0438\u0438 loop \u043D\u0435\u0431\u043E\u043B\u044C\u0448\u043E\
|
||||
\u0439 \u043E\u0442\u0434\u0435\u043B \u0441\u0438\u043D\u0435\u0433\u043E \u0449\
|
||||
\u0438\u0442\u0430 \u0438\u0437 \u0447\u0435\u0442\u044B\u0440\u0435\u0445 \u043A\
|
||||
\u043E\u043C\u043D\u0430\u0442, \u043E\u0434\u043D\u0430 \u0438\u0437 \u043A\
|
||||
\u043E\u0442\u043E\u0440\u044B\u0445 \u043A\u0430\u044E\u0442\u0430 \u0434\u043B\
|
||||
\u044F \u043B\u0435\u0439\u0442\u0435\u043D\u0430\u043D\u0442\u0430."
|
||||
type: Tweak
|
||||
- message: "\u041D\u0430 \u0441\u0442\u0430\u043D\u0446\u0438\u0438 loop \u0432\
|
||||
\ \u043A\u0430\u044E\u0442\u0435 \u0413\u0421\u0411 \u0431\u044B\u043B\u043E\
|
||||
\ \u0443\u0431\u0440\u0430\u043D\u043E \u0432\u0442\u043E\u0440\u0438\u0447\u043D\
|
||||
\u043E\u0435 \u043E\u0440\u0443\u0436\u0438\u0435. (\u0432 \u0441\u0432\u044F\
|
||||
\u0437\u0438 \u0441 \u0442\u0435\u043C, \u0447\u0442\u043E \u0442\u0435\u043F\
|
||||
\u0435\u0440\u044C \u043E\u043D \u0432\u044B\u0431\u0438\u0440\u0430\u0435\u0442\
|
||||
\ \u0432 \u043B\u043E\u0434\u0430\u0443\u0442\u0435 \u0432\u0442\u043E\u0440\
|
||||
\u043E\u0435 \u043E\u0440\u0443\u0436\u0438\u0435)."
|
||||
type: Remove
|
||||
id: 1118
|
||||
time: '2025-05-12T14:35:13.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2131
|
||||
- author: Kendrick
|
||||
changes:
|
||||
- message: "\u0412 \u0431\u0430\u0442\u0430\u0440\u0435\u0439\u043D\u043E\u043C\
|
||||
\ \u043E\u0440\u0443\u0436\u0438\u0438 \u0442\u0435\u043F\u0435\u0440\u044C\
|
||||
\ \u0441\u0440\u0430\u0437\u0443 \u0431\u0430\u0442\u0430\u0440\u0435\u0438\
|
||||
\ \u0432\u044B\u0441\u043E\u043A\u043E\u0439 \u0451\u043C\u043A\u043E\u0441\u0442\
|
||||
\u0438."
|
||||
type: Tweak
|
||||
id: 1119
|
||||
time: '2025-05-12T14:37:30.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2107
|
||||
- author: Kendrick
|
||||
changes:
|
||||
- message: "\u0412 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u043E\u043C\
|
||||
\ \u043C\u0430\u0433\u0430\u0437\u0438\u043D\u0435 \u0431\u0435\u0437\u0433\u0438\
|
||||
\u043B\u044C\u0437\u043E\u0432\u044B\u0445 \u043F\u0430\u0442\u0440\u043E\u043D\
|
||||
\u043E\u0432 \u0442\u0435\u043F\u0435\u0440\u044C 50 \u043F\u0430\u0442\u0440\
|
||||
\u043E\u043D\u043E\u0432."
|
||||
type: Tweak
|
||||
id: 1120
|
||||
time: '2025-05-12T14:39:12.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2109
|
||||
- author: ThereDrD
|
||||
changes:
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u043E\u0432\
|
||||
\u044B\u0435 \u0437\u0432\u0443\u043A\u0438 \u043F\u043E\u0434\u043D\u044F\u0442\
|
||||
\u0438\u044F \u0438 \u0431\u0440\u043E\u0441\u043A\u0430 \u0434\u043B\u044F\
|
||||
\ ID \u043A\u0430\u0440\u0442, \u0431\u043E\u0442\u0438\u043D\u043E\u043A, \u0431\
|
||||
\u043E\u043B\u044C\u0448\u0438\u043D\u0441\u0442\u0432\u0430 \u043C\u0430\u0442\
|
||||
\u0435\u0440\u0438\u0430\u043B\u043E\u0432, \u0441\u0442\u0430\u043D\u0431\u0430\
|
||||
\u0442\u043E\u043D\u043E\u0432, \u0442\u0435\u043B\u0435\u0441\u043A\u043E\u043F\
|
||||
\u0438\u0447\u0435\u043A, \u043F\u043B\u0430\u0441\u0442\u0438\u043A\u043E\u0432\
|
||||
\u044B\u0445 \u0441\u0442\u043E\u043B\u043E\u0432\u044B\u0445 \u043F\u0440\u0438\
|
||||
\u0431\u043E\u0440\u043E\u0432, \u043C\u0435\u0442\u0430\u043B\u043B\u0438\u0447\
|
||||
\u0435\u0441\u043A\u043E\u0439 \u043F\u043B\u0438\u0442\u043A\u0438, \u0441\u0442\
|
||||
\u0435\u043A\u043B\u044F\u043D\u043D\u044B\u0445 \u0440\u0430\u0441\u0442\u0435\
|
||||
\u043D\u0438\u0439"
|
||||
type: Add
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0437\u0432\u0443\
|
||||
\u043A\u0438 \u043F\u043E\u0434\u043D\u044F\u0442\u0438\u044F \u0438 \u0431\u0440\
|
||||
\u043E\u0441\u043A\u0430 \u0431\u0430\u043B\u043B\u043E\u043D\u043E\u0432. \u0422\
|
||||
\u0435\u043F\u0435\u0440\u044C \u0432\u044B\u0434\u0430\u0447\u0430 \u0431\u0430\
|
||||
\u043B\u043B\u043E\u043D\u0430 \u0438\u0437 \u0440\u0430\u0437\u0434\u0430\u0442\
|
||||
\u0447\u0438\u043A\u0430 \u0438 \u0432\u0441\u0442\u0430\u0432\u043A\u0430/\u0432\
|
||||
\u044B\u0434\u0430\u0447\u0430 \u0438\u0437 \u043A\u0430\u043D\u0438\u0441\u0442\
|
||||
\u0440\u044B \u0441\u043E\u043F\u0440\u043E\u0432\u043E\u0436\u0434\u0430\u0435\
|
||||
\u0442\u0441\u044F \u043F\u0440\u0438\u043A\u043E\u043B\u044C\u043D\u044B\u043C\
|
||||
\ \u0437\u0432\u0443\u043A\u043E\u043C,"
|
||||
type: Add
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0431\u0430\u0437\
|
||||
\u043E\u0432\u044B\u0435 \u0437\u0432\u0443\u043A\u0438 \u0434\u043B\u044F \u043D\
|
||||
\u0430\u0434\u0435\u0432\u0430\u043D\u0438\u044F \u0432\u0441\u0435\u0439 \u043E\
|
||||
\u0434\u0435\u0436\u0434\u044B"
|
||||
type: Add
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u043E\u0432\
|
||||
\u044B\u0435 \u0437\u0432\u0443\u043A\u0438 \u043F\u043E\u0434\u043D\u044F\u0442\
|
||||
\u0438\u044F, \u0431\u0440\u043E\u0441\u043A\u0430, \u043E\u0442\u043A\u0440\
|
||||
\u044B\u0442\u0438\u044F, \u0437\u0430\u043A\u0440\u044B\u0442\u0438\u044F \u0430\
|
||||
\u043F\u0442\u0435\u0447\u0435\u043A, \u043F\u043E\u0440\u0442\u0441\u0438\u0433\
|
||||
\u0430\u0440\u043E\u0432, \u0447\u0435\u043C\u043E\u0434\u0430\u043D\u043E\u0432\
|
||||
, \u043A\u0435\u0439\u0441\u0430 \u0441 \u043C\u0435\u0434\u0430\u043B\u044F\
|
||||
\u043C\u0438,"
|
||||
type: Add
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0437\u0432\u0443\
|
||||
\u043A\u0438 \u043D\u0430\u0434\u0435\u0432\u0430\u043D\u0438\u044F \u043F\u0435\
|
||||
\u0440\u0447\u0430\u0442\u043E\u043A \u0438 \u0431\u043E\u0435\u0432\u044B\u0445\
|
||||
\ \u0448\u043B\u0435\u043C\u043E\u0432. \u042D\u0442\u0438 \u0448\u043B\u0435\
|
||||
\u043C\u044B \u0442\u0430\u043A \u0436\u0435 \u0442\u0435\u043F\u0435\u0440\u044C\
|
||||
\ \u0438\u043C\u0435\u044E\u0442 \u0437\u0432\u0443\u043A\u0438 \u043F\u043E\
|
||||
\u0434\u043D\u044F\u0442\u0438\u044F \u0438 \u0431\u0440\u043E\u0441\u043A\u0430"
|
||||
type: Add
|
||||
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0437\u0432\u0443\u043A\
|
||||
\u0438 \u0448\u043A\u0430\u0444\u043E\u0432, \u0442\u0435\u043F\u0435\u0440\u044C\
|
||||
\ \u043E\u043D\u0438 \u0431\u043E\u043B\u0435\u0435 \u0436\u0435\u043B\u0435\
|
||||
\u0437\u043D\u044B\u0435, \u043A\u0430\u043A \u0438 \u0441\u0430\u043C\u0438\
|
||||
\ \u0448\u043A\u0430\u0444\u044B"
|
||||
type: Tweak
|
||||
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0437\u0432\u0443\u043A\
|
||||
\u0438 \u043F\u0438\u0442\u044C\u044F. \u0422\u0435\u043F\u0435\u0440\u044C\
|
||||
\ \u0438\u0445 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0438\
|
||||
\ \u043E\u043D\u0438 \u043F\u043E\u043B\u0443\u0447\u0448\u0435"
|
||||
type: Tweak
|
||||
- message: "\u0417\u0432\u0443\u043A\u0438 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\
|
||||
\u0435\u043D\u0442\u043E\u0432 \u0438 \u043F\u043E\u0434\u043D\u044F\u0442\u0438\
|
||||
\u044F \u0441\u0442\u0430\u043A\u0430\u043D\u0430 \u0441\u0442\u0430\u043B\u0438\
|
||||
\ \u0447\u0443\u0442\u044C \u0442\u0438\u0448\u0435"
|
||||
type: Tweak
|
||||
id: 1121
|
||||
time: '2025-05-12T14:39:01.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2113
|
||||
- author: Kendrick
|
||||
changes:
|
||||
- message: "\u041D\u043E\u0433\u0438 \u0443\u043D\u0430\u0442\u0445\u043E\u0432\
|
||||
\ \u0432\u044B\u043F\u0440\u044F\u043C\u0438\u043B\u0438\u0441\u044C"
|
||||
type: Fix
|
||||
id: 1122
|
||||
time: '2025-05-12T14:39:55.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2108
|
||||
- author: ASLEEP
|
||||
changes:
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u0435\u043B\
|
||||
\u043E\u0432\u043A\u0438\u0435 \u043E\u0447\u043A\u0438 \u0432 \u043B\u043E\u0434\
|
||||
\u0430\u0443\u0442"
|
||||
type: Add
|
||||
id: 1123
|
||||
time: '2025-05-12T14:42:35.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2138
|
||||
- author: KaiserMaus
|
||||
changes:
|
||||
- message: "\u0441\u043E\u0437\u0434\u0430\u043D\u0438\u0435 \u041F\u041D\u0412\
|
||||
\ \u0442\u0435\u043F\u0435\u0440\u044C \u0442\u0440\u0435\u0431\u0443\u0435\u0442\
|
||||
\ \u0443\u0440\u0430\u043D \u0432\u043C\u0435\u0441\u0442\u043E \u0430\u043B\
|
||||
\u043C\u0430\u0437\u0430."
|
||||
type: Tweak
|
||||
id: 1124
|
||||
time: '2025-05-12T14:44:46.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2143
|
||||
- author: KaiserMaus
|
||||
changes:
|
||||
- message: "\u0423\u0431\u0440\u0430\u043D \u0441\u043A\u0430\u0444\u0430\u043D\u0434\
|
||||
\u0440 \u041A\u043E\u043C\u0430\u043D\u0434\u0438\u0440\u0430 \u0438\u0437 \u0430\
|
||||
\u043F\u043B\u0438\u043D\u043A\u0430 \u0438 \u0434\u043E\u0431\u0430\u0432\u043B\
|
||||
\u0435\u043D \u043D\u0430 \u0448\u0430\u0442\u0442\u043B \u041E\u043F\u0435\u0440\
|
||||
\u0430\u0442\u0438\u0432\u043D\u0438\u043A\u043E\u0432."
|
||||
type: Tweak
|
||||
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u043D\u0435\u043A\u043E\
|
||||
\u0442\u043E\u0440\u044B\u0435 \u0446\u0435\u043D\u044B \u0432 \u0430\u043F\u043B\
|
||||
\u0438\u043D\u043A\u0435 \u043E\u043F\u0435\u0440\u0430\u0442\u0438\u0432\u043D\
|
||||
\u0438\u043A\u043E\u0432."
|
||||
type: Tweak
|
||||
- message: "\u042D\u043B\u0438\u0442\u043D\u044B\u0439 \u0441\u043A\u0430\u0444\u0430\
|
||||
\u043D\u0434\u0440 \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0438\u043C\
|
||||
\u0435\u0435\u0442 \u0432\u0441\u0442\u0440\u043E\u0435\u043D\u043D\u044B\u0439\
|
||||
\ \u0449\u0438\u0442."
|
||||
type: Tweak
|
||||
- message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D \u0448\u0430\u0442\u0442\
|
||||
\u043B \u042F\u0434\u0435\u0440\u043D\u044B\u0445 \u041E\u043F\u0435\u0440\u0430\
|
||||
\u0442\u0438\u0432\u043D\u0438\u043A\u043E\u0432."
|
||||
type: Tweak
|
||||
- message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D \u0410\u0432\u0430\u043D\
|
||||
\u043F\u043E\u0441\u0442 \u042F\u0434\u0435\u0440\u043D\u044B\u0445 \u041E\u043F\
|
||||
\u0435\u0440\u0430\u0442\u0438\u0432\u043D\u0438\u043A\u043E\u0432."
|
||||
type: Tweak
|
||||
id: 1125
|
||||
time: '2025-05-12T20:50:35.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2136
|
||||
- author: Noychik
|
||||
changes:
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0442\u0435\u043A\
|
||||
\u0441\u0442\u0443\u0440\u0430 \u0442\u0440\u043E\u0439\u043D\u043E\u0433\u043E\
|
||||
\ \u0448\u0430\u0445\u0442\u0435\u0440\u0441\u043A\u043E\u0433\u043E \u0448\u043B\
|
||||
\u044E\u0437\u0430"
|
||||
type: Tweak
|
||||
id: 1126
|
||||
time: '2025-05-17T08:53:21.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2111
|
||||
- author: darvin7531
|
||||
changes:
|
||||
- message: "\u0438\u0441\u043F\u0440\u0430\u0432\u0438\u043B \u043F\u0443\u0442\u044C\
|
||||
\ \u0434\u043E \u0441\u043F\u0440\u0430\u0439\u0442\u0430 \u043F\u0440\u043E\
|
||||
\u0442\u0438\u0432\u043E\u0433\u0430\u0437\u0430 \u0421\u0438\u043D\u0435\u0433\
|
||||
\u043E \u0429\u0438\u0442\u0430"
|
||||
type: Fix
|
||||
id: 1127
|
||||
time: '2025-05-19T16:22:02.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2180
|
||||
- author: KaiserMaus
|
||||
changes:
|
||||
- message: "\u0443\u0431\u0440\u0430\u043D \u0438\u0437 \u0415\u043C\u0430\u0433\
|
||||
\ \u0430\u0441\u043E\u0440\u0442\u0438\u043C\u0435\u043D\u0442\u0430 \u0414\u0435\
|
||||
\u043B\u043E\u0432\u043E\u0439 \u0431\u0440\u043E\u043D\u0435 \u043A\u043E\u0441\
|
||||
\u0442\u044E\u043C."
|
||||
type: Remove
|
||||
- message: "\u0414\u041E \u043F\u043E\u043B\u0443\u0447\u0438\u043B\u0438 \u0434\
|
||||
\u0435\u043B\u043E\u0432\u043E\u0439 \u043A\u043E\u0441\u0442\u044E\u043C \u0432\
|
||||
\ \u0430\u043F\u043B\u0438\u043D\u043A."
|
||||
type: Add
|
||||
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0443\u0440\u043E\u043D\
|
||||
\ \u0432\u0437\u0440\u044B\u0432-\u043E\u0448\u0435\u0439\u043D\u0438\u043A\u0430\
|
||||
."
|
||||
type: Tweak
|
||||
id: 1128
|
||||
time: '2025-05-19T17:02:20.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2179
|
||||
- author: Worldead2123
|
||||
changes:
|
||||
- message: "\u0418\u0437\u043C\u0435\u043D\u0451\u043D \u0423\u0431\u043E\u0440\u0448\
|
||||
\u043A\u0430\u0444."
|
||||
type: Tweak
|
||||
id: 1129
|
||||
time: '2025-05-19T17:02:12.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2158
|
||||
- author: Non_stop_smetana
|
||||
changes:
|
||||
- message: "\u0412\u0441\u0451 \u043D\u0438\u0436\u0435 \u043F\u0435\u0440\u0435\
|
||||
\u0447\u0438\u0441\u043B\u0435\u043D\u043D\u044B\u0435 \u0438\u0437\u043C\u0435\
|
||||
\u043D\u0435\u043D\u0438\u044F \u043A\u0430\u0441\u0430\u0442\u044C\u0441\u044F\
|
||||
\ \u043B\u0438\u0448\u044C \u043A\u0430\u0440\u0442\u044B \u043C\u0430\u0440\
|
||||
\u0430\u0444\u043E\u043D."
|
||||
type: Add
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043E\u0444\u0444\
|
||||
\u043E\u0432\u0441\u043A\u0430\u044F \u044D\u043A\u043E\u043D\u043E\u043C\u0438\
|
||||
\u043A\u0430."
|
||||
type: Add
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043A\u0440\u0430\u0441\
|
||||
\u043A\u043E\u043C\u0430\u0442."
|
||||
type: Add
|
||||
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0430\u0432\u0442\
|
||||
\u043E\u043C\u0430\u0442\u0438\u0437\u0430\u0446\u0438\u044F \u0431\u0440\u0438\
|
||||
\u0433\u0430."
|
||||
type: Add
|
||||
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u043E\u0440\u0443\u0436\
|
||||
\u0435\u0439\u043D\u0430\u044F."
|
||||
type: Tweak
|
||||
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u043C\u043D\u043E\u0436\
|
||||
\u0435\u0441\u0442\u0432\u043E \u043C\u0438\u043A\u0440\u043E \u0432\u0435\u0449\
|
||||
\u0435\u0439, \u0447\u0442\u043E \u043C\u0435\u0448\u0430\u043B\u0438 \u0438\
|
||||
\u0433\u0440\u0435"
|
||||
type: Tweak
|
||||
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043C\u043D\
|
||||
\u043E\u0436\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0435 \u0431\u0430\
|
||||
\u0433\u0438."
|
||||
type: Fix
|
||||
id: 1130
|
||||
time: '2025-05-19T20:30:31.0000000+00:00'
|
||||
url: https://github.com/space-sunrise/sunrise-station/pull/2168
|
||||
|
|
|
|||
|
|
@ -14,3 +14,5 @@ ent-ClothingEyesGlassesThermalSyndie = optical thermal scanner
|
|||
.desc = Thermals in the shape of glasses. for better exterminating NanoTrasen Scum.
|
||||
ent-ClothingEyesGlassesThermalSec = optical thermal scanner
|
||||
.desc = Thermals in the shape of glasses.
|
||||
ent-ClothingEyesStuttering = stuttering glasses
|
||||
.desc = Glasses that give the owner knowledge...or stuttering
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ ent-PlushieTwo = Unknown
|
|||
.desc = A plush, polite man with refined taste and a moustache.
|
||||
ent-PlushieThree = Teresa Sharapova
|
||||
.desc = The plush head of staff, he's pissing you off.
|
||||
ent-PlushieUunaMiira = Plushie Uuna Mi'Ira
|
||||
ent-PlushieUunaKatsuhiro = Plushie Uuna Katsuhiro
|
||||
.desc = A dark elf with a bright soul.
|
||||
ent-PlushieFour = Yasly Chunkanjuk
|
||||
.desc = A plush orange fox in an officer's uniform.
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
ent-MaterialBag = material bag
|
||||
ent-MaterialBagSunrise = material bag
|
||||
.desc = A very roomy engineering bag designed for storing materials.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
advertisement-ATM-1 = Hello! Your money missed you — don’t keep it waiting.
|
||||
advertisement-ATM-2 = Try entering your PIN. Just not “1234”, alright?
|
||||
advertisement-ATM-3 = Processing your request… let’s hope you’re not asking for everything at once.
|
||||
advertisement-ATM-4 = Money loves to be counted. We love fees.
|
||||
advertisement-ATM-5 = If you're trying to withdraw millions — we’ll pretend we didn’t hear that.
|
||||
advertisement-ATM-6 = The bank thanks you for your trust. And for the service fees.
|
||||
advertisement-ATM-7 = Thank you for using our system. We won’t tell the tax office. Probably.
|
||||
advertisement-ATM-8 = Your balance is safe. Unlike your self-esteem after checking it.
|
||||
|
|
@ -14,3 +14,5 @@ ent-ClothingEyesGlassesThermalSyndie = оптический термальный
|
|||
.desc = Компактный термальный сканер. Оборудован системой свой-чужой. Идеально подходит для выявления и уничтожения сотрудников НаноТрейзен.
|
||||
ent-ClothingEyesGlassesThermalSec = оптический термальный сканер
|
||||
.desc = Компактный термальный сканер. Идеально подходит для выявления и уничтожения врагов НаноТрейзен.
|
||||
ent-ClothingEyesStuttering = неловкие очки
|
||||
.desc = Очки, которые дают владельцу знания...или заикание
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ ent-ClothingUniformJumpsuitNtrepFormal = праздничный костюм п
|
|||
.desc = Этот костюм лучше не видеть.
|
||||
ent-ClothingUniformJumpsuitBlueShield = комбинезон офицера «синий щит»
|
||||
.desc = На стиле.
|
||||
ent-ClothingUniformJumpsuitNTRG = униформа Исполнителей Судебных Наказаний
|
||||
ent-ClothingUniformJumpsuitNTRG = униформа Исполнителей Судебных Наказаний
|
||||
.desc = На стиле.
|
||||
ent-ClothingUniformJumpsuitPrisonerGrey = комбинезон заключённого
|
||||
.desc = Почему он не оранжевый?
|
||||
|
|
@ -58,7 +58,7 @@ ent-ClothingUniformTShirtKhakiPants = однотонная футболка и
|
|||
.desc = Обычная, но функциональная одежда.
|
||||
ent-ClothingUniformJumpsuitAtmosSyndie = Акробатический комбинезон
|
||||
.desc = { ent-ClothingUniformJumpsuitAtmos.desc }
|
||||
ent-ClothingUniformJumpsuitArmouredBlack = бронированный черный адвокатский костюм
|
||||
ent-ClothingUniformJumpsuitArmouredBlack = чёрный адвокатский костюм
|
||||
.desc = Казалось бы, простой деловой костюм... пока не отлетела пуля...
|
||||
ent-ClothingUniformJumpsuitCapTurtleneck = черенок капитана
|
||||
.desc = Истинный черенок капитана.
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ ent-PlushieTwo = Неизвестный
|
|||
.desc = Плюшевый, вежливый мужчина с утончёнными вкусом и усами.
|
||||
ent-PlushieThree = Тереза Шарапова
|
||||
.desc = Плюшевый глава персонала, он вас бесит.
|
||||
ent-PlushieUunaMiira = Плюшевая Ууна Ми'Ира
|
||||
ent-PlushieUunaKatsuhiro = Плюшевая Ууна Кацухиро
|
||||
.desc = Тёмная эльфийка со светлой душой.
|
||||
ent-PlushieFour = Ясли Чунканжук
|
||||
.desc = Плюшевая оранжевая лиса в форме офицера.
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
ent-MaterialBag = сумка для материалов
|
||||
ent-MaterialBagSunrise = сумка для материалов
|
||||
.desc = Очень вместительная инженерная сумка, предназначенная для хранения материалов.
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ ent-ClothingOuterArmorBulletproof = пуленепробиваемый жиле
|
|||
ent-ClothingOuterArmorReflective = отражающий бронежилет
|
||||
.desc = Бронежилет с усовершенствованной защитой от энергетического оружия.
|
||||
ent-ClothingOuterArmorRaid = рейдерский костюм Синдиката
|
||||
.desc = Довольно гибкий и хорошо защищённый костюм с мощным наплечным фонарём, выполненный в легендарной кроваво-красной цветовой гамме Мародёров Горлекса, обеспечивающий защиту владельца от низкого давления но не космического пространства.
|
||||
.desc = Довольно гибкий и хорошо защищённый костюм с мощным наплечным фонарём, выполненный в легендарной кроваво-красной цветовой гамме Мародёров Горлекса, не обеспечивающий защиту владельца от низкого давления и космического пространства.
|
||||
ent-ClothingOuterArmorCult = доспехи аколита
|
||||
.desc = Зловещего вида броня культа, сделанная из костей.
|
||||
ent-ClothingOuterArmorHeavy = тяжёлый бронекостюм
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ ent-ClothingOuterHardsuitSyndie = кроваво-красный скафандр
|
|||
ent-ClothingOuterHardsuitSyndieMedic = кроваво-красный медицинский скафандр
|
||||
.desc = Тяжелобронированный и манёвренный продвинутый скафандр, предназначенный для полевых медицинских операций.
|
||||
ent-ClothingOuterHardsuitSyndieElite = элитный скафандр Синдиката
|
||||
.desc = Элитная версия кроваво-красного скафандра, отличающаяся повышенной мобильностью и огнеупорностью. Собственность Мародёров Горлекса.
|
||||
.desc = Элитная версия кроваво-красного скафандра, отличающаяся повышенной огнеупорностью. Собственность Мародёров Горлекса.
|
||||
ent-ClothingOuterHardsuitSyndieCommander = скафандр командира Синдиката
|
||||
.desc = Усиленная версия кроваво-красного скафандра, предназначенная для командиров оперативных отрядов Синдиката. Броня значительно усилена для ведения смертоносных боёв на передовой.
|
||||
ent-ClothingOuterHardsuitJuggernaut = костюм джаггернаута Cybersun
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
advertisement-ATM-1 = Здравствуйте! Ваши деньги так соскучились — не заставляйте их ждать.
|
||||
advertisement-ATM-2 = Попробуйте ввести ПИН. Только не “1234”, ладно?
|
||||
advertisement-ATM-3 = Обрабатываю запрос… надеемся, вы не хотите всё сразу.
|
||||
advertisement-ATM-4 = Деньги любят счёт. Мы любим комиссии.
|
||||
advertisement-ATM-5 = Если хотите снять миллионы — сделаем вид, что не слышали.
|
||||
advertisement-ATM-6 = Банк благодарит вас за доверие. И за процент по обслуживанию.
|
||||
advertisement-ATM-7 = Спасибо за использование нашей системы. Мы не сообщим налоговой. Наверное.
|
||||
advertisement-ATM-8 = Ваш баланс в безопасности. В отличие от вашей самооценки после его просмотра.
|
||||
|
|
@ -24,3 +24,4 @@ ui-options-function-auto-get-up = Автоматически вставать п
|
|||
ui-options-function-hold-look-up = Удерживать клавишу для прицеливания
|
||||
ui-options-chat-icons-enable = Использовать иконки профессий в чате
|
||||
ui-options-chat-pointing-visuals-enable = Отображать указывания с иконками в чате
|
||||
ui-options-play-heartbeat-sound = Проигрывать звук сердцебиения
|
||||
|
|
|
|||
|
|
@ -46,6 +46,8 @@ uplink-energy-dome-personal-name = Поясной Энергетический
|
|||
uplink-energy-dome-personal-desc = Генератор малого щита, защищающий владельца от лазеров и пуль, но не позволяющий самому использовать оружие дальнего боя. Использует батареи.
|
||||
uplink-energy-dome-backpack-name = Наспинный Энергетический барьер
|
||||
uplink-energy-dome-backpack-desc = Генератор большого барьера, защищающий владельца от лазеров и пуль, но не позволяющий самому использовать оружие дальнего боя. Использует батареи.
|
||||
uplink-armoured-jumpsuit-name = бронированный черный адвокатский костюм
|
||||
uplink-armoured-jumpsuit-desc = Казалось бы, простой деловой костюм... пока не отлетела пуля...
|
||||
|
||||
## Weapon
|
||||
|
||||
|
|
@ -109,7 +111,7 @@ uplink-mech-equipment-vindictor-desc = Тяжёлое оружие массов
|
|||
uplink-mech-equipment-uvm31-name = UVM-31 "Дрейк"
|
||||
uplink-mech-equipment-uvm31-desc = Тяжёлое оружие массового поражения разработанное Cybersun на основе минигана. теперь на прочном штативе позволяющем вести огонь прямо из МЕХа!
|
||||
uplink-mech-teleporter-medium-name = Телепорт среднего меха
|
||||
uplink-mech-teleporter-medium-desc = Содержит среднебронированный мех Cybersan с интегрированными цепным мечом и ракетной установкой BRM-8.
|
||||
uplink-mech-teleporter-medium-desc = Содержит среднебронированный мех Cybersan с AC-2 "Ультра" и ракетной установкой BRM-8.
|
||||
uplink-clothing-glasses-nvg-name = Модульные Очки
|
||||
uplink-clothing-glasses-nvg-desc = Качественно исполненные солнцезащитные очки, производства компании "Горлакс секьюрити". Использует модульные части для улучшения видимости в условиях низкой освещенности. Внимание! Очки не смогут защитить ваши глаза от прямых вспышек.
|
||||
|
||||
|
|
@ -147,9 +149,9 @@ uplink-ammo-lmguraniumkit-desc = Перезаряжаю! Содержит 4 ур
|
|||
uplink-cluster-mini-bomb-name = Кластерная минибомба синдиката
|
||||
uplink-cluster-mini-bomb-desc = Если вы не преследуете цель точечных диверсий, то этот выбор для вас.
|
||||
uplink-mech-teleporter-heavy-name = Телепорт тяжелого меха
|
||||
uplink-mech-teleporter-heavy-desc = Содержит тяжелобронированный мех Cybersan с интегрированными цепным мечом и ракетной установкой BRM-6.
|
||||
uplink-mech-teleporter-heavy-desc = Содержит тяжелобронированный мех Cybersan с AC-2 "Ультра", LBX AC 10 "Залп" и ракетной установкой BRM-6.
|
||||
uplink-mech-teleporter-assault-name = Телепорт штурмового меха
|
||||
uplink-mech-teleporter-assault-desc = Содержит легкобронированный мех Cybersan с интегрированными цепным мечом и легкой ракетной установкой SRM-8.
|
||||
uplink-mech-teleporter-assault-desc = Содержит легкобронированный мех Cybersan с LBX AC 10 "Залп" и легкой ракетной установкой SRM-8.
|
||||
uplink-energy-dome-name = Личный энергетический купол
|
||||
uplink-energy-dome-desc = Персональный генератор щита, который защищает владельца от лазеров и пуль, но не позволяет использовать дистанционное оружие. Поставляется с небольшим энергетическим элементом.
|
||||
uplink-syndicate-teleporter-name = Ручной телепорт Синдиката
|
||||
|
|
@ -158,4 +160,4 @@ uplink-syndicate-teleporter-desc = Экспериментальное устро
|
|||
## Disruption
|
||||
|
||||
uplink-syndicate-law-name = Плата законов (Синдикат)
|
||||
uplink-syndicate-law-desc = Электронная плата, содержащая набор законов Синдиката.
|
||||
uplink-syndicate-law-desc = Электронная плата, содержащая набор законов Синдиката.
|
||||
|
|
|
|||
|
|
@ -239,9 +239,9 @@ uplink-hardsuit-carp-desc = Выглядит как обычный костюм
|
|||
uplink-eva-syndie-name = Набор EVA Синдиката
|
||||
uplink-eva-syndie-desc = Простой EVA-скафандр, который не даёт никакой защиты, кроме той, что необходима для выживания в космосе.
|
||||
uplink-syndie-raid-name = Рейдерский костюм Синдиката
|
||||
uplink-syndie-raid-desc = Очень прочный и довольно гибкий костюм с кроваво-красным бронированием, лучше защищающий от всех обычных видов повреждений, но не предназначенный для выхода в открытый космос хоть и защищает от давления. Поставляется в комплекте с крутым шлемом.
|
||||
uplink-syndie-raid-desc = Очень прочный и довольно гибкий костюм с кроваво-красным бронированием, лучше защищающий от всех обычных видов повреждений, но не предназначенный для выхода в открытый космос. Поставляется в комплекте с крутым шлемом.
|
||||
uplink-hardsuit-syndieelite-name = Элитный скафандр Синдиката
|
||||
uplink-hardsuit-syndieelite-desc = Элитная версия кроваво-красного скафандра, отличающаяся повышенной мобильностью и огнеупорностью. Собственность Мародёров Горлекса.
|
||||
uplink-hardsuit-syndieelite-desc = Элитная версия кроваво-красного скафандра, отличающаяся повышенной огнеупорностью. Собственность Мародёров Горлекса.
|
||||
uplink-clothing-outer-hardsuit-juggernaut-name = Скафандр джаггернаута Cybersun
|
||||
uplink-clothing-outer-hardsuit-juggernaut-desc = Сверхпрочная броня из материалов, испытанных в хромосферном комплексе Тау. Единственное, что сможет вас задержать - этот костюм... и тазеры.
|
||||
uplink-cyberpen-name = Ручка Cybersun
|
||||
|
|
|
|||
25081
Resources/Maps/_Sunrise/Nonstations/nukieplanet.yml
Normal file
25081
Resources/Maps/_Sunrise/Nonstations/nukieplanet.yml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -40,7 +40,6 @@ entities:
|
|||
name: NTS-415 «Мертвец»
|
||||
- type: Transform
|
||||
pos: 50.796875,-0.453125
|
||||
parent: invalid
|
||||
- type: MapGrid
|
||||
chunks:
|
||||
-1,-1:
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ entities:
|
|||
name: NTS-РХБЗЗ-415
|
||||
- type: Transform
|
||||
pos: 17.5,10
|
||||
parent: invalid
|
||||
- type: MapGrid
|
||||
chunks:
|
||||
0,0:
|
||||
|
|
@ -461,7 +460,6 @@ entities:
|
|||
joints:
|
||||
docking248021: !type:WeldJoint
|
||||
bodyB: 1
|
||||
bodyA: invalid
|
||||
id: docking248021
|
||||
localAnchorB: 1.5,-8
|
||||
localAnchorA: 22.5,4
|
||||
|
|
@ -469,7 +467,6 @@ entities:
|
|||
stiffness: 8781.628
|
||||
docking248022: !type:WeldJoint
|
||||
bodyB: 1
|
||||
bodyA: invalid
|
||||
id: docking248022
|
||||
localAnchorB: -0.5,-8
|
||||
localAnchorA: 20.5,4
|
||||
|
|
@ -822,7 +819,6 @@ entities:
|
|||
parent: 1
|
||||
- type: Docking
|
||||
dockJointId: docking248022
|
||||
dockedWith: invalid
|
||||
- type: DeviceLinkSource
|
||||
lastSignals:
|
||||
DoorStatus: False
|
||||
|
|
@ -836,7 +832,6 @@ entities:
|
|||
parent: 1
|
||||
- type: Docking
|
||||
dockJointId: docking248021
|
||||
dockedWith: invalid
|
||||
- type: DeviceLinkSource
|
||||
lastSignals:
|
||||
DoorStatus: False
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ entities:
|
|||
name: NTS-Виверна-415
|
||||
- type: Transform
|
||||
pos: 8.274825,1.7586465
|
||||
parent: invalid
|
||||
- type: MapGrid
|
||||
chunks:
|
||||
0,0:
|
||||
|
|
@ -225,7 +224,6 @@ entities:
|
|||
joints:
|
||||
docking84837: !type:WeldJoint
|
||||
bodyB: 1
|
||||
bodyA: invalid
|
||||
id: docking84837
|
||||
localAnchorB: 0.49999997,0
|
||||
localAnchorA: 12.5,4
|
||||
|
|
@ -240,7 +238,6 @@ entities:
|
|||
parent: 1
|
||||
- type: Docking
|
||||
dockJointId: docking84837
|
||||
dockedWith: invalid
|
||||
- type: DeviceLinkSource
|
||||
lastSignals:
|
||||
DoorStatus: False
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -15098,20 +15098,6 @@ entities:
|
|||
parent: 515
|
||||
- type: Physics
|
||||
canCollide: False
|
||||
- proto: MusicTape132
|
||||
entities:
|
||||
- uid: 1468
|
||||
components:
|
||||
- type: Transform
|
||||
pos: 2.5480745,11.619652
|
||||
parent: 1
|
||||
- proto: MusicTape31
|
||||
entities:
|
||||
- uid: 1469
|
||||
components:
|
||||
- type: Transform
|
||||
pos: 2.4230745,11.760277
|
||||
parent: 1
|
||||
- proto: MysteryFigureBox
|
||||
entities:
|
||||
- uid: 1470
|
||||
|
|
|
|||
|
|
@ -2362,10 +2362,6 @@ entities:
|
|||
pos: -3.9028208,-4.015589
|
||||
parent: 1
|
||||
- type: NetworkConfigurator
|
||||
devices:
|
||||
'UID: 2758': invalid
|
||||
'UID: 2759': invalid
|
||||
linkModeActive: False
|
||||
- proto: Nanopaste10
|
||||
entities:
|
||||
- uid: 10
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
meta:
|
||||
format: 7
|
||||
category: Grid
|
||||
engineVersion: 252.0.0
|
||||
engineVersion: 255.1.0
|
||||
forkId: sunrise_station_public
|
||||
forkVersion: 8a92da2e178d70cf28f5e780ea205d677458605e
|
||||
time: 04/18/2025 04:07:00
|
||||
entityCount: 1096
|
||||
forkVersion: f012d89aa9d25bb6afaa8ab61174670c1ef23fd1
|
||||
time: 05/09/2025 06:45:40
|
||||
entityCount: 1097
|
||||
maps: []
|
||||
grids:
|
||||
- 2
|
||||
|
|
@ -3167,6 +3167,26 @@ entities:
|
|||
- type: Transform
|
||||
pos: -3.5,20.5
|
||||
parent: 2
|
||||
- proto: DebugGenerator
|
||||
entities:
|
||||
- uid: 98
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -1.5,1.5
|
||||
parent: 2
|
||||
- type: CMExplosionEffect
|
||||
- uid: 120
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -2.5,1.5
|
||||
parent: 2
|
||||
- type: CMExplosionEffect
|
||||
- uid: 131
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -0.5,1.5
|
||||
parent: 2
|
||||
- type: CMExplosionEffect
|
||||
- proto: DefibrillatorCabinetFilled
|
||||
entities:
|
||||
- uid: 1041
|
||||
|
|
@ -3211,7 +3231,7 @@ entities:
|
|||
parent: 2
|
||||
- proto: DoubleGlassAirlockAtmosphericsLocked
|
||||
entities:
|
||||
- uid: 120
|
||||
- uid: 236
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -7.5,2.5
|
||||
|
|
@ -3249,7 +3269,7 @@ entities:
|
|||
pos: -10.5,12.5
|
||||
parent: 2
|
||||
- type: Door
|
||||
secondsUntilStateChange: -2905.1365
|
||||
secondsUntilStateChange: -3039.35
|
||||
state: Opening
|
||||
- type: DeviceLinkSource
|
||||
lastSignals:
|
||||
|
|
@ -5061,26 +5081,6 @@ entities:
|
|||
- 1039
|
||||
- type: AtmosPipeColor
|
||||
color: '#990000FF'
|
||||
- proto: GeneratorBasic15kW
|
||||
entities:
|
||||
- uid: 98
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -1.5,1.5
|
||||
parent: 2
|
||||
- type: CMExplosionEffect
|
||||
- uid: 131
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -0.5,1.5
|
||||
parent: 2
|
||||
- type: CMExplosionEffect
|
||||
- uid: 236
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -2.5,1.5
|
||||
parent: 2
|
||||
- type: CMExplosionEffect
|
||||
- proto: GravityGeneratorMini
|
||||
entities:
|
||||
- uid: 80
|
||||
|
|
@ -5509,6 +5509,20 @@ entities:
|
|||
- type: Transform
|
||||
pos: -4.370948,-1.3201361
|
||||
parent: 2
|
||||
- proto: PlushieCoffeefox
|
||||
entities:
|
||||
- uid: 1097
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -8.536245,17.446934
|
||||
parent: 2
|
||||
- proto: PlushieOrangefox
|
||||
entities:
|
||||
- uid: 84
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -7.49389,17.488602
|
||||
parent: 2
|
||||
- proto: PortableScrubber
|
||||
entities:
|
||||
- uid: 43
|
||||
|
|
@ -5859,7 +5873,8 @@ entities:
|
|||
- type: DeviceLinkSource
|
||||
linkedPorts:
|
||||
543:
|
||||
- Timer: Open
|
||||
- - Timer
|
||||
- Open
|
||||
- uid: 548
|
||||
components:
|
||||
- type: Transform
|
||||
|
|
@ -5868,7 +5883,8 @@ entities:
|
|||
- type: DeviceLinkSource
|
||||
linkedPorts:
|
||||
544:
|
||||
- Timer: Open
|
||||
- - Timer
|
||||
- Open
|
||||
- proto: SheetGlass
|
||||
entities:
|
||||
- uid: 122
|
||||
|
|
@ -6265,19 +6281,26 @@ entities:
|
|||
- type: DeviceLinkSource
|
||||
linkedPorts:
|
||||
698:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
697:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
700:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
699:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
696:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
695:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
694:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
- uid: 738
|
||||
components:
|
||||
- type: Transform
|
||||
|
|
@ -6287,21 +6310,29 @@ entities:
|
|||
- type: DeviceLinkSource
|
||||
linkedPorts:
|
||||
745:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
744:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
743:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
742:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
741:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
739:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
746:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
740:
|
||||
- Pressed: Toggle
|
||||
- - Pressed
|
||||
- Toggle
|
||||
- proto: SignAtmos
|
||||
entities:
|
||||
- uid: 47
|
||||
|
|
@ -6805,22 +6836,84 @@ entities:
|
|||
- type: Transform
|
||||
pos: 5.5,12.5
|
||||
parent: 2
|
||||
- uid: 37
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -3.5,-1.5
|
||||
parent: 2
|
||||
- uid: 38
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -4.5,2.5
|
||||
parent: 2
|
||||
- uid: 41
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -3.5,0.5
|
||||
parent: 2
|
||||
- uid: 42
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -14.5,11.5
|
||||
parent: 2
|
||||
- uid: 54
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -3.5,-2.5
|
||||
parent: 2
|
||||
- uid: 56
|
||||
components:
|
||||
- type: Transform
|
||||
pos: 3.5,6.5
|
||||
parent: 2
|
||||
- uid: 60
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -12.5,1.5
|
||||
parent: 2
|
||||
- uid: 63
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -9.5,-3.5
|
||||
parent: 2
|
||||
- uid: 68
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -2.5,2.5
|
||||
parent: 2
|
||||
- uid: 76
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -10.5,0.5
|
||||
parent: 2
|
||||
- uid: 79
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: 4.5,8.5
|
||||
parent: 2
|
||||
- uid: 82
|
||||
components:
|
||||
- type: Transform
|
||||
pos: 5.5,8.5
|
||||
parent: 2
|
||||
- uid: 83
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -5.5,2.5
|
||||
parent: 2
|
||||
- uid: 100
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -13.5,2.5
|
||||
parent: 2
|
||||
- uid: 101
|
||||
components:
|
||||
- type: Transform
|
||||
|
|
@ -6887,6 +6980,54 @@ entities:
|
|||
rot: 3.141592653589793 rad
|
||||
pos: 3.5,3.5
|
||||
parent: 2
|
||||
- uid: 162
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -8.5,0.5
|
||||
parent: 2
|
||||
- uid: 163
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -9.5,2.5
|
||||
parent: 2
|
||||
- uid: 165
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -9.5,-1.5
|
||||
parent: 2
|
||||
- uid: 171
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -8.5,-1.5
|
||||
parent: 2
|
||||
- uid: 172
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -12.5,2.5
|
||||
parent: 2
|
||||
- uid: 182
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: 2.5,2.5
|
||||
parent: 2
|
||||
- uid: 183
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -9.5,0.5
|
||||
parent: 2
|
||||
- uid: 189
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -3.5,2.5
|
||||
parent: 2
|
||||
- uid: 190
|
||||
components:
|
||||
- type: Transform
|
||||
|
|
@ -6899,18 +7040,65 @@ entities:
|
|||
rot: -1.5707963267948966 rad
|
||||
pos: -14.5,21.5
|
||||
parent: 2
|
||||
- uid: 193
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -15.5,11.5
|
||||
parent: 2
|
||||
- uid: 195
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -14.5,2.5
|
||||
parent: 2
|
||||
- uid: 196
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -12.5,11.5
|
||||
parent: 2
|
||||
- uid: 197
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -11.5,0.5
|
||||
parent: 2
|
||||
- uid: 199
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -16.5,11.5
|
||||
parent: 2
|
||||
- uid: 200
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -10.5,11.5
|
||||
parent: 2
|
||||
- uid: 202
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -0.5,16.5
|
||||
parent: 2
|
||||
- uid: 203
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -17.5,11.5
|
||||
parent: 2
|
||||
- uid: 204
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -11.5,17.5
|
||||
parent: 2
|
||||
- uid: 205
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -15.5,2.5
|
||||
parent: 2
|
||||
- uid: 206
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -17.5,19.5
|
||||
parent: 2
|
||||
- uid: 207
|
||||
components:
|
||||
- type: Transform
|
||||
|
|
@ -6963,6 +7151,16 @@ entities:
|
|||
rot: -1.5707963267948966 rad
|
||||
pos: -19.5,17.5
|
||||
parent: 2
|
||||
- uid: 230
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -3.5,1.5
|
||||
parent: 2
|
||||
- uid: 239
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -11.5,11.5
|
||||
parent: 2
|
||||
- uid: 244
|
||||
components:
|
||||
- type: Transform
|
||||
|
|
@ -6975,6 +7173,12 @@ entities:
|
|||
rot: 3.141592653589793 rad
|
||||
pos: 3.5,5.5
|
||||
parent: 2
|
||||
- uid: 259
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -10.5,2.5
|
||||
parent: 2
|
||||
- uid: 262
|
||||
components:
|
||||
- type: Transform
|
||||
|
|
@ -6987,307 +7191,6 @@ entities:
|
|||
rot: -1.5707963267948966 rad
|
||||
pos: -11.5,-1.5
|
||||
parent: 2
|
||||
- uid: 282
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 3.141592653589793 rad
|
||||
pos: 3.5,-2.5
|
||||
parent: 2
|
||||
- uid: 283
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -11.5,21.5
|
||||
parent: 2
|
||||
- uid: 286
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 3.141592653589793 rad
|
||||
pos: -10.5,21.5
|
||||
parent: 2
|
||||
- uid: 287
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -12.5,21.5
|
||||
parent: 2
|
||||
- uid: 293
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -19.5,6.5
|
||||
parent: 2
|
||||
- uid: 312
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -17.5,2.5
|
||||
parent: 2
|
||||
- uid: 313
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -19.5,9.5
|
||||
parent: 2
|
||||
- uid: 320
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -19.5,7.5
|
||||
parent: 2
|
||||
- uid: 321
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -18.5,2.5
|
||||
parent: 2
|
||||
- uid: 323
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -19.5,11.5
|
||||
parent: 2
|
||||
- uid: 324
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -19.5,12.5
|
||||
parent: 2
|
||||
- uid: 328
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -11.5,-0.5
|
||||
parent: 2
|
||||
- proto: WallShuttleDiagonal
|
||||
entities:
|
||||
- uid: 9
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -17.5,21.5
|
||||
parent: 2
|
||||
- uid: 103
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -11.5,-3.5
|
||||
parent: 2
|
||||
- uid: 153
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 3.141592653589793 rad
|
||||
pos: 4.5,7.5
|
||||
parent: 2
|
||||
- uid: 209
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -13.5,1.5
|
||||
parent: 2
|
||||
- uid: 254
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 3.141592653589793 rad
|
||||
pos: 3.5,-3.5
|
||||
parent: 2
|
||||
- uid: 275
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -12.5,0.5
|
||||
parent: 2
|
||||
- uid: 278
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -19.5,2.5
|
||||
parent: 2
|
||||
- uid: 285
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -19.5,19.5
|
||||
parent: 2
|
||||
- proto: WallShuttleInterior
|
||||
entities:
|
||||
- uid: 37
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -3.5,-1.5
|
||||
parent: 2
|
||||
- uid: 38
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -4.5,2.5
|
||||
parent: 2
|
||||
- uid: 41
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -3.5,0.5
|
||||
parent: 2
|
||||
- uid: 42
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -14.5,11.5
|
||||
parent: 2
|
||||
- uid: 54
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -3.5,-2.5
|
||||
parent: 2
|
||||
- uid: 60
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -12.5,1.5
|
||||
parent: 2
|
||||
- uid: 68
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -2.5,2.5
|
||||
parent: 2
|
||||
- uid: 76
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -10.5,0.5
|
||||
parent: 2
|
||||
- uid: 79
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: 4.5,8.5
|
||||
parent: 2
|
||||
- uid: 83
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -5.5,2.5
|
||||
parent: 2
|
||||
- uid: 84
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -6.5,2.5
|
||||
parent: 2
|
||||
- uid: 100
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -13.5,2.5
|
||||
parent: 2
|
||||
- uid: 162
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -8.5,0.5
|
||||
parent: 2
|
||||
- uid: 163
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -9.5,2.5
|
||||
parent: 2
|
||||
- uid: 165
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -9.5,-1.5
|
||||
parent: 2
|
||||
- uid: 171
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -8.5,-1.5
|
||||
parent: 2
|
||||
- uid: 172
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -12.5,2.5
|
||||
parent: 2
|
||||
- uid: 182
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: 2.5,2.5
|
||||
parent: 2
|
||||
- uid: 183
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -9.5,0.5
|
||||
parent: 2
|
||||
- uid: 189
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -3.5,2.5
|
||||
parent: 2
|
||||
- uid: 193
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -15.5,11.5
|
||||
parent: 2
|
||||
- uid: 196
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -12.5,11.5
|
||||
parent: 2
|
||||
- uid: 197
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -11.5,0.5
|
||||
parent: 2
|
||||
- uid: 199
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -16.5,11.5
|
||||
parent: 2
|
||||
- uid: 200
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -10.5,11.5
|
||||
parent: 2
|
||||
- uid: 202
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -0.5,16.5
|
||||
parent: 2
|
||||
- uid: 203
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -17.5,11.5
|
||||
parent: 2
|
||||
- uid: 204
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -11.5,17.5
|
||||
parent: 2
|
||||
- uid: 206
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -17.5,19.5
|
||||
parent: 2
|
||||
- uid: 230
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -3.5,1.5
|
||||
parent: 2
|
||||
- uid: 239
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -11.5,11.5
|
||||
parent: 2
|
||||
- uid: 259
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -10.5,2.5
|
||||
parent: 2
|
||||
- uid: 270
|
||||
components:
|
||||
- type: Transform
|
||||
|
|
@ -7316,6 +7219,30 @@ entities:
|
|||
- type: Transform
|
||||
pos: -18.5,11.5
|
||||
parent: 2
|
||||
- uid: 282
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 3.141592653589793 rad
|
||||
pos: 3.5,-2.5
|
||||
parent: 2
|
||||
- uid: 283
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -11.5,21.5
|
||||
parent: 2
|
||||
- uid: 286
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 3.141592653589793 rad
|
||||
pos: -10.5,21.5
|
||||
parent: 2
|
||||
- uid: 287
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -12.5,21.5
|
||||
parent: 2
|
||||
- uid: 289
|
||||
components:
|
||||
- type: Transform
|
||||
|
|
@ -7334,26 +7261,74 @@ entities:
|
|||
rot: 1.5707963267948966 rad
|
||||
pos: -8.5,2.5
|
||||
parent: 2
|
||||
- uid: 293
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -19.5,6.5
|
||||
parent: 2
|
||||
- uid: 308
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -13.5,11.5
|
||||
parent: 2
|
||||
- uid: 312
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -17.5,2.5
|
||||
parent: 2
|
||||
- uid: 313
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -19.5,9.5
|
||||
parent: 2
|
||||
- uid: 316
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -11.5,18.5
|
||||
parent: 2
|
||||
- uid: 320
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -19.5,7.5
|
||||
parent: 2
|
||||
- uid: 321
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -18.5,2.5
|
||||
parent: 2
|
||||
- uid: 322
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -11.5,19.5
|
||||
parent: 2
|
||||
- uid: 323
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -19.5,11.5
|
||||
parent: 2
|
||||
- uid: 324
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -19.5,12.5
|
||||
parent: 2
|
||||
- uid: 327
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -11.5,20.5
|
||||
parent: 2
|
||||
- uid: 328
|
||||
components:
|
||||
- type: Transform
|
||||
rot: -1.5707963267948966 rad
|
||||
pos: -11.5,-0.5
|
||||
parent: 2
|
||||
- uid: 331
|
||||
components:
|
||||
- type: Transform
|
||||
|
|
@ -7490,6 +7465,54 @@ entities:
|
|||
rot: -1.5707963267948966 rad
|
||||
pos: -14.5,18.5
|
||||
parent: 2
|
||||
- proto: WallShuttleDiagonal
|
||||
entities:
|
||||
- uid: 9
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -17.5,21.5
|
||||
parent: 2
|
||||
- uid: 103
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -11.5,-3.5
|
||||
parent: 2
|
||||
- uid: 153
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 3.141592653589793 rad
|
||||
pos: 4.5,7.5
|
||||
parent: 2
|
||||
- uid: 209
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -13.5,1.5
|
||||
parent: 2
|
||||
- uid: 254
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 3.141592653589793 rad
|
||||
pos: 3.5,-3.5
|
||||
parent: 2
|
||||
- uid: 275
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -12.5,0.5
|
||||
parent: 2
|
||||
- uid: 278
|
||||
components:
|
||||
- type: Transform
|
||||
rot: 1.5707963267948966 rad
|
||||
pos: -19.5,2.5
|
||||
parent: 2
|
||||
- uid: 285
|
||||
components:
|
||||
- type: Transform
|
||||
pos: -19.5,19.5
|
||||
parent: 2
|
||||
- proto: WardrobeMixed
|
||||
entities:
|
||||
- uid: 528
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -4,7 +4,7 @@
|
|||
ClothingBackpackDuffelAtmospherics: 2
|
||||
ClothingBackpackSatchelAtmospherics: 2
|
||||
ClothingBackpackAtmospherics: 2
|
||||
MaterialBag: 3 # Sunrise-edit
|
||||
MaterialBagSunrise: 3 # Sunrise-edit
|
||||
ClothingUniformJumpsuitAtmos: 3
|
||||
ClothingUniformJumpskirtAtmos: 3
|
||||
ClothingUniformJumpsuitAtmosCasual: 3
|
||||
|
|
|
|||
|
|
@ -1,17 +1,21 @@
|
|||
- type: vendingMachineInventory
|
||||
id: JaniDrobeInventory
|
||||
startingInventory:
|
||||
ClothingUniformJumpsuitJanitor: 2
|
||||
ClothingUniformJumpskirtJanitor: 2
|
||||
ClothingHandsGlovesJanitor: 2
|
||||
ClothingShoesColorBlack: 2
|
||||
ClothingHeadHatPurplesoft: 2
|
||||
ClothingBeltJanitor: 2
|
||||
ClothingHeadsetService: 2
|
||||
ClothingOuterWinterJani: 2
|
||||
ClothingNeckScarfStripedPurple: 3
|
||||
ClothingUniformJumpsuitJanitor: 2
|
||||
ClothingUniformJumpskirtJanitor: 2
|
||||
ClothingHandsGlovesJanitor: 2
|
||||
ClothingShoesColorBlack: 2
|
||||
ClothingHeadHatPurplesoft: 2
|
||||
ClothingBeltJanitor: 2
|
||||
ClothingHeadsetService: 2
|
||||
ClothingOuterWinterJani: 2
|
||||
ClothingNeckScarfStripedPurple: 3
|
||||
contrabandInventory:
|
||||
ToyFigurineJanitor: 1
|
||||
emaggedInventory:
|
||||
ClothingUniformJumpskirtJanimaid: 2
|
||||
#Sunrise-start
|
||||
ClothingUniformJumpskirtJanimaid: 1
|
||||
ClothingUniformJumpskirtJanimaidmini: 1
|
||||
emaggedInventory:
|
||||
ClothingHandsTacticalMaidGloves: 1
|
||||
ClothingUniformJumpskirtTacticalMaid: 1
|
||||
#Sunrise-end
|
||||
|
|
|
|||
|
|
@ -33,4 +33,3 @@
|
|||
ToyFigurineLawyer: 1
|
||||
emaggedInventory:
|
||||
CyberPen: 1
|
||||
ClothingUniformJumpsuitArmouredBlack: 1
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
- type: entity
|
||||
parent: [Clothing, ContentsExplosionResistanceBase]
|
||||
parent: [BackpackSounds, Clothing, ContentsExplosionResistanceBase] # Sunrise edit
|
||||
id: ClothingBackpack
|
||||
name: backpack
|
||||
description: You wear this on your back and put items into it.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
- type: entity
|
||||
parent: ClothingBeltStorageBase
|
||||
parent: [BackpackSounds, ClothingBeltStorageBase] # Sunrise edit
|
||||
id: ClothingBeltStorageWaistbag
|
||||
name: leather waist bag
|
||||
description: A leather waist bag meant for carrying small items.
|
||||
|
|
|
|||
|
|
@ -7,6 +7,13 @@
|
|||
state: icon
|
||||
- type: Clothing
|
||||
slots: [gloves]
|
||||
# Sunrise added start
|
||||
equipSound:
|
||||
path: /Audio/_Sunrise/Items/Equip/Gloves/sound1.ogg
|
||||
params:
|
||||
volume: -4
|
||||
maxDistance: 3
|
||||
# Sunrise added end
|
||||
- type: Food
|
||||
requiresSpecialDigestion: true
|
||||
- type: Item
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
#Basic Helmet (Security Helmet)
|
||||
- type: entity
|
||||
parent: [ClothingHeadHelmetArmoredBase, BaseSecurityContraband]
|
||||
parent: [HelmetSounds, ClothingHeadHelmetArmoredBase, BaseSecurityContraband] # Sunrise edit
|
||||
id: ClothingHeadHelmetBasic
|
||||
name: helmet
|
||||
description: Standard security gear. Protects the head from impacts.
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
|
||||
#Mercenary Helmet
|
||||
- type: entity
|
||||
parent: [ ClothingHeadHelmetArmoredBase, BaseMajorContraband ]
|
||||
parent: [HelmetSounds, ClothingHeadHelmetArmoredBase, BaseMajorContraband] # Sunrise edit
|
||||
id: ClothingHeadHelmetMerc
|
||||
name: mercenary helmet
|
||||
description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle.
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
#SWAT Helmet
|
||||
- type: entity
|
||||
parent: [ClothingHeadHelmetBase, BaseSecurityContraband]
|
||||
parent: [HelmetSounds, ClothingHeadHelmetBase, BaseSecurityContraband] # Sunrise edit
|
||||
id: ClothingHeadHelmetSwat
|
||||
name: SWAT helmet
|
||||
description: An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top.
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
|
||||
#Light Riot Helmet
|
||||
- type: entity
|
||||
parent: [ClothingHeadHelmetBase, BaseSecurityContraband]
|
||||
parent: [HelmetSounds, ClothingHeadHelmetBase, BaseSecurityContraband] # Sunrise edit
|
||||
id: ClothingHeadHelmetRiot
|
||||
name: light riot helmet
|
||||
description: It's a helmet specifically designed to protect against close range attacks.
|
||||
|
|
@ -112,7 +112,7 @@
|
|||
|
||||
#Bombsuit Helmet
|
||||
- type: entity
|
||||
parent: ClothingHeadBase
|
||||
parent: [HelmetSounds, ClothingHeadBase] # Sunrise edit
|
||||
id: ClothingHeadHelmetBombSuit
|
||||
name: bombsuit helmet
|
||||
description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce.
|
||||
|
|
@ -235,7 +235,7 @@
|
|||
|
||||
#Fire Helmet
|
||||
- type: entity
|
||||
parent: ClothingHeadLightBase
|
||||
parent: [HelmetSounds, ClothingHeadLightBase] # Sunrise edit
|
||||
id: ClothingHeadHelmetFire
|
||||
name: fire helmet
|
||||
description: An atmos tech's best friend. Provides some heat resistance and looks cool.
|
||||
|
|
@ -459,7 +459,7 @@
|
|||
|
||||
#Justice Helmet
|
||||
- type: entity
|
||||
parent: ClothingHeadHelmetBasic
|
||||
parent: [HelmetSounds, ClothingHeadHelmetBasic] # Sunrise edit
|
||||
id: ClothingHeadHelmetJustice
|
||||
name: justice helm
|
||||
description: Advanced security gear. Protects the station from ne'er-do-wells.
|
||||
|
|
|
|||
|
|
@ -647,30 +647,6 @@
|
|||
- type: HeldSpeedModifier
|
||||
- type: ToggleableClothing
|
||||
clothingPrototype: ClothingHeadHelmetHardsuitSyndieElite
|
||||
#Sunrise-start
|
||||
- type: ContainerContainer
|
||||
containers:
|
||||
cell_slot: !type:ContainerSlot
|
||||
toggleable-clothing: !type:ContainerSlot
|
||||
- type: PowerCellSlot
|
||||
cellSlotId: cell_slot
|
||||
- type: ItemSlots
|
||||
slots:
|
||||
cell_slot:
|
||||
name: power-cell-slot-component-slot-name-default
|
||||
startingItem: PowerCellSyndicate
|
||||
whitelist:
|
||||
tags:
|
||||
- PowerCell
|
||||
- type: EnergyDomeGenerator
|
||||
damageEnergyDraw: 4
|
||||
domePrototype: EnergyDomeSmallRed
|
||||
- type: PowerCellDraw
|
||||
drawRate: 0
|
||||
useRate: 0
|
||||
- type: UseDelay
|
||||
delay: 10.0
|
||||
#Sunrise-end
|
||||
|
||||
#Syndicate Commander Hardsuit
|
||||
- type: entity
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue