Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Jabak
2024-07-28 15:08:05 +03:00
parent 5dbbf68af8 2a9344f616
commit decd47769b
91 changed files with 1040 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/CCVar/CCVars.cs
View File

@@ -1047,21 +1047,21 @@ namespace Content.Shared.CCVar
/// Divisor from maxForce (pressureDifference * 2.25f) to force applied on objects.
/// </summary>
public static readonly CVarDef<float> SpaceWindPressureForceDivisorPush =
CVarDef.Create("atmos.space_wind_pressure_force_divisor_push", 2500f, CVar.SERVERONLY);
CVarDef.Create("atmos.space_wind_pressure_force_divisor_push", 1700f, CVar.SERVERONLY);
/// <summary>
/// The maximum velocity (not force) that may be applied to an object by atmospheric pressure differences.
/// Useful to prevent clipping through objects.
/// </summary>
public static readonly CVarDef<float> SpaceWindMaxVelocity =
CVarDef.Create("atmos.space_wind_max_velocity", 15f, CVar.SERVERONLY);
CVarDef.Create("atmos.space_wind_max_velocity", 7f, CVar.SERVERONLY);
/// <summary>
/// The maximum force that may be applied to an object by pushing (i.e. not throwing) atmospheric pressure differences.
/// A "throwing" atmospheric pressure difference ignores this limit, but not the max. velocity limit.
/// </summary>
public static readonly CVarDef<float> SpaceWindMaxPushForce =
CVarDef.Create("atmos.space_wind_max_push_force", 20f, CVar.SERVERONLY);
CVarDef.Create("atmos.space_wind_max_push_force", 17f, CVar.SERVERONLY);
/// <summary>
/// If an object's mass is below this number, then this number is used in place of mass to determine whether air pressure can throw an object.
@@ -1079,7 +1079,7 @@ namespace Content.Shared.CCVar
/// If an object's inverse mass is lower than this, it is capped at this. Basically, an upper limit to how heavy an object can be before it stops resisting space wind more.
/// </summary>
public static readonly CVarDef<float> SpaceWindMaximumCalculatedInverseMass =
CVarDef.Create("atmos.space_wind_maximum_calculated_inverse_mass", 0.04f, CVar.SERVERONLY);
CVarDef.Create("atmos.space_wind_maximum_calculated_inverse_mass", 0.08f, CVar.SERVERONLY);
/// <summary>
/// Whether monstermos tile equalization is enabled.

28
Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs
View File

@@ -1,3 +1,4 @@
using Robust.Shared.Map;
using Robust.Shared.Serialization;
namespace Content.Shared.SurveillanceCamera;
@@ -17,30 +18,39 @@ public sealed class SurveillanceCameraMonitorUiState : BoundUserInterfaceState
public string ActiveAddress;
// Currently active subnet.
public string ActiveSubnet { get; }
// Known cameras, by address and name.
public Dictionary<string, string> Cameras { get; }
public Dictionary<NetEntity, CameraData> Cameras { get; }
public SurveillanceCameraMonitorUiState(NetEntity? activeCamera, HashSet<string> subnets, string activeAddress, string activeSubnet, Dictionary<string, string> cameras)
public SurveillanceCameraMonitorUiState(NetEntity? activeCamera, HashSet<string> subnets, string activeAddress, Dictionary<NetEntity, CameraData> cameras)
{
ActiveCamera = activeCamera;
Subnets = subnets;
ActiveAddress = activeAddress;
ActiveSubnet = activeSubnet;
Cameras = cameras;
}
}
// Sunrise-start
[Serializable, NetSerializable]
[DataDefinition]
public partial class CameraData
{
public string CameraAddress { get; set; }
public string SubnetAddress { get; set; }
public string Name { get; set; }
public NetCoordinates Coordinates { get; set; }
public Color SubnetColor { get; set; }
}
// Sunrise-end
[Serializable, NetSerializable]
public sealed class SurveillanceCameraMonitorSwitchMessage : BoundUserInterfaceMessage
{
public string Address { get; }
public NetEntity CameraNetEntity { get; }
public SurveillanceCameraMonitorSwitchMessage(string address)
public SurveillanceCameraMonitorSwitchMessage(NetEntity camera)
{
Address = address;
CameraNetEntity = camera;
}
}