diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs
index a00b58f54f9..57c861bd20f 100644
--- a/Content.Client/Actions/ActionsSystem.cs
+++ b/Content.Client/Actions/ActionsSystem.cs
@@ -259,13 +259,13 @@ public void UnlinkAllActions()
public void LinkAllActions(ActionsComponent? actions = null)
{
- if (_playerManager.LocalEntity is not { } user ||
- !Resolve(user, ref actions, false))
- {
- return;
- }
+ if (_playerManager.LocalEntity is not { } user ||
+ !Resolve(user, ref actions, false))
+ {
+ return;
+ }
- LinkActions?.Invoke(actions);
+ LinkActions?.Invoke(actions);
}
public override void Shutdown()
diff --git a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
index c8e3afeb22c..a412e47396b 100644
--- a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
+++ b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
@@ -159,7 +159,6 @@ private void OnTypeChanged(OptionButton.ItemSelectedEventArgs args)
SecretCheckBox.Pressed = false;
SeverityOption.Disabled = false;
PermanentCheckBox.Pressed = true;
- SubmitButton.Disabled = true;
UpdatePermanentCheckboxFields();
break;
case (int) NoteType.Message: // Message: these are shown to the player when they log on
diff --git a/Content.Client/Atmos/Components/PipeColorVisualsComponent.cs b/Content.Client/Atmos/Components/PipeColorVisualsComponent.cs
index 9b24b1adc25..355b10cb4a4 100644
--- a/Content.Client/Atmos/Components/PipeColorVisualsComponent.cs
+++ b/Content.Client/Atmos/Components/PipeColorVisualsComponent.cs
@@ -1,4 +1,8 @@
+using Robust.Shared.GameObjects;
+
namespace Content.Client.Atmos.Components;
[RegisterComponent]
-public sealed partial class PipeColorVisualsComponent : Component;
+public sealed partial class PipeColorVisualsComponent : Component
+{
+}
diff --git a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml
index 3dbe14e6b6d..6bdfb3989f9 100644
--- a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml
+++ b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml
@@ -1,5 +1,6 @@
@@ -61,7 +62,7 @@
-
+
diff --git a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
index e533ef2dce0..79bb66560e3 100644
--- a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
+++ b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
@@ -136,9 +136,8 @@ public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlert
GasGridContainer.RemoveAllChildren();
var gasData = focusData.Value.GasData.Where(g => g.Key != Gas.Oxygen);
- var keyValuePairs = gasData.ToList();
- if (keyValuePairs.Count == 0)
+ if (gasData.Count() == 0)
{
// No other gases
var gasLabel = new Label()
@@ -159,11 +158,13 @@ public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlert
else
{
// Add an entry for each gas
- foreach ((var gas, (var mol, var percent, var alert)) in keyValuePairs)
+ foreach ((var gas, (var mol, var percent, var alert)) in gasData)
{
- FixedPoint2 gasPercent = percent * 100f;
+ var gasPercent = (FixedPoint2)0f;
+ gasPercent = percent * 100f;
- var gasShorthand = _gasShorthands.GetValueOrDefault(gas, "X");
+ if (!_gasShorthands.TryGetValue(gas, out var gasShorthand))
+ gasShorthand = "X";
var gasLabel = new Label()
{
diff --git a/Content.Client/Atmos/Consoles/AtmosAlertsComputerBoundUserInterface.cs b/Content.Client/Atmos/Consoles/AtmosAlertsComputerBoundUserInterface.cs
index 6f0e7f80da1..08cae979b9b 100644
--- a/Content.Client/Atmos/Consoles/AtmosAlertsComputerBoundUserInterface.cs
+++ b/Content.Client/Atmos/Consoles/AtmosAlertsComputerBoundUserInterface.cs
@@ -14,6 +14,8 @@ protected override void Open()
_menu = new AtmosAlertsComputerWindow(this, Owner);
_menu.OpenCentered();
_menu.OnClose += Close;
+
+ EntMan.TryGetComponent(Owner, out var xform);
}
protected override void UpdateState(BoundUserInterfaceState state)
@@ -22,6 +24,9 @@ protected override void UpdateState(BoundUserInterfaceState state)
var castState = (AtmosAlertsComputerBoundInterfaceState) state;
+ if (castState == null)
+ return;
+
EntMan.TryGetComponent(Owner, out var xform);
_menu?.UpdateUI(xform?.Coordinates, castState.AirAlarms, castState.FireAlarms, castState.FocusData);
}
diff --git a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml
index e5ede1b92e3..8824a776ee6 100644
--- a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml
+++ b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml
@@ -1,6 +1,7 @@
(OnInit);
- SubscribeLocalEvent(OnAppearanceChanged, after: [typeof(SubFloorHideSystem)]);
+ SubscribeLocalEvent(OnAppearanceChanged, after: new[] { typeof(SubFloorHideSystem) });
}
private void OnInit(EntityUid uid, PipeAppearanceComponent component, ComponentInit args)
@@ -82,8 +84,7 @@ private void OnAppearanceChanged(EntityUid uid, PipeAppearanceComponent componen
layer.Visible &= visible;
- if (!visible)
- continue;
+ if (!visible) continue;
layer.Color = color;
}
diff --git a/Content.Client/Atmos/EntitySystems/GasPressurePumpSystem.cs b/Content.Client/Atmos/EntitySystems/GasPressurePumpSystem.cs
deleted file mode 100644
index 54e16bc8621..00000000000
--- a/Content.Client/Atmos/EntitySystems/GasPressurePumpSystem.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Client.Atmos.UI;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Atmos.EntitySystems;
-using Content.Shared.Atmos.Piping.Binary.Components;
-
-namespace Content.Client.Atmos.EntitySystems;
-
-public sealed class GasPressurePumpSystem : SharedGasPressurePumpSystem
-{
- public override void Initialize()
- {
- base.Initialize();
- SubscribeLocalEvent(OnPumpUpdate);
- }
-
- private void OnPumpUpdate(Entity ent, ref AfterAutoHandleStateEvent args)
- {
- if (UserInterfaceSystem.TryGetOpenUi(ent.Owner, GasPressurePumpUiKey.Key, out var bui))
- {
- bui.Update();
- }
- }
-}
diff --git a/Content.Client/Atmos/Monitor/AtmosAlarmableVisualsSystem.cs b/Content.Client/Atmos/Monitor/AtmosAlarmableVisualsSystem.cs
index 18ca2234752..019f25f376b 100644
--- a/Content.Client/Atmos/Monitor/AtmosAlarmableVisualsSystem.cs
+++ b/Content.Client/Atmos/Monitor/AtmosAlarmableVisualsSystem.cs
@@ -1,7 +1,12 @@
+using System.Collections.Generic;
using Content.Shared.Atmos.Monitor;
using Content.Shared.Power;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Maths;
+using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Client.Atmos.Monitor;
@@ -22,7 +27,7 @@ protected override void OnAppearanceChange(EntityUid uid, AtmosAlarmableVisualsC
{
foreach (var visLayer in component.HideOnDepowered)
{
- if (args.Sprite.LayerMapTryGet(visLayer, out var powerVisibilityLayer))
+ if (args.Sprite.LayerMapTryGet(visLayer, out int powerVisibilityLayer))
args.Sprite.LayerSetVisible(powerVisibilityLayer, powered);
}
}
@@ -31,7 +36,7 @@ protected override void OnAppearanceChange(EntityUid uid, AtmosAlarmableVisualsC
{
foreach (var (setLayer, powerState) in component.SetOnDepowered)
{
- if (args.Sprite.LayerMapTryGet(setLayer, out var setStateLayer))
+ if (args.Sprite.LayerMapTryGet(setLayer, out int setStateLayer))
args.Sprite.LayerSetState(setStateLayer, new RSI.StateId(powerState));
}
}
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
index 650f96eec97..d9e94e373b4 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
@@ -1,7 +1,11 @@
using Content.Shared.Atmos;
using Content.Shared.Atmos.Monitor;
using Content.Shared.Atmos.Monitor.Components;
+using Robust.Client.GameObjects;
using Robust.Client.UserInterface;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Log;
namespace Content.Client.Atmos.Monitor.UI;
@@ -74,7 +78,6 @@ protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
- if (disposing)
- _window?.Dispose();
+ if (disposing) _window?.Dispose();
}
}
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
index 65164983865..e1425ac491b 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
@@ -8,6 +8,7 @@
using Content.Shared.Atmos.Piping.Unary.Components;
using Content.Shared.Temperature;
using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
@@ -58,7 +59,7 @@ public AirAlarmWindow()
AirAlarmMode.Fill => "air-alarm-ui-mode-fill",
AirAlarmMode.Panic => "air-alarm-ui-mode-panic",
AirAlarmMode.None => "air-alarm-ui-mode-none",
- _ => "error",
+ _ => "error"
};
_modes.AddItem(Loc.GetString(text));
}
@@ -69,7 +70,7 @@ public AirAlarmWindow()
AirAlarmModeChanged!.Invoke((AirAlarmMode) args.Id);
};
- _autoMode.OnToggled += _ =>
+ _autoMode.OnToggled += args =>
{
AutoModeChanged!.Invoke(_autoMode.Pressed);
};
@@ -175,18 +176,22 @@ public void UpdateDeviceData(string addr, IAtmosDeviceData device)
public static Color ColorForThreshold(float amount, AtmosAlarmThreshold threshold)
{
- threshold.CheckThreshold(amount, out var curAlarm);
+ threshold.CheckThreshold(amount, out AtmosAlarmType curAlarm);
return ColorForAlarm(curAlarm);
}
public static Color ColorForAlarm(AtmosAlarmType curAlarm)
{
- return curAlarm switch
+ if(curAlarm == AtmosAlarmType.Danger)
{
- AtmosAlarmType.Danger => StyleNano.DangerousRedFore,
- AtmosAlarmType.Warning => StyleNano.ConcerningOrangeFore,
- _ => StyleNano.GoodGreenFore,
- };
+ return StyleNano.DangerousRedFore;
+ }
+ else if(curAlarm == AtmosAlarmType.Warning)
+ {
+ return StyleNano.ConcerningOrangeFore;
+ }
+
+ return StyleNano.GoodGreenFore;
}
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
index 2cd51d6fc7f..17b03b84684 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
@@ -1,8 +1,12 @@
+using System;
+using Content.Shared.Atmos.Monitor;
using Content.Shared.Atmos.Monitor.Components;
using Content.Shared.Atmos.Piping.Unary.Components;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Localization;
namespace Content.Client.Atmos.Monitor.UI.Widgets;
@@ -21,7 +25,7 @@ public sealed partial class PumpControl : BoxContainer
private OptionButton _pressureCheck => CPressureCheck;
private FloatSpinBox _externalBound => CExternalBound;
private FloatSpinBox _internalBound => CInternalBound;
- private Button _copySettings => CCopySettings;
+ private Button _copySettings => CCopySettings;
public PumpControl(GasVentPumpData data, string address)
{
@@ -82,7 +86,7 @@ public PumpControl(GasVentPumpData data, string address)
_data.PressureChecks = (VentPressureBound) args.Id;
PumpDataChanged?.Invoke(_address, _data);
};
-
+
_copySettings.OnPressed += _ =>
{
PumpDataCopied?.Invoke(_data);
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
index c16ff688c93..f2241bcd8da 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
@@ -1,9 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
using Content.Shared.Atmos;
+using Content.Shared.Atmos.Monitor;
using Content.Shared.Atmos.Monitor.Components;
using Content.Shared.Atmos.Piping.Unary.Components;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Localization;
namespace Content.Client.Atmos.Monitor.UI.Widgets;
@@ -21,7 +27,7 @@ public sealed partial class ScrubberControl : BoxContainer
private OptionButton _pumpDirection => CPumpDirection;
private FloatSpinBox _volumeRate => CVolumeRate;
private CheckBox _wideNet => CWideNet;
- private Button _copySettings => CCopySettings;
+ private Button _copySettings => CCopySettings;
private GridContainer _gases => CGasContainer;
private Dictionary _gasControls = new();
@@ -71,7 +77,7 @@ public ScrubberControl(GasVentScrubberData data, string address)
_data.PumpDirection = (ScrubberPumpDirection) args.Id;
ScrubberDataChanged?.Invoke(_address, _data);
};
-
+
_copySettings.OnPressed += _ =>
{
ScrubberDataCopied?.Invoke(_data);
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
index 9e60b6cea62..da602cd7479 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
@@ -43,8 +43,7 @@ public SensorInfo(AtmosSensorData data, string address)
var label = new RichTextLabel();
var fractionGas = amount / data.TotalMoles;
- label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator",
- ("gas", $"{gas}"),
+ label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator", ("gas", $"{gas}"),
("color", AirAlarmWindow.ColorForThreshold(fractionGas, data.GasThresholds[gas])),
("amount", $"{amount:0.####}"),
("percentage", $"{(100 * fractionGas):0.##}")));
@@ -54,9 +53,9 @@ public SensorInfo(AtmosSensorData data, string address)
var threshold = data.GasThresholds[gas];
var gasThresholdControl = new ThresholdControl(Loc.GetString($"air-alarm-ui-thresholds-gas-title", ("gas", $"{gas}")), threshold, AtmosMonitorThresholdType.Gas, gas, 100);
gasThresholdControl.Margin = new Thickness(20, 2, 2, 2);
- gasThresholdControl.ThresholdDataChanged += (type, alarmThreshold, arg3) =>
+ gasThresholdControl.ThresholdDataChanged += (type, threshold, arg3) =>
{
- OnThresholdUpdate!(_address, type, alarmThreshold, arg3);
+ OnThresholdUpdate!(_address, type, threshold, arg3);
};
_gasThresholds.Add(gas, gasThresholdControl);
@@ -65,8 +64,7 @@ public SensorInfo(AtmosSensorData data, string address)
_pressureThreshold = new ThresholdControl(Loc.GetString("air-alarm-ui-thresholds-pressure-title"), data.PressureThreshold, AtmosMonitorThresholdType.Pressure);
PressureThresholdContainer.AddChild(_pressureThreshold);
- _temperatureThreshold = new ThresholdControl(Loc.GetString("air-alarm-ui-thresholds-temperature-title"),
- data.TemperatureThreshold,
+ _temperatureThreshold = new ThresholdControl(Loc.GetString("air-alarm-ui-thresholds-temperature-title"), data.TemperatureThreshold,
AtmosMonitorThresholdType.Temperature);
TemperatureThresholdContainer.AddChild(_temperatureThreshold);
@@ -105,8 +103,7 @@ public void ChangeData(AtmosSensorData data)
}
var fractionGas = amount / data.TotalMoles;
- label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator",
- ("gas", $"{gas}"),
+ label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator", ("gas", $"{gas}"),
("color", AirAlarmWindow.ColorForThreshold(fractionGas, data.GasThresholds[gas])),
("amount", $"{amount:0.####}"),
("percentage", $"{(100 * fractionGas):0.##}")));
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
index 55f7c008987..3612d84de4c 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
@@ -1,4 +1,7 @@
+using Content.Client.Message;
+using Content.Shared.Atmos;
using Content.Shared.Atmos.Monitor;
+using Content.Shared.Temperature;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml.cs
index 651620f3e25..78c73fa573a 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml.cs
@@ -1,8 +1,12 @@
+using System;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Monitor;
+using Content.Shared.Atmos.Monitor.Components;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Localization;
// holy FUCK
// this technically works because some of this you can *not* do in XAML but holy FUCK
@@ -111,38 +115,29 @@ public ThresholdControl(string name, AtmosAlarmThreshold threshold, AtmosMonitor
_enabled.Pressed = !_threshold.Ignore;
}
- private string LabelForBound(string boundType) //, DebugMessage)> state) =>
{
if (_system.TileData.TryGetValue(uid, out var data))
diff --git a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs
index 0c07eec4025..220fdbe875c 100644
--- a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs
@@ -1,63 +1,65 @@
using Content.Shared.Atmos;
-using Content.Shared.Atmos.Components;
using Content.Shared.Atmos.Piping.Binary.Components;
-using Content.Shared.IdentityManagement;
using Content.Shared.Localizations;
using JetBrains.Annotations;
+using Robust.Client.GameObjects;
using Robust.Client.UserInterface;
-namespace Content.Client.Atmos.UI;
-
-///
-/// Initializes a and updates it when new server messages are received.
-///
-[UsedImplicitly]
-public sealed class GasPressurePumpBoundUserInterface : BoundUserInterface
+namespace Content.Client.Atmos.UI
{
- [ViewVariables]
- private const float MaxPressure = Atmospherics.MaxOutputPressure;
-
- [ViewVariables]
- private GasPressurePumpWindow? _window;
-
- public GasPressurePumpBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+ ///
+ /// Initializes a and updates it when new server messages are received.
+ ///
+ [UsedImplicitly]
+ public sealed class GasPressurePumpBoundUserInterface : BoundUserInterface
{
- }
+ [ViewVariables]
+ private const float MaxPressure = Atmospherics.MaxOutputPressure;
- protected override void Open()
- {
- base.Open();
+ [ViewVariables]
+ private GasPressurePumpWindow? _window;
- _window = this.CreateWindow();
+ public GasPressurePumpBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+ {
+ }
- _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
- _window.PumpOutputPressureChanged += OnPumpOutputPressurePressed;
- Update();
- }
+ protected override void Open()
+ {
+ base.Open();
- public void Update()
- {
- if (_window == null)
- return;
+ _window = this.CreateWindow();
- _window.Title = Identity.Name(Owner, EntMan);
+ _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
+ _window.PumpOutputPressureChanged += OnPumpOutputPressurePressed;
+ }
- if (!EntMan.TryGetComponent(Owner, out GasPressurePumpComponent? pump))
- return;
+ private void OnToggleStatusButtonPressed()
+ {
+ if (_window is null) return;
+ SendMessage(new GasPressurePumpToggleStatusMessage(_window.PumpStatus));
+ }
- _window.SetPumpStatus(pump.Enabled);
- _window.MaxPressure = pump.MaxTargetPressure;
- _window.SetOutputPressure(pump.TargetPressure);
- }
+ private void OnPumpOutputPressurePressed(string value)
+ {
+ var pressure = UserInputParser.TryFloat(value, out var parsed) ? parsed : 0f;
+ if (pressure > MaxPressure) pressure = MaxPressure;
- private void OnToggleStatusButtonPressed()
- {
- if (_window is null) return;
- SendPredictedMessage(new GasPressurePumpToggleStatusMessage(_window.PumpStatus));
- }
+ SendMessage(new GasPressurePumpChangeOutputPressureMessage(pressure));
+ }
- private void OnPumpOutputPressurePressed(float value)
- {
- SendPredictedMessage(new GasPressurePumpChangeOutputPressureMessage(value));
+ ///
+ /// Update the UI state based on server-sent info
+ ///
+ ///
+ protected override void UpdateState(BoundUserInterfaceState state)
+ {
+ base.UpdateState(state);
+ if (_window == null || state is not GasPressurePumpBoundUserInterfaceState cast)
+ return;
+
+ _window.Title = (cast.PumpLabel);
+ _window.SetPumpStatus(cast.Enabled);
+ _window.SetOutputPressure(cast.OutputPressure);
+ }
}
}
diff --git a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
index f2c2c7cec50..a0896a7b41e 100644
--- a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
+++ b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
@@ -1,18 +1,22 @@
-
+ MinSize="200 120" Title="Pressure Pump">
-
+
+
-
-
-
+
-
+
+
+
+
+
+
+
-
+
diff --git a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs
index aa86a1aa03b..b5ffcd10721 100644
--- a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs
@@ -1,8 +1,14 @@
-using Content.Client.UserInterface.Controls;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Content.Client.Atmos.EntitySystems;
using Content.Shared.Atmos;
+using Content.Shared.Atmos.Prototypes;
using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Localization;
namespace Content.Client.Atmos.UI
{
@@ -10,25 +16,12 @@ namespace Content.Client.Atmos.UI
/// Client-side UI used to control a gas pressure pump.
///
[GenerateTypedNameReferences]
- public sealed partial class GasPressurePumpWindow : FancyWindow
+ public sealed partial class GasPressurePumpWindow : DefaultWindow
{
public bool PumpStatus = true;
public event Action? ToggleStatusButtonPressed;
- public event Action? PumpOutputPressureChanged;
-
- public float MaxPressure
- {
- get => _maxPressure;
- set
- {
- _maxPressure = value;
-
- PumpPressureOutputInput.Value = MathF.Min(value, PumpPressureOutputInput.Value);
- }
- }
-
- private float _maxPressure = Atmospherics.MaxOutputPressure;
+ public event Action? PumpOutputPressureChanged;
public GasPressurePumpWindow()
{
@@ -37,25 +30,23 @@ public GasPressurePumpWindow()
ToggleStatusButton.OnPressed += _ => SetPumpStatus(!PumpStatus);
ToggleStatusButton.OnPressed += _ => ToggleStatusButtonPressed?.Invoke();
- PumpPressureOutputInput.OnValueChanged += _ => SetOutputPressureButton.Disabled = false;
-
+ PumpPressureOutputInput.OnTextChanged += _ => SetOutputPressureButton.Disabled = false;
SetOutputPressureButton.OnPressed += _ =>
{
- PumpPressureOutputInput.Value = Math.Clamp(PumpPressureOutputInput.Value, 0f, _maxPressure);
- PumpOutputPressureChanged?.Invoke(PumpPressureOutputInput.Value);
+ PumpOutputPressureChanged?.Invoke(PumpPressureOutputInput.Text ??= "");
SetOutputPressureButton.Disabled = true;
};
SetMaxPressureButton.OnPressed += _ =>
{
- PumpPressureOutputInput.Value = _maxPressure;
+ PumpPressureOutputInput.Text = Atmospherics.MaxOutputPressure.ToString(CultureInfo.CurrentCulture);
SetOutputPressureButton.Disabled = false;
};
}
public void SetOutputPressure(float pressure)
{
- PumpPressureOutputInput.Value = pressure;
+ PumpPressureOutputInput.Text = pressure.ToString(CultureInfo.CurrentCulture);
}
public void SetPumpStatus(bool enabled)
diff --git a/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs b/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs
index 1f09ae9eebb..2c3afb0324f 100644
--- a/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs
+++ b/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs
@@ -7,7 +7,7 @@
namespace Content.Client.Clothing;
-public sealed class FlippableClothingVisualizerSystem : VisualizerSystem
+public sealed class FlippableClothingVisualizerSystem : VisualizerSystem
{
[Dependency] private readonly SharedItemSystem _itemSys = default!;
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml b/Content.Client/Construction/UI/ConstructionMenu.xaml
index a934967a533..6e4438cf6fd 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml
@@ -1,20 +1,15 @@
-
+
-
-
-
-
-
-
-
-
+
+
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
index 9ab8a156005..f0cb8148762 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
@@ -25,16 +25,11 @@ public interface IConstructionMenuView : IDisposable
OptionButton OptionCategories { get; }
bool EraseButtonPressed { get; set; }
- bool GridViewButtonPressed { get; set; }
bool BuildButtonPressed { get; set; }
ItemList Recipes { get; }
ItemList RecipeStepList { get; }
-
- ScrollContainer RecipesGridScrollContainer { get; }
- GridContainer RecipesGrid { get; }
-
event EventHandler<(string search, string catagory)> PopulateRecipes;
event EventHandler RecipeSelected;
event EventHandler RecipeFavorited;
@@ -77,16 +72,9 @@ public bool EraseButtonPressed
set => EraseButton.Pressed = value;
}
- public bool GridViewButtonPressed
- {
- get => MenuGridViewButton.Pressed;
- set => MenuGridViewButton.Pressed = value;
- }
-
public ConstructionMenu()
{
- SetSize = new Vector2(560, 450);
- MinSize = new Vector2(560, 320);
+ SetSize = MinSize = new Vector2(720, 320);
IoCManager.InjectDependencies(this);
RobustXamlLoader.Load(this);
@@ -114,9 +102,6 @@ public ConstructionMenu()
EraseButton.OnToggled += args => EraseButtonToggled?.Invoke(this, args.Pressed);
FavoriteButton.OnPressed += args => RecipeFavorited?.Invoke(this, EventArgs.Empty);
-
- MenuGridViewButton.OnPressed += _ =>
- PopulateRecipes?.Invoke(this, (SearchBar.Text, Categories[OptionCategories.SelectedId]));
}
public event EventHandler? ClearAllGhosts;
diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
index d35e8fbe769..c315cdedb2c 100644
--- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
@@ -1,8 +1,7 @@
using System.Linq;
-using System.Numerics;
-using Content.Client.Stylesheets;
using Content.Client.UserInterface.Systems.MenuBar.Widgets;
using Content.Shared.Construction.Prototypes;
+using Content.Shared.Tag;
using Content.Shared.Whitelist;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
@@ -12,6 +11,7 @@
using Robust.Client.UserInterface.Controls;
using Robust.Client.Utility;
using Robust.Shared.Enums;
+using Robust.Shared.Graphics;
using Robust.Shared.Prototypes;
using static Robust.Client.UserInterface.Controls.BaseButton;
@@ -33,12 +33,10 @@ internal sealed class ConstructionMenuPresenter : IDisposable
private readonly IConstructionMenuView _constructionView;
private readonly EntityWhitelistSystem _whitelistSystem;
- private readonly SpriteSystem _spriteSystem;
private ConstructionSystem? _constructionSystem;
private ConstructionPrototype? _selected;
private List _favoritedRecipes = [];
- private Dictionary _recipeButtons = new();
private string _selectedCategory = string.Empty;
private string _favoriteCatName = "construction-category-favorites";
private string _forAllCategoryName = "construction-category-all";
@@ -87,7 +85,6 @@ public ConstructionMenuPresenter()
IoCManager.InjectDependencies(this);
_constructionView = new ConstructionMenu();
_whitelistSystem = _entManager.System();
- _spriteSystem = _entManager.System();
// This is required so that if we load after the system is initialized, we can bind to it immediately
if (_systemManager.TryGetEntitySystem(out var constructionSystem))
@@ -153,24 +150,12 @@ private void OnViewRecipeSelected(object? sender, ItemList.Item? item)
PopulateInfo(_selected);
}
- private void OnGridViewRecipeSelected(object? sender, ConstructionPrototype? recipe)
- {
- if (recipe is null)
- {
- _selected = null;
- _constructionView.ClearRecipeInfo();
- return;
- }
-
- _selected = recipe;
- if (_placementManager.IsActive && !_placementManager.Eraser) UpdateGhostPlacement();
- PopulateInfo(_selected);
- }
-
private void OnViewPopulateRecipes(object? sender, (string search, string catagory) args)
{
var (search, category) = args;
+ var recipesList = _constructionView.Recipes;
+ recipesList.Clear();
var recipes = new List();
var isEmptyCategory = string.IsNullOrEmpty(category) || category == _forAllCategoryName;
@@ -216,73 +201,12 @@ private void OnViewPopulateRecipes(object? sender, (string search, string catago
recipes.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.InvariantCulture));
- var recipesList = _constructionView.Recipes;
- recipesList.Clear();
-
- var recipesGrid = _constructionView.RecipesGrid;
- recipesGrid.RemoveAllChildren();
-
- _constructionView.RecipesGridScrollContainer.Visible = _constructionView.GridViewButtonPressed;
- _constructionView.Recipes.Visible = !_constructionView.GridViewButtonPressed;
-
- if (_constructionView.GridViewButtonPressed)
- {
- foreach (var recipe in recipes)
- {
- var itemButton = new TextureButton
- {
- TextureNormal = _spriteSystem.Frame0(recipe.Icon),
- VerticalAlignment = Control.VAlignment.Center,
- Name = recipe.Name,
- ToolTip = recipe.Name,
- Scale = new Vector2(1.35f),
- ToggleMode = true,
- };
- var itemButtonPanelContainer = new PanelContainer
- {
- PanelOverride = new StyleBoxFlat { BackgroundColor = StyleNano.ButtonColorDefault },
- Children = { itemButton },
- };
-
- itemButton.OnToggled += buttonToggledEventArgs =>
- {
- SelectGridButton(itemButton, buttonToggledEventArgs.Pressed);
-
- if (buttonToggledEventArgs.Pressed &&
- _selected != null &&
- _recipeButtons.TryGetValue(_selected.Name, out var oldButton))
- {
- oldButton.Pressed = false;
- SelectGridButton(oldButton, false);
- }
-
- OnGridViewRecipeSelected(this, buttonToggledEventArgs.Pressed ? recipe : null);
- };
-
- recipesGrid.AddChild(itemButtonPanelContainer);
- _recipeButtons[recipe.Name] = itemButton;
- var isCurrentButtonSelected = _selected == recipe;
- itemButton.Pressed = isCurrentButtonSelected;
- SelectGridButton(itemButton, isCurrentButtonSelected);
- }
- }
- else
+ foreach (var recipe in recipes)
{
- foreach (var recipe in recipes)
- {
- recipesList.Add(GetItem(recipe, recipesList));
- }
+ recipesList.Add(GetItem(recipe, recipesList));
}
- }
-
- private void SelectGridButton(TextureButton button, bool select)
- {
- if (button.Parent is not PanelContainer buttonPanel)
- return;
- button.Modulate = select ? Color.Green : Color.White;
- var buttonColor = select ? StyleNano.ButtonColorDefault : Color.Transparent;
- buttonPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = buttonColor };
+ // There is apparently no way to set which
}
private void PopulateCategories(string? selectCategory = null)
@@ -333,10 +257,11 @@ private void PopulateCategories(string? selectCategory = null)
private void PopulateInfo(ConstructionPrototype prototype)
{
+ var spriteSys = _systemManager.GetEntitySystem();
_constructionView.ClearRecipeInfo();
_constructionView.SetRecipeInfo(
- prototype.Name, prototype.Description, _spriteSystem.Frame0(prototype.Icon),
+ prototype.Name, prototype.Description, spriteSys.Frame0(prototype.Icon),
prototype.Type != ConstructionType.Item,
!_favoritedRecipes.Contains(prototype));
@@ -349,6 +274,7 @@ private void GenerateStepList(ConstructionPrototype prototype, ItemList stepList
if (_constructionSystem?.GetGuide(prototype) is not { } guide)
return;
+ var spriteSys = _systemManager.GetEntitySystem();
foreach (var entry in guide.Entries)
{
@@ -364,20 +290,20 @@ private void GenerateStepList(ConstructionPrototype prototype, ItemList stepList
// The padding needs to be applied regardless of text length... (See PadLeft documentation)
text = text.PadLeft(text.Length + entry.Padding);
- var icon = entry.Icon != null ? _spriteSystem.Frame0(entry.Icon) : Texture.Transparent;
+ var icon = entry.Icon != null ? spriteSys.Frame0(entry.Icon) : Texture.Transparent;
stepList.AddItem(text, icon, false);
}
}
- private ItemList.Item GetItem(ConstructionPrototype recipe, ItemList itemList)
+ private static ItemList.Item GetItem(ConstructionPrototype recipe, ItemList itemList)
{
return new(itemList)
{
Metadata = recipe,
Text = recipe.Name,
- Icon = _spriteSystem.Frame0(recipe.Icon),
+ Icon = recipe.Icon.Frame0(),
TooltipEnabled = true,
- TooltipText = recipe.Description,
+ TooltipText = recipe.Description
};
}
diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
index 44501767dd4..e5be0b1811f 100644
--- a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
+++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
@@ -31,7 +31,7 @@ protected override void Open()
private void PopulateCrayons()
{
var crayonDecals = _protoManager.EnumeratePrototypes().Where(x => x.Tags.Contains("crayon"));
- _menu?.Populate(crayonDecals.ToList());
+ _menu?.Populate(crayonDecals);
}
public override void OnProtoReload(PrototypesReloadedEventArgs args)
@@ -44,16 +44,6 @@ public override void OnProtoReload(PrototypesReloadedEventArgs args)
PopulateCrayons();
}
- protected override void ReceiveMessage(BoundUserInterfaceMessage message)
- {
- base.ReceiveMessage(message);
-
- if (_menu is null || message is not CrayonUsedMessage crayonMessage)
- return;
-
- _menu.AdvanceState(crayonMessage.DrawnDecal);
- }
-
protected override void UpdateState(BoundUserInterfaceState state)
{
base.UpdateState(state);
diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml b/Content.Client/Crayon/UI/CrayonWindow.xaml
index 7acb22551b7..7729318ae7f 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.xaml
+++ b/Content.Client/Crayon/UI/CrayonWindow.xaml
@@ -1,13 +1,14 @@
+ MinSize="250 300"
+ SetSize="250 300">
-
+
-
-
+
+
+
diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
index 88475562c67..6ef282d219a 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
+++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
@@ -1,10 +1,8 @@
using System.Collections.Generic;
-using System.Linq;
using Content.Client.Stylesheets;
using Content.Shared.Crayon;
using Content.Shared.Decals;
using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
using Robust.Client.Graphics;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
@@ -20,12 +18,7 @@ namespace Content.Client.Crayon.UI
[GenerateTypedNameReferences]
public sealed partial class CrayonWindow : DefaultWindow
{
- [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
- private readonly SpriteSystem _spriteSystem = default!;
-
- private Dictionary>? _decals;
- private List? _allDecals;
- private string? _autoSelected;
+ private Dictionary? _decals;
private string? _selected;
private Color _color;
@@ -35,10 +28,8 @@ public sealed partial class CrayonWindow : DefaultWindow
public CrayonWindow()
{
RobustXamlLoader.Load(this);
- IoCManager.InjectDependencies(this);
- _spriteSystem = _entitySystem.GetEntitySystem();
- Search.OnTextChanged += SearchChanged;
+ Search.OnTextChanged += _ => RefreshList();
ColorSelector.OnColorChanged += SelectColor;
}
@@ -53,94 +44,51 @@ private void SelectColor(Color color)
private void RefreshList()
{
// Clear
- Grids.DisposeAllChildren();
-
- if (_decals == null || _allDecals == null)
+ Grid.DisposeAllChildren();
+ if (_decals == null)
return;
var filter = Search.Text;
- var comma = filter.IndexOf(',');
- var first = (comma == -1 ? filter : filter[..comma]).Trim();
-
- var names = _decals.Keys.ToList();
- names.Sort((a, b) => a == "random" ? 1 : b == "random" ? -1 : a.CompareTo(b));
-
- if (_autoSelected != null && first != _autoSelected && _allDecals.Contains(first))
- {
- _selected = first;
- _autoSelected = _selected;
- OnSelected?.Invoke(_selected);
- }
-
- foreach (var categoryName in names)
+ foreach (var (decal, tex) in _decals)
{
- var locName = Loc.GetString("crayon-category-" + categoryName);
- var category = _decals[categoryName].Where(d => locName.Contains(first) || d.Name.Contains(first)).ToList();
-
- if (category.Count == 0)
+ if (!decal.Contains(filter))
continue;
- var label = new Label
+ var button = new TextureButton()
{
- Text = locName
+ TextureNormal = tex,
+ Name = decal,
+ ToolTip = decal,
+ Modulate = _color,
};
-
- var grid = new GridContainer
+ button.OnPressed += ButtonOnPressed;
+ if (_selected == decal)
{
- Columns = 6,
- Margin = new Thickness(0, 0, 0, 16)
- };
-
- Grids.AddChild(label);
- Grids.AddChild(grid);
-
- foreach (var (name, texture) in category)
- {
- var button = new TextureButton()
+ var panelContainer = new PanelContainer()
{
- TextureNormal = texture,
- Name = name,
- ToolTip = name,
- Modulate = _color,
- Scale = new System.Numerics.Vector2(2, 2)
- };
- button.OnPressed += ButtonOnPressed;
-
- if (_selected == name)
- {
- var panelContainer = new PanelContainer()
+ PanelOverride = new StyleBoxFlat()
{
- PanelOverride = new StyleBoxFlat()
- {
- BackgroundColor = StyleNano.ButtonColorDefault,
- },
- Children =
- {
- button,
- },
- };
- grid.AddChild(panelContainer);
- }
- else
- {
- grid.AddChild(button);
- }
+ BackgroundColor = StyleNano.ButtonColorDefault,
+ },
+ Children =
+ {
+ button,
+ },
+ };
+ Grid.AddChild(panelContainer);
+ }
+ else
+ {
+ Grid.AddChild(button);
}
}
}
- private void SearchChanged(LineEdit.LineEditEventArgs obj)
- {
- _autoSelected = ""; // Placeholder to kick off the auto-select in refreshlist()
- RefreshList();
- }
-
private void ButtonOnPressed(ButtonEventArgs obj)
{
if (obj.Button.Name == null) return;
_selected = obj.Button.Name;
- _autoSelected = null;
OnSelected?.Invoke(_selected);
RefreshList();
}
@@ -159,38 +107,12 @@ public void UpdateState(CrayonBoundUserInterfaceState state)
RefreshList();
}
- public void AdvanceState(string drawnDecal)
+ public void Populate(IEnumerable prototypes)
{
- var filter = Search.Text;
- if (!filter.Contains(',') || !filter.Contains(drawnDecal))
- return;
-
- var first = filter[..filter.IndexOf(',')].Trim();
-
- if (first.Equals(drawnDecal, StringComparison.InvariantCultureIgnoreCase))
- {
- Search.Text = filter[(filter.IndexOf(',') + 1)..].Trim();
- _autoSelected = first;
- }
-
- RefreshList();
- }
-
- public void Populate(List prototypes)
- {
- _decals = [];
- _allDecals = [];
-
- prototypes.Sort((a, b) => a.ID.CompareTo(b.ID));
-
+ _decals = new Dictionary();
foreach (var decalPrototype in prototypes)
{
- var category = "random";
- if (decalPrototype.Tags.Count > 1 && decalPrototype.Tags[1].StartsWith("crayon-"))
- category = decalPrototype.Tags[1].Replace("crayon-", "");
- var list = _decals.GetOrNew(category);
- list.Add((decalPrototype.ID, _spriteSystem.Frame0(decalPrototype.Sprite)));
- _allDecals.Add(decalPrototype.ID);
+ _decals.Add(decalPrototype.ID, decalPrototype.Sprite.Frame0());
}
RefreshList();
diff --git a/Content.Client/Electrocution/ElectrocutionHUDVisualizerSystem.cs b/Content.Client/Electrocution/ElectrocutionHUDVisualizerSystem.cs
deleted file mode 100644
index b95c0d585d7..00000000000
--- a/Content.Client/Electrocution/ElectrocutionHUDVisualizerSystem.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using Content.Shared.Electrocution;
-using Robust.Client.GameObjects;
-using Robust.Client.Player;
-using Robust.Shared.Player;
-
-namespace Content.Client.Electrocution;
-
-///
-/// Shows the Electrocution HUD to entities with the ShowElectrocutionHUDComponent.
-///
-public sealed class ElectrocutionHUDVisualizerSystem : VisualizerSystem
-{
- [Dependency] private readonly IPlayerManager _playerMan = default!;
-
- public override void Initialize()
- {
- base.Initialize();
-
- SubscribeLocalEvent(OnInit);
- SubscribeLocalEvent(OnShutdown);
- SubscribeLocalEvent(OnPlayerAttached);
- SubscribeLocalEvent(OnPlayerDetached);
- }
-
- private void OnPlayerAttached(Entity ent, ref LocalPlayerAttachedEvent args)
- {
- ShowHUD();
- }
-
- private void OnPlayerDetached(Entity ent, ref LocalPlayerDetachedEvent args)
- {
- RemoveHUD();
- }
-
- private void OnInit(Entity ent, ref ComponentInit args)
- {
- if (_playerMan.LocalEntity == ent)
- {
- ShowHUD();
- }
- }
-
- private void OnShutdown(Entity ent, ref ComponentShutdown args)
- {
- if (_playerMan.LocalEntity == ent)
- {
- RemoveHUD();
- }
- }
-
- // Show the HUD to the client.
- // We have to look for all current entities that can be electrified and toggle the HUD layer on if they are.
- private void ShowHUD()
- {
- var electrifiedQuery = AllEntityQuery();
- while (electrifiedQuery.MoveNext(out var uid, out var _, out var appearanceComp, out var spriteComp))
- {
- if (!AppearanceSystem.TryGetData(uid, ElectrifiedVisuals.IsElectrified, out var electrified, appearanceComp))
- continue;
-
- if (electrified)
- spriteComp.LayerSetVisible(ElectrifiedLayers.HUD, true);
- else
- spriteComp.LayerSetVisible(ElectrifiedLayers.HUD, false);
- }
- }
-
- // Remove the HUD from the client.
- // Find all current entities that can be electrified and hide the HUD layer.
- private void RemoveHUD()
- {
- var electrifiedQuery = AllEntityQuery();
- while (electrifiedQuery.MoveNext(out var uid, out var _, out var appearanceComp, out var spriteComp))
- {
-
- spriteComp.LayerSetVisible(ElectrifiedLayers.HUD, false);
- }
- }
-
- // Toggle the HUD layer if an entity becomes (de-)electrified
- protected override void OnAppearanceChange(EntityUid uid, ElectrocutionHUDVisualsComponent comp, ref AppearanceChangeEvent args)
- {
- if (args.Sprite == null)
- return;
-
- if (!AppearanceSystem.TryGetData(uid, ElectrifiedVisuals.IsElectrified, out var electrified, args.Component))
- return;
-
- var player = _playerMan.LocalEntity;
- if (electrified && HasComp(player))
- args.Sprite.LayerSetVisible(ElectrifiedLayers.HUD, true);
- else
- args.Sprite.LayerSetVisible(ElectrifiedLayers.HUD, false);
- }
-}
diff --git a/Content.Client/Eui/BaseEui.cs b/Content.Client/Eui/BaseEui.cs
index c11ba5a9b69..7f86ded7e48 100644
--- a/Content.Client/Eui/BaseEui.cs
+++ b/Content.Client/Eui/BaseEui.cs
@@ -55,7 +55,7 @@ public virtual void HandleMessage(EuiMessageBase msg)
///
protected void SendMessage(EuiMessageBase msg)
{
- var netMsg = new MsgEuiMessage();
+ var netMsg = _netManager.CreateNetMessage();
netMsg.Id = Id;
netMsg.Message = msg;
diff --git a/Content.Client/Info/LinkBanner.cs b/Content.Client/Info/LinkBanner.cs
index 7366a8f8565..a30aa413761 100644
--- a/Content.Client/Info/LinkBanner.cs
+++ b/Content.Client/Info/LinkBanner.cs
@@ -34,7 +34,6 @@ public LinkBanner()
AddInfoButton("server-info-website-button", CCVars.InfoLinksWebsite);
AddInfoButton("server-info-wiki-button", CCVars.InfoLinksWiki);
AddInfoButton("server-info-forum-button", CCVars.InfoLinksForum);
- AddInfoButton("server-info-telegram-button", CCVars.InfoLinksTelegram);
var guidebookController = UserInterfaceManager.GetUIController();
var guidebookButton = new Button() { Text = Loc.GetString("server-info-guidebook-button") };
diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index 90e52d72837..2ce07758c96 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -17,7 +17,6 @@
using Content.Shared.Strip.Components;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
-using Robust.Client.Player;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Input;
@@ -30,13 +29,10 @@ namespace Content.Client.Inventory
[UsedImplicitly]
public sealed class StrippableBoundUserInterface : BoundUserInterface
{
- [Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private readonly IUserInterfaceManager _ui = default!;
-
private readonly ExamineSystem _examine;
private readonly InventorySystem _inv;
private readonly SharedCuffableSystem _cuffable;
- private readonly StrippableSystem _strippable;
[ViewVariables]
private const int ButtonSeparation = 4;
@@ -55,8 +51,6 @@ public StrippableBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, u
_examine = EntMan.System();
_inv = EntMan.System();
_cuffable = EntMan.System();
- _strippable = EntMan.System();
-
_virtualHiddenEntity = EntMan.SpawnEntity(HiddenPocketEntityId, MapCoordinates.Nullspace);
}
@@ -191,15 +185,9 @@ private void SlotPressed(GUIBoundKeyEventArgs ev, SlotControl slot)
return;
if (ev.Function == ContentKeyFunctions.ExamineEntity)
- {
_examine.DoExamine(slot.Entity.Value);
- ev.Handle();
- }
else if (ev.Function == EngineKeyFunctions.UseSecondary)
- {
_ui.GetUIController().OpenVerbMenu(slot.Entity.Value);
- ev.Handle();
- }
}
private void AddInventoryButton(EntityUid invUid, string slotId, InventoryComponent inv)
@@ -210,8 +198,7 @@ private void AddInventoryButton(EntityUid invUid, string slotId, InventoryCompon
var entity = container.ContainedEntity;
// If this is a full pocket, obscure the real entity
- // this does not work for modified clients because they are still sent the real entity
- if (entity != null && _strippable.IsStripHidden(slotDef, _player.LocalEntity))
+ if (entity != null && slotDef.StripHidden)
entity = _virtualHiddenEntity;
var button = new SlotButton(new SlotData(slotDef, container));
diff --git a/Content.Client/Light/HandheldLightSystem.cs b/Content.Client/Light/HandheldLightSystem.cs
index d25b28756f8..ddd99c7c483 100644
--- a/Content.Client/Light/HandheldLightSystem.cs
+++ b/Content.Client/Light/HandheldLightSystem.cs
@@ -21,22 +21,6 @@ public override void Initialize()
SubscribeLocalEvent(OnAppearanceChange);
}
- ///
- /// TODO: Not properly predicted yet. Don't call this function if you want a the actual return value!
- ///
- public override bool TurnOff(Entity ent, bool makeNoise = true)
- {
- return true;
- }
-
- ///
- /// TODO: Not properly predicted yet. Don't call this function if you want a the actual return value!
- ///
- public override bool TurnOn(EntityUid user, Entity uid)
- {
- return true;
- }
-
private void OnAppearanceChange(EntityUid uid, HandheldLightComponent? component, ref AppearanceChangeEvent args)
{
if (!Resolve(uid, ref component))
diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index 1361ca57cd2..1aabc4ff381 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -116,7 +116,7 @@ public override void FrameUpdate(FrameEventArgs e)
return;
}
- Lobby!.StationTime.Text = Loc.GetString("lobby-state-player-status-round-not-started");
+ Lobby!.StationTime.Text = Loc.GetString("lobby-state-player-status-round-not-started");
string text;
if (_gameTicker.Paused)
@@ -136,10 +136,6 @@ public override void FrameUpdate(FrameEventArgs e)
{
text = Loc.GetString(seconds < -5 ? "lobby-state-right-now-question" : "lobby-state-right-now-confirmation");
}
- else if (difference.TotalHours >= 1)
- {
- text = $"{Math.Floor(difference.TotalHours)}:{difference.Minutes:D2}:{difference.Seconds:D2}";
- }
else
{
text = $"{difference.Minutes}:{difference.Seconds:D2}";
diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs
index 50a25519988..3cf98c98aba 100644
--- a/Content.Client/Lobby/LobbyUIController.cs
+++ b/Content.Client/Lobby/LobbyUIController.cs
@@ -279,7 +279,7 @@ private void OpenSavePanel()
_profileEditor.OnOpenGuidebook += _guide.OpenHelp;
- _characterSetup = new CharacterSetupGui(_profileEditor);
+ _characterSetup = new CharacterSetupGui(EntityManager, _prototypeManager, _resourceCache, _preferencesManager, _profileEditor);
_characterSetup.CloseButton.OnPressed += _ =>
{
diff --git a/Content.Client/Lobby/UI/CharacterSetupGui.xaml b/Content.Client/Lobby/UI/CharacterSetupGui.xaml
index c463987a1fe..f83be265884 100644
--- a/Content.Client/Lobby/UI/CharacterSetupGui.xaml
+++ b/Content.Client/Lobby/UI/CharacterSetupGui.xaml
@@ -2,7 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
xmlns:style="clr-namespace:Content.Client.Stylesheets"
- xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
VerticalExpand="True">
@@ -11,15 +10,10 @@
-
-
diff --git a/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs b/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
index 45799161324..777725b9eda 100644
--- a/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
+++ b/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
@@ -1,7 +1,6 @@
using Content.Client.Info;
using Content.Client.Info.PlaytimeStats;
using Content.Client.Resources;
-using Content.Shared.CCVar;
using Content.Shared.Preferences;
using Robust.Client.AutoGenerated;
using Robust.Client.Graphics;
@@ -9,7 +8,6 @@
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Configuration;
using Robust.Shared.Prototypes;
namespace Content.Client.Lobby.UI
@@ -20,23 +18,28 @@ namespace Content.Client.Lobby.UI
[GenerateTypedNameReferences]
public sealed partial class CharacterSetupGui : Control
{
- [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
- [Dependency] private readonly IEntityManager _entManager = default!;
- [Dependency] private readonly IPrototypeManager _protomanager = default!;
- [Dependency] private readonly IResourceCache _resourceCache = default!;
- [Dependency] private readonly IConfigurationManager _cfg = default!;
+ private readonly IClientPreferencesManager _preferencesManager;
+ private readonly IEntityManager _entManager;
+ private readonly IPrototypeManager _protomanager;
private readonly Button _createNewCharacterButton;
public event Action? SelectCharacter;
public event Action? DeleteCharacter;
- public CharacterSetupGui(HumanoidProfileEditor profileEditor)
+ public CharacterSetupGui(
+ IEntityManager entManager,
+ IPrototypeManager protoManager,
+ IResourceCache resourceCache,
+ IClientPreferencesManager preferencesManager,
+ HumanoidProfileEditor profileEditor)
{
RobustXamlLoader.Load(this);
- IoCManager.InjectDependencies(this);
+ _preferencesManager = preferencesManager;
+ _entManager = entManager;
+ _protomanager = protoManager;
- var panelTex = _resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
+ var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
var back = new StyleBoxTexture
{
Texture = panelTex,
@@ -53,7 +56,7 @@ public CharacterSetupGui(HumanoidProfileEditor profileEditor)
_createNewCharacterButton.OnPressed += args =>
{
- _preferencesManager.CreateCharacter(HumanoidCharacterProfile.Random());
+ preferencesManager.CreateCharacter(HumanoidCharacterProfile.Random());
ReloadCharacterPickers();
args.Event.Handle();
};
@@ -62,8 +65,6 @@ public CharacterSetupGui(HumanoidProfileEditor profileEditor)
RulesButton.OnPressed += _ => new RulesAndInfoWindow().Open();
StatsButton.OnPressed += _ => new PlaytimeStatsWindow().OpenCentered();
-
- _cfg.OnValueChanged(CCVars.SeeOwnNotes, p => AdminRemarksButton.Visible = p, true);
}
///
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
index 6471edb6f37..81230130a1d 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -2,6 +2,7 @@
using Content.Client.UserInterface.Systems.EscapeMenu;
using Robust.Client.AutoGenerated;
using Robust.Client.Console;
+using Robust.Client.State;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Overlays/StencilOverlay.Weather.cs b/Content.Client/Overlays/StencilOverlay.Weather.cs
index ad69522dfda..bc514548036 100644
--- a/Content.Client/Overlays/StencilOverlay.Weather.cs
+++ b/Content.Client/Overlays/StencilOverlay.Weather.cs
@@ -35,7 +35,7 @@ private void DrawWeather(in OverlayDrawArgs args, WeatherPrototype weatherProto,
var matty = Matrix3x2.Multiply(matrix, invMatrix);
worldHandle.SetTransform(matty);
- foreach (var tile in _map.GetTilesIntersecting(grid.Owner, grid, worldAABB))
+ foreach (var tile in grid.Comp.GetTilesIntersecting(worldAABB))
{
// Ignored tiles for stencil
if (_weather.CanWeatherAffect(grid.Owner, grid, tile))
diff --git a/Content.Client/Overlays/StencilOverlay.cs b/Content.Client/Overlays/StencilOverlay.cs
index eb5c27156ed..78b1c4d2b15 100644
--- a/Content.Client/Overlays/StencilOverlay.cs
+++ b/Content.Client/Overlays/StencilOverlay.cs
@@ -24,7 +24,6 @@ public sealed partial class StencilOverlay : Overlay
[Dependency] private readonly IPrototypeManager _protoManager = default!;
private readonly ParallaxSystem _parallax;
private readonly SharedTransformSystem _transform;
- private readonly SharedMapSystem _map;
private readonly SpriteSystem _sprite;
private readonly WeatherSystem _weather;
@@ -34,12 +33,11 @@ public sealed partial class StencilOverlay : Overlay
private readonly ShaderInstance _shader;
- public StencilOverlay(ParallaxSystem parallax, SharedTransformSystem transform, SharedMapSystem map, SpriteSystem sprite, WeatherSystem weather)
+ public StencilOverlay(ParallaxSystem parallax, SharedTransformSystem transform, SpriteSystem sprite, WeatherSystem weather)
{
ZIndex = ParallaxSystem.ParallaxZIndex + 1;
_parallax = parallax;
_transform = transform;
- _map = map;
_sprite = sprite;
_weather = weather;
IoCManager.InjectDependencies(this);
diff --git a/Content.Client/Overlays/StencilOverlaySystem.cs b/Content.Client/Overlays/StencilOverlaySystem.cs
index 364ec0fddbf..c8a9553cfdd 100644
--- a/Content.Client/Overlays/StencilOverlaySystem.cs
+++ b/Content.Client/Overlays/StencilOverlaySystem.cs
@@ -10,14 +10,13 @@ public sealed class StencilOverlaySystem : EntitySystem
[Dependency] private readonly IOverlayManager _overlay = default!;
[Dependency] private readonly ParallaxSystem _parallax = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
- [Dependency] private readonly SharedMapSystem _map = default!;
[Dependency] private readonly SpriteSystem _sprite = default!;
[Dependency] private readonly WeatherSystem _weather = default!;
public override void Initialize()
{
base.Initialize();
- _overlay.AddOverlay(new StencilOverlay(_parallax, _transform, _map, _sprite, _weather));
+ _overlay.AddOverlay(new StencilOverlay(_parallax, _transform, _sprite, _weather));
}
public override void Shutdown()
diff --git a/Content.Client/Sandbox/SandboxSystem.cs b/Content.Client/Sandbox/SandboxSystem.cs
index abc717642c8..8a4c93fa354 100644
--- a/Content.Client/Sandbox/SandboxSystem.cs
+++ b/Content.Client/Sandbox/SandboxSystem.cs
@@ -110,7 +110,7 @@ public bool Copy(ICommonSession? session, EntityCoordinates coords, EntityUid ui
}
// Try copy tile.
-
+
if (!_map.TryFindGridAt(_transform.ToMapCoordinates(coords), out var gridUid, out var grid) || !_mapSystem.TryGetTileRef(gridUid, grid, coords, out var tileRef))
return false;
@@ -157,5 +157,10 @@ public void ShowBb()
{
_consoleHost.ExecuteCommand("physics shapes");
}
+
+ public void MachineLinking()
+ {
+ _consoleHost.ExecuteCommand("signallink");
+ }
}
}
diff --git a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
index a5411005391..b50d8fa6b21 100644
--- a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
@@ -116,7 +116,7 @@ protected void DrawCircles(DrawingHandleScreen handle)
}
}
- protected void DrawGrid(DrawingHandleScreen handle, Matrix3x2 gridToView, Entity grid, Color color, float alpha = 0.01f)
+ protected void DrawGrid(DrawingHandleScreen handle, Matrix3x2 matrix, Entity grid, Color color, float alpha = 0.01f)
{
var rator = Maps.GetAllTilesEnumerator(grid.Owner, grid.Comp);
var minimapScale = MinimapScale;
@@ -264,7 +264,7 @@ protected void DrawGrid(DrawingHandleScreen handle, Matrix3x2 gridToView, Entity
Extensions.EnsureLength(ref _allVertices, totalData);
_drawJob.MidPoint = midpoint;
- _drawJob.Matrix = gridToView;
+ _drawJob.Matrix = matrix;
_drawJob.MinimapScale = minimapScale;
_drawJob.Vertices = gridData.Vertices;
_drawJob.ScaledVertices = _allVertices;
@@ -286,7 +286,7 @@ protected void DrawGrid(DrawingHandleScreen handle, Matrix3x2 gridToView, Entity
private record struct GridDrawJob : IParallelRobustJob
{
- public int BatchSize => 64;
+ public int BatchSize => 16;
public float MinimapScale;
public Vector2 MidPoint;
@@ -297,7 +297,12 @@ private record struct GridDrawJob : IParallelRobustJob
public void Execute(int index)
{
- ScaledVertices[index] = Vector2.Transform(Vertices[index], Matrix);
+ var vert = Vertices[index];
+ var adjustedVert = Vector2.Transform(vert, Matrix);
+ adjustedVert = adjustedVert with { Y = -adjustedVert.Y };
+
+ var scaledVert = ScalePosition(adjustedVert, MinimapScale, MidPoint);
+ ScaledVertices[index] = scaledVert;
}
}
}
diff --git a/Content.Client/Shuttles/UI/NavScreen.xaml.cs b/Content.Client/Shuttles/UI/NavScreen.xaml.cs
index 7236714ef29..91d95aaa042 100644
--- a/Content.Client/Shuttles/UI/NavScreen.xaml.cs
+++ b/Content.Client/Shuttles/UI/NavScreen.xaml.cs
@@ -15,7 +15,6 @@ public sealed partial class NavScreen : BoxContainer
[Dependency] private readonly IEntityManager _entManager = default!;
private SharedTransformSystem _xformSystem;
- private EntityUid? _consoleEntity; // Entity of controlling console
private EntityUid? _shuttleEntity;
public NavScreen()
@@ -36,12 +35,6 @@ public void SetShuttle(EntityUid? shuttle)
_shuttleEntity = shuttle;
}
- public void SetConsole(EntityUid? console)
- {
- _consoleEntity = console;
- NavRadar.SetConsole(console);
- }
-
private void OnIFFTogglePressed(BaseButton.ButtonEventArgs args)
{
NavRadar.ShowIFF ^= true;
diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
index d0e6f9ebf7b..a4b42fb672c 100644
--- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
@@ -138,7 +138,6 @@ public void UpdateState(EntityUid owner, ShuttleBoundUserInterfaceState cState)
{
var coordinates = _entManager.GetCoordinates(cState.NavState.Coordinates);
NavContainer.SetShuttle(coordinates?.EntityId);
- NavContainer.SetConsole(owner);
MapContainer.SetShuttle(coordinates?.EntityId);
MapContainer.SetConsole(owner);
diff --git a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
index 2b575b48059..61ae0699266 100644
--- a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
@@ -107,19 +107,16 @@ protected override void Draw(DrawingHandleScreen handle)
DrawCircles(handle);
var gridNent = EntManager.GetNetEntity(GridEntity);
var mapPos = _xformSystem.ToMapCoordinates(_coordinates.Value);
- var ourGridToWorld = _xformSystem.GetWorldMatrix(GridEntity.Value);
- var selectedDockToOurGrid = Matrix3Helpers.CreateTransform(_coordinates.Value.Position, Angle.Zero);
- var selectedDockToWorld = Matrix3x2.Multiply(selectedDockToOurGrid, ourGridToWorld);
+ var ourGridMatrix = _xformSystem.GetWorldMatrix(GridEntity.Value);
+ var dockMatrix = Matrix3Helpers.CreateTransform(_coordinates.Value.Position, Angle.Zero);
+ var worldFromDock = Matrix3x2.Multiply(dockMatrix, ourGridMatrix);
- Box2 viewBoundsWorld = Matrix3Helpers.TransformBox(selectedDockToWorld, new Box2(-WorldRangeVector, WorldRangeVector));
-
- Matrix3x2.Invert(selectedDockToWorld, out var worldToSelectedDock);
- var selectedDockToView = Matrix3x2.CreateScale(new Vector2(MinimapScale, -MinimapScale)) * Matrix3x2.CreateTranslation(MidPointVector);
+ Matrix3x2.Invert(worldFromDock, out var offsetMatrix);
// Draw nearby grids
var controlBounds = PixelSizeBox;
_grids.Clear();
- _mapManager.FindGridsIntersecting(gridXform.MapID, viewBoundsWorld, ref _grids);
+ _mapManager.FindGridsIntersecting(gridXform.MapID, new Box2(mapPos.Position - WorldRangeVector, mapPos.Position + WorldRangeVector), ref _grids);
// offset the dotted-line position to the bounds.
Vector2? viewedDockPos = _viewedState != null ? MidPointVector : null;
@@ -139,11 +136,11 @@ protected override void Draw(DrawingHandleScreen handle)
if (grid.Owner != GridEntity && !_shuttles.CanDraw(grid.Owner, iffComp: iffComp))
continue;
- var curGridToWorld = _xformSystem.GetWorldMatrix(grid.Owner);
- var curGridToView = curGridToWorld * worldToSelectedDock * selectedDockToView;
+ var gridMatrix = _xformSystem.GetWorldMatrix(grid.Owner);
+ var matty = Matrix3x2.Multiply(gridMatrix, offsetMatrix);
var color = _shuttles.GetIFFColor(grid.Owner, grid.Owner == GridEntity, component: iffComp);
- DrawGrid(handle, curGridToView, grid, color);
+ DrawGrid(handle, matty, grid, color);
// Draw any docks on that grid
if (!DockState.Docks.TryGetValue(EntManager.GetNetEntity(grid), out var gridDocks))
@@ -154,24 +151,23 @@ protected override void Draw(DrawingHandleScreen handle)
if (ViewedDock == dock.Entity)
continue;
+ var position = Vector2.Transform(dock.Coordinates.Position, matty);
+
var otherDockRotation = Matrix3Helpers.CreateRotation(dock.Angle);
+ var scaledPos = ScalePosition(position with {Y = -position.Y});
- // This box is the AABB of all the vertices we draw below.
- var dockRenderBoundsLocal = new Box2(-0.5f, -0.7f, 0.5f, 0.5f);
- var currentDockToCurGrid = Matrix3Helpers.CreateTransform(dock.Coordinates.Position, dock.Angle);
- var currentDockToWorld = Matrix3x2.Multiply(currentDockToCurGrid, curGridToWorld);
- var dockRenderBoundsWorld = Matrix3Helpers.TransformBox(currentDockToWorld, dockRenderBoundsLocal);
- if (!viewBoundsWorld.Intersects(dockRenderBoundsWorld))
+ if (!controlBounds.Contains(scaledPos.Floored()))
continue;
+ // Draw the dock's collision
var collisionBL = Vector2.Transform(dock.Coordinates.Position +
- Vector2.Transform(new Vector2(-0.2f, -0.7f), otherDockRotation), curGridToView);
+ Vector2.Transform(new Vector2(-0.2f, -0.7f), otherDockRotation), matty);
var collisionBR = Vector2.Transform(dock.Coordinates.Position +
- Vector2.Transform(new Vector2(0.2f, -0.7f), otherDockRotation), curGridToView);
+ Vector2.Transform(new Vector2(0.2f, -0.7f), otherDockRotation), matty);
var collisionTR = Vector2.Transform(dock.Coordinates.Position +
- Vector2.Transform(new Vector2(0.2f, -0.5f), otherDockRotation), curGridToView);
+ Vector2.Transform(new Vector2(0.2f, -0.5f), otherDockRotation), matty);
var collisionTL = Vector2.Transform(dock.Coordinates.Position +
- Vector2.Transform(new Vector2(-0.2f, -0.5f), otherDockRotation), curGridToView);
+ Vector2.Transform(new Vector2(-0.2f, -0.5f), otherDockRotation), matty);
var verts = new[]
{
@@ -185,6 +181,13 @@ protected override void Draw(DrawingHandleScreen handle)
collisionBL,
};
+ for (var i = 0; i < verts.Length; i++)
+ {
+ var vert = verts[i];
+ vert.Y = -vert.Y;
+ verts[i] = ScalePosition(vert);
+ }
+
var collisionCenter = verts[0] + verts[1] + verts[3] + verts[5];
var otherDockConnection = Color.ToSrgb(Color.Pink);
@@ -192,10 +195,10 @@ protected override void Draw(DrawingHandleScreen handle)
handle.DrawPrimitives(DrawPrimitiveTopology.LineList, verts, otherDockConnection);
// Draw the dock itself
- var dockBL = Vector2.Transform(dock.Coordinates.Position + new Vector2(-0.5f, -0.5f), curGridToView);
- var dockBR = Vector2.Transform(dock.Coordinates.Position + new Vector2(0.5f, -0.5f), curGridToView);
- var dockTR = Vector2.Transform(dock.Coordinates.Position + new Vector2(0.5f, 0.5f), curGridToView);
- var dockTL = Vector2.Transform(dock.Coordinates.Position + new Vector2(-0.5f, 0.5f), curGridToView);
+ var dockBL = Vector2.Transform(dock.Coordinates.Position + new Vector2(-0.5f, -0.5f), matty);
+ var dockBR = Vector2.Transform(dock.Coordinates.Position + new Vector2(0.5f, -0.5f), matty);
+ var dockTR = Vector2.Transform(dock.Coordinates.Position + new Vector2(0.5f, 0.5f), matty);
+ var dockTL = Vector2.Transform(dock.Coordinates.Position + new Vector2(-0.5f, 0.5f), matty);
verts = new[]
{
@@ -209,6 +212,13 @@ protected override void Draw(DrawingHandleScreen handle)
dockBL
};
+ for (var i = 0; i < verts.Length; i++)
+ {
+ var vert = verts[i];
+ vert.Y = -vert.Y;
+ verts[i] = ScalePosition(vert);
+ }
+
Color otherDockColor;
if (HighlightedDock == dock.Entity)
@@ -243,11 +253,9 @@ protected override void Draw(DrawingHandleScreen handle)
collisionCenter /= 4;
var range = viewedDockPos.Value - collisionCenter;
- var maxRange = SharedDockingSystem.DockingHiglightRange * MinimapScale;
- var maxRangeSq = maxRange * maxRange;
- if (range.LengthSquared() < maxRangeSq)
+ if (range.Length() < SharedDockingSystem.DockingHiglightRange * MinimapScale)
{
- if (dock.GridDockedWith == null)
+ if (_viewedState?.GridDockedWith == null)
{
var coordsOne = EntManager.GetCoordinates(_viewedState!.Coordinates);
var coordsTwo = EntManager.GetCoordinates(dock.Coordinates);
@@ -257,11 +265,10 @@ protected override void Draw(DrawingHandleScreen handle)
var rotA = _xformSystem.GetWorldRotation(coordsOne.EntityId) + _viewedState!.Angle;
var rotB = _xformSystem.GetWorldRotation(coordsTwo.EntityId) + dock.Angle;
- var distanceSq = (mapOne.Position - mapTwo.Position).LengthSquared();
+ var distance = (mapOne.Position - mapTwo.Position).Length();
var inAlignment = _dockSystem.InAlignment(mapOne, rotA, mapTwo, rotB);
- var maxDockDistSq = SharedDockingSystem.DockRange * SharedDockingSystem.DockRange;
- var canDock = distanceSq < maxDockDistSq && inAlignment;
+ var canDock = distance < SharedDockingSystem.DockRange && inAlignment;
if (dockButton != null)
dockButton.Disabled = !canDock || !canDockChange;
@@ -290,8 +297,7 @@ protected override void Draw(DrawingHandleScreen handle)
{
// Because it's being layed out top-down we have to arrange for first frame.
container.Arrange(PixelRect);
- var dockPositionInView = Vector2.Transform(dock.Coordinates.Position, curGridToView);
- var containerPos = dockPositionInView / UIScale - container.DesiredSize / 2 - new Vector2(0f, 0.75f) * MinimapScale;
+ var containerPos = scaledPos / UIScale - container.DesiredSize / 2 - new Vector2(0f, 0.75f) * MinimapScale;
SetPosition(container, containerPos);
}
diff --git a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
index 805608c9a53..2674343e059 100644
--- a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
@@ -29,11 +29,6 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
///
private EntityCoordinates? _coordinates;
- ///
- /// Entity of controlling console
- ///
- private EntityUid? _consoleEntity;
-
private Angle? _rotation;
private Dictionary> _docks = new();
@@ -62,11 +57,6 @@ public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
_rotation = angle;
}
- public void SetConsole(EntityUid? consoleEntity)
- {
- _consoleEntity = consoleEntity;
- }
-
protected override void KeyBindUp(GUIBoundKeyEventArgs args)
{
base.KeyBindUp(args);
@@ -149,35 +139,40 @@ protected override void Draw(DrawingHandleScreen handle)
}
var mapPos = _transform.ToMapCoordinates(_coordinates.Value);
- var posMatrix = Matrix3Helpers.CreateTransform(_coordinates.Value.Position, _rotation.Value);
+ var offset = _coordinates.Value.Position;
+ var posMatrix = Matrix3Helpers.CreateTransform(offset, _rotation.Value);
var ourEntRot = RotateWithEntity ? _transform.GetWorldRotation(xform) : _rotation.Value;
var ourEntMatrix = Matrix3Helpers.CreateTransform(_transform.GetWorldPosition(xform), ourEntRot);
- var shuttleToWorld = Matrix3x2.Multiply(posMatrix, ourEntMatrix);
- Matrix3x2.Invert(shuttleToWorld, out var worldToShuttle);
- var shuttleToView = Matrix3x2.CreateScale(new Vector2(MinimapScale, -MinimapScale)) * Matrix3x2.CreateTranslation(MidPointVector);
+ var ourWorldMatrix = Matrix3x2.Multiply(posMatrix, ourEntMatrix);
+ Matrix3x2.Invert(ourWorldMatrix, out var ourWorldMatrixInvert);
// Draw our grid in detail
var ourGridId = xform.GridUid;
if (EntManager.TryGetComponent(ourGridId, out var ourGrid) &&
fixturesQuery.HasComponent(ourGridId.Value))
{
- var ourGridToWorld = _transform.GetWorldMatrix(ourGridId.Value);
- var ourGridToShuttle = Matrix3x2.Multiply(ourGridToWorld, worldToShuttle);
- var ourGridToView = ourGridToShuttle * shuttleToView;
+ var ourGridMatrix = _transform.GetWorldMatrix(ourGridId.Value);
+ var matrix = Matrix3x2.Multiply(ourGridMatrix, ourWorldMatrixInvert);
var color = _shuttles.GetIFFColor(ourGridId.Value, self: true);
- DrawGrid(handle, ourGridToView, (ourGridId.Value, ourGrid), color);
- DrawDocks(handle, ourGridId.Value, ourGridToView);
+ DrawGrid(handle, matrix, (ourGridId.Value, ourGrid), color);
+ DrawDocks(handle, ourGridId.Value, matrix);
}
+ var invertedPosition = _coordinates.Value.Position - offset;
+ invertedPosition.Y = -invertedPosition.Y;
+ // Don't need to transform the InvWorldMatrix again as it's already offset to its position.
+
// Draw radar position on the station
+ var radarPos = invertedPosition;
const float radarVertRadius = 2f;
+
var radarPosVerts = new Vector2[]
{
- ScalePosition(new Vector2(0f, -radarVertRadius)),
- ScalePosition(new Vector2(radarVertRadius / 2f, 0f)),
- ScalePosition(new Vector2(0f, radarVertRadius)),
- ScalePosition(new Vector2(radarVertRadius / -2f, 0f)),
+ ScalePosition(radarPos + new Vector2(0f, -radarVertRadius)),
+ ScalePosition(radarPos + new Vector2(radarVertRadius / 2f, 0f)),
+ ScalePosition(radarPos + new Vector2(0f, radarVertRadius)),
+ ScalePosition(radarPos + new Vector2(radarVertRadius / -2f, 0f)),
};
handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, radarPosVerts, Color.Lime);
@@ -202,8 +197,8 @@ protected override void Draw(DrawingHandleScreen handle)
if (!_shuttles.CanDraw(gUid, gridBody, iff))
continue;
- var curGridToWorld = _transform.GetWorldMatrix(gUid);
- var curGridToView = curGridToWorld * worldToShuttle * shuttleToView;
+ var gridMatrix = _transform.GetWorldMatrix(gUid);
+ var matty = Matrix3x2.Multiply(gridMatrix, ourWorldMatrixInvert);
var labelColor = _shuttles.GetIFFColor(grid, self: false, iff);
var coordColor = new Color(labelColor.R * 0.8f, labelColor.G * 0.8f, labelColor.B * 0.8f, 0.5f);
@@ -218,7 +213,8 @@ protected override void Draw(DrawingHandleScreen handle)
{
var gridBounds = grid.Comp.LocalAABB;
- var gridCentre = Vector2.Transform(gridBody.LocalCenter, curGridToView);
+ var gridCentre = Vector2.Transform(gridBody.LocalCenter, matty);
+ gridCentre.Y = -gridCentre.Y;
var distance = gridCentre.Length();
var labelText = Loc.GetString("shuttle-console-iff-label", ("name", labelName),
@@ -234,8 +230,9 @@ protected override void Draw(DrawingHandleScreen handle)
// y-offset the control to always render below the grid (vertically)
var yOffset = Math.Max(gridBounds.Height, gridBounds.Width) * MinimapScale / 1.8f;
- // The actual position in the UI.
- var gridScaledPosition = gridCentre - new Vector2(0, -yOffset);
+ // The actual position in the UI. We centre the label by offsetting the matrix position
+ // by half the label's width, plus the y-offset
+ var gridScaledPosition = ScalePosition(gridCentre) - new Vector2(0, -yOffset);
// Normalize the grid position if it exceeds the viewport bounds
// normalizing it instead of clamping it preserves the direction of the vector and prevents corner-hugging
@@ -267,32 +264,18 @@ protected override void Draw(DrawingHandleScreen handle)
}
// Detailed view
- var gridAABB = curGridToWorld.TransformBox(grid.Comp.LocalAABB);
+ var gridAABB = gridMatrix.TransformBox(grid.Comp.LocalAABB);
// Skip drawing if it's out of range.
if (!gridAABB.Intersects(viewAABB))
continue;
- DrawGrid(handle, curGridToView, grid, labelColor);
- DrawDocks(handle, gUid, curGridToView);
+ DrawGrid(handle, matty, grid, labelColor);
+ DrawDocks(handle, gUid, matty);
}
-
- // If we've set the controlling console, and it's on a different grid
- // to the shuttle itself, then draw an additional marker to help the
- // player determine where they are relative to the shuttle.
- if (_consoleEntity != null && xformQuery.TryGetComponent(_consoleEntity, out var consoleXform))
- {
- if (consoleXform.ParentUid != _coordinates.Value.EntityId)
- {
- var consolePositionWorld = _transform.GetWorldPosition((EntityUid)_consoleEntity);
- var p = Vector2.Transform(consolePositionWorld, worldToShuttle * shuttleToView);
- handle.DrawCircle(p, 5, Color.ToSrgb(Color.Cyan), true);
- }
- }
-
}
- private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3x2 gridToView)
+ private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3x2 matrix)
{
if (!ShowDocks)
return;
@@ -300,32 +283,33 @@ private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3x2 grid
const float DockScale = 0.6f;
var nent = EntManager.GetNetEntity(uid);
- const float sqrt2 = 1.41421356f;
- const float dockRadius = DockScale * sqrt2;
- // Worst-case bounds used to cull a dock:
- Box2 viewBounds = new Box2(-dockRadius, -dockRadius, Size.X + dockRadius, Size.Y + dockRadius);
if (_docks.TryGetValue(nent, out var docks))
{
foreach (var state in docks)
{
var position = state.Coordinates.Position;
+ var uiPosition = Vector2.Transform(position, matrix);
- var positionInView = Vector2.Transform(position, gridToView);
- if (!viewBounds.Contains(positionInView))
- {
+ if (uiPosition.Length() > (WorldRange * 2f) - DockScale)
continue;
- }
var color = Color.ToSrgb(Color.Magenta);
var verts = new[]
{
- Vector2.Transform(position + new Vector2(-DockScale, -DockScale), gridToView),
- Vector2.Transform(position + new Vector2(DockScale, -DockScale), gridToView),
- Vector2.Transform(position + new Vector2(DockScale, DockScale), gridToView),
- Vector2.Transform(position + new Vector2(-DockScale, DockScale), gridToView),
+ Vector2.Transform(position + new Vector2(-DockScale, -DockScale), matrix),
+ Vector2.Transform(position + new Vector2(DockScale, -DockScale), matrix),
+ Vector2.Transform(position + new Vector2(DockScale, DockScale), matrix),
+ Vector2.Transform(position + new Vector2(-DockScale, DockScale), matrix),
};
+ for (var i = 0; i < verts.Length; i++)
+ {
+ var vert = verts[i];
+ vert.Y = -vert.Y;
+ verts[i] = ScalePosition(vert);
+ }
+
handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, verts, color.WithAlpha(0.8f));
handle.DrawPrimitives(DrawPrimitiveTopology.LineStrip, verts, color);
}
diff --git a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
index bb0dba2f57d..4e412df8581 100644
--- a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
+++ b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
@@ -9,7 +9,6 @@
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
using Robust.Shared.Utility;
namespace Content.Client.Silicons.Laws.Ui;
@@ -19,13 +18,8 @@ public sealed partial class LawDisplay : Control
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
- [Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly EntityManager _entityManager = default!;
- private static readonly TimeSpan PressCooldown = TimeSpan.FromSeconds(3);
-
- private readonly Dictionary _nextAllowedPress = new();
-
public LawDisplay(EntityUid uid, SiliconLaw law, HashSet? radioChannels)
{
RobustXamlLoader.Load(this);
@@ -53,12 +47,9 @@ public LawDisplay(EntityUid uid, SiliconLaw law, HashSet? radioChannels)
MinWidth = 75,
};
- _nextAllowedPress[localButton] = TimeSpan.Zero;
-
localButton.OnPressed += _ =>
{
_chatManager.SendMessage($"{lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Local);
- _nextAllowedPress[localButton] = _timing.CurTime + PressCooldown;
};
LawAnnouncementButtons.AddChild(localButton);
@@ -80,8 +71,6 @@ public LawDisplay(EntityUid uid, SiliconLaw law, HashSet? radioChannels)
MinWidth = 75,
};
- _nextAllowedPress[radioChannelButton] = TimeSpan.Zero;
-
radioChannelButton.OnPressed += _ =>
{
switch (radioChannel)
@@ -91,21 +80,9 @@ public LawDisplay(EntityUid uid, SiliconLaw law, HashSet? radioChannels)
default:
_chatManager.SendMessage($"{SharedChatSystem.RadioChannelPrefix}{radioChannelProto.KeyCode} {lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Radio); break;
}
- _nextAllowedPress[radioChannelButton] = _timing.CurTime + PressCooldown;
};
LawAnnouncementButtons.AddChild(radioChannelButton);
}
}
-
- protected override void FrameUpdate(FrameEventArgs args)
- {
- base.FrameUpdate(args);
-
- var curTime = _timing.CurTime;
- foreach (var (button, nextPress) in _nextAllowedPress)
- {
- button.Disabled = curTime < nextPress;
- }
- }
}
diff --git a/Content.Client/Singularity/Systems/EventHorizonSystem.cs b/Content.Client/Singularity/Systems/EventHorizonSystem.cs
index 606116fced4..3dd63a0c9c8 100644
--- a/Content.Client/Singularity/Systems/EventHorizonSystem.cs
+++ b/Content.Client/Singularity/Systems/EventHorizonSystem.cs
@@ -1,7 +1,7 @@
using Content.Shared.Singularity.EntitySystems;
using Content.Shared.Singularity.Components;
-namespace Content.Client.Singularity.Systems;
+namespace Content.Client.Singularity.EntitySystems;
///
/// The client-side version of .
diff --git a/Content.Client/Singularity/Systems/SingularityGeneratorSystem.cs b/Content.Client/Singularity/Systems/SingularityGeneratorSystem.cs
deleted file mode 100644
index f5b85f8b3cf..00000000000
--- a/Content.Client/Singularity/Systems/SingularityGeneratorSystem.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Content.Shared.Singularity.EntitySystems;
-using Content.Shared.Singularity.Components;
-
-namespace Content.Client.Singularity.Systems;
-
-///
-/// The client-side version of .
-/// Manages s.
-/// Exists to make relevant signal handlers (ie: ) work on the client.
-///
-public sealed class SingularityGeneratorSystem : SharedSingularityGeneratorSystem
-{}
diff --git a/Content.Client/Singularity/Systems/SingularitySystem.cs b/Content.Client/Singularity/Systems/SingularitySystem.cs
index 50a12466be1..5293ad499d0 100644
--- a/Content.Client/Singularity/Systems/SingularitySystem.cs
+++ b/Content.Client/Singularity/Systems/SingularitySystem.cs
@@ -5,7 +5,7 @@
using Robust.Shared.GameStates;
using Robust.Shared.Utility;
-namespace Content.Client.Singularity.Systems;
+namespace Content.Client.Singularity.EntitySystems;
///
/// The client-side version of .
diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
index 62b3b19e38b..0696ae9d3f9 100644
--- a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
@@ -16,8 +16,9 @@
namespace Content.Client.UserInterface.Systems.Chat.Widgets;
[GenerateTypedNameReferences]
-[Virtual]
+#pragma warning disable RA0003
public partial class ChatBox : UIWidget
+#pragma warning restore RA0003
{
private readonly ChatUIController _controller;
private readonly IEntityManager _entManager;
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
index 9e2ff816b36..627ecfe987a 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
@@ -71,7 +71,6 @@ public void AddEntry(string name, string description, bool hasAccess, FormattedM
buttonHeading.AddStyleClass(ContainerButton.StyleClassButton);
buttonHeading.Label.HorizontalAlignment = HAlignment.Center;
buttonHeading.Label.HorizontalExpand = true;
- buttonHeading.Margin = new Thickness(8, 0, 8, 2);
var body = new CollapsibleBody
{
diff --git a/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs b/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
index edc02600611..9ee429ba7e9 100644
--- a/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
+++ b/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
@@ -83,27 +83,22 @@ private void HandPressed(GUIBoundKeyEventArgs args, SlotControl hand)
if (args.Function == EngineKeyFunctions.UIClick)
{
_handsSystem.UIHandClick(_playerHandsComponent, hand.SlotName);
- args.Handle();
}
else if (args.Function == EngineKeyFunctions.UseSecondary)
{
_handsSystem.UIHandOpenContextMenu(hand.SlotName);
- args.Handle();
}
else if (args.Function == ContentKeyFunctions.ActivateItemInWorld)
{
_handsSystem.UIHandActivate(hand.SlotName);
- args.Handle();
}
else if (args.Function == ContentKeyFunctions.AltActivateItemInWorld)
{
_handsSystem.UIHandAltActivateItem(hand.SlotName);
- args.Handle();
}
else if (args.Function == ContentKeyFunctions.ExamineEntity)
{
_handsSystem.UIInventoryExamine(hand.SlotName);
- args.Handle();
}
}
diff --git a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
index 5368d5d8721..dc8972970ac 100644
--- a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
+++ b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
@@ -11,21 +11,17 @@
Orientation="Horizontal"
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
+ SeparationOverride="5"
>
-
@@ -43,7 +39,7 @@
Icon="{xe:Tex '/Textures/Interface/character.svg.192dpi.png'}"
ToolTip="{Loc 'game-hud-open-character-menu-button-tooltip'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenCharacterMenu}"
- MinSize="48 64"
+ MinSize="42 64"
HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/>
@@ -53,7 +49,7 @@
Icon="{xe:Tex '/Textures/Interface/emotes.svg.192dpi.png'}"
ToolTip="{Loc 'game-hud-open-emotes-menu-button-tooltip'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenEmotesMenu}"
- MinSize="48 64"
+ MinSize="42 64"
HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/>
@@ -63,7 +59,7 @@
Icon="{xe:Tex '/Textures/Interface/hammer.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenCraftingMenu}"
ToolTip="{Loc 'game-hud-open-crafting-menu-button-tooltip'}"
- MinSize="48 64"
+ MinSize="42 64"
HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/>
@@ -73,7 +69,7 @@
Icon="{xe:Tex '/Textures/Interface/fist.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenActionsMenu}"
ToolTip="{Loc 'game-hud-open-actions-menu-button-tooltip'}"
- MinSize="48 64"
+ MinSize="42 64"
HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/>
@@ -83,7 +79,7 @@
Icon="{xe:Tex '/Textures/Interface/gavel.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenAdminMenu}"
ToolTip="{Loc 'game-hud-open-admin-menu-button-tooltip'}"
- MinSize="48 64"
+ MinSize="42 64"
HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/>
@@ -93,7 +89,7 @@
Icon="{xe:Tex '/Textures/Interface/sandbox.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenSandboxWindow}"
ToolTip="{Loc 'game-hud-open-sandbox-menu-button-tooltip'}"
- MinSize="48 64"
+ MinSize="42 64"
HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/>
@@ -103,9 +99,8 @@
Icon="{xe:Tex '/Textures/Interface/info.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenAHelp}"
ToolTip="{Loc 'ui-options-function-open-a-help'}"
- MinSize="48 64"
+ MinSize="42 64"
HorizontalExpand="True"
- AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
+ AppendStyleClass="{x:Static style:StyleBase.ButtonOpenLeft}"
/>
-
diff --git a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
index 1924bf2b24c..58c8a1451bd 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
+++ b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
@@ -1,5 +1,4 @@
-using System.Numerics;
-using Content.Client.Administration.Managers;
+using Content.Client.Administration.Managers;
using Content.Client.Gameplay;
using Content.Client.Markers;
using Content.Client.Sandbox;
@@ -8,7 +7,9 @@
using Content.Client.UserInterface.Systems.DecalPlacer;
using Content.Client.UserInterface.Systems.Sandbox.Windows;
using Content.Shared.Input;
+using Content.Shared.Silicons.StationAi;
using JetBrains.Annotations;
+using Robust.Client.Console;
using Robust.Client.Debugging;
using Robust.Client.Graphics;
using Robust.Client.Input;
@@ -108,13 +109,9 @@ public void LoadButton()
private void EnsureWindow()
{
- if (_window is { Disposed: false })
+ if(_window is { Disposed: false })
return;
_window = UIManager.CreateWindow();
- // Pre-center the window without forcing it to the center every time.
- _window.OpenCentered();
- _window.Close();
-
_window.OnOpen += () => { SandboxButton!.Pressed = true; };
_window.OnClose += () => { SandboxButton!.Pressed = false; };
_window.ToggleLightButton.Pressed = !_light.Enabled;
@@ -152,6 +149,7 @@ private void EnsureWindow()
_window.ToggleSubfloorButton.OnPressed += _ => _sandbox.ToggleSubFloor();
_window.ShowMarkersButton.OnPressed += _ => _sandbox.ShowMarkers();
_window.ShowBbButton.OnPressed += _ => _sandbox.ShowBb();
+ _window.MachineLinkingButton.OnPressed += _ => _sandbox.MachineLinking();
}
private void CheckSandboxVisibility()
@@ -166,7 +164,7 @@ public void OnStateExited(GameplayState state)
{
if (_window != null)
{
- _window.Close();
+ _window.Dispose();
_window = null;
}
@@ -211,7 +209,7 @@ private void ToggleWindow()
if (_sandbox.SandboxAllowed && _window.IsOpen != true)
{
UIManager.ClickSound();
- _window.Open();
+ _window.OpenCentered();
}
else
{
diff --git a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
index bec1d6b4d6f..05e65cf29c3 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
@@ -4,24 +4,20 @@
Title="{Loc sandbox-window-title}"
Resizable="False">
-
-
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
+
diff --git a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
index 1e61ad98380..97c9d8b7959 100644
--- a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
+++ b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
@@ -307,6 +307,12 @@ private void OnPieceUnpressed(GUIBoundKeyEventArgs args, ItemGridPiece control)
_entity.GetNetEntity(storageEnt),
new ItemStorageLocation(DraggingRotation, position)));
}
+ else
+ {
+ _entity.RaisePredictiveEvent(new StorageRemoveItemEvent(
+ _entity.GetNetEntity(draggingGhost.Entity),
+ _entity.GetNetEntity(storageEnt)));
+ }
_menuDragHelper.EndDrag();
_container?.BuildItemPieces();
diff --git a/Content.Client/Wires/UI/WiresMenu.cs b/Content.Client/Wires/UI/WiresMenu.cs
index 01c88bcd0c6..77fc3accceb 100644
--- a/Content.Client/Wires/UI/WiresMenu.cs
+++ b/Content.Client/Wires/UI/WiresMenu.cs
@@ -206,7 +206,8 @@ public WiresMenu()
(_statusContainer = new GridContainer
{
Margin = new Thickness(8, 4),
- Rows = 2
+ // TODO: automatically change columns count.
+ Columns = 3
})
}
}
@@ -226,8 +227,7 @@ public WiresMenu()
PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#525252ff")}
});
CloseButton.OnPressed += _ => Close();
- SetHeight = 200;
- MinWidth = 320;
+ SetSize = new Vector2(320, 200);
}
@@ -503,8 +503,6 @@ private sealed class StatusLight : Control
public StatusLight(StatusLightData data, IResourceCache resourceCache)
{
- HorizontalAlignment = HAlignment.Right;
-
var hsv = Color.ToHsv(data.Color);
hsv.Z /= 2;
var dimColor = Color.FromHsv(hsv);
diff --git a/Content.PatreonParser/Content.PatreonParser.csproj b/Content.PatreonParser/Content.PatreonParser.csproj
index ec259e6f1dc..3206ad42e9d 100644
--- a/Content.PatreonParser/Content.PatreonParser.csproj
+++ b/Content.PatreonParser/Content.PatreonParser.csproj
@@ -2,7 +2,7 @@
Exe
- net8.0
+ net7.0
enable
enable
true
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 5e002198056..d57898d9d98 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -23,7 +23,6 @@
using Content.Shared.Administration.Components;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
-using Content.Shared.Clumsy;
using Content.Shared.Clothing.Components;
using Content.Shared.Cluwne;
using Content.Shared.Damage;
diff --git a/Content.Server/Administration/Systems/SuperBonkSystem.cs b/Content.Server/Administration/Systems/SuperBonkSystem.cs
index 5cd62d83572..5488a8d6f46 100644
--- a/Content.Server/Administration/Systems/SuperBonkSystem.cs
+++ b/Content.Server/Administration/Systems/SuperBonkSystem.cs
@@ -1,27 +1,27 @@
using Content.Server.Administration.Components;
using Content.Shared.Climbing.Components;
-using Content.Shared.Clumsy;
+using Content.Shared.Climbing.Events;
+using Content.Shared.Climbing.Systems;
+using Content.Shared.Interaction.Components;
using Content.Shared.Mobs;
using Content.Shared.Mobs.Components;
-using Robust.Shared.Audio.Systems;
namespace Content.Server.Administration.Systems;
-public sealed class SuperBonkSystem : EntitySystem
+public sealed class SuperBonkSystem: EntitySystem
{
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
- [Dependency] private readonly ClumsySystem _clumsySystem = default!;
- [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+ [Dependency] private readonly BonkSystem _bonkSystem = default!;
public override void Initialize()
{
base.Initialize();
- SubscribeLocalEvent(OnMobStateChanged);
SubscribeLocalEvent(OnBonkShutdown);
+ SubscribeLocalEvent(OnMobStateChanged);
}
- public void StartSuperBonk(EntityUid target, float delay = 0.1f, bool stopWhenDead = false)
+ public void StartSuperBonk(EntityUid target, float delay = 0.1f, bool stopWhenDead = false )
{
//The other check in the code to stop when the target dies does not work if the target is already dead.
@@ -31,6 +31,7 @@ public void StartSuperBonk(EntityUid target, float delay = 0.1f, bool stopWhenDe
return;
}
+
var hadClumsy = EnsureComp(target, out _);
var tables = EntityQueryEnumerator();
@@ -78,17 +79,16 @@ public override void Update(float frameTime)
private void Bonk(SuperBonkComponent comp)
{
var uid = comp.Tables.Current.Key;
+ var bonkComp = comp.Tables.Current.Value;
// It would be very weird for something without a transform component to have a bonk component
// but just in case because I don't want to crash the server.
- if (!HasComp(uid) || !TryComp(comp.Target, out var clumsyComp))
+ if (!HasComp(uid))
return;
_transformSystem.SetCoordinates(comp.Target, Transform(uid).Coordinates);
- _clumsySystem.HitHeadClumsy((comp.Target, clumsyComp), uid);
-
- _audioSystem.PlayPvs(clumsyComp.TableBonkSound, comp.Target);
+ _bonkSystem.TryBonk(comp.Target, uid, bonkComp);
}
private void OnMobStateChanged(EntityUid uid, SuperBonkComponent comp, MobStateChangedEvent args)
diff --git a/Content.Server/Announcements/AnnounceCommand.cs b/Content.Server/Announcements/AnnounceCommand.cs
index 3249fcc95d2..2307f36a5d0 100644
--- a/Content.Server/Announcements/AnnounceCommand.cs
+++ b/Content.Server/Announcements/AnnounceCommand.cs
@@ -28,8 +28,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
}
else
{
- // Explicit IEnumerable due to overload ambiguity on .NET 9
- var message = string.Join(' ', (IEnumerable)new ArraySegment(args, 1, args.Length-1));
+ var message = string.Join(' ', new ArraySegment(args, 1, args.Length-1));
chat.DispatchGlobalAnnouncement(message, args[0], colorOverride: Color.Gold);
}
shell.WriteLine("Sent!");
diff --git a/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs b/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs
index b6bc012d83e..7fee8fdb985 100644
--- a/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs
@@ -16,7 +16,6 @@ public sealed class GasProducerAnomalySystem : EntitySystem
{
[Dependency] private readonly AtmosphereSystem _atmosphere = default!;
[Dependency] private readonly IRobustRandom _random = default!;
- [Dependency] private readonly SharedMapSystem _map = default!;
public override void Initialize()
{
@@ -57,11 +56,8 @@ private void ReleaseGas(EntityUid uid, Gas gas, float mols, float radius, int co
return;
var localpos = xform.Coordinates.Position;
- var tilerefs = _map.GetLocalTilesIntersecting(
- xform.GridUid.Value,
- grid,
- new Box2(localpos + new Vector2(-radius, -radius), localpos + new Vector2(radius, radius)))
- .ToArray();
+ var tilerefs = grid.GetLocalTilesIntersecting(
+ new Box2(localpos + new Vector2(-radius, -radius), localpos + new Vector2(radius, radius))).ToArray();
if (tilerefs.Length == 0)
return;
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 45daa7a312f..610c0ad182a 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -184,7 +184,7 @@ protected override void Started(EntityUid uid, AntagSelectionComponent component
return;
var players = _playerManager.Sessions
- .Where(x => GameTicker.PlayerGameStatuses.TryGetValue(x.UserId, out var status) && status == PlayerGameStatus.JoinedGame)
+ .Where(x => GameTicker.PlayerGameStatuses[x.UserId] == PlayerGameStatus.JoinedGame)
.ToList();
ChooseAntags((uid, component), players, midround: true);
diff --git a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
index 830479561de..cb6d4d16301 100644
--- a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
+++ b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
@@ -48,9 +48,7 @@ public sealed partial class AtmosMonitorComponent : Component
[DataField("gasThresholds")]
public Dictionary? GasThresholds;
- ///
- /// Stores a reference to the gas on the tile this entity is on (or the pipe network it monitors; see ).
- ///
+ // Stores a reference to the gas on the tile this is on.
[ViewVariables]
public GasMixture? TileGas;
@@ -67,19 +65,4 @@ public sealed partial class AtmosMonitorComponent : Component
///
[DataField("registeredDevices")]
public HashSet RegisteredDevices = new();
-
- ///
- /// Specifies whether this device monitors its own internal pipe network rather than the surrounding atmosphere.
- ///
- ///
- /// If 'true', the entity will require a NodeContainerComponent with one or more PipeNodes to function.
- ///
- [DataField]
- public bool MonitorsPipeNet = false;
-
- ///
- /// Specifies the name of the pipe node that this device is monitoring.
- ///
- [DataField]
- public string NodeNameMonitoredPipe = "monitored";
}
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index 875d8ad1cda..fbe74cbab7f 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -4,14 +4,10 @@
using Content.Server.Atmos.Piping.EntitySystems;
using Content.Server.DeviceNetwork;
using Content.Server.DeviceNetwork.Systems;
-using Content.Server.NodeContainer;
-using Content.Server.NodeContainer.EntitySystems;
-using Content.Server.NodeContainer.Nodes;
using Content.Server.Power.Components;
using Content.Server.Power.EntitySystems;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Monitor;
-using Content.Shared.Atmos.Piping.Components;
using Content.Shared.DeviceNetwork;
using Content.Shared.Power;
using Content.Shared.Tag;
@@ -29,7 +25,6 @@ public sealed class AtmosMonitorSystem : EntitySystem
[Dependency] private readonly AtmosDeviceSystem _atmosDeviceSystem = default!;
[Dependency] private readonly DeviceNetworkSystem _deviceNetSystem = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
- [Dependency] private readonly NodeContainerSystem _nodeContainerSystem = default!;
// Commands
public const string AtmosMonitorSetThresholdCmd = "atmos_monitor_set_threshold";
@@ -61,15 +56,8 @@ private void OnAtmosDeviceLeaveAtmosphere(EntityUid uid, AtmosMonitorComponent a
private void OnAtmosDeviceEnterAtmosphere(EntityUid uid, AtmosMonitorComponent atmosMonitor, ref AtmosDeviceEnabledEvent args)
{
- if (atmosMonitor.MonitorsPipeNet && _nodeContainerSystem.TryGetNode(uid, atmosMonitor.NodeNameMonitoredPipe, out var pipeNode))
- {
- atmosMonitor.TileGas = pipeNode.Air;
- return;
- }
-
atmosMonitor.TileGas = _atmosphereSystem.GetContainingMixture(uid, true);
}
-
private void OnMapInit(EntityUid uid, AtmosMonitorComponent component, MapInitEvent args)
{
if (component.TemperatureThresholdId != null)
@@ -218,7 +206,7 @@ private void OnAtmosUpdate(EntityUid uid, AtmosMonitorComponent component, ref A
if (!this.IsPowered(uid, EntityManager))
return;
- if (args.Grid == null)
+ if (args.Grid == null)
return;
// if we're not monitoring atmos, don't bother
@@ -227,10 +215,6 @@ private void OnAtmosUpdate(EntityUid uid, AtmosMonitorComponent component, ref A
&& component.GasThresholds == null)
return;
- // If monitoring a pipe network, get its most recent gas mixture
- if (component.MonitorsPipeNet && _nodeContainerSystem.TryGetNode(uid, component.NodeNameMonitoredPipe, out var pipeNode))
- component.TileGas = pipeNode.Air;
-
UpdateState(uid, component.TileGas, component);
}
diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasPressurePumpComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasPressurePumpComponent.cs
new file mode 100644
index 00000000000..8816e1af220
--- /dev/null
+++ b/Content.Server/Atmos/Piping/Binary/Components/GasPressurePumpComponent.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Atmos;
+
+namespace Content.Server.Atmos.Piping.Binary.Components
+{
+ [RegisterComponent]
+ public sealed partial class GasPressurePumpComponent : Component
+ {
+ [ViewVariables(VVAccess.ReadWrite)]
+ [DataField("enabled")]
+ public bool Enabled { get; set; } = true;
+
+ [ViewVariables(VVAccess.ReadWrite)]
+ [DataField("inlet")]
+ public string InletName { get; set; } = "inlet";
+
+ [ViewVariables(VVAccess.ReadWrite)]
+ [DataField("outlet")]
+ public string OutletName { get; set; } = "outlet";
+
+ [ViewVariables(VVAccess.ReadWrite)]
+ [DataField("targetPressure")]
+ public float TargetPressure { get; set; } = Atmospherics.OneAtmosphere;
+
+ ///
+ /// Max pressure of the target gas (NOT relative to source).
+ ///
+ [ViewVariables(VVAccess.ReadWrite)]
+ [DataField("maxTargetPressure")]
+ public float MaxTargetPressure = Atmospherics.MaxOutputPressure;
+ }
+}
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
index 5f0092f3778..abd34396a0c 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
@@ -1,57 +1,169 @@
+using Content.Server.Administration.Logs;
using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.Piping.Binary.Components;
using Content.Server.Atmos.Piping.Components;
using Content.Server.NodeContainer.EntitySystems;
using Content.Server.NodeContainer.Nodes;
using Content.Server.Power.Components;
using Content.Shared.Atmos;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Atmos.EntitySystems;
+using Content.Shared.Atmos.Piping;
+using Content.Shared.Atmos.Piping.Binary.Components;
using Content.Shared.Audio;
+using Content.Shared.Database;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Power;
using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+using Robust.Shared.Player;
-namespace Content.Server.Atmos.Piping.Binary.EntitySystems;
-
-[UsedImplicitly]
-public sealed class GasPressurePumpSystem : SharedGasPressurePumpSystem
+namespace Content.Server.Atmos.Piping.Binary.EntitySystems
{
- [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
- [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!;
- [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
-
- public override void Initialize()
+ [UsedImplicitly]
+ public sealed class GasPressurePumpSystem : EntitySystem
{
- base.Initialize();
+ [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
+ [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+ [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+ [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!;
+ [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+ [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
+ [Dependency] private readonly SharedPopupSystem _popup = default!;
- SubscribeLocalEvent(OnPumpUpdated);
- }
+ public override void Initialize()
+ {
+ base.Initialize();
- private void OnPumpUpdated(EntityUid uid, GasPressurePumpComponent pump, ref AtmosDeviceUpdateEvent args)
- {
- if (!pump.Enabled
- || (TryComp(uid, out var power) && !power.Powered)
- || !_nodeContainer.TryGetNodes(uid, pump.InletName, pump.OutletName, out PipeNode? inlet, out PipeNode? outlet))
+ SubscribeLocalEvent(OnInit);
+ SubscribeLocalEvent(OnPumpUpdated);
+ SubscribeLocalEvent(OnPumpLeaveAtmosphere);
+ SubscribeLocalEvent(OnExamined);
+ SubscribeLocalEvent(OnPumpActivate);
+ SubscribeLocalEvent(OnPowerChanged);
+ // Bound UI subscriptions
+ SubscribeLocalEvent(OnOutputPressureChangeMessage);
+ SubscribeLocalEvent(OnToggleStatusMessage);
+ }
+
+ private void OnInit(EntityUid uid, GasPressurePumpComponent pump, ComponentInit args)
+ {
+ UpdateAppearance(uid, pump);
+ }
+
+ private void OnExamined(EntityUid uid, GasPressurePumpComponent pump, ExaminedEvent args)
+ {
+ if (!EntityManager.GetComponent(uid).Anchored || !args.IsInDetailsRange) // Not anchored? Out of range? No status.
+ return;
+
+ if (Loc.TryGetString("gas-pressure-pump-system-examined", out var str,
+ ("statusColor", "lightblue"), // TODO: change with pressure?
+ ("pressure", pump.TargetPressure)
+ ))
+ {
+ args.PushMarkup(str);
+ }
+ }
+
+ private void OnPowerChanged(EntityUid uid, GasPressurePumpComponent component, ref PowerChangedEvent args)
+ {
+ UpdateAppearance(uid, component);
+ }
+
+ private void OnPumpUpdated(EntityUid uid, GasPressurePumpComponent pump, ref AtmosDeviceUpdateEvent args)
+ {
+ if (!pump.Enabled
+ || (TryComp(uid, out var power) && !power.Powered)
+ || !_nodeContainer.TryGetNodes(uid, pump.InletName, pump.OutletName, out PipeNode? inlet, out PipeNode? outlet))
+ {
+ _ambientSoundSystem.SetAmbience(uid, false);
+ return;
+ }
+
+ var outputStartingPressure = outlet.Air.Pressure;
+
+ if (outputStartingPressure >= pump.TargetPressure)
+ {
+ _ambientSoundSystem.SetAmbience(uid, false);
+ return; // No need to pump gas if target has been reached.
+ }
+
+ if (inlet.Air.TotalMoles > 0 && inlet.Air.Temperature > 0)
+ {
+ // We calculate the necessary moles to transfer using our good ol' friend PV=nRT.
+ var pressureDelta = pump.TargetPressure - outputStartingPressure;
+ var transferMoles = (pressureDelta * outlet.Air.Volume) / (inlet.Air.Temperature * Atmospherics.R);
+
+ var removed = inlet.Air.Remove(transferMoles);
+ _atmosphereSystem.Merge(outlet.Air, removed);
+ _ambientSoundSystem.SetAmbience(uid, removed.TotalMoles > 0f);
+ }
+ }
+
+ private void OnPumpLeaveAtmosphere(EntityUid uid, GasPressurePumpComponent pump, ref AtmosDeviceDisabledEvent args)
{
- _ambientSoundSystem.SetAmbience(uid, false);
- return;
+ pump.Enabled = false;
+ UpdateAppearance(uid, pump);
+
+ DirtyUI(uid, pump);
+ _userInterfaceSystem.CloseUi(uid, GasPressurePumpUiKey.Key);
}
- var outputStartingPressure = outlet.Air.Pressure;
+ private void OnPumpActivate(EntityUid uid, GasPressurePumpComponent pump, ActivateInWorldEvent args)
+ {
+ if (args.Handled || !args.Complex)
+ return;
+
+ if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
+ return;
- if (outputStartingPressure >= pump.TargetPressure)
+ if (Transform(uid).Anchored)
+ {
+ _userInterfaceSystem.OpenUi(uid, GasPressurePumpUiKey.Key, actor.PlayerSession);
+ DirtyUI(uid, pump);
+ }
+ else
+ {
+ _popup.PopupCursor(Loc.GetString("comp-gas-pump-ui-needs-anchor"), args.User);
+ }
+
+ args.Handled = true;
+ }
+
+ private void OnToggleStatusMessage(EntityUid uid, GasPressurePumpComponent pump, GasPressurePumpToggleStatusMessage args)
{
- _ambientSoundSystem.SetAmbience(uid, false);
- return; // No need to pump gas if target has been reached.
+ pump.Enabled = args.Enabled;
+ _adminLogger.Add(LogType.AtmosPowerChanged, LogImpact.Medium,
+ $"{ToPrettyString(args.Actor):player} set the power on {ToPrettyString(uid):device} to {args.Enabled}");
+ DirtyUI(uid, pump);
+ UpdateAppearance(uid, pump);
+ }
+
+ private void OnOutputPressureChangeMessage(EntityUid uid, GasPressurePumpComponent pump, GasPressurePumpChangeOutputPressureMessage args)
+ {
+ pump.TargetPressure = Math.Clamp(args.Pressure, 0f, Atmospherics.MaxOutputPressure);
+ _adminLogger.Add(LogType.AtmosPressureChanged, LogImpact.Medium,
+ $"{ToPrettyString(args.Actor):player} set the pressure on {ToPrettyString(uid):device} to {args.Pressure}kPa");
+ DirtyUI(uid, pump);
+
+ }
+
+ private void DirtyUI(EntityUid uid, GasPressurePumpComponent? pump)
+ {
+ if (!Resolve(uid, ref pump))
+ return;
+
+ _userInterfaceSystem.SetUiState(uid, GasPressurePumpUiKey.Key,
+ new GasPressurePumpBoundUserInterfaceState(EntityManager.GetComponent(uid).EntityName, pump.TargetPressure, pump.Enabled));
}
- if (inlet.Air.TotalMoles > 0 && inlet.Air.Temperature > 0)
+ private void UpdateAppearance(EntityUid uid, GasPressurePumpComponent? pump = null, AppearanceComponent? appearance = null)
{
- // We calculate the necessary moles to transfer using our good ol' friend PV=nRT.
- var pressureDelta = pump.TargetPressure - outputStartingPressure;
- var transferMoles = (pressureDelta * outlet.Air.Volume) / (inlet.Air.Temperature * Atmospherics.R);
+ if (!Resolve(uid, ref pump, ref appearance, false))
+ return;
- var removed = inlet.Air.Remove(transferMoles);
- _atmosphereSystem.Merge(outlet.Air, removed);
- _ambientSoundSystem.SetAmbience(uid, removed.TotalMoles > 0f);
+ bool pumpOn = pump.Enabled && (TryComp(uid, out var power) && power.Powered);
+ _appearance.SetData(uid, PumpVisuals.Enabled, pumpOn, appearance);
}
}
}
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
index f7789794096..3ebc5094926 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
@@ -6,7 +6,6 @@
using Content.Server.NodeContainer.Nodes;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Piping;
-using Content.Shared.Atmos.Piping.Components;
using Content.Shared.Audio;
using Content.Shared.Examine;
using JetBrains.Annotations;
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
index d593324b190..9ddd7dce67d 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
@@ -10,7 +10,6 @@
using Content.Server.NodeContainer.Nodes;
using Content.Server.Power.Components;
using Content.Shared.Atmos.Piping.Binary.Components;
-using Content.Shared.Atmos.Piping.Components;
using Content.Shared.Atmos.Visuals;
using Content.Shared.Audio;
using Content.Shared.Database;
diff --git a/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs b/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
index 5b55d9d3b67..b70262e857b 100644
--- a/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
+++ b/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
@@ -67,3 +67,15 @@ public readonly struct AtmosDeviceUpdateEvent(float dt, Entity
public readonly Entity? Map = map;
}
+
+///
+/// Raised directed on an atmos device when it is enabled.
+///
+[ByRefEvent]
+public record struct AtmosDeviceEnabledEvent;
+
+///
+/// Raised directed on an atmos device when it is enabled.
+///
+[ByRefEvent]
+public record struct AtmosDeviceDisabledEvent;
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
index 3feaf79eb73..f932ef36208 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
@@ -1,7 +1,6 @@
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Atmos.Piping.Components;
-using Content.Shared.Atmos.Piping.Components;
using JetBrains.Annotations;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
index c5a91895b2e..752d1e9eb83 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
@@ -7,7 +7,6 @@
using Content.Server.NodeContainer.Nodes;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Piping;
-using Content.Shared.Atmos.Piping.Components;
using Content.Shared.Atmos.Piping.Trinary.Components;
using Content.Shared.Audio;
using Content.Shared.Database;
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
index 0852051487b..178caeaa4a9 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
@@ -7,7 +7,6 @@
using Content.Server.NodeContainer.Nodes;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Piping;
-using Content.Shared.Atmos.Piping.Components;
using Content.Shared.Atmos.Piping.Trinary.Components;
using Content.Shared.Audio;
using Content.Shared.Database;
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs
index d1570b11292..1bab2abd8e9 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs
@@ -5,7 +5,6 @@
using Content.Server.NodeContainer.EntitySystems;
using Content.Server.NodeContainer.Nodes;
using Content.Shared.Atmos.Piping;
-using Content.Shared.Atmos.Piping.Components;
using Content.Shared.Audio;
using JetBrains.Annotations;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
index 23016debeb6..9d9862ff1dd 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
@@ -11,7 +11,6 @@
using Content.Server.NodeContainer.Nodes;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Monitor;
-using Content.Shared.Atmos.Piping.Components;
using Content.Shared.Atmos.Piping.Unary;
using Content.Shared.Atmos.Piping.Unary.Components;
using Content.Shared.Atmos.Visuals;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
index a633d29e41d..a35cf6c2e30 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
@@ -13,7 +13,6 @@
using Content.Shared.Atmos;
using Content.Shared.Atmos.Piping.Unary.Visuals;
using Content.Shared.Atmos.Monitor;
-using Content.Shared.Atmos.Piping.Components;
using Content.Shared.Atmos.Piping.Unary.Components;
using Content.Shared.Audio;
using Content.Shared.DeviceNetwork;
diff --git a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
index 21f43c31956..345f51783ca 100644
--- a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
+++ b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
@@ -1,6 +1,6 @@
-using System.Globalization;
using Content.Server.Chat.Managers;
using Content.Server.Chat.Systems;
+using Content.Server.GameTicking;
using Content.Server.Ghost;
using Content.Server.Hands.Systems;
using Content.Server.Inventory;
@@ -14,7 +14,6 @@
using Content.Shared.Chat;
using Content.Shared.Climbing.Systems;
using Content.Shared.Database;
-using Content.Shared.GameTicking;
using Content.Shared.Hands.Components;
using Content.Shared.Mind.Components;
using Content.Shared.StationRecords;
@@ -27,6 +26,7 @@
using Robust.Shared.Enums;
using Robust.Shared.Network;
using Robust.Shared.Player;
+using System.Globalization;
namespace Content.Server.Bed.Cryostorage;
diff --git a/Content.Server/Botany/Systems/SeedExtractorSystem.cs b/Content.Server/Botany/Systems/SeedExtractorSystem.cs
index c7e20983a7a..93f76473ff8 100644
--- a/Content.Server/Botany/Systems/SeedExtractorSystem.cs
+++ b/Content.Server/Botany/Systems/SeedExtractorSystem.cs
@@ -38,7 +38,6 @@ private void OnInteractUsing(EntityUid uid, SeedExtractorComponent seedExtractor
args.User, PopupType.Medium);
QueueDel(args.Used);
- args.Handled = true;
var amount = _random.Next(seedExtractor.BaseMinSeeds, seedExtractor.BaseMaxSeeds + 1);
var coords = Transform(uid).Coordinates;
diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs
index 5362dae964d..7e2fa60ae87 100644
--- a/Content.Server/Cargo/Systems/PricingSystem.cs
+++ b/Content.Server/Cargo/Systems/PricingSystem.cs
@@ -424,7 +424,7 @@ public record struct PriceCalculationEvent()
[ByRefEvent]
public record struct EstimatedPriceCalculationEvent()
{
- public required EntityPrototype Prototype;
+ public EntityPrototype Prototype;
///
/// The total price of the entity.
diff --git a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
index 8345aa3c3dd..9b78e81aa00 100644
--- a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
@@ -1,7 +1,6 @@
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.Hypospray.Events;
using Content.Shared.Chemistry;
using Content.Shared.Database;
using Content.Shared.FixedPoint;
@@ -86,44 +85,14 @@ public bool TryDoInject(Entity entity, EntityUid target, Ent
string? msgFormat = null;
- // Self event
- var selfEvent = new SelfBeforeHyposprayInjectsEvent(user, entity.Owner, target);
- RaiseLocalEvent(user, selfEvent);
-
- if (selfEvent.Cancelled)
- {
- _popup.PopupEntity(Loc.GetString(selfEvent.InjectMessageOverride ?? "hypospray-cant-inject", ("owner", Identity.Entity(target, EntityManager))), target, user);
- return false;
- }
-
- target = selfEvent.TargetGettingInjected;
-
- if (!EligibleEntity(target, EntityManager, component))
- return false;
-
- // Target event
- var targetEvent = new TargetBeforeHyposprayInjectsEvent(user, entity.Owner, target);
- RaiseLocalEvent(target, targetEvent);
-
- if (targetEvent.Cancelled)
+ if (target == user)
+ msgFormat = "hypospray-component-inject-self-message";
+ else if (EligibleEntity(user, EntityManager, component) && _interaction.TryRollClumsy(user, component.ClumsyFailChance))
{
- _popup.PopupEntity(Loc.GetString(targetEvent.InjectMessageOverride ?? "hypospray-cant-inject", ("owner", Identity.Entity(target, EntityManager))), target, user);
- return false;
+ msgFormat = "hypospray-component-inject-self-clumsy-message";
+ target = user;
}
- target = targetEvent.TargetGettingInjected;
-
- if (!EligibleEntity(target, EntityManager, component))
- return false;
-
- // The target event gets priority for the overriden message.
- if (targetEvent.InjectMessageOverride != null)
- msgFormat = targetEvent.InjectMessageOverride;
- else if (selfEvent.InjectMessageOverride != null)
- msgFormat = selfEvent.InjectMessageOverride;
- else if (target == user)
- msgFormat = "hypospray-component-inject-self-message";
-
if (!_solutionContainers.TryGetSolution(uid, component.SolutionName, out var hypoSpraySoln, out var hypoSpraySolution) || hypoSpraySolution.Volume == 0)
{
_popup.PopupEntity(Loc.GetString("hypospray-component-empty-message"), target, user);
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index 1fbb0c72690..f24f0143f31 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -16,7 +16,6 @@
using Content.Shared.Interaction.Components;
using Robust.Shared.Audio.Systems;
using Content.Shared.NameModifier.EntitySystems;
-using Content.Shared.Clumsy;
namespace Content.Server.Cluwne;
diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs
index 4257c436c23..07a13d8a34a 100644
--- a/Content.Server/Crayon/CrayonSystem.cs
+++ b/Content.Server/Crayon/CrayonSystem.cs
@@ -82,8 +82,6 @@ private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, Aft
if (component.DeleteEmpty && component.Charges <= 0)
UseUpCrayon(uid, args.User);
- else
- _uiSystem.ServerSendUiMessage(uid, SharedCrayonComponent.CrayonUiKey.Key, new CrayonUsedMessage(component.SelectedState));
}
private void OnCrayonUse(EntityUid uid, CrayonComponent component, UseInHandEvent args)
diff --git a/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs b/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs
index 1280ecd5d11..598d5a2725e 100644
--- a/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs
@@ -102,12 +102,10 @@ private void OnSignalReceived(EntityUid uid, LogicGateComponent comp, ref Signal
if (args.Port == comp.InputPortA)
{
comp.StateA = state;
- _appearance.SetData(uid, LogicGateVisuals.InputA, state == SignalState.High); //If A == High => Sets input A sprite to True
}
else if (args.Port == comp.InputPortB)
{
comp.StateB = state;
- _appearance.SetData(uid, LogicGateVisuals.InputB, state == SignalState.High); //If B == High => Sets input B sprite to True
}
UpdateOutput(uid, comp);
@@ -145,8 +143,6 @@ private void UpdateOutput(EntityUid uid, LogicGateComponent comp)
break;
}
- _appearance.SetData(uid, LogicGateVisuals.Output, output);
-
// only send a payload if it actually changed
if (output != comp.LastOutput)
{
diff --git a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
index efaf5680947..0dc4f45d9e0 100644
--- a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
@@ -18,7 +18,7 @@
using Robust.Server.Audio;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
-using Robust.Shared.Map.Events;
+using Robust.Shared.Player;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
@@ -66,42 +66,6 @@ public override void Initialize()
SubscribeLocalEvent(OnUiRangeCheck);
SubscribeLocalEvent(OnComponentRemoved);
-
- SubscribeLocalEvent(OnMapSave);
- }
-
- private void OnMapSave(BeforeSaveEvent ev)
- {
- var enumerator = AllEntityQuery();
- while (enumerator.MoveNext(out var uid, out var conf))
- {
- if (CompOrNull(conf.ActiveDeviceList)?.MapUid != ev.Map)
- continue;
-
- // The linked device list is (probably) being saved. Make sure that the configurator is also being saved
- // (i.e., not in the hands of a mapper/ghost). In the future, map saving should raise a separate event
- // containing a set of all entities that are about to be saved, which would make checking this much easier.
- // This is a shitty bandaid, and will force close the UI during auto-saves.
- // TODO Map serialization refactor
-
- var xform = Transform(uid);
- if (xform.MapUid == ev.Map && IsSaveable(uid))
- continue;
-
- _uiSystem.CloseUi(uid, NetworkConfiguratorUiKey.Configure);
- DebugTools.AssertNull(conf.ActiveDeviceList);
- }
-
- bool IsSaveable(EntityUid uid)
- {
- while (uid.IsValid())
- {
- if (Prototype(uid)?.MapSavable == false)
- return false;
- uid = Transform(uid).ParentUid;
- }
- return true;
- }
}
private void OnUiRangeCheck(Entity ent, ref BoundUserInterfaceCheckRangeEvent args)
@@ -521,9 +485,6 @@ private void OpenDeviceListUi(EntityUid configuratorUid, EntityUid? targetUid, E
if (!TryComp(targetUid, out DeviceListComponent? list))
return;
- if (TryComp(configurator.ActiveDeviceList, out DeviceListComponent? oldList))
- oldList.Configurators.Remove(configuratorUid);
-
list.Configurators.Add(configuratorUid);
configurator.ActiveDeviceList = targetUid;
Dirty(configuratorUid, configurator);
@@ -797,7 +758,7 @@ private void OnConfigButtonPressed(EntityUid uid, NetworkConfiguratorComponent c
{
if (query.TryGetComponent(device, out var comp))
{
- component.Devices.Add(addr, device);
+ component.Devices[addr] = device;
comp.Configurators.Add(uid);
}
}
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index efac049b354..42610a03237 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -28,7 +28,6 @@ public sealed partial class DragonSystem : EntitySystem
[Dependency] private readonly SharedActionsSystem _actions = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
- [Dependency] private readonly SharedMapSystem _map = default!;
[Dependency] private readonly MobStateSystem _mobState = default!;
private EntityQuery _objQuery;
@@ -157,7 +156,7 @@ private void OnSpawnRift(EntityUid uid, DragonComponent component, DragonSpawnRi
}
// cant put a rift on solars
- foreach (var tile in _map.GetTilesIntersecting(xform.GridUid.Value, grid, new Circle(_transform.GetWorldPosition(xform), RiftTileRadius), false))
+ foreach (var tile in grid.GetTilesIntersecting(new Circle(_transform.GetWorldPosition(xform), RiftTileRadius), false))
{
if (!tile.IsSpace(_tileDef))
continue;
diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs
index eb10f8d2809..88404c4aa96 100644
--- a/Content.Server/Electrocution/ElectrocutionSystem.cs
+++ b/Content.Server/Electrocution/ElectrocutionSystem.cs
@@ -121,7 +121,7 @@ private void UpdateState(float frameTime)
activated.TimeLeft -= frameTime;
if (activated.TimeLeft <= 0 || !IsPowered(uid, electrified, transform))
{
- _appearance.SetData(uid, ElectrifiedVisuals.ShowSparks, false);
+ _appearance.SetData(uid, ElectrifiedVisuals.IsPowered, false);
RemComp(uid);
}
}
@@ -217,7 +217,7 @@ public bool TryDoElectrifiedAct(EntityUid uid, EntityUid targetUid,
return false;
EnsureComp(uid);
- _appearance.SetData(uid, ElectrifiedVisuals.ShowSparks, true);
+ _appearance.SetData(uid, ElectrifiedVisuals.IsPowered, true);
siemens *= electrified.SiemensCoefficient;
if (!DoCommonElectrocutionAttempt(targetUid, uid, ref siemens) || siemens <= 0)
@@ -488,4 +488,15 @@ private void PlayElectrocutionSound(EntityUid targetUid, EntityUid sourceUid, El
}
_audio.PlayPvs(electrified.ShockNoises, targetUid, AudioParams.Default.WithVolume(electrified.ShockVolume));
}
+
+ public void SetElectrifiedWireCut(Entity ent, bool value)
+ {
+ if (ent.Comp.IsWireCut == value)
+ {
+ return;
+ }
+
+ ent.Comp.IsWireCut = value;
+ Dirty(ent);
+ }
}
diff --git a/Content.Server/DeltaV/Execution/ExecutionSystem.cs b/Content.Server/Execution/ExecutionSystem.cs
similarity index 91%
rename from Content.Server/DeltaV/Execution/ExecutionSystem.cs
rename to Content.Server/Execution/ExecutionSystem.cs
index 5de3332494b..25491127b1d 100644
--- a/Content.Server/DeltaV/Execution/ExecutionSystem.cs
+++ b/Content.Server/Execution/ExecutionSystem.cs
@@ -2,7 +2,6 @@
using Content.Server.Kitchen.Components;
using Content.Server.Weapons.Ranged.Systems;
using Content.Shared.ActionBlocker;
-using Content.Shared.Clumsy;
using Content.Shared.Damage;
using Content.Shared.Database;
using Content.Shared.DoAfter;
@@ -21,16 +20,12 @@
using Robust.Shared.Audio.Systems;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
namespace Content.Server.Execution;
///
-/// Verb for violently murdering cuffed creatures using guns.
+/// Verb for violently murdering cuffed creatures.
///
-///
-/// Upstream won't have this for years so it goes in the DeltaV folder.
-///
public sealed class ExecutionSystem : EntitySystem
{
[Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
@@ -40,7 +35,6 @@ public sealed class ExecutionSystem : EntitySystem
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
- [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IComponentFactory _componentFactory = default!;
[Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
@@ -262,17 +256,18 @@ private void OnDoafterGun(EntityUid uid, GunComponent component, DoAfterEvent ar
}
// Clumsy people have a chance to shoot themselves
- if (!component.ClumsyProof &&
- TryComp(attacker, out var clumsy) &&
- _random.Prob(1f/3f))
+ if (TryComp(attacker, out var clumsy) && component.ClumsyProof == false)
{
- ShowExecutionPopup("execution-popup-gun-clumsy-internal", Filter.Entities(attacker), PopupType.Medium, attacker, victim, weapon);
- ShowExecutionPopup("execution-popup-gun-clumsy-external", Filter.PvsExcept(attacker), PopupType.MediumCaution, attacker, victim, weapon);
+ if (_interactionSystem.TryRollClumsy(attacker, 0.33333333f, clumsy))
+ {
+ ShowExecutionPopup("execution-popup-gun-clumsy-internal", Filter.Entities(attacker), PopupType.Medium, attacker, victim, weapon);
+ ShowExecutionPopup("execution-popup-gun-clumsy-external", Filter.PvsExcept(attacker), PopupType.MediumCaution, attacker, victim, weapon);
- // You shoot yourself with the gun (no damage multiplier)
- _damageableSystem.TryChangeDamage(attacker, damage, origin: attacker);
- _audioSystem.PlayEntity(component.SoundGunshot, Filter.Pvs(weapon), weapon, true, AudioParams.Default);
- return;
+ // You shoot yourself with the gun (no damage multiplier)
+ _damageableSystem.TryChangeDamage(attacker, damage, origin: attacker);
+ _audioSystem.PlayEntity(component.SoundGunshot, Filter.Pvs(weapon), weapon, true, AudioParams.Default);
+ return;
+ }
}
// Gun successfully fired, deal damage
diff --git a/Content.Server/Fluids/EntitySystems/DrainSystem.cs b/Content.Server/Fluids/EntitySystems/DrainSystem.cs
index 215c58804e3..69d15b8d008 100644
--- a/Content.Server/Fluids/EntitySystems/DrainSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/DrainSystem.cs
@@ -134,6 +134,13 @@ public override void Update(float frameTime)
}
drain.Accumulator -= drain.DrainFrequency;
+ // Disable ambient sound from emptying manually
+ if (!drain.AutoDrain)
+ {
+ _ambientSoundSystem.SetAmbience(uid, false);
+ continue;
+ }
+
if (!managerQuery.TryGetComponent(uid, out var manager))
continue;
@@ -153,44 +160,41 @@ public override void Update(float frameTime)
// This will ensure that UnitsPerSecond is per second...
var amount = drain.UnitsPerSecond * drain.DrainFrequency;
- if (drain.AutoDrain)
+ _puddles.Clear();
+ _lookup.GetEntitiesInRange(Transform(uid).Coordinates, drain.Range, _puddles);
+
+ if (_puddles.Count == 0)
{
- _puddles.Clear();
- _lookup.GetEntitiesInRange(Transform(uid).Coordinates, drain.Range, _puddles);
+ _ambientSoundSystem.SetAmbience(uid, false);
+ continue;
+ }
- if (_puddles.Count == 0)
+ _ambientSoundSystem.SetAmbience(uid, true);
+
+ amount /= _puddles.Count;
+
+ foreach (var puddle in _puddles)
+ {
+ // Queue the solution deletion if it's empty. EvaporationSystem might also do this
+ // but queuedelete should be pretty safe.
+ if (!_solutionContainerSystem.ResolveSolution(puddle.Owner, puddle.Comp.SolutionName, ref puddle.Comp.Solution, out var puddleSolution))
{
- _ambientSoundSystem.SetAmbience(uid, false);
+ EntityManager.QueueDeleteEntity(puddle);
continue;
}
- _ambientSoundSystem.SetAmbience(uid, true);
+ // Removes the lowest of:
+ // the drain component's units per second adjusted for # of puddles
+ // the puddle's remaining volume (making it cleanly zero)
+ // the drain's remaining volume in its buffer.
+ var transferSolution = _solutionContainerSystem.SplitSolution(puddle.Comp.Solution.Value,
+ FixedPoint2.Min(FixedPoint2.New(amount), puddleSolution.Volume, drainSolution.AvailableVolume));
- amount /= _puddles.Count;
+ drainSolution.AddSolution(transferSolution, _prototypeManager);
- foreach (var puddle in _puddles)
+ if (puddleSolution.Volume <= 0)
{
- // Queue the solution deletion if it's empty. EvaporationSystem might also do this
- // but queuedelete should be pretty safe.
- if (!_solutionContainerSystem.ResolveSolution(puddle.Owner, puddle.Comp.SolutionName, ref puddle.Comp.Solution, out var puddleSolution))
- {
- EntityManager.QueueDeleteEntity(puddle);
- continue;
- }
-
- // Removes the lowest of:
- // the drain component's units per second adjusted for # of puddles
- // the puddle's remaining volume (making it cleanly zero)
- // the drain's remaining volume in its buffer.
- var transferSolution = _solutionContainerSystem.SplitSolution(puddle.Comp.Solution.Value,
- FixedPoint2.Min(FixedPoint2.New(amount), puddleSolution.Volume, drainSolution.AvailableVolume));
-
- drainSolution.AddSolution(transferSolution, _prototypeManager);
-
- if (puddleSolution.Volume <= 0)
- {
- QueueDel(puddle);
- }
+ QueueDel(puddle);
}
}
diff --git a/Content.Server/GameTicking/GameTicker.Lobby.cs b/Content.Server/GameTicking/GameTicker.Lobby.cs
index 9a9eb61b673..61d9fd99cae 100644
--- a/Content.Server/GameTicking/GameTicker.Lobby.cs
+++ b/Content.Server/GameTicking/GameTicker.Lobby.cs
@@ -184,6 +184,6 @@ public bool UserHasJoinedGame(ICommonSession session)
=> UserHasJoinedGame(session.UserId);
public bool UserHasJoinedGame(NetUserId userId)
- => PlayerGameStatuses.TryGetValue(userId, out var status) && status == PlayerGameStatus.JoinedGame;
+ => PlayerGameStatuses[userId] == PlayerGameStatus.JoinedGame;
}
}
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index bbcb4eeafe9..8bec89747d9 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -7,12 +7,12 @@
using Content.Server.Speech.Components;
using Content.Server.Station.Components;
using Content.Shared.Database;
-using Content.Shared.GameTicking;
using Content.Shared.Mind;
using Content.Shared.Players;
using Content.Shared.Preferences;
using Content.Shared.Roles;
using Content.Shared.Roles.Jobs;
+using JetBrains.Annotations;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Network;
@@ -463,4 +463,71 @@ public EntityCoordinates GetObserverSpawnPoint()
#endregion
}
+
+ ///
+ /// Event raised broadcast before a player is spawned by the GameTicker.
+ /// You can use this event to spawn a player off-station on late-join but also at round start.
+ /// When this event is handled, the GameTicker will not perform its own player-spawning logic.
+ ///
+ [PublicAPI]
+ public sealed class PlayerBeforeSpawnEvent : HandledEntityEventArgs
+ {
+ public ICommonSession Player { get; }
+ public HumanoidCharacterProfile Profile { get; }
+ public string? JobId { get; }
+ public bool LateJoin { get; }
+ public EntityUid Station { get; }
+
+ public PlayerBeforeSpawnEvent(ICommonSession player,
+ HumanoidCharacterProfile profile,
+ string? jobId,
+ bool lateJoin,
+ EntityUid station)
+ {
+ Player = player;
+ Profile = profile;
+ JobId = jobId;
+ LateJoin = lateJoin;
+ Station = station;
+ }
+ }
+
+ ///
+ /// Event raised both directed and broadcast when a player has been spawned by the GameTicker.
+ /// You can use this to handle people late-joining, or to handle people being spawned at round start.
+ /// Can be used to give random players a role, modify their equipment, etc.
+ ///
+ [PublicAPI]
+ public sealed class PlayerSpawnCompleteEvent : EntityEventArgs
+ {
+ public EntityUid Mob { get; }
+ public ICommonSession Player { get; }
+ public string? JobId { get; }
+ public bool LateJoin { get; }
+ public bool Silent { get; }
+ public EntityUid Station { get; }
+ public HumanoidCharacterProfile Profile { get; }
+
+ // Ex. If this is the 27th person to join, this will be 27.
+ public int JoinOrder { get; }
+
+ public PlayerSpawnCompleteEvent(EntityUid mob,
+ ICommonSession player,
+ string? jobId,
+ bool lateJoin,
+ bool silent,
+ int joinOrder,
+ EntityUid station,
+ HumanoidCharacterProfile profile)
+ {
+ Mob = mob;
+ Player = player;
+ JobId = jobId;
+ LateJoin = lateJoin;
+ Silent = silent;
+ Station = station;
+ Profile = profile;
+ JoinOrder = joinOrder;
+ }
+ }
}
diff --git a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
index 2e97a72f3b5..557e44f0952 100644
--- a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
@@ -6,7 +6,6 @@
using Content.Server.Points;
using Content.Server.RoundEnd;
using Content.Server.Station.Systems;
-using Content.Shared.GameTicking;
using Content.Shared.GameTicking.Components;
using Content.Shared.Points;
using Content.Shared.Storage;
diff --git a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
index f18115d3cf6..d2686ecdcdd 100644
--- a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
@@ -1,14 +1,14 @@
using Content.Server.GameTicking.Rules.Components;
using Content.Server.GridPreloader;
-using Content.Server.StationEvents.Events;
using Content.Shared.GameTicking.Components;
using Robust.Server.GameObjects;
using Robust.Server.Maps;
+using Robust.Shared.Map;
using Robust.Shared.Prototypes;
namespace Content.Server.GameTicking.Rules;
-public sealed class LoadMapRuleSystem : StationEventSystem
+public sealed class LoadMapRuleSystem : GameRuleSystem
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly MapSystem _map = default!;
@@ -75,7 +75,5 @@ protected override void Added(EntityUid uid, LoadMapRuleComponent comp, GameRule
var ev = new RuleLoadedGridsEvent(mapId, grids);
RaiseLocalEvent(uid, ref ev);
-
- base.Added(uid, comp, rule, args);
}
}
diff --git a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
index 666d1045174..7dcd42e06fa 100644
--- a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
+++ b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
@@ -34,11 +34,10 @@ public sealed class GatewayGeneratorSystem : EntitySystem
[Dependency] private readonly GatewaySystem _gateway = default!;
[Dependency] private readonly MetaDataSystem _metadata = default!;
[Dependency] private readonly SharedMapSystem _maps = default!;
- [Dependency] private readonly SharedSalvageSystem _salvage = default!;
[Dependency] private readonly TileSystem _tile = default!;
- [ValidatePrototypeId]
- private const string PlanetNames = "NamesBorer";
+ [ValidatePrototypeId]
+ private const string PlanetNames = "names_borer";
// TODO:
// Fix shader some more
@@ -103,7 +102,7 @@ private void GenerateDestination(EntityUid uid, GatewayGeneratorComponent? gener
var mapId = _mapManager.CreateMap();
var mapUid = _mapManager.GetMapEntityId(mapId);
- var gatewayName = _salvage.GetFTLName(_protoManager.Index(PlanetNames), seed);
+ var gatewayName = SharedSalvageSystem.GetFTLName(_protoManager.Index(PlanetNames), seed);
_metadata.SetEntityName(mapUid, gatewayName);
var origin = new Vector2i(random.Next(-MaxOffset, MaxOffset), random.Next(-MaxOffset, MaxOffset));
diff --git a/Content.Server/Ghost/GhostCommand.cs b/Content.Server/Ghost/GhostCommand.cs
index 26163f6d4d9..a2f361d29db 100644
--- a/Content.Server/Ghost/GhostCommand.cs
+++ b/Content.Server/Ghost/GhostCommand.cs
@@ -1,9 +1,7 @@
using Content.Server.Popups;
using Content.Shared.Administration;
-using Content.Shared.GameTicking;
using Content.Shared.Mind;
using Robust.Shared.Console;
-using Content.Server.GameTicking;
namespace Content.Server.Ghost
{
@@ -25,14 +23,6 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
return;
}
- var gameTicker = _entities.System();
- if (!gameTicker.PlayerGameStatuses.TryGetValue(player.UserId, out var playerStatus) ||
- playerStatus is not PlayerGameStatus.JoinedGame)
- {
- shell.WriteLine("ghost-command-error-lobby");
- return;
- }
-
if (player.AttachedEntity is { Valid: true } frozen &&
_entities.HasComponent(frozen))
{
diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index 77cf813b56b..2f4269a05d0 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -1,5 +1,3 @@
-using System.Linq;
-using System.Numerics;
using Content.Server.Administration.Logs;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking;
@@ -34,13 +32,14 @@
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
+using System.Linq;
+using System.Numerics;
namespace Content.Server.Ghost
{
public sealed class GhostSystem : SharedGhostSystem
{
[Dependency] private readonly SharedActionsSystem _actions = default!;
- [Dependency] private readonly IAdminLogManager _adminLog = default!;
[Dependency] private readonly SharedEyeSystem _eye = default!;
[Dependency] private readonly FollowerSystem _followerSystem = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
@@ -324,8 +323,6 @@ private void OnGhostnadoRequest(GhostnadoRequestEvent msg, EntitySessionEventArg
private void WarpTo(EntityUid uid, EntityUid target)
{
- _adminLog.Add(LogType.GhostWarp, $"{ToPrettyString(uid)} ghost warped to {ToPrettyString(target)}");
-
if ((TryComp(target, out WarpPointComponent? warp) && warp.Follow) || HasComp(target))
{
_followerSystem.StartFollowingEntity(uid, target);
diff --git a/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs b/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs
index 5827ab802f6..5f5eabdad40 100644
--- a/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs
+++ b/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
using Content.Server.Administration;
using Content.Server.Ghost.Roles.Components;
using Content.Server.Ghost.Roles.Raffles;
@@ -77,13 +77,13 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
if (isProto)
{
- if (!_protoManager.TryIndex(args[3], out var proto))
+ if (!_protoManager.TryIndex(args[4], out var proto))
{
var validProtos = string.Join(", ",
_protoManager.EnumeratePrototypes().Select(p => p.ID)
);
- shell.WriteLine($"{args[3]} is not a valid raffle settings prototype. Valid options: {validProtos}");
+ shell.WriteLine($"{args[4]} is not a valid raffle settings prototype. Valid options: {validProtos}");
return;
}
diff --git a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs
index 0816c2c36ce..4603f45ed81 100644
--- a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs
+++ b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs
@@ -60,6 +60,7 @@ private void OnUseInHand(EntityUid uid, RandomGiftComponent component, UseInHand
var coords = Transform(args.User).Coordinates;
var handsEnt = Spawn(component.SelectedEntity, coords);
_adminLogger.Add(LogType.EntitySpawn, LogImpact.Low, $"{ToPrettyString(args.User)} used {ToPrettyString(uid)} which spawned {ToPrettyString(handsEnt)}");
+ EnsureComp(handsEnt); // For insane mode.
if (component.Wrapper is not null)
Spawn(component.Wrapper, coords);
diff --git a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
index a1977d5a463..a5a41bcc105 100644
--- a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
@@ -9,6 +9,7 @@
using Content.Shared.Light.Components;
using Content.Shared.Rounding;
using Content.Shared.Toggleable;
+using Content.Shared.Verbs;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
@@ -45,6 +46,7 @@ public override void Initialize()
SubscribeLocalEvent(OnShutdown);
SubscribeLocalEvent(OnExamine);
+ SubscribeLocalEvent>(AddToggleLightVerb);
SubscribeLocalEvent(OnActivate);
@@ -177,7 +179,25 @@ public override void Update(float frameTime)
}
}
- public override bool TurnOff(Entity ent, bool makeNoise = true)
+ private void AddToggleLightVerb(Entity ent, ref GetVerbsEvent args)
+ {
+ if (!args.CanAccess || !args.CanInteract || !ent.Comp.ToggleOnInteract)
+ return;
+
+ var @event = args;
+ ActivationVerb verb = new()
+ {
+ Text = Loc.GetString("verb-common-toggle-light"),
+ Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/light.svg.192dpi.png")),
+ Act = ent.Comp.Activated
+ ? () => TurnOff(ent)
+ : () => TurnOn(@event.User, ent)
+ };
+
+ args.Verbs.Add(verb);
+ }
+
+ public bool TurnOff(Entity ent, bool makeNoise = true)
{
if (!ent.Comp.Activated || !_lights.TryGetLight(ent, out var pointLightComponent))
{
@@ -191,7 +211,7 @@ public override bool TurnOff(Entity ent, bool makeNoise
return true;
}
- public override bool TurnOn(EntityUid user, Entity uid)
+ public bool TurnOn(EntityUid user, Entity uid)
{
var component = uid.Comp;
if (component.Activated || !_lights.TryGetLight(uid, out var pointLightComponent))
diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs
index fa0ea26385d..c9cb6cc58dc 100644
--- a/Content.Server/Medical/DefibrillatorSystem.cs
+++ b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -77,20 +77,7 @@ private void OnDoAfter(EntityUid uid, DefibrillatorComponent component, Defibril
Zap(uid, target, args.User, component);
}
- ///
- /// Checks if you can actually defib a target.
- ///
- /// Uid of the defib
- /// Uid of the target getting defibbed
- /// Uid of the entity using the defibrillator
- /// Defib component
- ///
- /// If true, the target can be alive. If false, the function will check if the target is alive and will return false if they are.
- ///
- ///
- /// Returns true if the target is valid to be defibed, false otherwise.
- ///
- public bool CanZap(EntityUid uid, EntityUid target, EntityUid? user = null, DefibrillatorComponent? component = null, bool targetCanBeAlive = false)
+ public bool CanZap(EntityUid uid, EntityUid target, EntityUid? user = null, DefibrillatorComponent? component = null)
{
if (!Resolve(uid, ref component))
return false;
@@ -111,25 +98,15 @@ public bool CanZap(EntityUid uid, EntityUid target, EntityUid? user = null, Defi
if (!_powerCell.HasActivatableCharge(uid, user: user))
return false;
- if (!targetCanBeAlive && _mobState.IsAlive(target, mobState))
+ if (_mobState.IsAlive(target, mobState))
return false;
- if (!targetCanBeAlive && !component.CanDefibCrit && _mobState.IsCritical(target, mobState))
+ if (!component.CanDefibCrit && _mobState.IsCritical(target, mobState))
return false;
return true;
}
- ///
- /// Tries to start defibrillating the target. If the target is valid, will start the defib do-after.
- ///
- /// Uid of the defib
- /// Uid of the target getting defibbed
- /// Uid of the entity using the defibrillator
- /// Defib component
- ///
- /// Returns true if the defibrillation do-after started, otherwise false.
- ///
public bool TryStartZap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorComponent? component = null)
{
if (!Resolve(uid, ref component))
@@ -141,42 +118,25 @@ public bool TryStartZap(EntityUid uid, EntityUid target, EntityUid user, Defibri
_audio.PlayPvs(component.ChargeSound, uid);
return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.DoAfterDuration, new DefibrillatorZapDoAfterEvent(),
uid, target, uid)
- {
- NeedHand = true,
- BreakOnMove = !component.AllowDoAfterMovement
- });
+ {
+ NeedHand = true,
+ BreakOnMove = !component.AllowDoAfterMovement
+ });
}
- ///
- /// Tries to defibrillate the target with the given defibrillator.
- ///
- public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorComponent? component = null)
+ public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorComponent? component = null, MobStateComponent? mob = null, MobThresholdsComponent? thresholds = null)
{
- if (!Resolve(uid, ref component))
- return;
-
- if (!_powerCell.TryUseActivatableCharge(uid, user: user))
+ if (!Resolve(uid, ref component) || !Resolve(target, ref mob, ref thresholds, false))
return;
- var selfEvent = new SelfBeforeDefibrillatorZapsEvent(user, uid, target);
- RaiseLocalEvent(user, selfEvent);
-
- target = selfEvent.DefibTarget;
-
- // Ensure thet new target is still valid.
- if (selfEvent.Cancelled || !CanZap(uid, target, user, component, true))
- return;
-
- var targetEvent = new TargetBeforeDefibrillatorZapsEvent(user, uid, target);
- RaiseLocalEvent(target, targetEvent);
-
- target = targetEvent.DefibTarget;
-
- if (targetEvent.Cancelled || !CanZap(uid, target, user, component, true))
+ // clowns zap themselves
+ if (HasComp(user) && user != target)
+ {
+ Zap(uid, user, user, component);
return;
+ }
- if (!TryComp(target, out var mob) ||
- !TryComp(target, out var thresholds))
+ if (!_powerCell.TryUseActivatableCharge(uid, user: user))
return;
_audio.PlayPvs(component.ZapSound, uid);
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index 51974d7036c..f56b16432e1 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -4,6 +4,7 @@
using Content.Server.DeviceNetwork.Components;
using Content.Server.DeviceNetwork.Systems;
using Content.Server.Emp;
+using Content.Server.GameTicking;
using Content.Server.Medical.CrewMonitoring;
using Content.Server.Popups;
using Content.Server.Station.Systems;
@@ -13,10 +14,8 @@
using Content.Shared.DeviceNetwork;
using Content.Shared.DoAfter;
using Content.Shared.Examine;
-using Content.Shared.GameTicking;
using Content.Shared.Interaction;
using Content.Shared.Medical.SuitSensor;
-using Content.Shared.Mobs;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
using Content.Shared.Verbs;
@@ -384,7 +383,7 @@ public void SetSensor(Entity sensors, SuitSensorMode mode,
// Get mob total damage crit threshold
int? totalDamageThreshold = null;
- if (_mobThresholdSystem.TryGetThresholdForState(sensor.User.Value, MobState.Critical, out var critThreshold))
+ if (_mobThresholdSystem.TryGetThresholdForState(sensor.User.Value, Shared.Mobs.MobState.Critical, out var critThreshold))
totalDamageThreshold = critThreshold.Value.Int();
// finally, form suit sensor status
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Breadth.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Breadth.cs
index 1504894b4a8..ee8eaa9ad1a 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Breadth.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Breadth.cs
@@ -11,8 +11,8 @@ public sealed partial class PathfindingSystem
///
public record struct BreadthPathArgs()
{
- public required Vector2i Start;
- public required List Ends;
+ public Vector2i Start;
+ public List Ends;
public bool Diagonals = false;
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Splines.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Splines.cs
index 91c42e651c1..9979755f995 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Splines.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Splines.cs
@@ -19,7 +19,7 @@ public record struct SplinePathResult()
public List Points = new();
public List Path = new();
- public Dictionary? CameFrom;
+ public Dictionary CameFrom;
}
public record struct SplinePathArgs(SimplePathArgs Args)
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Widen.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Widen.cs
index 11ac93876ef..f7bcd019f5f 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Widen.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Widen.cs
@@ -84,6 +84,6 @@ public record struct WidenArgs()
public float MaxWiden = 7f;
- public required List Path;
+ public List Path;
}
}
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index ffeb852e8b5..38c1070a8ab 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -40,7 +40,6 @@ public sealed class NukeSystem : EntitySystem
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
- [Dependency] private readonly SharedMapSystem _map = default!;
[Dependency] private readonly StationSystem _station = default!;
[Dependency] private readonly UserInterfaceSystem _ui = default!;
[Dependency] private readonly AppearanceSystem _appearance = default!;
@@ -191,7 +190,7 @@ private async void OnAnchorButtonPressed(EntityUid uid, NukeComponent component,
var worldPos = _transform.GetWorldPosition(xform);
- foreach (var tile in _map.GetTilesIntersecting(xform.GridUid.Value, grid, new Circle(worldPos, component.RequiredFloorRadius), false))
+ foreach (var tile in grid.GetTilesIntersecting(new Circle(worldPos, component.RequiredFloorRadius), false))
{
if (!tile.IsSpace(_tileDefManager))
continue;
diff --git a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
index 766c38d561b..1f3d5afb433 100644
--- a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
@@ -44,7 +44,7 @@ private void OnAfterInteract(Entity entity, ref AfterInteractE
public (bool Success, bool Handled) TryUseUtensil(EntityUid user, EntityUid target, Entity utensil)
{
if (!EntityManager.TryGetComponent(target, out FoodComponent? food))
- return (false, false);
+ return (false, true);
//Prevents food usage with a wrong utensil
if ((food.Utensil & utensil.Comp.Types) == 0)
diff --git a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
index 61e28bc9bcc..80a3b405a84 100644
--- a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
+++ b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
@@ -65,7 +65,7 @@ private void AssignRandomTarget(EntityUid uid, ObjectiveAssignedEvent args, Pred
return;
// Get all alive humans, filter out any with TargetObjectiveImmuneComponent
- var allHumans = _mind.GetAliveHumans(args.MindId)
+ var allHumans = _mind.GetAliveHumansExcept(args.MindId)
.Where(mindId =>
{
if (!TryComp(mindId, out var mindComp) || mindComp.OwnedEntity == null)
diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index d0605e916e7..f927e717a9d 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -314,9 +314,6 @@ private void HandleShuttleMovement(float frameTime)
var linearInput = Vector2.Zero;
var brakeInput = 0f;
var angularInput = 0f;
- var linearCount = 0;
- var brakeCount = 0;
- var angularCount = 0;
foreach (var (pilotUid, pilot, _, consoleXform) in pilots)
{
@@ -325,27 +322,24 @@ private void HandleShuttleMovement(float frameTime)
if (brakes > 0f)
{
brakeInput += brakes;
- brakeCount++;
}
if (strafe.Length() > 0f)
{
var offsetRotation = consoleXform.LocalRotation;
linearInput += offsetRotation.RotateVec(strafe);
- linearCount++;
}
if (rotation != 0f)
{
angularInput += rotation;
- angularCount++;
}
}
- // Don't slow down the shuttle if there's someone just looking at the console
- linearInput /= Math.Max(1, linearCount);
- angularInput /= Math.Max(1, angularCount);
- brakeInput /= Math.Max(1, brakeCount);
+ var count = pilots.Count;
+ linearInput /= count;
+ angularInput /= count;
+ brakeInput /= count;
// Handle shuttle movement
if (brakeInput > 0f)
diff --git a/Content.Server/Power/Components/CableComponent.cs b/Content.Server/Power/Components/CableComponent.cs
index 63899735b58..7398bc0616e 100644
--- a/Content.Server/Power/Components/CableComponent.cs
+++ b/Content.Server/Power/Components/CableComponent.cs
@@ -18,11 +18,8 @@ public sealed partial class CableComponent : Component
[DataField]
public EntProtoId CableDroppedOnCutPrototype = "CableHVStack1";
- ///
- /// The tool quality needed to cut the cable. Setting to null prevents cutting.
- ///
[DataField]
- public ProtoId? CuttingQuality = SharedToolSystem.CutQuality;
+ public ProtoId CuttingQuality = SharedToolSystem.CutQuality;
///
/// Checked by to determine if there is
diff --git a/Content.Server/Power/EntitySystems/CableSystem.cs b/Content.Server/Power/EntitySystems/CableSystem.cs
index db44323007a..d0f45b54fcf 100644
--- a/Content.Server/Power/EntitySystems/CableSystem.cs
+++ b/Content.Server/Power/EntitySystems/CableSystem.cs
@@ -35,10 +35,7 @@ private void OnInteractUsing(EntityUid uid, CableComponent cable, InteractUsingE
if (args.Handled)
return;
- if (cable.CuttingQuality != null)
- {
- args.Handled = _toolSystem.UseTool(args.Used, args.User, uid, cable.CuttingDelay, cable.CuttingQuality, new CableCuttingFinishedEvent());
- }
+ args.Handled = _toolSystem.UseTool(args.Used, args.User, uid, cable.CuttingDelay, cable.CuttingQuality, new CableCuttingFinishedEvent());
}
private void OnCableCut(EntityUid uid, CableComponent cable, DoAfterEvent args)
diff --git a/Content.Server/Power/PowerWireAction.cs b/Content.Server/Power/PowerWireAction.cs
index 9e4e6a6086d..cebb7de8ec8 100644
--- a/Content.Server/Power/PowerWireAction.cs
+++ b/Content.Server/Power/PowerWireAction.cs
@@ -17,7 +17,7 @@ public sealed partial class PowerWireAction : BaseWireAction
[DataField("pulseTimeout")]
private int _pulseTimeout = 30;
- private ElectrocutionSystem _electrocution = default!;
+ private ElectrocutionSystem _electrocutionSystem = default!;
public override object StatusKey { get; } = PowerWireActionKey.Status;
@@ -105,8 +105,8 @@ private void SetElectrified(EntityUid used, bool setting, ElectrifiedComponent?
&& !EntityManager.TryGetComponent(used, out electrified))
return;
- _electrocution.SetElectrifiedWireCut((used, electrified), setting);
- _electrocution.SetElectrified((used, electrified), setting);
+ _electrocutionSystem.SetElectrifiedWireCut((used, electrified), setting);
+ electrified.Enabled = setting;
}
/// false if failed, true otherwise, or if the entity cannot be electrified
@@ -120,7 +120,7 @@ private bool TrySetElectrocution(EntityUid user, Wire wire, bool timed = false)
// always set this to true
SetElectrified(wire.Owner, true, electrified);
- var electrifiedAttempt = _electrocution.TryDoElectrifiedAct(wire.Owner, user);
+ var electrifiedAttempt = _electrocutionSystem.TryDoElectrifiedAct(wire.Owner, user);
// if we were electrified, then return false
return !electrifiedAttempt;
@@ -161,7 +161,7 @@ public override void Initialize()
{
base.Initialize();
- _electrocution = EntityManager.System();
+ _electrocutionSystem = EntityManager.System();
}
// This should add a wire into the entity's state, whether it be
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs
index 9e5f3bdcfc1..65f6d2d14f9 100644
--- a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs
@@ -1,6 +1,5 @@
using System.Threading.Tasks;
using Content.Server.Parallax;
-using Content.Shared.Maps;
using Content.Shared.Parallax.Biomes;
using Content.Shared.Procedural;
using Content.Shared.Procedural.PostGeneration;
@@ -16,35 +15,27 @@ public sealed partial class DungeonJob
///
private async Task PostGen(BiomeDunGen dunGen, DungeonData data, Dungeon dungeon, HashSet reservedTiles, Random random)
{
- if (!_prototype.TryIndex(dunGen.BiomeTemplate, out var indexedBiome))
+ if (_entManager.TryGetComponent(_gridUid, out BiomeComponent? biomeComp))
return;
+ biomeComp = _entManager.AddComponent(_gridUid);
var biomeSystem = _entManager.System();
-
+ biomeSystem.SetTemplate(_gridUid, biomeComp, _prototype.Index(dunGen.BiomeTemplate));
var seed = random.Next();
var xformQuery = _entManager.GetEntityQuery();
- var tiles = _maps.GetAllTilesEnumerator(_gridUid, _grid);
- while (tiles.MoveNext(out var tileRef))
+ foreach (var node in dungeon.RoomTiles)
{
- var node = tileRef.Value.GridIndices;
-
if (reservedTiles.Contains(node))
continue;
-
- if (dunGen.TileMask is not null)
- {
- if (!dunGen.TileMask.Contains(((ContentTileDefinition) _tileDefManager[tileRef.Value.Tile.TypeId]).ID))
- continue;
- }
// Need to set per-tile to override data.
- if (biomeSystem.TryGetTile(node, indexedBiome.Layers, seed, _grid, out var tile))
+ if (biomeSystem.TryGetTile(node, biomeComp.Layers, seed, _grid, out var tile))
{
_maps.SetTile(_gridUid, _grid, node, tile.Value);
}
- if (biomeSystem.TryGetDecals(node, indexedBiome.Layers, seed, _grid, out var decals))
+ if (biomeSystem.TryGetDecals(node, biomeComp.Layers, seed, _grid, out var decals))
{
foreach (var decal in decals)
{
@@ -52,7 +43,7 @@ private async Task PostGen(BiomeDunGen dunGen, DungeonData data, Dungeon dungeon
}
}
- if (biomeSystem.TryGetEntity(node, indexedBiome.Layers, tile ?? tileRef.Value.Tile, seed, _grid, out var entityProto))
+ if (biomeSystem.TryGetEntity(node, biomeComp, _grid, out var entityProto))
{
var ent = _entManager.SpawnEntity(entityProto, new EntityCoordinates(_gridUid, node + _grid.TileSizeHalfVector));
var xform = xformQuery.Get(ent);
@@ -70,5 +61,7 @@ private async Task PostGen(BiomeDunGen dunGen, DungeonData data, Dungeon dungeon
if (!ValidateResume())
return;
}
+
+ biomeComp.Enabled = false;
}
}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenWallMount.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenWallMount.cs
index d5c8587ea95..afc7608d64a 100644
--- a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenWallMount.cs
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenWallMount.cs
@@ -20,11 +20,7 @@ private async Task PostGen(WallMountDunGen gen, DungeonData data, Dungeon dungeo
}
var tileDef = _prototype.Index(tileProto);
- if (!data.SpawnGroups.TryGetValue(DungeonDataKey.WallMounts, out var spawnProto))
- {
- // caves can have no walls
- return;
- }
+ data.SpawnGroups.TryGetValue(DungeonDataKey.WallMounts, out var spawnProto);
var checkedTiles = new HashSet();
var allExterior = new HashSet(dungeon.CorridorExteriorTiles);
diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index 5cbc56b8fbc..970536f42b0 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -45,6 +45,7 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
RaiseLocalEvent(uid, ref ev);
var otherName = ToPrettyString(target);
+ var direction = args.OurBody.LinearVelocity.Normalized();
var modifiedDamage = _damageableSystem.TryChangeDamage(target, ev.Damage, component.IgnoreResistances, origin: component.Shooter);
var deleted = Deleted(target);
@@ -63,9 +64,7 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
if (!deleted)
{
_guns.PlayImpactSound(target, modifiedDamage, component.SoundHit, component.ForceSound);
-
- if (!args.OurBody.LinearVelocity.IsLengthZero())
- _sharedCameraRecoil.KickCamera(target, args.OurBody.LinearVelocity.Normalized());
+ _sharedCameraRecoil.KickCamera(target, direction);
}
component.DamagedEntity = true;
diff --git a/Content.Server/Respawn/SpecialRespawnSystem.cs b/Content.Server/Respawn/SpecialRespawnSystem.cs
index a403818e742..6d398db259d 100644
--- a/Content.Server/Respawn/SpecialRespawnSystem.cs
+++ b/Content.Server/Respawn/SpecialRespawnSystem.cs
@@ -21,7 +21,6 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
[Dependency] private readonly AtmosphereSystem _atmosphere = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
- [Dependency] private readonly SharedMapSystem _map = default!;
[Dependency] private readonly TurfSystem _turf = default!;
[Dependency] private readonly IChatManager _chat = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
@@ -106,7 +105,7 @@ private void OnTermination(EntityUid uid, SpecialRespawnComponent component, ref
var found = false;
- foreach (var tile in _map.GetTilesIntersecting(entityGridUid.Value, grid, circle))
+ foreach (var tile in grid.GetTilesIntersecting(circle))
{
if (tile.IsSpace(_tileDefinitionManager)
|| _turf.IsTileBlocked(tile, CollisionGroup.MobMask)
@@ -177,7 +176,7 @@ public bool TryFindRandomTile(EntityUid targetGrid, EntityUid targetMap, int max
var mapTarget = grid.WorldToTile(mapPos);
var circle = new Circle(mapPos, 2);
- foreach (var newTileRef in _map.GetTilesIntersecting(targetGrid, grid, circle))
+ foreach (var newTileRef in grid.GetTilesIntersecting(circle))
{
if (newTileRef.IsSpace(_tileDefinitionManager) || _turf.IsTileBlocked(newTileRef, CollisionGroup.MobMask) || !_atmosphere.IsTileMixtureProbablySafe(targetGrid, targetMap, mapTarget))
continue;
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
index 6b83a61d286..f972865509e 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -43,7 +43,6 @@ public sealed partial class RevenantSystem
[Dependency] private readonly TileSystem _tile = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
- [Dependency] private readonly SharedMapSystem _mapSystem = default!;
private void InitializeAbilities()
{
@@ -229,12 +228,8 @@ private void OnDefileAction(EntityUid uid, RevenantComponent component, Revenant
var xform = Transform(uid);
if (!TryComp(xform.GridUid, out var map))
return;
- var tiles = _mapSystem.GetTilesIntersecting(
- xform.GridUid.Value,
- map,
- Box2.CenteredAround(_transformSystem.GetWorldPosition(xform),
- new Vector2(component.DefileRadius * 2, component.DefileRadius)))
- .ToArray();
+ var tiles = map.GetTilesIntersecting(Box2.CenteredAround(_transformSystem.GetWorldPosition(xform),
+ new Vector2(component.DefileRadius * 2, component.DefileRadius))).ToArray();
_random.Shuffle(tiles);
diff --git a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
index a9d8314f57c..d0314184767 100644
--- a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
+++ b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
@@ -28,7 +28,7 @@ private void OnSalvageClaimMessage(EntityUid uid, SalvageExpeditionConsoleCompon
var mission = GetMission(_prototypeManager.Index(missionparams.Difficulty), missionparams.Seed);
data.NextOffer = _timing.CurTime + mission.Duration + TimeSpan.FromSeconds(1);
- _labelSystem.Label(cdUid, GetFTLName(_prototypeManager.Index("NamesBorer"), missionparams.Seed));
+ _labelSystem.Label(cdUid, GetFTLName(_prototypeManager.Index("names_borer"), missionparams.Seed));
_audio.PlayPvs(component.PrintSound, uid);
UpdateConsoles((station.Value, data));
diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
index 21da7e89a07..525fe01a1f8 100644
--- a/Content.Server/Salvage/SpawnSalvageMissionJob.cs
+++ b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -104,9 +104,7 @@ protected override async Task Process()
destComp.BeaconsOnly = true;
destComp.RequireCoordinateDisk = true;
destComp.Enabled = true;
- _metaData.SetEntityName(
- mapUid,
- _entManager.System().GetFTLName(_prototypeManager.Index("NamesBorer"), _missionParams.Seed));
+ _metaData.SetEntityName(mapUid, SharedSalvageSystem.GetFTLName(_prototypeManager.Index("names_borer"), _missionParams.Seed));
_entManager.AddComponent(mapUid);
// Saving the mission mapUid to a CD is made optional, in case one is somehow made in a process without a CD entity
@@ -193,7 +191,7 @@ protected override async Task Process()
List reservedTiles = new();
- foreach (var tile in _map.GetTilesIntersecting(mapUid, grid, new Circle(Vector2.Zero, landingPadRadius), false))
+ foreach (var tile in grid.GetTilesIntersecting(new Circle(Vector2.Zero, landingPadRadius), false))
{
if (!_biome.TryGetBiomeTile(mapUid, grid, tile.GridIndices, out _))
continue;
diff --git a/Content.Server/ServerInfo/ServerInfoManager.cs b/Content.Server/ServerInfo/ServerInfoManager.cs
index 673a33a9419..d2e35e9663d 100644
--- a/Content.Server/ServerInfo/ServerInfoManager.cs
+++ b/Content.Server/ServerInfo/ServerInfoManager.cs
@@ -13,12 +13,11 @@ public sealed class ServerInfoManager
private static readonly (CVarDef cVar, string icon, string name)[] Vars =
{
// @formatter:off
- (CCVars.InfoLinksDiscord, "discord", "info-link-discord"),
- (CCVars.InfoLinksForum, "forum", "info-link-forum"),
- (CCVars.InfoLinksGithub, "github", "info-link-github"),
- (CCVars.InfoLinksWebsite, "web", "info-link-website"),
- (CCVars.InfoLinksWiki, "wiki", "info-link-wiki"),
- (CCVars.InfoLinksTelegram, "telegram", "info-link-telegram")
+ (CCVars.InfoLinksDiscord, "discord", "info-link-discord"),
+ (CCVars.InfoLinksForum, "forum", "info-link-forum"),
+ (CCVars.InfoLinksGithub, "github", "info-link-github"),
+ (CCVars.InfoLinksWebsite, "web", "info-link-website"),
+ (CCVars.InfoLinksWiki, "wiki", "info-link-wiki")
// @formatter:on
};
diff --git a/Content.Server/Shuttles/Components/GridSpawnComponent.cs b/Content.Server/Shuttles/Components/GridSpawnComponent.cs
index 18959dd7f37..430c9c8df28 100644
--- a/Content.Server/Shuttles/Components/GridSpawnComponent.cs
+++ b/Content.Server/Shuttles/Components/GridSpawnComponent.cs
@@ -32,7 +32,7 @@ public interface IGridSpawnGroup
public float MaximumDistance { get; }
///
- public ProtoId? NameDataset { get; }
+ public ProtoId? NameDataset { get; }
///
int MinCount { get; set; }
@@ -75,7 +75,7 @@ public sealed class DungeonSpawnGroup : IGridSpawnGroup
public float MaximumDistance { get; }
///
- public ProtoId? NameDataset { get; }
+ public ProtoId? NameDataset { get; }
///
public int MinCount { get; set; } = 1;
@@ -106,7 +106,7 @@ public sealed class GridSpawnGroup : IGridSpawnGroup
///
public float MaximumDistance { get; }
- public ProtoId? NameDataset { get; }
+ public ProtoId? NameDataset { get; }
public int MinCount { get; set; } = 1;
public int MaxCount { get; set; } = 1;
public ComponentRegistry AddComponents { get; set; } = new();
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index 1f972d96756..46d2cd69b91 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -19,10 +19,10 @@
using Content.Shared.CCVar;
using Content.Shared.Damage.Components;
using Content.Shared.DeviceNetwork;
-using Content.Shared.GameTicking;
using Content.Shared.Mobs.Components;
using Content.Shared.Movement.Components;
using Content.Shared.Parallax.Biomes;
+using Content.Shared.Preferences;
using Content.Shared.Salvage;
using Content.Shared.Shuttles.Components;
using Content.Shared.Tiles;
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index b550db93ed6..d0aab9aad55 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -234,6 +234,12 @@ public bool CanFTL(EntityUid shuttleUid, [NotNullWhen(false)] out string? reason
if (TryComp(shuttleUid, out var shuttlePhysics))
{
+ // Static physics type is set when station anchor is enabled
+ if (shuttlePhysics.BodyType == BodyType.Static)
+ {
+ reason = Loc.GetString("shuttle-console-static");
+ return false;
+ }
// Too large to FTL
if (FTLMassLimit > 0 && shuttlePhysics.Mass > FTLMassLimit)
@@ -1002,7 +1008,6 @@ private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridCom
continue;
}
- // If it has the FTLSmashImmuneComponent ignore it.
if (_immuneQuery.HasComponent(ent))
{
continue;
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
index de0593b26f0..5ad94699bed 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
@@ -208,7 +208,7 @@ private void GridSpawns(EntityUid uid, GridSpawnComponent component)
if (_protoManager.TryIndex(group.NameDataset, out var dataset))
{
- _metadata.SetEntityName(spawned, _salvage.GetFTLName(dataset, _random.Next()));
+ _metadata.SetEntityName(spawned, SharedSalvageSystem.GetFTLName(dataset, _random.Next()));
}
if (group.Hide)
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index 6e8c1a9e204..054c42f934a 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -8,7 +8,6 @@
using Content.Server.Stunnable;
using Content.Shared.GameTicking;
using Content.Shared.Mobs.Systems;
-using Content.Shared.Salvage;
using Content.Shared.Shuttles.Systems;
using Content.Shared.Throwing;
using JetBrains.Annotations;
@@ -52,7 +51,6 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
- [Dependency] private readonly SharedSalvageSystem _salvage = default!;
[Dependency] private readonly ShuttleConsoleSystem _console = default!;
[Dependency] private readonly StationSystem _station = default!;
[Dependency] private readonly StunSystem _stuns = default!;
diff --git a/Content.Server/Silicons/Laws/IonStormSystem.cs b/Content.Server/Silicons/Laws/IonStormSystem.cs
deleted file mode 100644
index 6017a36fc01..00000000000
--- a/Content.Server/Silicons/Laws/IonStormSystem.cs
+++ /dev/null
@@ -1,280 +0,0 @@
-using Content.Server.StationEvents.Components;
-using Content.Shared.Administration.Logs;
-using Content.Shared.Database;
-using Content.Shared.Dataset;
-using Content.Shared.FixedPoint;
-using Content.Shared.GameTicking.Components;
-using Content.Shared.Random;
-using Content.Shared.Random.Helpers;
-using Content.Shared.Silicons.Laws;
-using Content.Shared.Silicons.Laws.Components;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using System.Linq;
-
-namespace Content.Server.Silicons.Laws;
-
-public sealed class IonStormSystem : EntitySystem
-{
- [Dependency] private readonly IPrototypeManager _proto = default!;
- [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
- [Dependency] private readonly SiliconLawSystem _siliconLaw = default!;
- [Dependency] private readonly IRobustRandom _robustRandom = default!;
-
- // funny
- [ValidatePrototypeId]
- private const string Threats = "IonStormThreats";
- [ValidatePrototypeId]
- private const string Objects = "IonStormObjects";
- [ValidatePrototypeId]
- private const string Crew = "IonStormCrew";
- [ValidatePrototypeId]
- private const string Adjectives = "IonStormAdjectives";
- [ValidatePrototypeId]
- private const string Verbs = "IonStormVerbs";
- [ValidatePrototypeId]
- private const string NumberBase = "IonStormNumberBase";
- [ValidatePrototypeId]
- private const string NumberMod = "IonStormNumberMod";
- [ValidatePrototypeId]
- private const string Areas = "IonStormAreas";
- [ValidatePrototypeId]
- private const string Feelings = "IonStormFeelings";
- [ValidatePrototypeId]
- private const string FeelingsPlural = "IonStormFeelingsPlural";
- [ValidatePrototypeId]
- private const string Musts = "IonStormMusts";
- [ValidatePrototypeId]
- private const string Requires = "IonStormRequires";
- [ValidatePrototypeId]
- private const string Actions = "IonStormActions";
- [ValidatePrototypeId]
- private const string Allergies = "IonStormAllergies";
- [ValidatePrototypeId]
- private const string AllergySeverities = "IonStormAllergySeverities";
- [ValidatePrototypeId]
- private const string Concepts = "IonStormConcepts";
- [ValidatePrototypeId]
- private const string Drinks = "IonStormDrinks";
- [ValidatePrototypeId]
- private const string Foods = "IonStormFoods";
-
- ///
- /// Randomly alters the laws of an individual silicon.
- ///
- public void IonStormTarget(Entity ent, bool adminlog = true)
- {
- var lawBound = ent.Comp1;
- var target = ent.Comp2;
- if (!_robustRandom.Prob(target.Chance))
- return;
-
- var laws = _siliconLaw.GetLaws(ent, lawBound);
- if (laws.Laws.Count == 0)
- return;
-
- // try to swap it out with a random lawset
- if (_robustRandom.Prob(target.RandomLawsetChance))
- {
- var lawsets = _proto.Index(target.RandomLawsets);
- var lawset = lawsets.Pick(_robustRandom);
- laws = _siliconLaw.GetLawset(lawset);
- }
- // clone it so not modifying stations lawset
- laws = laws.Clone();
-
- // shuffle them all
- if (_robustRandom.Prob(target.ShuffleChance))
- {
- // hopefully work with existing glitched laws if there are multiple ion storms
- var baseOrder = FixedPoint2.New(1);
- foreach (var law in laws.Laws)
- {
- if (law.Order < baseOrder)
- baseOrder = law.Order;
- }
-
- _robustRandom.Shuffle(laws.Laws);
-
- // change order based on shuffled position
- for (int i = 0; i < laws.Laws.Count; i++)
- {
- laws.Laws[i].Order = baseOrder + i;
- }
- }
-
- // see if we can remove a random law
- if (laws.Laws.Count > 0 && _robustRandom.Prob(target.RemoveChance))
- {
- var i = _robustRandom.Next(laws.Laws.Count);
- laws.Laws.RemoveAt(i);
- }
-
- // generate a new law...
- var newLaw = GenerateLaw();
-
- // see if the law we add will replace a random existing law or be a new glitched order one
- if (laws.Laws.Count > 0 && _robustRandom.Prob(target.ReplaceChance))
- {
- var i = _robustRandom.Next(laws.Laws.Count);
- laws.Laws[i] = new SiliconLaw()
- {
- LawString = newLaw,
- Order = laws.Laws[i].Order
- };
- }
- else
- {
- laws.Laws.Insert(0, new SiliconLaw
- {
- LawString = newLaw,
- Order = -1,
- LawIdentifierOverride = Loc.GetString("ion-storm-law-scrambled-number", ("length", _robustRandom.Next(5, 10)))
- });
- }
-
- // sets all unobfuscated laws' indentifier in order from highest to lowest priority
- // This could technically override the Obfuscation from the code above, but it seems unlikely enough to basically never happen
- int orderDeduction = -1;
-
- for (int i = 0; i < laws.Laws.Count; i++)
- {
- var notNullIdentifier = laws.Laws[i].LawIdentifierOverride ?? (i - orderDeduction).ToString();
-
- if (notNullIdentifier.Any(char.IsSymbol))
- {
- orderDeduction += 1;
- }
- else
- {
- laws.Laws[i].LawIdentifierOverride = (i - orderDeduction).ToString();
- }
- }
-
- // adminlog is used to prevent adminlog spam.
- if (adminlog)
- _adminLogger.Add(LogType.Mind, LogImpact.High, $"{ToPrettyString(ent):silicon} had its laws changed by an ion storm to {laws.LoggingString()}");
-
- // laws unique to this silicon, dont use station laws anymore
- EnsureComp(ent);
- var ev = new IonStormLawsEvent(laws);
- RaiseLocalEvent(ent, ref ev);
- }
-
- // for your own sake direct your eyes elsewhere
- private string GenerateLaw()
- {
- // pick all values ahead of time to make the logic cleaner
- var threats = Pick(Threats);
- var objects = Pick(Objects);
- var crew1 = Pick(Crew);
- var crew2 = Pick(Crew);
- var adjective = Pick(Adjectives);
- var verb = Pick(Verbs);
- var number = Pick(NumberBase) + " " + Pick(NumberMod);
- var area = Pick(Areas);
- var feeling = Pick(Feelings);
- var feelingPlural = Pick(FeelingsPlural);
- var must = Pick(Musts);
- var require = Pick(Requires);
- var action = Pick(Actions);
- var allergy = Pick(Allergies);
- var allergySeverity = Pick(AllergySeverities);
- var concept = Pick(Concepts);
- var drink = Pick(Drinks);
- var food = Pick(Foods);
-
- var joined = $"{number} {adjective}";
- // a lot of things have subjects of a threat/crew/object
- var triple = _robustRandom.Next(0, 3) switch
- {
- 0 => threats,
- 1 => crew1,
- 2 => objects,
- _ => throw new IndexOutOfRangeException(),
- };
- var crewAll = _robustRandom.Prob(0.5f) ? crew2 : Loc.GetString("ion-storm-crew");
- var objectsThreats = _robustRandom.Prob(0.5f) ? objects : threats;
- var objectsConcept = _robustRandom.Prob(0.5f) ? objects : concept;
- // s goes ahead of require, is/are
- // i dont think theres a way to do this in fluent
- var (who, plural) = _robustRandom.Next(0, 5) switch
- {
- 0 => (Loc.GetString("ion-storm-you"), false),
- 1 => (Loc.GetString("ion-storm-the-station"), true),
- 2 => (Loc.GetString("ion-storm-the-crew"), true),
- 3 => (Loc.GetString("ion-storm-the-job", ("job", crew2)), false),
- _ => (area, true) // THE SINGULARITY REQUIRES THE HAPPY CLOWNS
- };
- var jobChange = _robustRandom.Next(0, 3) switch
- {
- 0 => crew1,
- 1 => Loc.GetString("ion-storm-clowns"),
- _ => Loc.GetString("ion-storm-heads")
- };
- var part = Loc.GetString("ion-storm-part", ("part", _robustRandom.Prob(0.5f)));
- var harm = _robustRandom.Next(0, 6) switch
- {
- 0 => concept,
- 1 => $"{adjective} {threats}",
- 2 => $"{adjective} {objects}",
- 3 => Loc.GetString("ion-storm-adjective-things", ("adjective", adjective)),
- 4 => crew1,
- _ => Loc.GetString("ion-storm-x-and-y", ("x", crew1), ("y", crew2))
- };
-
- if (plural) feeling = feelingPlural;
-
- var subjects = _robustRandom.Prob(0.5f) ? objectsThreats : Loc.GetString("ion-storm-people");
-
- // message logic!!!
- return _robustRandom.Next(0, 35) switch
- {
- 0 => Loc.GetString("ion-storm-law-on-station", ("joined", joined), ("subjects", triple)),
- 1 => Loc.GetString("ion-storm-law-no-shuttle", ("joined", joined), ("subjects", triple)),
- 2 => Loc.GetString("ion-storm-law-crew-are", ("who", crewAll), ("joined", joined), ("subjects", objectsThreats)),
- 3 => Loc.GetString("ion-storm-law-subjects-harmful", ("adjective", adjective), ("subjects", triple)),
- 4 => Loc.GetString("ion-storm-law-must-harmful", ("must", must)),
- 5 => Loc.GetString("ion-storm-law-thing-harmful", ("thing", _robustRandom.Prob(0.5f) ? concept : action)),
- 6 => Loc.GetString("ion-storm-law-job-harmful", ("adjective", adjective), ("job", crew1)),
- 7 => Loc.GetString("ion-storm-law-having-harmful", ("adjective", adjective), ("thing", objectsConcept)),
- 8 => Loc.GetString("ion-storm-law-not-having-harmful", ("adjective", adjective), ("thing", objectsConcept)),
- 9 => Loc.GetString("ion-storm-law-requires", ("who", who), ("plural", plural), ("thing", _robustRandom.Prob(0.5f) ? concept : require)),
- 10 => Loc.GetString("ion-storm-law-requires-subjects", ("who", who), ("plural", plural), ("joined", joined), ("subjects", triple)),
- 11 => Loc.GetString("ion-storm-law-allergic", ("who", who), ("plural", plural), ("severity", allergySeverity), ("allergy", _robustRandom.Prob(0.5f) ? concept : allergy)),
- 12 => Loc.GetString("ion-storm-law-allergic-subjects", ("who", who), ("plural", plural), ("severity", allergySeverity), ("adjective", adjective), ("subjects", _robustRandom.Prob(0.5f) ? objects : crew1)),
- 13 => Loc.GetString("ion-storm-law-feeling", ("who", who), ("feeling", feeling), ("concept", concept)),
- 14 => Loc.GetString("ion-storm-law-feeling-subjects", ("who", who), ("feeling", feeling), ("joined", joined), ("subjects", triple)),
- 15 => Loc.GetString("ion-storm-law-you-are", ("concept", concept)),
- 16 => Loc.GetString("ion-storm-law-you-are-subjects", ("joined", joined), ("subjects", triple)),
- 17 => Loc.GetString("ion-storm-law-you-must-always", ("must", must)),
- 18 => Loc.GetString("ion-storm-law-you-must-never", ("must", must)),
- 19 => Loc.GetString("ion-storm-law-eat", ("who", crewAll), ("adjective", adjective), ("food", _robustRandom.Prob(0.5f) ? food : triple)),
- 20 => Loc.GetString("ion-storm-law-drink", ("who", crewAll), ("adjective", adjective), ("drink", drink)),
- 21 => Loc.GetString("ion-storm-law-change-job", ("who", crewAll), ("adjective", adjective), ("change", jobChange)),
- 22 => Loc.GetString("ion-storm-law-highest-rank", ("who", crew1)),
- 23 => Loc.GetString("ion-storm-law-lowest-rank", ("who", crew1)),
- 24 => Loc.GetString("ion-storm-law-crew-must", ("who", crewAll), ("must", must)),
- 25 => Loc.GetString("ion-storm-law-crew-must-go", ("who", crewAll), ("area", area)),
- 26 => Loc.GetString("ion-storm-law-crew-only-1", ("who", crew1), ("part", part)),
- 27 => Loc.GetString("ion-storm-law-crew-only-2", ("who", crew1), ("other", crew2), ("part", part)),
- 28 => Loc.GetString("ion-storm-law-crew-only-subjects", ("adjective", adjective), ("subjects", subjects), ("part", part)),
- 29 => Loc.GetString("ion-storm-law-crew-must-do", ("must", must), ("part", part)),
- 30 => Loc.GetString("ion-storm-law-crew-must-have", ("adjective", adjective), ("objects", objects), ("part", part)),
- 31 => Loc.GetString("ion-storm-law-crew-must-eat", ("who", who), ("adjective", adjective), ("food", food), ("part", part)),
- 32 => Loc.GetString("ion-storm-law-harm", ("who", harm)),
- 33 => Loc.GetString("ion-storm-law-protect", ("who", harm)),
- _ => Loc.GetString("ion-storm-law-concept-verb", ("concept", concept), ("verb", verb), ("subjects", triple))
- };
- }
-
- ///
- /// Picks a random value from an ion storm dataset.
- /// All ion storm datasets start with IonStorm.
- ///
- private string Pick(string name)
- {
- var dataset = _proto.Index(name);
- return _robustRandom.Pick(dataset.Values);
- }
-}
diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
index b36b1be548f..1dc8ae1c219 100644
--- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
@@ -1,6 +1,7 @@
using System.Linq;
using Content.Server.Administration;
using Content.Server.Chat.Managers;
+using Content.Server.GameTicking;
using Content.Server.Radio.Components;
using Content.Server.Roles;
using Content.Server.Station.Systems;
@@ -8,7 +9,6 @@
using Content.Shared.Chat;
using Content.Shared.Emag.Components;
using Content.Shared.Emag.Systems;
-using Content.Shared.GameTicking;
using Content.Shared.Mind;
using Content.Shared.Mind.Components;
using Content.Shared.Roles;
@@ -17,12 +17,12 @@
using Content.Shared.Stunnable;
using Content.Shared.Wires;
using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
using Robust.Shared.Containers;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Toolshed;
using Robust.Shared.Audio;
+using Robust.Shared.GameObjects;
namespace Content.Server.Silicons.Laws;
@@ -50,9 +50,9 @@ public override void Initialize()
SubscribeLocalEvent(OnDirectedGetLaws);
SubscribeLocalEvent(OnIonStormLaws);
- SubscribeLocalEvent(OnLawProviderMindAdded);
- SubscribeLocalEvent(OnLawProviderMindRemoved);
SubscribeLocalEvent(OnEmagLawsAdded);
+ SubscribeLocalEvent(OnEmagMindAdded);
+ SubscribeLocalEvent(OnEmagMindRemoved);
}
private void OnMapInit(EntityUid uid, SiliconLawBoundComponent component, MapInitEvent args)
@@ -67,35 +67,10 @@ private void OnMindAdded(EntityUid uid, SiliconLawBoundComponent component, Mind
var msg = Loc.GetString("laws-notify");
var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", msg));
- _chatManager.ChatMessageToOne(ChatChannel.Server, msg, wrappedMessage, default, false, actor.PlayerSession.Channel, colorOverride: Color.FromHex("#2ed2fd"));
-
- if (!TryComp(uid, out var lawcomp))
- return;
-
- if (!lawcomp.Subverted)
- return;
-
- var modifedLawMsg = Loc.GetString("laws-notify-subverted");
- var modifiedLawWrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", modifedLawMsg));
- _chatManager.ChatMessageToOne(ChatChannel.Server, modifedLawMsg, modifiedLawWrappedMessage, default, false, actor.PlayerSession.Channel, colorOverride: Color.Red);
- }
-
- private void OnLawProviderMindAdded(Entity ent, ref MindAddedMessage args)
- {
- if (!ent.Comp.Subverted)
- return;
- EnsureSubvertedSiliconRole(args.Mind);
- }
-
- private void OnLawProviderMindRemoved(Entity ent, ref MindRemovedMessage args)
- {
- if (!ent.Comp.Subverted)
- return;
- RemoveSubvertedSiliconRole(args.Mind);
-
+ _chatManager.ChatMessageToOne(ChatChannel.Server, msg, wrappedMessage, default, false,
+ actor.PlayerSession.Channel, colorOverride: Color.FromHex("#2ed2fd"));
}
-
private void OnToggleLawsScreen(EntityUid uid, SiliconLawBoundComponent component, ToggleLawsScreenEvent args)
{
if (args.Handled || !TryComp(uid, out var actor))
@@ -142,12 +117,9 @@ private void OnIonStormLaws(EntityUid uid, SiliconLawProviderComponent component
// gotta tell player to check their laws
NotifyLawsChanged(uid, component.LawUploadSound);
- // Show the silicon has been subverted.
- component.Subverted = true;
-
// new laws may allow antagonist behaviour so make it clear for admins
- if(_mind.TryGetMind(uid, out var mindId, out _))
- EnsureSubvertedSiliconRole(mindId);
+ if (TryComp(uid, out var emag))
+ EnsureEmaggedRole(uid, emag);
}
}
@@ -158,9 +130,6 @@ private void OnEmagLawsAdded(EntityUid uid, SiliconLawProviderComponent componen
if (component.Lawset == null)
component.Lawset = GetLawset(component.Laws);
- // Show the silicon has been subverted.
- component.Subverted = true;
-
// Add the first emag law before the others
var name = CompOrNull(uid)?.OwnerName ?? Name(args.UserUid); // DeltaV: Reuse emagger name if possible
component.Lawset?.Laws.Insert(0, new SiliconLaw
@@ -184,23 +153,33 @@ protected override void OnGotEmagged(EntityUid uid, EmagSiliconLawComponent comp
base.OnGotEmagged(uid, component, ref args);
NotifyLawsChanged(uid, component.EmaggedSound);
- if(_mind.TryGetMind(uid, out var mindId, out _))
- EnsureSubvertedSiliconRole(mindId);
+ EnsureEmaggedRole(uid, component);
_stunSystem.TryParalyze(uid, component.StunTime, true);
}
- private void EnsureSubvertedSiliconRole(EntityUid mindId)
+ private void OnEmagMindAdded(EntityUid uid, EmagSiliconLawComponent component, MindAddedMessage args)
{
- if (!_roles.MindHasRole(mindId))
- _roles.MindAddRole(mindId, "MindRoleSubvertedSilicon");
+ if (HasComp(uid))
+ EnsureEmaggedRole(uid, component);
+ }
+
+ private void OnEmagMindRemoved(EntityUid uid, EmagSiliconLawComponent component, MindRemovedMessage args)
+ {
+ if (component.AntagonistRole == null)
+ return;
+
+ _roles.MindTryRemoveRole(args.Mind);
}
- private void RemoveSubvertedSiliconRole(EntityUid mindId)
+ private void EnsureEmaggedRole(EntityUid uid, EmagSiliconLawComponent component)
{
- if (_roles.MindHasRole(mindId))
- _roles.MindTryRemoveRole(mindId);
+ if (component.AntagonistRole == null || !_mind.TryGetMind(uid, out var mindId, out _))
+ return;
+
+ if (!_roles.MindHasRole(mindId))
+ _roles.MindAddRole(mindId, "MindRoleSubvertedSilicon");
}
public SiliconLawset GetLaws(EntityUid uid, SiliconLawBoundComponent? component = null)
diff --git a/Content.Server/Silicons/Laws/StartIonStormedSystem.cs b/Content.Server/Silicons/Laws/StartIonStormedSystem.cs
deleted file mode 100644
index 9d56d267b9c..00000000000
--- a/Content.Server/Silicons/Laws/StartIonStormedSystem.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Content.Shared.Silicons.Laws.Components;
-using Content.Shared.Administration.Logs;
-using Content.Shared.Database;
-
-namespace Content.Server.Silicons.Laws;
-
-///
-/// This handles running the ion storm event a on specific entity when that entity is spawned in.
-///
-public sealed class StartIonStormedSystem : EntitySystem
-{
- [Dependency] private readonly IonStormSystem _ionStorm = default!;
- [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
- [Dependency] private readonly SiliconLawSystem _siliconLaw = default!;
-
- public override void Initialize()
- {
- base.Initialize();
- SubscribeLocalEvent(OnMapInit);
- }
-
- private void OnMapInit(Entity ent, ref MapInitEvent args)
- {
- if (!TryComp(ent.Owner, out var lawBound))
- return;
- if (!TryComp(ent.Owner, out var target))
- return;
-
- for (int currentIonStorm = 0; currentIonStorm < ent.Comp.IonStormAmount; currentIonStorm++)
- {
- _ionStorm.IonStormTarget((ent.Owner, lawBound, target), false);
- }
-
- var laws = _siliconLaw.GetLaws(ent.Owner, lawBound);
- _adminLogger.Add(LogType.Mind, LogImpact.High, $"{ToPrettyString(ent.Owner):silicon} spawned with ion stormed laws: {laws.LoggingString()}");
- }
-}
diff --git a/Content.Server/Singularity/Components/SingularityGeneratorComponent.cs b/Content.Server/Singularity/Components/SingularityGeneratorComponent.cs
new file mode 100644
index 00000000000..ea2628e5cb8
--- /dev/null
+++ b/Content.Server/Singularity/Components/SingularityGeneratorComponent.cs
@@ -0,0 +1,33 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+using Content.Server.Singularity.EntitySystems;
+
+namespace Content.Server.Singularity.Components;
+
+[RegisterComponent]
+public sealed partial class SingularityGeneratorComponent : Component
+{
+ ///
+ /// The amount of power this generator has accumulated.
+ /// If you want to set this use
+ ///
+ [DataField("power")]
+ [Access(friends:typeof(SingularityGeneratorSystem))]
+ public float Power = 0;
+
+ ///
+ /// The power threshold at which this generator will spawn a singularity.
+ /// If you want to set this use
+ ///
+ [DataField("threshold")]
+ [Access(friends:typeof(SingularityGeneratorSystem))]
+ public float Threshold = 16;
+
+ ///
+ /// The prototype ID used to spawn a singularity.
+ ///
+ [DataField("spawnId", customTypeSerializer: typeof(PrototypeIdSerializer))]
+ [ViewVariables(VVAccess.ReadWrite)]
+ public string? SpawnPrototype = "Singularity";
+}
diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index 2a2952916ec..bf5a45549ce 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -308,7 +308,7 @@ public void ConsumeTilesInRange(EntityUid uid, float range, TransformComponent?
foreach (var grid in grids)
{
// TODO: Remover grid.Owner when this iterator returns entityuids as well.
- AttemptConsumeTiles(uid, _mapSystem.GetTilesIntersecting(grid.Owner, grid.Comp, circle), grid, grid, eventHorizon);
+ AttemptConsumeTiles(uid, grid.Comp.GetTilesIntersecting(circle), grid, grid, eventHorizon);
}
}
diff --git a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
index 95722449b87..a0c02627948 100644
--- a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
@@ -1,23 +1,14 @@
using Content.Server.ParticleAccelerator.Components;
-using Content.Shared.Popups;
+using Content.Server.Singularity.Components;
using Content.Shared.Singularity.Components;
-using Content.Shared.Singularity.EntitySystems;
-using Robust.Server.GameObjects;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Events;
-using Robust.Shared.Timing;
namespace Content.Server.Singularity.EntitySystems;
-public sealed class SingularityGeneratorSystem : SharedSingularityGeneratorSystem
+public sealed class SingularityGeneratorSystem : EntitySystem
{
#region Dependencies
[Dependency] private readonly IViewVariablesManager _vvm = default!;
- [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
- [Dependency] private readonly PhysicsSystem _physics = default!;
- [Dependency] private readonly IGameTiming _timing = default!;
- [Dependency] private readonly MetaDataSystem _metadata = default!;
#endregion Dependencies
public override void Initialize()
@@ -109,37 +100,11 @@ public void SetThreshold(EntityUid uid, float value, SingularityGeneratorCompone
/// The state of the beginning of the collision.
private void HandleParticleCollide(EntityUid uid, ParticleProjectileComponent component, ref StartCollideEvent args)
{
- if (!EntityManager.TryGetComponent(args.OtherEntity, out var generatorComp))
- return;
-
- if (_timing.CurTime < _metadata.GetPauseTime(uid) + generatorComp.NextFailsafe && !generatorComp.FailsafeDisabled)
- {
- EntityManager.QueueDeleteEntity(uid);
- return;
- }
-
- var contained = true;
- if (!generatorComp.FailsafeDisabled)
- {
- var transform = Transform(args.OtherEntity);
- var directions = Enum.GetValues().Length;
- for (var i = 0; i < directions - 1; i += 2) // Skip every other direction, checking only cardinals
- {
- if (!CheckContainmentField((Direction)i, new Entity(args.OtherEntity, generatorComp), transform))
- contained = false;
- }
- }
-
- if (!contained && !generatorComp.FailsafeDisabled)
- {
- generatorComp.NextFailsafe = _timing.CurTime + generatorComp.FailsafeCooldown;
- PopupSystem.PopupEntity(Loc.GetString("comp-generator-failsafe", ("target", args.OtherEntity)), args.OtherEntity, PopupType.LargeCaution);
- }
- else
+ if (EntityManager.TryGetComponent(args.OtherEntity, out var singularityGeneratorComponent))
{
SetPower(
args.OtherEntity,
- generatorComp.Power + component.State switch
+ singularityGeneratorComponent.Power + component.State switch
{
ParticleAcceleratorPowerState.Standby => 0,
ParticleAcceleratorPowerState.Level0 => 1,
@@ -148,46 +113,10 @@ private void HandleParticleCollide(EntityUid uid, ParticleProjectileComponent co
ParticleAcceleratorPowerState.Level3 => 8,
_ => 0
},
- generatorComp
+ singularityGeneratorComponent
);
+ EntityManager.QueueDeleteEntity(uid);
}
-
- EntityManager.QueueDeleteEntity(uid);
}
#endregion Event Handlers
-
- ///
- /// Checks whether there's a containment field in a given direction away from the generator
- ///
- /// The transform component of the singularity generator.
- /// Mostly copied from
- private bool CheckContainmentField(Direction dir, Entity generator, TransformComponent transform)
- {
- var component = generator.Comp;
-
- var (worldPosition, worldRotation) = _transformSystem.GetWorldPositionRotation(transform);
- var dirRad = dir.ToAngle() + worldRotation;
-
- var ray = new CollisionRay(worldPosition, dirRad.ToVec(), component.CollisionMask);
- var rayCastResults = _physics.IntersectRay(transform.MapID, ray, component.FailsafeDistance, generator, false);
- var genQuery = GetEntityQuery();
-
- RayCastResults? closestResult = null;
-
- foreach (var result in rayCastResults)
- {
- if (genQuery.HasComponent(result.HitEntity))
- closestResult = result;
-
- break;
- }
-
- if (closestResult == null)
- return false;
-
- var ent = closestResult.Value.HitEntity;
-
- // Check that the field can't be moved. The fields' transform parenting is weird, so skip that
- return TryComp(ent, out var collidableComponent) && collidableComponent.BodyType == BodyType.Static;
- }
}
diff --git a/Content.Server/StationEvents/Components/GreytideVirusComponent.cs b/Content.Server/StationEvents/Components/GreytideVirusComponent.cs
deleted file mode 100644
index 307f131db11..00000000000
--- a/Content.Server/StationEvents/Components/GreytideVirusComponent.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Server.StationEvents.Events;
-using Content.Shared.Access;
-using Content.Shared.Destructible.Thresholds;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.StationEvents.Components;
-
-///
-/// Greytide Virus event specific configuration
-///
-[RegisterComponent, Access(typeof(GreytideVirusRule))]
-public sealed partial class GreytideVirusRuleComponent : Component
-{
- ///
- /// Range from which the severity is randomly picked from.
- ///
- [DataField]
- public MinMax SeverityRange = new(1, 3);
-
- ///
- /// Severity corresponding to the number of access groups affected.
- /// Will pick randomly from the SeverityRange if not specified.
- ///
- [DataField]
- public int? Severity;
-
- ///
- /// Access groups to pick from.
- ///
- [DataField]
- public List> AccessGroups = new();
-
- ///
- /// Entities with this access level will be ignored.
- ///
- [DataField]
- public List> Blacklist = new();
-}
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
index 741b95d969c..49059deeefe 100644
--- a/Content.Server/StationEvents/EventManagerSystem.cs
+++ b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -152,20 +152,20 @@ public bool TryBuildLimitedEvents(EntityTableSelector limitedEventsTable, out Di
return null;
}
- var sumOfWeights = 0.0f;
+ var sumOfWeights = 0;
foreach (var stationEvent in availableEvents.Values)
{
- sumOfWeights += stationEvent.Weight;
+ sumOfWeights += (int) stationEvent.Weight;
}
- sumOfWeights = _random.NextFloat(sumOfWeights);
+ sumOfWeights = _random.Next(sumOfWeights);
foreach (var (proto, stationEvent) in availableEvents)
{
- sumOfWeights -= stationEvent.Weight;
+ sumOfWeights -= (int) stationEvent.Weight;
- if (sumOfWeights <= 0.0f)
+ if (sumOfWeights <= 0)
{
return proto.ID;
}
diff --git a/Content.Server/StationEvents/Events/GreytideVirusRule.cs b/Content.Server/StationEvents/Events/GreytideVirusRule.cs
deleted file mode 100644
index d32a6a6da1f..00000000000
--- a/Content.Server/StationEvents/Events/GreytideVirusRule.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using Content.Server.StationEvents.Components;
-using Content.Shared.Access;
-using Content.Shared.Access.Systems;
-using Content.Shared.Access.Components;
-using Content.Shared.Doors.Components;
-using Content.Shared.Doors.Systems;
-using Content.Shared.Lock;
-using Content.Shared.GameTicking.Components;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.StationEvents.Events;
-
-
-///
-/// Greytide Virus event
-/// This will open and bolt airlocks and unlock lockers from randomly selected access groups.
-///
-public sealed class GreytideVirusRule : StationEventSystem
-{
- [Dependency] private readonly AccessReaderSystem _access = default!;
- [Dependency] private readonly SharedDoorSystem _door = default!;
- [Dependency] private readonly LockSystem _lock = default!;
- [Dependency] private readonly IPrototypeManager _prototype = default!;
- [Dependency] private readonly IRobustRandom _random = default!;
-
- protected override void Added(EntityUid uid, GreytideVirusRuleComponent virusComp, GameRuleComponent gameRule, GameRuleAddedEvent args)
- {
- if (!TryComp(uid, out var stationEvent))
- return;
-
- // pick severity randomly from range if not specified otherwise
- virusComp.Severity ??= virusComp.SeverityRange.Next(_random);
- virusComp.Severity = Math.Min(virusComp.Severity.Value, virusComp.AccessGroups.Count);
-
- stationEvent.StartAnnouncement = Loc.GetString("station-event-greytide-virus-start-announcement-deltav", ("severity", virusComp.Severity.Value)); // DeltaV: Change the announcement string
- base.Added(uid, virusComp, gameRule, args);
- }
- protected override void Started(EntityUid uid, GreytideVirusRuleComponent virusComp, GameRuleComponent gameRule, GameRuleStartedEvent args)
- {
- base.Started(uid, virusComp, gameRule, args);
-
- if (virusComp.Severity == null)
- return;
-
- // pick random access groups
- var chosen = _random.GetItems(virusComp.AccessGroups, virusComp.Severity.Value, allowDuplicates: false);
-
- // combine all the selected access groups
- var accessIds = new HashSet>();
- foreach (var group in chosen)
- {
- if (_prototype.TryIndex(group, out var proto))
- accessIds.UnionWith(proto.Tags);
- }
-
- var firelockQuery = GetEntityQuery();
- var accessQuery = GetEntityQuery();
-
- var lockQuery = AllEntityQuery();
- while (lockQuery.MoveNext(out var lockUid, out var lockComp))
- {
- if (!accessQuery.TryComp(lockUid, out var accessComp))
- continue;
-
- // check access
- // the AreAccessTagsAllowed function is a little weird because it technically has support for certain tags to be locked out of opening something
- // which might have unintened side effects (see the comments in the function itself)
- // but no one uses that yet, so it is fine for now
- if (!_access.AreAccessTagsAllowed(accessIds, accessComp) || _access.AreAccessTagsAllowed(virusComp.Blacklist, accessComp))
- continue;
-
- // open lockers
- _lock.Unlock(lockUid, null, lockComp);
- }
-
- var airlockQuery = AllEntityQuery();
- while (airlockQuery.MoveNext(out var airlockUid, out var airlockComp, out var doorComp))
- {
- // don't space everything
- if (firelockQuery.HasComp(airlockUid))
- continue;
-
- // use the access reader from the door electronics if they exist
- if (!_access.GetMainAccessReader(airlockUid, out var accessComp))
- continue;
-
- // check access
- if (!_access.AreAccessTagsAllowed(accessIds, accessComp) || _access.AreAccessTagsAllowed(virusComp.Blacklist, accessComp))
- continue;
-
- // open and bolt airlocks
- _door.TryOpenAndBolt(airlockUid, doorComp, airlockComp);
- }
- }
-}
diff --git a/Content.Server/StationEvents/Events/IonStormRule.cs b/Content.Server/StationEvents/Events/IonStormRule.cs
index e7c2d563ba9..805549439ba 100644
--- a/Content.Server/StationEvents/Events/IonStormRule.cs
+++ b/Content.Server/StationEvents/Events/IonStormRule.cs
@@ -1,14 +1,64 @@
+using System.Linq;
using Content.Server.Silicons.Laws;
using Content.Server.StationEvents.Components;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Database;
+using Content.Shared.Dataset;
+using Content.Shared.FixedPoint;
using Content.Shared.GameTicking.Components;
+using Content.Shared.Random;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Silicons.Laws;
using Content.Shared.Silicons.Laws.Components;
using Content.Shared.Station.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
namespace Content.Server.StationEvents.Events;
public sealed class IonStormRule : StationEventSystem
{
- [Dependency] private readonly IonStormSystem _ionStorm = default!;
+ [Dependency] private readonly IPrototypeManager _proto = default!;
+ [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+ [Dependency] private readonly SiliconLawSystem _siliconLaw = default!;
+
+ // funny
+ [ValidatePrototypeId]
+ private const string Threats = "IonStormThreats";
+ [ValidatePrototypeId]
+ private const string Objects = "IonStormObjects";
+ [ValidatePrototypeId]
+ private const string Crew = "IonStormCrew";
+ [ValidatePrototypeId]
+ private const string Adjectives = "IonStormAdjectives";
+ [ValidatePrototypeId]
+ private const string Verbs = "IonStormVerbs";
+ [ValidatePrototypeId]
+ private const string NumberBase = "IonStormNumberBase";
+ [ValidatePrototypeId]
+ private const string NumberMod = "IonStormNumberMod";
+ [ValidatePrototypeId]
+ private const string Areas = "IonStormAreas";
+ [ValidatePrototypeId]
+ private const string Feelings = "IonStormFeelings";
+ [ValidatePrototypeId]
+ private const string FeelingsPlural = "IonStormFeelingsPlural";
+ [ValidatePrototypeId]
+ private const string Musts = "IonStormMusts";
+ [ValidatePrototypeId]
+ private const string Requires = "IonStormRequires";
+ [ValidatePrototypeId]
+ private const string Actions = "IonStormActions";
+ [ValidatePrototypeId]
+ private const string Allergies = "IonStormAllergies";
+ [ValidatePrototypeId]
+ private const string AllergySeverities = "IonStormAllergySeverities";
+ [ValidatePrototypeId]
+ private const string Concepts = "IonStormConcepts";
+ [ValidatePrototypeId]
+ private const string Drinks = "IonStormDrinks";
+ [ValidatePrototypeId]
+ private const string Foods = "IonStormFoods";
protected override void Started(EntityUid uid, IonStormRuleComponent comp, GameRuleComponent gameRule, GameRuleStartedEvent args)
{
@@ -24,7 +74,217 @@ protected override void Started(EntityUid uid, IonStormRuleComponent comp, GameR
if (CompOrNull(xform.GridUid)?.Station != chosenStation)
continue;
- _ionStorm.IonStormTarget((ent, lawBound, target));
+ if (!RobustRandom.Prob(target.Chance))
+ continue;
+
+ var laws = _siliconLaw.GetLaws(ent, lawBound);
+ if (laws.Laws.Count == 0)
+ continue;
+
+ // try to swap it out with a random lawset
+ if (RobustRandom.Prob(target.RandomLawsetChance))
+ {
+ var lawsets = PrototypeManager.Index(target.RandomLawsets);
+ var lawset = lawsets.Pick(RobustRandom);
+ laws = _siliconLaw.GetLawset(lawset);
+ }
+ else
+ {
+ // clone it so not modifying stations lawset
+ laws = laws.Clone();
+ }
+
+ // shuffle them all
+ if (RobustRandom.Prob(target.ShuffleChance))
+ {
+ // hopefully work with existing glitched laws if there are multiple ion storms
+ FixedPoint2 baseOrder = FixedPoint2.New(1);
+ foreach (var law in laws.Laws)
+ {
+ if (law.Order < baseOrder)
+ baseOrder = law.Order;
+ }
+
+ RobustRandom.Shuffle(laws.Laws);
+
+ // change order based on shuffled position
+ for (int i = 0; i < laws.Laws.Count; i++)
+ {
+ laws.Laws[i].Order = baseOrder + i;
+ }
+ }
+
+ // see if we can remove a random law
+ if (laws.Laws.Count > 0 && RobustRandom.Prob(target.RemoveChance))
+ {
+ var i = RobustRandom.Next(laws.Laws.Count);
+ laws.Laws.RemoveAt(i);
+ }
+
+ // generate a new law...
+ var newLaw = GenerateLaw();
+
+ // see if the law we add will replace a random existing law or be a new glitched order one
+ if (laws.Laws.Count > 0 && RobustRandom.Prob(target.ReplaceChance))
+ {
+ var i = RobustRandom.Next(laws.Laws.Count);
+ laws.Laws[i] = new SiliconLaw()
+ {
+ LawString = newLaw,
+ Order = laws.Laws[i].Order
+ };
+ }
+ else
+ {
+ laws.Laws.Insert(0, new SiliconLaw
+ {
+ LawString = newLaw,
+ Order = -1,
+ LawIdentifierOverride = Loc.GetString("ion-storm-law-scrambled-number", ("length", RobustRandom.Next(5, 10)))
+ });
+ }
+
+ // sets all unobfuscated laws' indentifier in order from highest to lowest priority
+ // This could technically override the Obfuscation from the code above, but it seems unlikely enough to basically never happen
+ int orderDeduction = -1;
+
+ for (int i = 0; i < laws.Laws.Count; i++)
+ {
+ string notNullIdentifier = laws.Laws[i].LawIdentifierOverride ?? (i - orderDeduction).ToString();
+
+ if (notNullIdentifier.Any(char.IsSymbol))
+ {
+ orderDeduction += 1;
+ }
+ else
+ {
+ laws.Laws[i].LawIdentifierOverride = (i - orderDeduction).ToString();
+ }
+ }
+
+ _adminLogger.Add(LogType.Mind, LogImpact.High, $"{ToPrettyString(ent):silicon} had its laws changed by an ion storm to {laws.LoggingString()}");
+
+ // laws unique to this silicon, dont use station laws anymore
+ EnsureComp(ent);
+ var ev = new IonStormLawsEvent(laws);
+ RaiseLocalEvent(ent, ref ev);
}
}
+
+ // for your own sake direct your eyes elsewhere
+ private string GenerateLaw()
+ {
+ // pick all values ahead of time to make the logic cleaner
+ var threats = Pick(Threats);
+ var objects = Pick(Objects);
+ var crew1 = Pick(Crew);
+ var crew2 = Pick(Crew);
+ var adjective = Pick(Adjectives);
+ var verb = Pick(Verbs);
+ var number = Pick(NumberBase) + " " + Pick(NumberMod);
+ var area = Pick(Areas);
+ var feeling = Pick(Feelings);
+ var feelingPlural = Pick(FeelingsPlural);
+ var must = Pick(Musts);
+ var require = Pick(Requires);
+ var action = Pick(Actions);
+ var allergy = Pick(Allergies);
+ var allergySeverity = Pick(AllergySeverities);
+ var concept = Pick(Concepts);
+ var drink = Pick(Drinks);
+ var food = Pick(Foods);
+
+ var joined = $"{number} {adjective}";
+ // a lot of things have subjects of a threat/crew/object
+ var triple = RobustRandom.Next(0, 3) switch
+ {
+ 0 => threats,
+ 1 => crew1,
+ 2 => objects,
+ _ => throw new IndexOutOfRangeException(),
+ };
+ var crewAll = RobustRandom.Prob(0.5f) ? crew2 : Loc.GetString("ion-storm-crew");
+ var objectsThreats = RobustRandom.Prob(0.5f) ? objects : threats;
+ var objectsConcept = RobustRandom.Prob(0.5f) ? objects : concept;
+ // s goes ahead of require, is/are
+ // i dont think theres a way to do this in fluent
+ var (who, plural) = RobustRandom.Next(0, 5) switch
+ {
+ 0 => (Loc.GetString("ion-storm-you"), false),
+ 1 => (Loc.GetString("ion-storm-the-station"), true),
+ 2 => (Loc.GetString("ion-storm-the-crew"), true),
+ 3 => (Loc.GetString("ion-storm-the-job", ("job", crew2)), false),
+ _ => (area, true) // THE SINGULARITY REQUIRES THE HAPPY CLOWNS
+ };
+ var jobChange = RobustRandom.Next(0, 3) switch
+ {
+ 0 => crew1,
+ 1 => Loc.GetString("ion-storm-clowns"),
+ _ => Loc.GetString("ion-storm-heads")
+ };
+ var part = Loc.GetString("ion-storm-part", ("part", RobustRandom.Prob(0.5f)));
+ var harm = RobustRandom.Next(0, 6) switch
+ {
+ 0 => concept,
+ 1 => $"{adjective} {threats}",
+ 2 => $"{adjective} {objects}",
+ 3 => Loc.GetString("ion-storm-adjective-things", ("adjective", adjective)),
+ 4 => crew1,
+ _ => Loc.GetString("ion-storm-x-and-y", ("x", crew1), ("y", crew2))
+ };
+
+ if (plural) feeling = feelingPlural;
+
+ var subjects = RobustRandom.Prob(0.5f) ? objectsThreats : Loc.GetString("ion-storm-people");
+
+ // message logic!!!
+ return RobustRandom.Next(0, 36) switch
+ {
+ 0 => Loc.GetString("ion-storm-law-on-station", ("joined", joined), ("subjects", triple)),
+ 1 => Loc.GetString("ion-storm-law-no-shuttle", ("joined", joined), ("subjects", triple)),
+ 2 => Loc.GetString("ion-storm-law-crew-are", ("who", crewAll), ("joined", joined), ("subjects", objectsThreats)),
+ 3 => Loc.GetString("ion-storm-law-subjects-harmful", ("adjective", adjective), ("subjects", triple)),
+ 4 => Loc.GetString("ion-storm-law-must-harmful", ("must", must)),
+ 5 => Loc.GetString("ion-storm-law-thing-harmful", ("thing", RobustRandom.Prob(0.5f) ? concept : action)),
+ 6 => Loc.GetString("ion-storm-law-job-harmful", ("adjective", adjective), ("job", crew1)),
+ 7 => Loc.GetString("ion-storm-law-having-harmful", ("adjective", adjective), ("thing", objectsConcept)),
+ 8 => Loc.GetString("ion-storm-law-not-having-harmful", ("adjective", adjective), ("thing", objectsConcept)),
+ 9 => Loc.GetString("ion-storm-law-requires", ("who", who), ("plural", plural), ("thing", RobustRandom.Prob(0.5f) ? concept : require)),
+ 10 => Loc.GetString("ion-storm-law-requires-subjects", ("who", who), ("plural", plural), ("joined", joined), ("subjects", triple)),
+ 11 => Loc.GetString("ion-storm-law-allergic", ("who", who), ("plural", plural), ("severity", allergySeverity), ("allergy", RobustRandom.Prob(0.5f) ? concept : allergy)),
+ 12 => Loc.GetString("ion-storm-law-allergic-subjects", ("who", who), ("plural", plural), ("severity", allergySeverity), ("adjective", adjective), ("subjects", RobustRandom.Prob(0.5f) ? objects : crew1)),
+ 13 => Loc.GetString("ion-storm-law-feeling", ("who", who), ("feeling", feeling), ("concept", concept)),
+ 14 => Loc.GetString("ion-storm-law-feeling-subjects", ("who", who), ("feeling", feeling), ("joined", joined), ("subjects", triple)),
+ 15 => Loc.GetString("ion-storm-law-you-are", ("concept", concept)),
+ 16 => Loc.GetString("ion-storm-law-you-are-subjects", ("joined", joined), ("subjects", triple)),
+ 17 => Loc.GetString("ion-storm-law-you-must-always", ("must", must)),
+ 18 => Loc.GetString("ion-storm-law-you-must-never", ("must", must)),
+ 19 => Loc.GetString("ion-storm-law-eat", ("who", crewAll), ("adjective", adjective), ("food", RobustRandom.Prob(0.5f) ? food : triple)),
+ 20 => Loc.GetString("ion-storm-law-drink", ("who", crewAll), ("adjective", adjective), ("drink", drink)),
+ 22 => Loc.GetString("ion-storm-law-change-job", ("who", crewAll), ("adjective", adjective), ("change", jobChange)),
+ 23 => Loc.GetString("ion-storm-law-highest-rank", ("who", crew1)),
+ 24 => Loc.GetString("ion-storm-law-lowest-rank", ("who", crew1)),
+ 25 => Loc.GetString("ion-storm-law-crew-must", ("who", crewAll), ("must", must)),
+ 26 => Loc.GetString("ion-storm-law-crew-must-go", ("who", crewAll), ("area", area)),
+ 27 => Loc.GetString("ion-storm-law-crew-only-1", ("who", crew1), ("part", part)),
+ 28 => Loc.GetString("ion-storm-law-crew-only-2", ("who", crew1), ("other", crew2), ("part", part)),
+ 29 => Loc.GetString("ion-storm-law-crew-only-subjects", ("adjective", adjective), ("subjects", subjects), ("part", part)),
+ 30 => Loc.GetString("ion-storm-law-crew-must-do", ("must", must), ("part", part)),
+ 31 => Loc.GetString("ion-storm-law-crew-must-have", ("adjective", adjective), ("objects", objects), ("part", part)),
+ 32 => Loc.GetString("ion-storm-law-crew-must-eat", ("who", who), ("adjective", adjective), ("food", food), ("part", part)),
+ 33 => Loc.GetString("ion-storm-law-harm", ("who", harm)),
+ 34 => Loc.GetString("ion-storm-law-protect", ("who", harm)),
+ _ => Loc.GetString("ion-storm-law-concept-verb", ("concept", concept), ("verb", verb), ("subjects", triple))
+ };
+ }
+
+ ///
+ /// Picks a random value from an ion storm dataset.
+ /// All ion storm datasets start with IonStorm.
+ ///
+ private string Pick(string name)
+ {
+ var dataset = _proto.Index(name);
+ return RobustRandom.Pick(dataset.Values);
+ }
}
diff --git a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs
index fbef5852401..e416effbdd8 100644
--- a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs
+++ b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs
@@ -1,9 +1,10 @@
using System.Diagnostics.CodeAnalysis;
+using System.IO;
using Content.Server.Access.Systems;
using Content.Server.Forensics;
+using Content.Server.GameTicking;
using Content.Shared.Access.Components;
using Content.Shared.Access.Systems; // DeltaV
-using Content.Shared.GameTicking;
using Content.Shared.Inventory;
using Content.Shared.PDA;
using Content.Shared.Preferences;
diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
index 5af6ce1c975..f1c0cb1e906 100644
--- a/Content.Server/Store/Systems/StoreSystem.Ui.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -256,11 +256,6 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
RaiseLocalEvent(buyer, listing.ProductEvent);
}
- if (listing.DisableRefund)
- {
- component.RefundAllowed = false;
- }
-
//log dat shit.
_admin.Add(LogType.StorePurchase,
LogImpact.Low,
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index 38cbc1859cb..e19f736f067 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -1,10 +1,11 @@
-using Content.Shared.GameTicking;
+using Content.Server.GameTicking;
using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Roles;
using Content.Shared.Traits;
using Content.Shared.Whitelist;
using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.Manager;
namespace Content.Server.Traits;
diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index c20a6a46446..90fe4cb7d8a 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -38,7 +38,6 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem
[Dependency] private readonly ThrowingSystem _throwingSystem = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly SpeakOnUIClosedSystem _speakOnUIClosed = default!;
- [Dependency] private readonly SharedPointLightSystem _light = default!;
private const float WallVendEjectDistanceFromWall = 1f;
@@ -335,12 +334,6 @@ public void TryUpdateVisualState(EntityUid uid, VendingMachineComponent? vendCom
finalState = VendingMachineVisualState.Off;
}
- if (_light.TryGetLight(uid, out var pointlight))
- {
- var lightState = finalState != VendingMachineVisualState.Broken && finalState != VendingMachineVisualState.Off;
- _light.SetEnabled(uid, lightState, pointlight);
- }
-
_appearanceSystem.SetData(uid, VendingMachineVisuals.VisualState, finalState);
}
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 03e529c4398..29504d5a76d 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -1,12 +1,15 @@
using System.Linq;
using System.Numerics;
using Content.Server.Cargo.Systems;
+using Content.Server.Interaction;
using Content.Server.Power.EntitySystems;
+using Content.Server.Stunnable;
using Content.Server.Weapons.Ranged.Components;
using Content.Shared.Damage;
using Content.Shared.Damage.Systems;
using Content.Shared.Database;
using Content.Shared.Effects;
+using Content.Shared.Interaction.Components;
using Content.Shared.Projectiles;
using Content.Shared.Weapons.Melee;
using Content.Shared.Weapons.Ranged;
@@ -33,13 +36,16 @@ public sealed partial class GunSystem : SharedGunSystem
[Dependency] private readonly IComponentFactory _factory = default!;
[Dependency] private readonly BatterySystem _battery = default!;
[Dependency] private readonly DamageExamineSystem _damageExamine = default!;
+ [Dependency] private readonly InteractionSystem _interaction = default!;
[Dependency] private readonly PricingSystem _pricing = default!;
[Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly StaminaSystem _stamina = default!;
+ [Dependency] private readonly StunSystem _stun = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;
private const float DamagePitchVariation = 0.05f;
+ public const float GunClumsyChance = 0.5f;
public override void Initialize()
{
@@ -74,14 +80,26 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
{
userImpulse = true;
- if (user != null)
+ // Try a clumsy roll
+ // TODO: Who put this here
+ if (TryComp(user, out var clumsy) && gun.ClumsyProof == false)
{
- var selfEvent = new SelfBeforeGunShotEvent(user.Value, (gunUid, gun), ammo);
- RaiseLocalEvent(user.Value, selfEvent);
- if (selfEvent.Cancelled)
+ for (var i = 0; i < ammo.Count; i++)
{
- userImpulse = false;
- return;
+ if (_interaction.TryRollClumsy(user.Value, GunClumsyChance, clumsy))
+ {
+ // Wound them
+ Damageable.TryChangeDamage(user, clumsy.ClumsyDamage, origin: user);
+ _stun.TryParalyze(user.Value, TimeSpan.FromSeconds(3f), true);
+
+ // Apply salt to the wound ("Honk!")
+ Audio.PlayPvs(new SoundPathSpecifier("/Audio/Weapons/Guns/Gunshots/bang.ogg"), gunUid);
+ Audio.PlayPvs(clumsy.ClumsySound, gunUid);
+
+ PopupSystem.PopupEntity(Loc.GetString("gun-clumsy"), user.Value);
+ userImpulse = false;
+ return;
+ }
}
}
diff --git a/Content.Server/Wires/ComponentWireAction.cs b/Content.Server/Wires/ComponentWireAction.cs
index 90c8a7594d4..91c07486727 100644
--- a/Content.Server/Wires/ComponentWireAction.cs
+++ b/Content.Server/Wires/ComponentWireAction.cs
@@ -21,15 +21,14 @@ public abstract partial class ComponentWireAction : BaseWireAction w
public override bool Cut(EntityUid user, Wire wire)
{
- base.Cut(user, wire);
- // if the entity doesn't exist, we need to return true otherwise the wire sprite is never updated
- return EntityManager.TryGetComponent(wire.Owner, out TComponent? component) ? Cut(user, wire, component) : true;
+ return base.Cut(user, wire) &&
+ EntityManager.TryGetComponent(wire.Owner, out TComponent? component) && Cut(user, wire, component); // Nyanotrasen - Tactical hacking
}
public override bool Mend(EntityUid user, Wire wire)
{
- base.Mend(user, wire);
- return EntityManager.TryGetComponent(wire.Owner, out TComponent? component) ? Mend(user, wire, component) : true;
+ return base.Mend(user, wire) &&
+ EntityManager.TryGetComponent(wire.Owner, out TComponent? component) && Mend(user, wire, component); // Nyanotrasen - Tactical hacking
}
public override void Pulse(EntityUid user, Wire wire)
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs
index 7b8430dc480..05912229960 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs
@@ -4,6 +4,7 @@
using Content.Shared.Maps;
using Content.Shared.Physics;
using Content.Shared.Throwing;
+using Robust.Server.GameObjects;
using Robust.Shared.Map.Components;
using Robust.Shared.Physics.Components;
using Robust.Shared.Random;
@@ -16,8 +17,7 @@ public sealed class ThrowArtifactSystem : EntitySystem
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly ThrowingSystem _throwing = default!;
[Dependency] private readonly TileSystem _tile = default!;
- [Dependency] private readonly SharedTransformSystem _transform = default!;
- [Dependency] private readonly SharedMapSystem _mapSystem = default!;
+ [Dependency] private readonly TransformSystem _transform = default!;
///
public override void Initialize()
@@ -30,9 +30,7 @@ private void OnActivated(EntityUid uid, ThrowArtifactComponent component, Artifa
var xform = Transform(uid);
if (TryComp(xform.GridUid, out var grid))
{
- var tiles = _mapSystem.GetTilesIntersecting(
- xform.GridUid.Value,
- grid,
+ var tiles = grid.GetTilesIntersecting(
Box2.CenteredAround(_transform.GetWorldPosition(xform), new Vector2(component.Range * 2, component.Range)));
foreach (var tile in tiles)
diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index d848512def6..23f3177d7e8 100644
--- a/Content.Shared.Database/LogType.cs
+++ b/Content.Shared.Database/LogType.cs
@@ -117,14 +117,10 @@ public enum LogType
/// Storage & entity-storage related interactions
///
Storage = 93,
-
+
///
/// A player got hit by an explosion and was dealt damage.
///
ExplosionHit = 94,
- ///
- /// A ghost warped to an entity through the ghost warp menu.
- ///
- GhostWarp = 95,
}
diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs
index 05e12d406e2..00d97c1a46e 100644
--- a/Content.Shared/Anomaly/SharedAnomalySystem.cs
+++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs
@@ -34,7 +34,6 @@ public abstract class SharedAnomalySystem : EntitySystem
[Dependency] protected readonly SharedPopupSystem Popup = default!;
[Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
- [Dependency] private readonly SharedMapSystem _map = default!;
public override void Initialize()
{
@@ -359,11 +358,8 @@ public override void Update(float frameTime)
var amount = (int) (MathHelper.Lerp(settings.MinAmount, settings.MaxAmount, severity * stability * powerModifier) + 0.5f);
var localpos = xform.Coordinates.Position;
- var tilerefs = _map.GetLocalTilesIntersecting(
- xform.GridUid.Value,
- grid,
- new Box2(localpos + new Vector2(-settings.MaxRange, -settings.MaxRange), localpos + new Vector2(settings.MaxRange, settings.MaxRange)))
- .ToList();
+ var tilerefs = grid.GetLocalTilesIntersecting(
+ new Box2(localpos + new Vector2(-settings.MaxRange, -settings.MaxRange), localpos + new Vector2(settings.MaxRange, settings.MaxRange))).ToList();
if (tilerefs.Count == 0)
return null;
diff --git a/Content.Shared/Atmos/Components/GasPressurePumpComponent.cs b/Content.Shared/Atmos/Components/GasPressurePumpComponent.cs
deleted file mode 100644
index ca6b4d4e225..00000000000
--- a/Content.Shared/Atmos/Components/GasPressurePumpComponent.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Atmos.Components;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class GasPressurePumpComponent : Component
-{
- [DataField, AutoNetworkedField]
- public bool Enabled = true;
-
- [DataField("inlet")]
- public string InletName = "inlet";
-
- [DataField("outlet")]
- public string OutletName = "outlet";
-
- [DataField, AutoNetworkedField]
- public float TargetPressure = Atmospherics.OneAtmosphere;
-
- ///
- /// Max pressure of the target gas (NOT relative to source).
- ///
- [DataField]
- public float MaxTargetPressure = Atmospherics.MaxOutputPressure;
-}
diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasPressurePumpSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasPressurePumpSystem.cs
deleted file mode 100644
index 77444eb3c53..00000000000
--- a/Content.Shared/Atmos/EntitySystems/SharedGasPressurePumpSystem.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using Content.Shared.Administration.Logs;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Atmos.Piping;
-using Content.Shared.Atmos.Piping.Binary.Components;
-using Content.Shared.Atmos.Piping.Components;
-using Content.Shared.Database;
-using Content.Shared.Examine;
-using Content.Shared.Popups;
-using Content.Shared.Power;
-using Content.Shared.Power.Components;
-using Content.Shared.Power.EntitySystems;
-using Content.Shared.UserInterface;
-
-namespace Content.Shared.Atmos.EntitySystems;
-
-public abstract class SharedGasPressurePumpSystem : EntitySystem
-{
- [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
- [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
- [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!;
- [Dependency] protected readonly SharedUserInterfaceSystem UserInterfaceSystem = default!;
-
- // TODO: Check enabled for activatableUI
- // TODO: Add activatableUI to it.
-
- public override void Initialize()
- {
- base.Initialize();
- SubscribeLocalEvent(OnInit);
- SubscribeLocalEvent(OnPowerChanged);
-
- SubscribeLocalEvent(OnOutputPressureChangeMessage);
- SubscribeLocalEvent(OnToggleStatusMessage);
-
- SubscribeLocalEvent(OnPumpLeaveAtmosphere);
- SubscribeLocalEvent(OnExamined);
- }
-
- private void OnExamined(EntityUid uid, GasPressurePumpComponent pump, ExaminedEvent args)
- {
- if (!Transform(uid).Anchored)
- return;
-
- if (Loc.TryGetString("gas-pressure-pump-system-examined", out var str,
- ("statusColor", "lightblue"), // TODO: change with pressure?
- ("pressure", pump.TargetPressure)
- ))
- {
- args.PushMarkup(str);
- }
- }
-
- private void OnInit(EntityUid uid, GasPressurePumpComponent pump, ComponentInit args)
- {
- UpdateAppearance(uid, pump);
- }
-
- private void OnPowerChanged(EntityUid uid, GasPressurePumpComponent component, ref PowerChangedEvent args)
- {
- UpdateAppearance(uid, component);
- }
-
- private void UpdateAppearance(EntityUid uid, GasPressurePumpComponent? pump = null, AppearanceComponent? appearance = null)
- {
- if (!Resolve(uid, ref pump, ref appearance, false))
- return;
-
- var pumpOn = pump.Enabled && _receiver.IsPowered(uid);
- Appearance.SetData(uid, PumpVisuals.Enabled, pumpOn, appearance);
- }
-
- private void OnToggleStatusMessage(EntityUid uid, GasPressurePumpComponent pump, GasPressurePumpToggleStatusMessage args)
- {
- pump.Enabled = args.Enabled;
- _adminLogger.Add(LogType.AtmosPowerChanged, LogImpact.Medium,
- $"{ToPrettyString(args.Actor):player} set the power on {ToPrettyString(uid):device} to {args.Enabled}");
- Dirty(uid, pump);
- UpdateAppearance(uid, pump);
- }
-
- private void OnOutputPressureChangeMessage(EntityUid uid, GasPressurePumpComponent pump, GasPressurePumpChangeOutputPressureMessage args)
- {
- pump.TargetPressure = Math.Clamp(args.Pressure, 0f, Atmospherics.MaxOutputPressure);
- _adminLogger.Add(LogType.AtmosPressureChanged, LogImpact.Medium,
- $"{ToPrettyString(args.Actor):player} set the pressure on {ToPrettyString(uid):device} to {args.Pressure}kPa");
- Dirty(uid, pump);
- }
-
- private void OnPumpLeaveAtmosphere(EntityUid uid, GasPressurePumpComponent pump, ref AtmosDeviceDisabledEvent args)
- {
- pump.Enabled = false;
- Dirty(uid, pump);
- UpdateAppearance(uid, pump);
-
- UserInterfaceSystem.CloseUi(uid, GasPressurePumpUiKey.Key);
- }
-}
diff --git a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressurePumpComponent.cs b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressurePumpComponent.cs
index 041708dde04..217d81e972f 100644
--- a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressurePumpComponent.cs
+++ b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressurePumpComponent.cs
@@ -1,21 +1,47 @@
using Robust.Shared.Serialization;
-namespace Content.Shared.Atmos.Piping.Binary.Components;
-
-[Serializable, NetSerializable]
-public enum GasPressurePumpUiKey : byte
+namespace Content.Shared.Atmos.Piping.Binary.Components
{
- Key,
-}
+ [Serializable, NetSerializable]
+ public enum GasPressurePumpUiKey
+ {
+ Key,
+ }
-[Serializable, NetSerializable]
-public sealed class GasPressurePumpToggleStatusMessage(bool enabled) : BoundUserInterfaceMessage
-{
- public bool Enabled { get; } = enabled;
-}
+ [Serializable, NetSerializable]
+ public sealed class GasPressurePumpBoundUserInterfaceState : BoundUserInterfaceState
+ {
+ public string PumpLabel { get; }
+ public float OutputPressure { get; }
+ public bool Enabled { get; }
-[Serializable, NetSerializable]
-public sealed class GasPressurePumpChangeOutputPressureMessage(float pressure) : BoundUserInterfaceMessage
-{
- public float Pressure { get; } = pressure;
+ public GasPressurePumpBoundUserInterfaceState(string pumpLabel, float outputPressure, bool enabled)
+ {
+ PumpLabel = pumpLabel;
+ OutputPressure = outputPressure;
+ Enabled = enabled;
+ }
+ }
+
+ [Serializable, NetSerializable]
+ public sealed class GasPressurePumpToggleStatusMessage : BoundUserInterfaceMessage
+ {
+ public bool Enabled { get; }
+
+ public GasPressurePumpToggleStatusMessage(bool enabled)
+ {
+ Enabled = enabled;
+ }
+ }
+
+ [Serializable, NetSerializable]
+ public sealed class GasPressurePumpChangeOutputPressureMessage : BoundUserInterfaceMessage
+ {
+ public float Pressure { get; }
+
+ public GasPressurePumpChangeOutputPressureMessage(float pressure)
+ {
+ Pressure = pressure;
+ }
+ }
}
diff --git a/Content.Shared/Atmos/Piping/Components/AtmosDeviceDisabledEvent.cs b/Content.Shared/Atmos/Piping/Components/AtmosDeviceDisabledEvent.cs
deleted file mode 100644
index 6fe5d86df2b..00000000000
--- a/Content.Shared/Atmos/Piping/Components/AtmosDeviceDisabledEvent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.Atmos.Piping.Components;
-
-///
-/// Raised directed on an atmos device when it is enabled.
-///
-[ByRefEvent]
-public readonly record struct AtmosDeviceDisabledEvent;
\ No newline at end of file
diff --git a/Content.Shared/Atmos/Piping/Components/AtmosDeviceEnabledEvent.cs b/Content.Shared/Atmos/Piping/Components/AtmosDeviceEnabledEvent.cs
deleted file mode 100644
index d656367245e..00000000000
--- a/Content.Shared/Atmos/Piping/Components/AtmosDeviceEnabledEvent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.Atmos.Piping.Components;
-
-///
-/// Raised directed on an atmos device when it is enabled.
-///
-[ByRefEvent]
-public readonly record struct AtmosDeviceEnabledEvent;
\ No newline at end of file
diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs b/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs
index 7eb4871936c..7677e800fe9 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs
@@ -101,9 +101,10 @@ private void OnBuckleInteractHand(Entity ent, ref InteractHandE
return;
if (ent.Comp.BuckledTo != null)
- args.Handled = TryUnbuckle(ent!, args.User, popup: true);
+ TryUnbuckle(ent!, args.User, popup: true);
// TODO BUCKLE add out bool for whether a pop-up was generated or not.
+ args.Handled = true;
}
private void AddStrapVerbs(EntityUid uid, StrapComponent component, GetVerbsEvent args)
diff --git a/Content.Shared/CCVar/CCVars.Game.Infolinks.cs b/Content.Shared/CCVar/CCVars.Game.Infolinks.cs
index 5544953a0d5..fa8332b497e 100644
--- a/Content.Shared/CCVar/CCVars.Game.Infolinks.cs
+++ b/Content.Shared/CCVar/CCVars.Game.Infolinks.cs
@@ -51,10 +51,4 @@ public sealed partial class CCVars
///
public static readonly CVarDef InfoLinksAppeal =
CVarDef.Create("infolinks.appeal", "", CVar.SERVER | CVar.REPLICATED);
-
- ///
- /// Link to Telegram channel to show in the launcher.
- ///
- public static readonly CVarDef InfoLinksTelegram =
- CVarDef.Create("infolinks.telegram", "", CVar.SERVER | CVar.REPLICATED);
}
diff --git a/Content.Shared/CCVar/CCVars.Shuttle.cs b/Content.Shared/CCVar/CCVars.Shuttle.cs
index caf7f81b0e1..f66fe9ca598 100644
--- a/Content.Shared/CCVar/CCVars.Shuttle.cs
+++ b/Content.Shared/CCVar/CCVars.Shuttle.cs
@@ -4,12 +4,6 @@ namespace Content.Shared.CCVar;
public sealed partial class CCVars
{
- ///
- /// Delay for auto-orientation. Used for people arriving via arrivals.
- ///
- public static readonly CVarDef AutoOrientDelay =
- CVarDef.Create("shuttle.auto_orient_delay", 2.0, CVar.SERVER | CVar.REPLICATED);
-
///
/// If true then the camera will match the grid / map and is unchangeable.
/// - When traversing grids it will snap to 0 degrees rotation.
diff --git a/Content.Shared/Chemistry/Components/HyposprayComponent.cs b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
index 17d52f0ad93..05ef84bbaf7 100644
--- a/Content.Shared/Chemistry/Components/HyposprayComponent.cs
+++ b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
@@ -11,6 +11,11 @@ public sealed partial class HyposprayComponent : Component
[DataField]
public string SolutionName = "hypospray";
+ // TODO: This should be on clumsycomponent.
+ [DataField]
+ [ViewVariables(VVAccess.ReadWrite)]
+ public float ClumsyFailChance = 0.5f;
+
[DataField]
[ViewVariables(VVAccess.ReadWrite)]
public FixedPoint2 TransferAmount = FixedPoint2.New(5);
diff --git a/Content.Shared/Chemistry/Events/HyposprayEvents.cs b/Content.Shared/Chemistry/Events/HyposprayEvents.cs
deleted file mode 100644
index 33293a40498..00000000000
--- a/Content.Shared/Chemistry/Events/HyposprayEvents.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Shared.Inventory;
-
-namespace Content.Shared.Chemistry.Hypospray.Events;
-
-public abstract partial class BeforeHyposprayInjectsTargetEvent : CancellableEntityEventArgs, IInventoryRelayEvent
-{
- public SlotFlags TargetSlots { get; } = SlotFlags.WITHOUT_POCKET;
- public EntityUid EntityUsingHypospray;
- public readonly EntityUid Hypospray;
- public EntityUid TargetGettingInjected;
- public string? InjectMessageOverride;
-
- public BeforeHyposprayInjectsTargetEvent(EntityUid user, EntityUid hypospray, EntityUid target)
- {
- EntityUsingHypospray = user;
- Hypospray = hypospray;
- TargetGettingInjected = target;
- InjectMessageOverride = null;
- }
-}
-
-///
-/// This event is raised on the user using the hypospray before the hypospray is injected.
-/// The event is triggered on the user and all their clothing.
-///
-public sealed class SelfBeforeHyposprayInjectsEvent : BeforeHyposprayInjectsTargetEvent
-{
- public SelfBeforeHyposprayInjectsEvent(EntityUid user, EntityUid hypospray, EntityUid target) : base(user, hypospray, target) { }
-}
-
-///
-/// This event is raised on the target before the hypospray is injected.
-/// The event is triggered on the target itself and all its clothing.
-///
-public sealed class TargetBeforeHyposprayInjectsEvent : BeforeHyposprayInjectsTargetEvent
-{
- public TargetBeforeHyposprayInjectsEvent(EntityUid user, EntityUid hypospray, EntityUid target) : base(user, hypospray, target) { }
-}
diff --git a/Content.Shared/Climbing/Components/BonkableComponent.cs b/Content.Shared/Climbing/Components/BonkableComponent.cs
index cb4839cae71..5e97396fbad 100644
--- a/Content.Shared/Climbing/Components/BonkableComponent.cs
+++ b/Content.Shared/Climbing/Components/BonkableComponent.cs
@@ -1,4 +1,5 @@
using Content.Shared.Damage;
+using Robust.Shared.Audio;
using Robust.Shared.GameStates;
namespace Content.Shared.Climbing.Components;
@@ -7,18 +8,39 @@ namespace Content.Shared.Climbing.Components;
/// Makes entity do damage and stun entities with ClumsyComponent
/// upon DragDrop or Climb interactions.
///
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, Access(typeof(Systems.BonkSystem))]
public sealed partial class BonkableComponent : Component
{
///
- /// How long to stun players on bonk, in seconds.
+ /// Chance of bonk triggering if the user is clumsy.
///
- [DataField]
- public TimeSpan BonkTime = TimeSpan.FromSeconds(2);
+ [DataField("bonkClumsyChance")]
+ public float BonkClumsyChance = 0.5f;
///
- /// How much damage to apply on bonk.
+ /// Sound to play when bonking.
///
- [DataField]
+ ///
+ [DataField("bonkSound")]
+ public SoundSpecifier? BonkSound;
+
+ ///
+ /// How long to stun players on bonk, in seconds.
+ ///
+ ///
+ [DataField("bonkTime")]
+ public float BonkTime = 2;
+
+ ///
+ /// How much damage to apply on bonk.
+ ///
+ ///
+ [DataField("bonkDamage")]
public DamageSpecifier? BonkDamage;
+
+ ///
+ /// How long it takes to bonk.
+ ///
+ [DataField("bonkDelay")]
+ public float BonkDelay = 1.5f;
}
diff --git a/Content.Shared/Climbing/Events/BeforeClimbEvents.cs b/Content.Shared/Climbing/Events/BeforeClimbEvents.cs
deleted file mode 100644
index 85c40f9427c..00000000000
--- a/Content.Shared/Climbing/Events/BeforeClimbEvents.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared.Inventory;
-using Content.Shared.Climbing.Components;
-
-namespace Content.Shared.Climbing.Events;
-
-public abstract partial class BeforeClimbEvent : CancellableEntityEventArgs
-{
- public readonly EntityUid GettingPutOnTable;
- public readonly EntityUid PuttingOnTable;
- public readonly Entity BeingClimbedOn;
-
- public BeforeClimbEvent(EntityUid gettingPutOntable, EntityUid puttingOnTable, Entity beingClimbedOn)
- {
- GettingPutOnTable = gettingPutOntable;
- PuttingOnTable = puttingOnTable;
- BeingClimbedOn = beingClimbedOn;
- }
-}
-
-///
-/// This event is raised on the the person either getting put on or going on the table.
-/// The event is also called on their clothing as well.
-///
-public sealed class SelfBeforeClimbEvent : BeforeClimbEvent, IInventoryRelayEvent
-{
- public SlotFlags TargetSlots { get; } = SlotFlags.WITHOUT_POCKET;
- public SelfBeforeClimbEvent(EntityUid gettingPutOntable, EntityUid puttingOnTable, Entity beingClimbedOn) : base(gettingPutOntable, puttingOnTable, beingClimbedOn) { }
-}
-
-///
-/// This event is raised on the thing being climbed on.
-///
-public sealed class TargetBeforeClimbEvent : BeforeClimbEvent
-{
- public TargetBeforeClimbEvent(EntityUid gettingPutOntable, EntityUid puttingOnTable, Entity beingClimbedOn) : base(gettingPutOntable, puttingOnTable, beingClimbedOn) { }
-}
diff --git a/Content.Shared/Climbing/Systems/BonkSystem.cs b/Content.Shared/Climbing/Systems/BonkSystem.cs
new file mode 100644
index 00000000000..f59fe925736
--- /dev/null
+++ b/Content.Shared/Climbing/Systems/BonkSystem.cs
@@ -0,0 +1,130 @@
+using Content.Shared.CCVar;
+using Content.Shared.Climbing.Components;
+using Content.Shared.Climbing.Events;
+using Content.Shared.Damage;
+using Content.Shared.DoAfter;
+using Content.Shared.DragDrop;
+using Content.Shared.Hands.Components;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Components;
+using Content.Shared.Popups;
+using Content.Shared.Stunnable;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Configuration;
+using Robust.Shared.Player;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Climbing.Systems;
+
+public sealed partial class BonkSystem : EntitySystem
+{
+ [Dependency] private readonly IConfigurationManager _cfg = default!;
+ [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+ [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+ [Dependency] private readonly SharedStunSystem _stunSystem = default!;
+ [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+ [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+ [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+ SubscribeLocalEvent(OnBonkDoAfter);
+ SubscribeLocalEvent(OnAttemptClimb);
+ }
+
+ private void OnBonkDoAfter(EntityUid uid, BonkableComponent component, BonkDoAfterEvent args)
+ {
+ if (args.Handled || args.Cancelled || args.Args.Used == null)
+ return;
+
+ TryBonk(args.Args.Used.Value, uid, component, source: args.Args.User);
+
+ args.Handled = true;
+ }
+
+
+ public bool TryBonk(EntityUid user, EntityUid bonkableUid, BonkableComponent? bonkableComponent = null, EntityUid? source = null)
+ {
+ if (!Resolve(bonkableUid, ref bonkableComponent, false))
+ return false;
+
+ // BONK!
+ var userName = Identity.Entity(user, EntityManager);
+ var bonkableName = Identity.Entity(bonkableUid, EntityManager);
+
+ if (user == source)
+ {
+ // Non-local, non-bonking players
+ var othersMessage = Loc.GetString("bonkable-success-message-others", ("user", userName), ("bonkable", bonkableName));
+ // Local, bonking player
+ var selfMessage = Loc.GetString("bonkable-success-message-user", ("user", userName), ("bonkable", bonkableName));
+
+ _popupSystem.PopupPredicted(selfMessage, othersMessage, user, user);
+ }
+ else if (source != null)
+ {
+ // Local, non-bonking player (dragger)
+ _popupSystem.PopupClient(Loc.GetString("bonkable-success-message-others", ("user", userName), ("bonkable", bonkableName)), user, source.Value);
+ // Non-local, non-bonking players
+ _popupSystem.PopupEntity(Loc.GetString("bonkable-success-message-others", ("user", userName), ("bonkable", bonkableName)), user, Filter.Pvs(user).RemoveWhereAttachedEntity(e => e == user || e == source.Value), true);
+ // Non-local, bonking player
+ _popupSystem.PopupEntity(Loc.GetString("bonkable-success-message-user", ("user", userName), ("bonkable", bonkableName)), user, user);
+ }
+
+
+
+ if (source != null)
+ _audioSystem.PlayPredicted(bonkableComponent.BonkSound, bonkableUid, source);
+ else
+ _audioSystem.PlayPvs(bonkableComponent.BonkSound, bonkableUid);
+
+ _stunSystem.TryParalyze(user, TimeSpan.FromSeconds(bonkableComponent.BonkTime), true);
+
+ if (bonkableComponent.BonkDamage is { } bonkDmg)
+ _damageableSystem.TryChangeDamage(user, bonkDmg, true, origin: user);
+
+ return true;
+
+ }
+
+ private bool TryStartBonk(EntityUid uid, EntityUid user, EntityUid climber, BonkableComponent? bonkableComponent = null)
+ {
+ if (!Resolve(uid, ref bonkableComponent, false))
+ return false;
+
+ if (!HasComp(climber) || !HasComp(user))
+ return false;
+
+ if (!_cfg.GetCVar(CCVars.GameTableBonk))
+ {
+ // Not set to always bonk, try clumsy roll.
+ if (!_interactionSystem.TryRollClumsy(climber, bonkableComponent.BonkClumsyChance))
+ return false;
+ }
+
+ var doAfterArgs = new DoAfterArgs(EntityManager, user, bonkableComponent.BonkDelay, new BonkDoAfterEvent(), uid, target: uid, used: climber)
+ {
+ BreakOnMove = true,
+ BreakOnDamage = true,
+ DuplicateCondition = DuplicateConditions.SameTool | DuplicateConditions.SameTarget
+ };
+
+ return _doAfter.TryStartDoAfter(doAfterArgs);
+ }
+
+ private void OnAttemptClimb(EntityUid uid, BonkableComponent component, ref AttemptClimbEvent args)
+ {
+ if (args.Cancelled)
+ return;
+
+ if (TryStartBonk(uid, args.User, args.Climber, component))
+ args.Cancelled = true;
+ }
+
+ [Serializable, NetSerializable]
+ private sealed partial class BonkDoAfterEvent : SimpleDoAfterEvent
+ {
+ }
+}
diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
index 467d96187e5..da194706f8f 100644
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -151,10 +151,6 @@ private void OnCanDragDropOn(EntityUid uid, ClimbableComponent component, ref Ca
if (args.Handled)
return;
- // If already climbing then don't show outlines.
- if (TryComp(args.Dragged, out ClimbingComponent? climbing) && climbing.IsClimbing)
- return;
-
var canVault = args.User == args.Dragged
? CanVault(component, args.User, uid, out _)
: CanVault(component, args.User, args.Dragged, uid, out _);
@@ -255,18 +251,6 @@ private void Climb(EntityUid uid, EntityUid user, EntityUid climbable, bool sile
if (!Resolve(climbable, ref comp, false))
return;
- var selfEvent = new SelfBeforeClimbEvent(uid, user, (climbable, comp));
- RaiseLocalEvent(uid, selfEvent);
-
- if (selfEvent.Cancelled)
- return;
-
- var targetEvent = new TargetBeforeClimbEvent(uid, user, (climbable, comp));
- RaiseLocalEvent(climbable, targetEvent);
-
- if (targetEvent.Cancelled)
- return;
-
if (!ReplaceFixtures(uid, climbing, fixtures))
return;
diff --git a/Content.Shared/Clothing/Components/ToggleClothingComponent.cs b/Content.Shared/Clothing/Components/ToggleClothingComponent.cs
index f827cbfea8d..04bc3ed4e83 100644
--- a/Content.Shared/Clothing/Components/ToggleClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/ToggleClothingComponent.cs
@@ -33,12 +33,6 @@ public sealed partial class ToggleClothingComponent : Component
///
[DataField]
public bool DisableOnUnequip;
-
- ///
- /// If true, the clothes must equip for adding action.
- ///
- [DataField]
- public bool MustEquip = true;
}
///
diff --git a/Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs
index 8d6e3e3de65..9889376c9d4 100644
--- a/Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs
@@ -39,12 +39,8 @@ private void OnMapInit(Entity ent, ref MapInitEvent arg
private void OnGetActions(Entity ent, ref GetItemActionsEvent args)
{
- if (args.InHands && ent.Comp.MustEquip)
- return;
-
var ev = new ToggleClothingCheckEvent(args.User);
RaiseLocalEvent(ent, ref ev);
-
if (!ev.Cancelled)
args.AddAction(ent.Comp.ActionEntity);
}
diff --git a/Content.Shared/Clumsy/ClumsyComponent.cs b/Content.Shared/Clumsy/ClumsyComponent.cs
deleted file mode 100644
index 6b013a5c2f1..00000000000
--- a/Content.Shared/Clumsy/ClumsyComponent.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using Content.Shared.Damage;
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Clumsy;
-
-///
-/// A simple clumsy tag-component.
-///
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class ClumsyComponent : Component
-{
-
- // Standard options. Try to fit these in if you can!
-
- ///
- /// Sound to play when clumsy interactions fail.
- ///
- [DataField]
- public SoundSpecifier ClumsySound = new SoundPathSpecifier("/Audio/Items/bikehorn.ogg");
-
- ///
- /// Default chance to fail a clumsy interaction.
- /// If a system needs to use something else, add a new variable in the component, do not modify this percentage.
- ///
- [DataField, AutoNetworkedField]
- public float ClumsyDefaultCheck = 0.5f;
-
- ///
- /// Default stun time.
- /// If a system needs to use something else, add a new variable in the component, do not modify this number.
- ///
- [DataField, AutoNetworkedField]
- public TimeSpan ClumsyDefaultStunTime = TimeSpan.FromSeconds(2.5);
-
- // Specific options
-
- ///
- /// Sound to play after hitting your head on a table. Ouch!
- ///
- [DataField]
- public SoundCollectionSpecifier TableBonkSound = new SoundCollectionSpecifier("TrayHit");
-
- ///
- /// Stun time after failing to shoot a gun.
- ///
- [DataField, AutoNetworkedField]
- public TimeSpan GunShootFailStunTime = TimeSpan.FromSeconds(3);
-
- ///
- /// Stun time after failing to shoot a gun.
- ///
- [DataField, AutoNetworkedField]
- public DamageSpecifier? GunShootFailDamage;
-
- ///
- /// Noise to play after failing to shoot a gun. Boom!
- ///
- [DataField]
- public SoundSpecifier GunShootFailSound = new SoundPathSpecifier("/Audio/Weapons/Guns/Gunshots/bang.ogg");
-
- ///
- /// Whether or not to apply Clumsy to hyposprays.
- ///
- [DataField, AutoNetworkedField]
- public bool ClumsyHypo = true;
-
- ///
- /// Whether or not to apply Clumsy to defibs.
- ///
- [DataField, AutoNetworkedField]
- public bool ClumsyDefib = true;
-
- ///
- /// Whether or not to apply Clumsy to guns.
- ///
- [DataField, AutoNetworkedField]
- public bool ClumsyGuns = true;
-
- ///
- /// Whether or not to apply Clumsy to vaulting.
- ///
- [DataField, AutoNetworkedField]
- public bool ClumsyVaulting = true;
-
- ///
- /// Lets you define a new "failed" message for each event.
- ///
- [DataField]
- public LocId HypoFailedMessage = "hypospray-component-inject-self-clumsy-message";
-
- [DataField]
- public LocId GunFailedMessage = "gun-clumsy";
-
- [DataField]
- public LocId VaulingFailedMessageSelf = "bonkable-success-message-user";
-
- [DataField]
- public LocId VaulingFailedMessageOthers = "bonkable-success-message-others";
-
- [DataField]
- public LocId VaulingFailedMessageForced = "forced-bonkable-success-message";
-}
diff --git a/Content.Shared/Clumsy/ClumsySystem.cs b/Content.Shared/Clumsy/ClumsySystem.cs
deleted file mode 100644
index 4804b6b7234..00000000000
--- a/Content.Shared/Clumsy/ClumsySystem.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-using Content.Shared.CCVar;
-using Content.Shared.Chemistry.Hypospray.Events;
-using Content.Shared.Climbing.Components;
-using Content.Shared.Climbing.Events;
-using Content.Shared.Damage;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Medical;
-using Content.Shared.Popups;
-using Content.Shared.Stunnable;
-using Content.Shared.Weapons.Ranged.Events;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Configuration;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.Clumsy;
-
-public sealed class ClumsySystem : EntitySystem
-{
- [Dependency] private readonly IRobustRandom _random = default!;
- [Dependency] private readonly SharedStunSystem _stun = default!;
- [Dependency] private readonly SharedAudioSystem _audio = default!;
- [Dependency] private readonly SharedPopupSystem _popup = default!;
- [Dependency] private readonly DamageableSystem _damageable = default!;
- [Dependency] private readonly IGameTiming _timing = default!;
- [Dependency] private readonly IConfigurationManager _cfg = default!;
-
- public override void Initialize()
- {
- SubscribeLocalEvent(BeforeHyposprayEvent);
- SubscribeLocalEvent(BeforeDefibrillatorZapsEvent);
- SubscribeLocalEvent(BeforeGunShotEvent);
- SubscribeLocalEvent(OnBeforeClimbEvent);
- }
-
- // If you add more clumsy interactions add them in this section!
- #region Clumsy interaction events
- private void BeforeHyposprayEvent(Entity ent, ref SelfBeforeHyposprayInjectsEvent args)
- {
- // Clumsy people sometimes inject themselves! Apparently syringes are clumsy proof...
-
- // checks if ClumsyHypo is false, if so, skips.
- if (!ent.Comp.ClumsyHypo)
- return;
-
- if (!_random.Prob(ent.Comp.ClumsyDefaultCheck))
- return;
-
- args.TargetGettingInjected = args.EntityUsingHypospray;
- args.InjectMessageOverride = "hypospray-component-inject-self-clumsy-message";
- _audio.PlayPvs(ent.Comp.ClumsySound, ent);
- }
-
- private void BeforeDefibrillatorZapsEvent(Entity ent, ref SelfBeforeDefibrillatorZapsEvent args)
- {
- // Clumsy people sometimes defib themselves!
-
- // checks if ClumsyDefib is false, if so, skips.
- if (!ent.Comp.ClumsyDefib)
- return;
-
- if (!_random.Prob(ent.Comp.ClumsyDefaultCheck))
- return;
-
- args.DefibTarget = args.EntityUsingDefib;
- _audio.PlayPvs(ent.Comp.ClumsySound, ent);
-
- }
-
- private void BeforeGunShotEvent(Entity ent, ref SelfBeforeGunShotEvent args)
- {
- // Clumsy people sometimes can't shoot :(
-
- // checks if ClumsyGuns is false, if so, skips.
- if (!ent.Comp.ClumsyGuns)
- return;
-
- if (args.Gun.Comp.ClumsyProof)
- return;
-
- if (!_random.Prob(ent.Comp.ClumsyDefaultCheck))
- return;
-
- if (ent.Comp.GunShootFailDamage != null)
- _damageable.TryChangeDamage(ent, ent.Comp.GunShootFailDamage, origin: ent);
-
- _stun.TryParalyze(ent, ent.Comp.GunShootFailStunTime, true);
-
- // Apply salt to the wound ("Honk!") (No idea what this comment means)
- _audio.PlayPvs(ent.Comp.GunShootFailSound, ent);
- _audio.PlayPvs(ent.Comp.ClumsySound, ent);
-
- _popup.PopupEntity(Loc.GetString("gun-clumsy"), ent, ent);
- args.Cancel();
- }
-
- private void OnBeforeClimbEvent(Entity ent, ref SelfBeforeClimbEvent args)
- {
- // checks if ClumsyVaulting is false, if so, skips.
- if (!ent.Comp.ClumsyVaulting)
- return;
-
- // This event is called in shared, thats why it has all the extra prediction stuff.
- var rand = new System.Random((int)_timing.CurTick.Value);
-
- // If someone is putting you on the table, always get past the guard.
- if (!_cfg.GetCVar(CCVars.GameTableBonk) && args.PuttingOnTable == ent.Owner && !rand.Prob(ent.Comp.ClumsyDefaultCheck))
- return;
-
- HitHeadClumsy(ent, args.BeingClimbedOn);
-
- _audio.PlayPredicted(ent.Comp.ClumsySound, ent, ent);
-
- _audio.PlayPredicted(ent.Comp.TableBonkSound, ent, ent);
-
- var gettingPutOnTableName = Identity.Entity(args.GettingPutOnTable, EntityManager);
- var puttingOnTableName = Identity.Entity(args.PuttingOnTable, EntityManager);
-
- if (args.PuttingOnTable == ent.Owner)
- {
- // You are slamming yourself onto the table.
- _popup.PopupPredicted(
- Loc.GetString(ent.Comp.VaulingFailedMessageSelf, ("bonkable", args.BeingClimbedOn)),
- Loc.GetString(ent.Comp.VaulingFailedMessageOthers, ("victim", gettingPutOnTableName), ("bonkable", args.BeingClimbedOn)),
- ent,
- ent);
- }
- else
- {
- // Someone else slamed you onto the table.
- // This is only run in server so you need to use popup entity.
- _popup.PopupPredicted(
- Loc.GetString(ent.Comp.VaulingFailedMessageForced,
- ("bonker", puttingOnTableName),
- ("victim", gettingPutOnTableName),
- ("bonkable", args.BeingClimbedOn)),
- ent,
- null);
- }
-
- args.Cancel();
- }
- #endregion
-
- #region Helper functions
- ///
- /// "Hits" an entites head against the given table.
- ///
- // Oh this fucntion is public le- NO!! This is only public for the one admin command if you use this anywhere else I will cry.
- public void HitHeadClumsy(Entity target, EntityUid table)
- {
- var stunTime = target.Comp.ClumsyDefaultStunTime;
-
- if (TryComp(table, out var bonkComp))
- {
- stunTime = bonkComp.BonkTime;
- if (bonkComp.BonkDamage != null)
- _damageable.TryChangeDamage(target, bonkComp.BonkDamage, true);
- }
-
- _stun.TryParalyze(target, stunTime, true);
- }
- #endregion
-}
diff --git a/Content.Shared/Crayon/SharedCrayonComponent.cs b/Content.Shared/Crayon/SharedCrayonComponent.cs
index a9c21988ea6..f8e88b218de 100644
--- a/Content.Shared/Crayon/SharedCrayonComponent.cs
+++ b/Content.Shared/Crayon/SharedCrayonComponent.cs
@@ -3,23 +3,12 @@
namespace Content.Shared.Crayon
{
-
- ///
- /// Component holding the state of a crayon-like component
- ///
[NetworkedComponent, ComponentProtoName("Crayon"), Access(typeof(SharedCrayonSystem))]
public abstract partial class SharedCrayonComponent : Component
{
- ///
- /// The ID of currently selected decal prototype that will be placed when the crayon is used
- ///
public string SelectedState { get; set; } = string.Empty;
- ///
- /// Color with which the crayon will draw
- ///
- [DataField("color")]
- public Color Color;
+ [DataField("color")] public Color Color;
[Serializable, NetSerializable]
public enum CrayonUiKey : byte
@@ -28,9 +17,6 @@ public enum CrayonUiKey : byte
}
}
- ///
- /// Used by the client to notify the server about the selected decal ID
- ///
[Serializable, NetSerializable]
public sealed class CrayonSelectMessage : BoundUserInterfaceMessage
{
@@ -41,9 +27,6 @@ public CrayonSelectMessage(string selected)
}
}
- ///
- /// Sets the color of the crayon, used by Rainbow Crayon
- ///
[Serializable, NetSerializable]
public sealed class CrayonColorMessage : BoundUserInterfaceMessage
{
@@ -54,25 +37,13 @@ public CrayonColorMessage(Color color)
}
}
- ///
- /// Server to CLIENT. Notifies the BUI that a decal with given ID has been drawn.
- /// Allows the client UI to advance forward in the client-only ephemeral queue,
- /// preventing the crayon from becoming a magic text storage device.
- ///
[Serializable, NetSerializable]
- public sealed class CrayonUsedMessage : BoundUserInterfaceMessage
+ public enum CrayonVisuals
{
- public readonly string DrawnDecal;
-
- public CrayonUsedMessage(string drawn)
- {
- DrawnDecal = drawn;
- }
+ State,
+ Color
}
- ///
- /// Component state, describes how many charges are left in the crayon in the near-hand UI
- ///
[Serializable, NetSerializable]
public sealed class CrayonComponentState : ComponentState
{
@@ -89,17 +60,10 @@ public CrayonComponentState(Color color, string state, int charges, int capacity
Capacity = capacity;
}
}
-
- ///
- /// The state of the crayon UI as sent by the server
- ///
[Serializable, NetSerializable]
public sealed class CrayonBoundUserInterfaceState : BoundUserInterfaceState
{
public string Selected;
- ///
- /// Whether or not the color can be selected
- ///
public bool SelectableColor;
public Color Color;
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index b323dc6dd18..21d09c744cd 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -461,12 +461,6 @@ public bool TryAddNewCuffs(EntityUid target, EntityUid user, EntityUid handcuff,
if (!_interaction.InRangeUnobstructed(handcuff, target))
return false;
- // if the amount of hands the target has is equal to or less than the amount of hands that are cuffed
- // don't apply the new set of cuffs
- // (how would you even end up with more cuffed hands than actual hands? either way accounting for it)
- if (TryComp(target, out var hands) && hands.Count <= component.CuffedHandCount)
- return false;
-
// Success!
_hands.TryDrop(user, handcuff);
diff --git a/Content.Shared/DeviceLinking/SharedLogicGate.cs b/Content.Shared/DeviceLinking/SharedLogicGate.cs
index 75f8cb4951c..8d814f461fe 100644
--- a/Content.Shared/DeviceLinking/SharedLogicGate.cs
+++ b/Content.Shared/DeviceLinking/SharedLogicGate.cs
@@ -23,10 +23,7 @@ public enum LogicGate : byte
[Serializable, NetSerializable]
public enum LogicGateVisuals : byte
{
- Gate,
- InputA,
- InputB,
- Output
+ Gate
}
///
@@ -35,8 +32,5 @@ public enum LogicGateVisuals : byte
[Serializable, NetSerializable]
public enum LogicGateLayers : byte
{
- Gate,
- InputA,
- InputB,
- Output
+ Gate
}
diff --git a/Content.Shared/Doors/Components/DoorComponent.cs b/Content.Shared/Doors/Components/DoorComponent.cs
index 5e35045b109..21fad142b3a 100644
--- a/Content.Shared/Doors/Components/DoorComponent.cs
+++ b/Content.Shared/Doors/Components/DoorComponent.cs
@@ -66,7 +66,7 @@ public sealed partial class DoorComponent : Component
///
/// When the door is active, this is the time when the state will next update.
///
- [AutoNetworkedField, ViewVariables]
+ [AutoNetworkedField]
public TimeSpan? NextStateChange;
///
diff --git a/Content.Shared/Doors/DoorEvents.cs b/Content.Shared/Doors/DoorEvents.cs
index 849ea837303..08a2c8b18b1 100644
--- a/Content.Shared/Doors/DoorEvents.cs
+++ b/Content.Shared/Doors/DoorEvents.cs
@@ -15,19 +15,6 @@ public DoorStateChangedEvent(DoorState state)
}
}
- ///
- /// Raised when the door's bolt status was changed.
- ///
- public sealed class DoorBoltsChangedEvent : EntityEventArgs
- {
- public readonly bool BoltsDown;
-
- public DoorBoltsChangedEvent(bool boltsDown)
- {
- BoltsDown = boltsDown;
- }
- }
-
///
/// Raised when the door is determining whether it is able to open.
/// Cancel to stop the door from being opened.
diff --git a/Content.Shared/Doors/Systems/SharedAirlockSystem.cs b/Content.Shared/Doors/Systems/SharedAirlockSystem.cs
index bdd119004e8..e404a91bdd7 100644
--- a/Content.Shared/Doors/Systems/SharedAirlockSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedAirlockSystem.cs
@@ -22,7 +22,6 @@ public override void Initialize()
SubscribeLocalEvent(OnBeforeDoorClosed);
SubscribeLocalEvent(OnStateChanged);
- SubscribeLocalEvent(OnBoltsChanged);
SubscribeLocalEvent(OnBeforeDoorOpened);
SubscribeLocalEvent(OnBeforeDoorDenied);
SubscribeLocalEvent(OnGetPryMod);
@@ -71,13 +70,6 @@ private void OnStateChanged(EntityUid uid, AirlockComponent component, DoorState
}
}
- private void OnBoltsChanged(EntityUid uid, AirlockComponent component, DoorBoltsChangedEvent args)
- {
- // If unbolted, reset the auto close timer
- if (!args.BoltsDown)
- UpdateAutoClose(uid, component);
- }
-
private void OnBeforeDoorOpened(EntityUid uid, AirlockComponent component, BeforeDoorOpenedEvent args)
{
if (!CanChangeState(uid, component))
@@ -153,7 +145,7 @@ public void SetEmergencyAccess(Entity ent, bool value, EntityU
ent.Comp.EmergencyAccess = value;
Dirty(ent, ent.Comp); // This only runs on the server apparently so we need this.
UpdateEmergencyLightStatus(ent, ent.Comp);
-
+
var sound = ent.Comp.EmergencyAccess ? ent.Comp.EmergencyOnSound : ent.Comp.EmergencyOffSound;
if (predicted)
Audio.PlayPredicted(sound, ent, user: user);
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.Bolts.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.Bolts.cs
index d14b6c71906..13050616e1b 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.Bolts.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.Bolts.cs
@@ -96,10 +96,6 @@ public bool TrySetBoltDown(
Dirty(ent, ent.Comp);
UpdateBoltLightStatus(ent);
- // used to reset the auto-close timer after unbolting
- var ev = new DoorBoltsChangedEvent(value);
- RaiseLocalEvent(ent.Owner, ev);
-
var sound = value ? ent.Comp.BoltDownSound : ent.Comp.BoltUpSound;
if (predicted)
Audio.PlayPredicted(sound, ent, user: user);
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index 69905d1bd6b..80e7ff96698 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -396,25 +396,6 @@ public void OnPartialOpen(EntityUid uid, DoorComponent? door = null)
Dirty(uid, door);
}
-
- ///
- /// Opens and then bolts a door.
- /// Different from emagging this does not remove the access reader, so it can be repaired by simply unbolting the door.
- ///
- public bool TryOpenAndBolt(EntityUid uid, DoorComponent? door = null, AirlockComponent? airlock = null)
- {
- if (!Resolve(uid, ref door, ref airlock))
- return false;
-
- if (IsBolted(uid) || !airlock.Powered || door.State != DoorState.Closed)
- {
- return false;
- }
-
- SetState(uid, DoorState.Emagging, door);
-
- return true;
- }
#endregion
#region Closing
@@ -480,17 +461,17 @@ public bool OnPartialClose(EntityUid uid, DoorComponent? door = null, PhysicsCom
if (!Resolve(uid, ref door, ref physics))
return false;
+ door.Partial = true;
+
// Make sure no entity walked into the airlock when it started closing.
if (!CanClose(uid, door))
{
door.NextStateChange = GameTiming.CurTime + door.OpenTimeTwo;
- door.State = DoorState.Open;
- AppearanceSystem.SetData(uid, DoorVisuals.State, DoorState.Open);
- Dirty(uid, door);
+ door.State = DoorState.Opening;
+ AppearanceSystem.SetData(uid, DoorVisuals.State, DoorState.Opening);
return false;
}
- door.Partial = true;
SetCollidable(uid, true, door, physics);
door.NextStateChange = GameTiming.CurTime + door.CloseTimeTwo;
Dirty(uid, door);
@@ -719,8 +700,6 @@ public void SetNextStateChange(EntityUid uid, TimeSpan? delay, DoorComponent? do
}
door.NextStateChange = GameTiming.CurTime + delay.Value;
- Dirty(uid, door);
-
_activeDoors.Add((uid, door));
}
diff --git a/Content.Shared/DrawDepth/DrawDepth.cs b/Content.Shared/DrawDepth/DrawDepth.cs
index d0d2daf5d90..f7b1f3648ab 100644
--- a/Content.Shared/DrawDepth/DrawDepth.cs
+++ b/Content.Shared/DrawDepth/DrawDepth.cs
@@ -74,38 +74,33 @@ public enum DrawDepth
///
Items = DrawDepthTag.Default + 3,
- ///
- /// Stuff that should be drawn below mobs, but on top of items. Like muzzle flash.
- ///
- BelowMobs = DrawDepthTag.Default + 4,
-
- Mobs = DrawDepthTag.Default + 5,
-
- OverMobs = DrawDepthTag.Default + 6,
+ Mobs = DrawDepthTag.Default + 4,
+
+ OverMobs = DrawDepthTag.Default + 5,
- Doors = DrawDepthTag.Default + 7,
+ Doors = DrawDepthTag.Default + 6,
///
/// Blast doors and shutters which go over the usual doors.
///
- BlastDoors = DrawDepthTag.Default + 8,
+ BlastDoors = DrawDepthTag.Default + 7,
///
/// Stuff that needs to draw over most things, but not effects, like Kudzu.
///
- Overdoors = DrawDepthTag.Default + 9,
+ Overdoors = DrawDepthTag.Default + 8,
///
/// Explosions, fire, melee swings. Whatever.
///
- Effects = DrawDepthTag.Default + 10,
+ Effects = DrawDepthTag.Default + 9,
- Ghosts = DrawDepthTag.Default + 11,
+ Ghosts = DrawDepthTag.Default + 10,
///
/// Use this selectively if it absolutely needs to be drawn above (almost) everything else. Examples include
/// the pointing arrow, the drag & drop ghost-entity, and some debug tools.
///
- Overlays = DrawDepthTag.Default + 12,
+ Overlays = DrawDepthTag.Default + 11,
}
}
diff --git a/Content.Shared/Electrocution/Components/ElectrocutionHUDVisualsComponent.cs b/Content.Shared/Electrocution/Components/ElectrocutionHUDVisualsComponent.cs
deleted file mode 100644
index a48b1e3e5a3..00000000000
--- a/Content.Shared/Electrocution/Components/ElectrocutionHUDVisualsComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.Electrocution;
-
-///
-/// Handles toggling sprite layers for the electrocution HUD to show if an entity with the ElectrifiedComponent is electrified.
-///
-[RegisterComponent]
-public sealed partial class ElectrocutionHUDVisualsComponent : Component;
diff --git a/Content.Shared/Electrocution/Components/ShowElectrocutionHUDComponent.cs b/Content.Shared/Electrocution/Components/ShowElectrocutionHUDComponent.cs
deleted file mode 100644
index a6d9f380da3..00000000000
--- a/Content.Shared/Electrocution/Components/ShowElectrocutionHUDComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Electrocution;
-
-///
-/// Allow an entity to see the Electrocution HUD showing electrocuted doors.
-///
-[RegisterComponent, NetworkedComponent]
-public sealed partial class ShowElectrocutionHUDComponent : Component;
diff --git a/Content.Shared/Electrocution/SharedElectrocution.cs b/Content.Shared/Electrocution/SharedElectrocution.cs
index 5422049874d..4060856d4d6 100644
--- a/Content.Shared/Electrocution/SharedElectrocution.cs
+++ b/Content.Shared/Electrocution/SharedElectrocution.cs
@@ -5,13 +5,11 @@ namespace Content.Shared.Electrocution;
[Serializable, NetSerializable]
public enum ElectrifiedLayers : byte
{
- Sparks,
- HUD,
+ Powered
}
[Serializable, NetSerializable]
public enum ElectrifiedVisuals : byte
{
- ShowSparks, // only shown when zapping someone, deactivated after a short time
- IsElectrified, // if the entity is electrified or not, used for the AI HUD
+ IsPowered
}
diff --git a/Content.Shared/Electrocution/SharedElectrocutionSystem.cs b/Content.Shared/Electrocution/SharedElectrocutionSystem.cs
index 5da344e023a..e36e4a804b7 100644
--- a/Content.Shared/Electrocution/SharedElectrocutionSystem.cs
+++ b/Content.Shared/Electrocution/SharedElectrocutionSystem.cs
@@ -5,8 +5,6 @@ namespace Content.Shared.Electrocution
{
public abstract class SharedElectrocutionSystem : EntitySystem
{
- [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
public override void Initialize()
{
base.Initialize();
@@ -37,19 +35,6 @@ public void SetElectrified(Entity ent, bool value)
ent.Comp.Enabled = value;
Dirty(ent, ent.Comp);
-
- _appearance.SetData(ent.Owner, ElectrifiedVisuals.IsElectrified, value);
- }
-
- public void SetElectrifiedWireCut(Entity ent, bool value)
- {
- if (ent.Comp.IsWireCut == value)
- {
- return;
- }
-
- ent.Comp.IsWireCut = value;
- Dirty(ent);
}
/// Entity being electrocuted.
diff --git a/Content.Shared/Emag/Systems/EmagSystem.cs b/Content.Shared/Emag/Systems/EmagSystem.cs
index 20af8365197..18a28f4f5bd 100644
--- a/Content.Shared/Emag/Systems/EmagSystem.cs
+++ b/Content.Shared/Emag/Systems/EmagSystem.cs
@@ -107,13 +107,6 @@ public bool DoEmagEffect(EntityUid user, EntityUid target)
}
}
-///
-/// Shows a popup to emag user (client side only!) and adds to the entity when handled
-///
-/// Emag user
-/// Did the emagging succeed? Causes a user-only popup to show on client side
-/// Can the entity be emagged more than once? Prevents adding of
-/// Needs to be handled in shared/client, not just the server, to actually show the emagging popup
[ByRefEvent]
public record struct GotEmaggedEvent(EntityUid UserUid, bool Handled = false, bool Repeatable = false);
diff --git a/Content.Shared/Fluids/Components/DrainComponent.cs b/Content.Shared/Fluids/Components/DrainComponent.cs
index ef0277d214f..3064721bf3c 100644
--- a/Content.Shared/Fluids/Components/DrainComponent.cs
+++ b/Content.Shared/Fluids/Components/DrainComponent.cs
@@ -27,8 +27,8 @@ public sealed partial class DrainComponent : Component
public float Accumulator = 0f;
///
- /// If true, automatically transfers solutions from nearby puddles and drains them. True for floor drains;
- /// false for things like toilets and sinks.
+ /// Does this drain automatically absorb surrouding puddles? Or is it a drain designed to empty
+ /// solutions in it manually?
///
[DataField]
public bool AutoDrain = true;
diff --git a/Content.Shared/Forensics/Events.cs b/Content.Shared/Forensics/Events.cs
index c346d08536d..f7b9475cb57 100644
--- a/Content.Shared/Forensics/Events.cs
+++ b/Content.Shared/Forensics/Events.cs
@@ -66,5 +66,5 @@ public record struct GenerateDnaEvent()
///
/// The generated DNA.
///
- public required string DNA;
+ public string DNA;
}
diff --git a/Content.Shared/GameTicking/PlayerBeforeSpawnEvent.cs b/Content.Shared/GameTicking/PlayerBeforeSpawnEvent.cs
deleted file mode 100644
index 48623ecf8e0..00000000000
--- a/Content.Shared/GameTicking/PlayerBeforeSpawnEvent.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Shared.Preferences;
-using JetBrains.Annotations;
-using Robust.Shared.Player;
-
-namespace Content.Shared.GameTicking;
-
-///
-/// Event raised broadcast before a player is spawned by the GameTicker.
-/// You can use this event to spawn a player off-station on late-join but also at round start.
-/// When this event is handled, the GameTicker will not perform its own player-spawning logic.
-///
-[PublicAPI]
-public sealed class PlayerBeforeSpawnEvent : HandledEntityEventArgs
-{
- public ICommonSession Player { get; }
- public HumanoidCharacterProfile Profile { get; }
- public string? JobId { get; }
- public bool LateJoin { get; }
- public EntityUid Station { get; }
-
- public PlayerBeforeSpawnEvent(ICommonSession player,
- HumanoidCharacterProfile profile,
- string? jobId,
- bool lateJoin,
- EntityUid station)
- {
- Player = player;
- Profile = profile;
- JobId = jobId;
- LateJoin = lateJoin;
- Station = station;
- }
-}
diff --git a/Content.Shared/GameTicking/PlayerSpawnCompleteEvent.cs b/Content.Shared/GameTicking/PlayerSpawnCompleteEvent.cs
deleted file mode 100644
index 034b76beeb0..00000000000
--- a/Content.Shared/GameTicking/PlayerSpawnCompleteEvent.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Content.Shared.Preferences;
-using JetBrains.Annotations;
-using Robust.Shared.Player;
-
-namespace Content.Shared.GameTicking;
-
-///
-/// Event raised both directed and broadcast when a player has been spawned by the GameTicker.
-/// You can use this to handle people late-joining, or to handle people being spawned at round start.
-/// Can be used to give random players a role, modify their equipment, etc.
-///
-[PublicAPI]
-public sealed class PlayerSpawnCompleteEvent : EntityEventArgs
-{
- public EntityUid Mob { get; }
- public ICommonSession Player { get; }
- public string? JobId { get; }
- public bool LateJoin { get; }
- public bool Silent { get; }
- public EntityUid Station { get; }
- public HumanoidCharacterProfile Profile { get; }
-
- // Ex. If this is the 27th person to join, this will be 27.
- public int JoinOrder { get; }
-
- public PlayerSpawnCompleteEvent(EntityUid mob,
- ICommonSession player,
- string? jobId,
- bool lateJoin,
- bool silent,
- int joinOrder,
- EntityUid station,
- HumanoidCharacterProfile profile)
- {
- Mob = mob;
- Player = player;
- JobId = jobId;
- LateJoin = lateJoin;
- Silent = silent;
- Station = station;
- Profile = profile;
- JoinOrder = joinOrder;
- }
-}
diff --git a/Content.Shared/Interaction/Components/ClumsyComponent.cs b/Content.Shared/Interaction/Components/ClumsyComponent.cs
new file mode 100644
index 00000000000..824696c8385
--- /dev/null
+++ b/Content.Shared/Interaction/Components/ClumsyComponent.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Damage;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Interaction.Components;
+
+///
+/// A simple clumsy tag-component.
+///
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ClumsyComponent : Component
+{
+ ///
+ /// Damage dealt to a clumsy character when they try to fire a gun.
+ ///
+ [DataField(required: true), AutoNetworkedField]
+ public DamageSpecifier ClumsyDamage = default!;
+
+ ///
+ /// Sound to play when clumsy interactions fail.
+ ///
+ [DataField]
+ public SoundSpecifier ClumsySound = new SoundPathSpecifier("/Audio/Items/bikehorn.ogg");
+}
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.Clumsy.cs b/Content.Shared/Interaction/SharedInteractionSystem.Clumsy.cs
new file mode 100644
index 00000000000..9e45847e078
--- /dev/null
+++ b/Content.Shared/Interaction/SharedInteractionSystem.Clumsy.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Interaction.Components;
+using Robust.Shared.Random;
+
+namespace Content.Shared.Interaction
+{
+ public partial class SharedInteractionSystem
+ {
+ public bool RollClumsy(ClumsyComponent component, float chance)
+ {
+ return component.Running && _random.Prob(chance);
+ }
+
+ ///
+ /// Rolls a probability chance for a "bad action" if the target entity is clumsy.
+ ///
+ /// The entity that the clumsy check is happening for.
+ ///
+ /// The chance that a "bad action" happens if the user is clumsy, between 0 and 1 inclusive.
+ ///
+ /// True if a "bad action" happened, false if the normal action should happen.
+ public bool TryRollClumsy(EntityUid entity, float chance, ClumsyComponent? component = null)
+ {
+ return Resolve(entity, ref component, false) && RollClumsy(component, chance);
+ }
+ }
+}
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 2926e1d1b38..7f2ecb50f88 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -21,7 +21,6 @@
using Content.Shared.Players.RateLimiting;
using Content.Shared.Popups;
using Content.Shared.Storage;
-using Content.Shared.Strip;
using Content.Shared.Tag;
using Content.Shared.Timing;
using Content.Shared.UserInterface;
@@ -68,7 +67,6 @@ public abstract partial class SharedInteractionSystem : EntitySystem
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly TagSystem _tagSystem = default!;
[Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
- [Dependency] private readonly SharedStrippableSystem _strippable = default!;
[Dependency] private readonly SharedPlayerRateLimitManager _rateLimit = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly ISharedChatManager _chat = default!;
@@ -1323,7 +1321,7 @@ public bool CanAccessEquipment(EntityUid user, EntityUid target)
if (wearer == user)
return true;
- if (_strippable.IsStripHidden(slotDef, user))
+ if (slotDef.StripHidden)
return false;
return InRangeUnobstructed(user, wearer) && _containerSystem.IsInSameOrParentContainer(user, wearer);
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index 8158b8c2f62..f089dfaf238 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -10,7 +10,6 @@
using Content.Shared.Item;
using Content.Shared.Movement.Systems;
using Content.Shared.Popups;
-using Content.Shared.Strip;
using Content.Shared.Strip.Components;
using Content.Shared.Whitelist;
using Robust.Shared.Audio.Systems;
@@ -33,7 +32,6 @@ public abstract partial class InventorySystem
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
- [Dependency] private readonly SharedStrippableSystem _strippable = default!;
[ValidatePrototypeId]
private const string PocketableItemSize = "Small";
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index d431195a816..c910a9ae772 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -1,7 +1,4 @@
-using Content.Shared.Chat;
using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Hypospray.Events;
-using Content.Shared.Climbing.Events;
using Content.Shared.Damage;
using Content.Shared.Electrocution;
using Content.Shared.Explosion;
@@ -18,7 +15,7 @@
using Content.Shared.Strip.Components;
using Content.Shared.Temperature;
using Content.Shared.Verbs;
-using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared.Chat;
namespace Content.Shared.Inventory;
@@ -36,10 +33,6 @@ public void InitializeRelay()
SubscribeLocalEvent(RelayInventoryEvent);
SubscribeLocalEvent(RelayInventoryEvent);
SubscribeLocalEvent(RelayInventoryEvent);
- SubscribeLocalEvent(RelayInventoryEvent);
- SubscribeLocalEvent(RelayInventoryEvent);
- SubscribeLocalEvent(RelayInventoryEvent);
- SubscribeLocalEvent(RelayInventoryEvent);
// by-ref events
SubscribeLocalEvent(RefRelayInventoryEvent);
@@ -114,7 +107,7 @@ private void OnGetEquipmentVerbs(EntityUid uid, InventoryComponent component, Ge
var enumerator = new InventorySlotEnumerator(component);
while (enumerator.NextItem(out var item, out var slotDef))
{
- if (!_strippable.IsStripHidden(slotDef, args.User) || args.User == uid)
+ if (!slotDef.StripHidden || args.User == uid)
RaiseLocalEvent(item, ev);
}
}
diff --git a/Content.Shared/Inventory/InventoryTemplatePrototype.cs b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
index 91accec8c93..a4d77767e37 100644
--- a/Content.Shared/Inventory/InventoryTemplatePrototype.cs
+++ b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
@@ -1,5 +1,4 @@
using System.Numerics;
-using Content.Shared.Strip;
using Content.Shared.Whitelist;
using Robust.Shared.Prototypes;
@@ -40,10 +39,6 @@ public sealed partial class SlotDefinition
[DataField("displayName", required: true)]
public string DisplayName { get; private set; } = string.Empty;
- ///
- /// Whether or not this slot will have its item hidden in the strip menu, and block interactions.
- ///
- ///
[DataField("stripHidden")] public bool StripHidden { get; private set; }
///
diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
index 110ae80626e..47edec135d8 100644
--- a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
+++ b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
@@ -32,18 +32,6 @@ public sealed partial class ItemToggleComponent : Component
[DataField]
public bool OnUse = true;
- ///
- /// The localized text to display in the verb to activate.
- ///
- [DataField]
- public string VerbToggleOn = "item-toggle-activate";
-
- ///
- /// The localized text to display in the verb to de-activate.
- ///
- [DataField]
- public string VerbToggleOff = "item-toggle-deactivate";
-
///
/// Whether the item's toggle can be predicted by the client.
///
diff --git a/Content.Shared/Item/ItemToggle/Components/ToggleVerbComponent.cs b/Content.Shared/Item/ItemToggle/Components/ToggleVerbComponent.cs
new file mode 100644
index 00000000000..b673c55e0f1
--- /dev/null
+++ b/Content.Shared/Item/ItemToggle/Components/ToggleVerbComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Item.ItemToggle;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Item.ItemToggle.Components;
+
+///
+/// Adds a verb for toggling something, requires .
+///
+[RegisterComponent, NetworkedComponent, Access(typeof(ToggleVerbSystem))]
+public sealed partial class ToggleVerbComponent : Component
+{
+ ///
+ /// Text the verb will have.
+ /// Gets passed "entity" as the entity's identity string.
+ ///
+ [DataField(required: true)]
+ public LocId Text = string.Empty;
+}
diff --git a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
index f6752a67f61..d5bbaac12c3 100644
--- a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
+++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
@@ -78,7 +78,7 @@ private void OnActivateVerb(Entity ent, ref GetVerbsEvent
{
Toggle((ent.Owner, ent.Comp), user, predicted: ent.Comp.Predictable);
diff --git a/Content.Shared/Item/ItemToggle/ToggleVerbSystem.cs b/Content.Shared/Item/ItemToggle/ToggleVerbSystem.cs
new file mode 100644
index 00000000000..858cd9bc111
--- /dev/null
+++ b/Content.Shared/Item/ItemToggle/ToggleVerbSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.IdentityManagement;
+using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.Verbs;
+
+namespace Content.Shared.Item.ItemToggle;
+
+///
+/// Adds a verb for toggling something with .
+///
+public sealed class ToggleVerbSystem : EntitySystem
+{
+ [Dependency] private readonly ItemToggleSystem _toggle = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent>(OnGetVerbs);
+ }
+
+ private void OnGetVerbs(Entity ent, ref GetVerbsEvent args)
+ {
+ if (!args.CanAccess || !args.CanInteract)
+ return;
+
+ var name = Identity.Entity(ent, EntityManager);
+ var user = args.User;
+ args.Verbs.Add(new ActivationVerb()
+ {
+ Text = Loc.GetString(ent.Comp.Text, ("entity", name)),
+ Act = () => _toggle.Toggle(ent.Owner, user)
+ });
+ }
+}
diff --git a/Content.Shared/Light/SharedHandheldLightSystem.cs b/Content.Shared/Light/SharedHandheldLightSystem.cs
index 74c809797b0..9bec37a3140 100644
--- a/Content.Shared/Light/SharedHandheldLightSystem.cs
+++ b/Content.Shared/Light/SharedHandheldLightSystem.cs
@@ -3,11 +3,9 @@
using Content.Shared.Item;
using Content.Shared.Light.Components;
using Content.Shared.Toggleable;
-using Content.Shared.Verbs;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.GameStates;
-using Robust.Shared.Utility;
namespace Content.Shared.Light;
@@ -24,8 +22,6 @@ public override void Initialize()
base.Initialize();
SubscribeLocalEvent(OnInit);
SubscribeLocalEvent(OnHandleState);
-
- SubscribeLocalEvent>(AddToggleLightVerb);
}
private void OnInit(EntityUid uid, HandheldLightComponent component, ComponentInit args)
@@ -82,25 +78,4 @@ public void UpdateVisuals(EntityUid uid, HandheldLightComponent? component = nul
_appearance.SetData(uid, ToggleableLightVisuals.Enabled, component.Activated, appearance);
}
-
- private void AddToggleLightVerb(Entity ent, ref GetVerbsEvent args)
- {
- if (!args.CanAccess || !args.CanInteract || !ent.Comp.ToggleOnInteract)
- return;
-
- var @event = args;
- ActivationVerb verb = new()
- {
- Text = Loc.GetString("verb-common-toggle-light"),
- Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/light.svg.192dpi.png")),
- Act = ent.Comp.Activated
- ? () => TurnOff(ent)
- : () => TurnOn(@event.User, ent)
- };
-
- args.Verbs.Add(verb);
- }
-
- public abstract bool TurnOff(Entity ent, bool makeNoise = true);
- public abstract bool TurnOn(EntityUid user, Entity uid);
}
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index 411766d8c1f..3349034f32e 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -131,24 +131,8 @@ public bool TryLock(EntityUid uid, EntityUid user, LockComponent? lockComp = nul
});
}
- Lock(uid, user, lockComp);
- return true;
- }
-
- ///
- /// Forces a given entity to be locked, does not activate a do-after.
- ///
- public void Lock(EntityUid uid, EntityUid? user, LockComponent? lockComp = null)
- {
- if (!Resolve(uid, ref lockComp))
- return;
-
- if (user is { Valid: true })
- {
- _sharedPopupSystem.PopupClient(Loc.GetString("lock-comp-do-lock-success",
+ _sharedPopupSystem.PopupClient(Loc.GetString("lock-comp-do-lock-success",
("entityName", Identity.Name(uid, EntityManager))), uid, user);
- }
-
_audio.PlayPredicted(lockComp.LockSound, uid, user);
lockComp.Locked = true;
@@ -157,6 +141,7 @@ public void Lock(EntityUid uid, EntityUid? user, LockComponent? lockComp = null)
var ev = new LockToggledEvent(true);
RaiseLocalEvent(uid, ref ev, true);
+ return true;
}
///
diff --git a/Content.Shared/Magic/Events/RandomGlobalSpawnSpellEvent.cs b/Content.Shared/Magic/Events/RandomGlobalSpawnSpellEvent.cs
deleted file mode 100644
index c77607562a4..00000000000
--- a/Content.Shared/Magic/Events/RandomGlobalSpawnSpellEvent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Storage;
-using Robust.Shared.Audio;
-
-namespace Content.Shared.Magic.Events;
-
-public sealed partial class RandomGlobalSpawnSpellEvent : InstantActionEvent, ISpeakSpell
-{
- ///
- /// The list of prototypes this spell can spawn, will select one randomly
- ///
- [DataField]
- public List Spawns = new();
-
- ///
- /// Sound that will play globally when cast
- ///
- [DataField]
- public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Magic/staff_animation.ogg");
-
- [DataField]
- public string? Speech { get; private set; }
-}
diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs
index 21e137346ef..02d483c0a3f 100644
--- a/Content.Shared/Magic/SharedMagicSystem.cs
+++ b/Content.Shared/Magic/SharedMagicSystem.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
using Content.Shared.Actions;
using Content.Shared.Body.Components;
using Content.Shared.Body.Systems;
@@ -7,17 +7,12 @@
using Content.Shared.Doors.Systems;
using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Humanoid;
using Content.Shared.Interaction;
using Content.Shared.Inventory;
using Content.Shared.Lock;
using Content.Shared.Magic.Components;
using Content.Shared.Magic.Events;
using Content.Shared.Maps;
-using Content.Shared.Mind;
-using Content.Shared.Mind.Components;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
using Content.Shared.Physics;
using Content.Shared.Popups;
using Content.Shared.Speech.Muting;
@@ -25,7 +20,6 @@
using Content.Shared.Tag;
using Content.Shared.Weapons.Ranged.Components;
using Content.Shared.Weapons.Ranged.Systems;
-using Robust.Shared.Audio.Systems;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Network;
@@ -59,9 +53,6 @@ public abstract class SharedMagicSystem : EntitySystem
[Dependency] private readonly LockSystem _lock = default!;
[Dependency] private readonly SharedHandsSystem _hands = default!;
[Dependency] private readonly TagSystem _tag = default!;
- [Dependency] private readonly MobStateSystem _mobState = default!;
- [Dependency] private readonly SharedAudioSystem _audio = default!;
- [Dependency] private readonly SharedMindSystem _mind = default!;
public override void Initialize()
{
@@ -76,7 +67,6 @@ public override void Initialize()
SubscribeLocalEvent(OnSmiteSpell);
SubscribeLocalEvent(OnKnockSpell);
SubscribeLocalEvent(OnChargeSpell);
- SubscribeLocalEvent(OnRandomGlobalSpawnSpell);
// Spell wishlist
// A wishlish of spells that I'd like to implement or planning on implementing in a future PR
@@ -511,37 +501,6 @@ private void OnChargeSpell(ChargeSpellEvent ev)
_gunSystem.UpdateBasicEntityAmmoCount(wand.Value, basicAmmoComp.Count.Value + ev.Charge, basicAmmoComp);
}
// End Charge Spells
- #endregion
- #region Global Spells
-
- private void OnRandomGlobalSpawnSpell(RandomGlobalSpawnSpellEvent ev)
- {
- if (!_net.IsServer || ev.Handled || !PassesSpellPrerequisites(ev.Action, ev.Performer) || ev.Spawns is not { } spawns)
- return;
-
- ev.Handled = true;
- Speak(ev);
-
- var allHumans = _mind.GetAliveHumans();
-
- foreach (var human in allHumans)
- {
- if (!human.Comp.OwnedEntity.HasValue)
- continue;
-
- var ent = human.Comp.OwnedEntity.Value;
-
- var mapCoords = _transform.GetMapCoordinates(ent);
- foreach (var spawn in EntitySpawnCollection.GetSpawns(spawns, _random))
- {
- var spawned = Spawn(spawn, mapCoords);
- _hands.PickupOrDrop(ent, spawned);
- }
- }
-
- _audio.PlayGlobal(ev.Sound, ev.Performer);
- }
-
#endregion
// End Spells
#endregion
diff --git a/Content.Shared/Medical/DefibrillatorEvents.cs b/Content.Shared/Medical/DefibrillatorEvents.cs
deleted file mode 100644
index 54a21a40d42..00000000000
--- a/Content.Shared/Medical/DefibrillatorEvents.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Shared.Inventory;
-
-namespace Content.Shared.Medical;
-
-[ByRefEvent]
-public readonly record struct TargetDefibrillatedEvent(EntityUid User, Entity Defibrillator);
-
-public abstract class BeforeDefibrillatorZapsEvent : CancellableEntityEventArgs, IInventoryRelayEvent
-{
- public SlotFlags TargetSlots { get; } = SlotFlags.WITHOUT_POCKET;
- public EntityUid EntityUsingDefib;
- public readonly EntityUid Defib;
- public EntityUid DefibTarget;
-
- public BeforeDefibrillatorZapsEvent(EntityUid entityUsingDefib, EntityUid defib, EntityUid defibTarget)
- {
- EntityUsingDefib = entityUsingDefib;
- Defib = defib;
- DefibTarget = defibTarget;
- }
-}
-
-///
-/// This event is raised on the user using the defibrillator before is actually zaps someone.
-/// The event is triggered on the user and all their clothing.
-///
-public sealed class SelfBeforeDefibrillatorZapsEvent : BeforeDefibrillatorZapsEvent
-{
- public SelfBeforeDefibrillatorZapsEvent(EntityUid entityUsingDefib, EntityUid defib, EntityUid defibtarget) : base(entityUsingDefib, defib, defibtarget) { }
-}
-
-///
-/// This event is raised on the target before it gets zapped with the defibrillator.
-/// The event is triggered on the target itself and all its clothing.
-///
-public sealed class TargetBeforeDefibrillatorZapsEvent : BeforeDefibrillatorZapsEvent
-{
- public TargetBeforeDefibrillatorZapsEvent(EntityUid entityUsingDefib, EntityUid defib, EntityUid defibtarget) : base(entityUsingDefib, defib, defibtarget) { }
-}
diff --git a/Content.Shared/Medical/TargetDefibrillatedEvent.cs b/Content.Shared/Medical/TargetDefibrillatedEvent.cs
new file mode 100644
index 00000000000..60d1a215845
--- /dev/null
+++ b/Content.Shared/Medical/TargetDefibrillatedEvent.cs
@@ -0,0 +1,4 @@
+namespace Content.Shared.Medical;
+
+[ByRefEvent]
+public readonly record struct TargetDefibrillatedEvent(EntityUid User, Entity Defibrillator);
diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs
index 0f5f9172cc6..bf0b5f650ad 100644
--- a/Content.Shared/Mind/SharedMindSystem.cs
+++ b/Content.Shared/Mind/SharedMindSystem.cs
@@ -532,19 +532,22 @@ public string MindOwnerLoggingString(MindComponent mind)
///
/// Returns a list of every living humanoid player's minds, except for a single one which is exluded.
///
- public HashSet> GetAliveHumans(EntityUid? exclude = null)
+ public List GetAliveHumansExcept(EntityUid exclude)
{
- var allHumans = new HashSet>();
+ var mindQuery = EntityQuery();
+
+ var allHumans = new List();
// HumanoidAppearanceComponent is used to prevent mice, pAIs, etc from being chosen
- var query = EntityQueryEnumerator();
- while (query.MoveNext(out var uid, out var mobState, out _))
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var uid, out var mc, out var mobState, out _))
{
- // the player needs to have a mind and not be the excluded one +
- // the player has to be alive
- if (!TryGetMind(uid, out var mind, out var mindComp) || mind == exclude || !_mobState.IsAlive(uid, mobState))
+ // the player needs to have a mind and not be the excluded one
+ if (mc.Mind == null || mc.Mind == exclude)
continue;
- allHumans.Add(new Entity(mind, mindComp));
+ // the player has to be alive
+ if (_mobState.IsAlive(uid, mobState))
+ allHumans.Add(mc.Mind.Value);
}
return allHumans;
diff --git a/Content.Shared/Movement/Components/AutoOrientComponent.cs b/Content.Shared/Movement/Components/AutoOrientComponent.cs
index 1031425c717..4b89b0cbf42 100644
--- a/Content.Shared/Movement/Components/AutoOrientComponent.cs
+++ b/Content.Shared/Movement/Components/AutoOrientComponent.cs
@@ -5,9 +5,8 @@ namespace Content.Shared.Movement.Components;
///
/// Automatically rotates eye upon grid traversals.
///
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[RegisterComponent, NetworkedComponent]
public sealed partial class AutoOrientComponent : Component
{
- [DataField, AutoNetworkedField, AutoPausedField]
- public TimeSpan? NextChange;
+
}
diff --git a/Content.Shared/Movement/Systems/AutoOrientSystem.cs b/Content.Shared/Movement/Systems/AutoOrientSystem.cs
deleted file mode 100644
index 3bbd715df50..00000000000
--- a/Content.Shared/Movement/Systems/AutoOrientSystem.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Content.Shared.CCVar;
-using Content.Shared.Movement.Components;
-using Robust.Shared.Configuration;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.Movement.Systems;
-
-public sealed class AutoOrientSystem : EntitySystem
-{
- [Dependency] private readonly IConfigurationManager _cfgManager = default!;
- [Dependency] private readonly IGameTiming _timing = default!;
- [Dependency] private readonly SharedMoverController _mover = default!;
-
- private TimeSpan _delay = TimeSpan.Zero;
-
- public override void Initialize()
- {
- base.Initialize();
- SubscribeLocalEvent(OnEntParentChanged);
-
- Subs.CVar(_cfgManager, CCVars.AutoOrientDelay, OnAutoOrient, true);
- }
-
- private void OnAutoOrient(double obj)
- {
- _delay = TimeSpan.FromSeconds(obj);
- }
-
- private void OnEntParentChanged(Entity ent, ref EntParentChangedMessage args)
- {
- ent.Comp.NextChange = _timing.CurTime + _delay;
- Dirty(ent);
- }
-
- public override void Update(float frameTime)
- {
- base.Update(frameTime);
-
- var query = EntityQueryEnumerator();
-
- while (query.MoveNext(out var uid, out var comp))
- {
- if (comp.NextChange <= _timing.CurTime)
- {
- comp.NextChange = null;
- Dirty(uid, comp);
- _mover.ResetCamera(uid);
- }
- }
- }
-}
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
index 1fe38b6cdf1..c11df709f63 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -57,6 +57,8 @@ private void InitializeInput()
SubscribeLocalEvent(OnMoverHandleState);
SubscribeLocalEvent(OnInputParentChange);
+ SubscribeLocalEvent(OnAutoParentChange);
+
SubscribeLocalEvent(OnFollowedParentChange);
Subs.CVar(_configManager, CCVars.CameraRotationLocked, obj => CameraRotationLocked = obj, true);
@@ -144,6 +146,11 @@ private void ShutdownInput()
protected virtual void HandleShuttleInput(EntityUid uid, ShuttleButtons button, ushort subTick, bool state) {}
+ private void OnAutoParentChange(Entity entity, ref EntParentChangedMessage args)
+ {
+ ResetCamera(entity.Owner);
+ }
+
public void RotateCamera(EntityUid uid, Angle angle)
{
if (CameraRotationLocked || !MoverQuery.TryGetComponent(uid, out var mover))
diff --git a/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs b/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs
index 250b0f70a54..b14baba9817 100644
--- a/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs
+++ b/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs
@@ -183,7 +183,7 @@ public bool TryGetEntity(Vector2i indices, BiomeComponent component, MapGridComp
}
- public bool TryGetEntity(Vector2i indices, List layers, Tile tileRef, int seed, MapGridComponent grid,
+ private bool TryGetEntity(Vector2i indices, List layers, Tile tileRef, int seed, MapGridComponent grid,
[NotNullWhen(true)] out string? entity)
{
var tileId = TileDefManager[tileRef.TypeId].ID;
diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadoutPrototype.cs b/Content.Shared/Preferences/Loadouts/RoleLoadoutPrototype.cs
index 92b2d3ef0e0..7a29bad6678 100644
--- a/Content.Shared/Preferences/Loadouts/RoleLoadoutPrototype.cs
+++ b/Content.Shared/Preferences/Loadouts/RoleLoadoutPrototype.cs
@@ -20,7 +20,7 @@ public sealed partial class RoleLoadoutPrototype : IPrototype
/// Should we use a random name for this loadout?
///
[DataField]
- public ProtoId? NameDataset;
+ public ProtoId? NameDataset;
// Not required so people can set their names.
///
diff --git a/Content.Shared/Procedural/PostGeneration/BiomeDunGen.cs b/Content.Shared/Procedural/PostGeneration/BiomeDunGen.cs
index e21e582211b..833cf2dec76 100644
--- a/Content.Shared/Procedural/PostGeneration/BiomeDunGen.cs
+++ b/Content.Shared/Procedural/PostGeneration/BiomeDunGen.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Maps;
using Content.Shared.Parallax.Biomes;
using Robust.Shared.Prototypes;
@@ -12,10 +11,4 @@ public sealed partial class BiomeDunGen : IDunGenLayer
{
[DataField(required: true)]
public ProtoId BiomeTemplate;
-
- ///
- /// creates a biome only on the specified tiles
- ///
- [DataField]
- public HashSet>? TileMask;
}
diff --git a/Content.Shared/Random/Rules/GridInRange.cs b/Content.Shared/Random/Rules/GridInRange.cs
index dfe57b93757..8cbbef1cdc2 100644
--- a/Content.Shared/Random/Rules/GridInRange.cs
+++ b/Content.Shared/Random/Rules/GridInRange.cs
@@ -34,6 +34,6 @@ public override bool Check(EntityManager entManager, EntityUid uid)
return !Inverted;
}
- return Inverted;
+ return false;
}
}
diff --git a/Content.Shared/Random/Rules/NearbyTilesPercent.cs b/Content.Shared/Random/Rules/NearbyTilesPercent.cs
index beadfea05be..465ac8dc5c6 100644
--- a/Content.Shared/Random/Rules/NearbyTilesPercent.cs
+++ b/Content.Shared/Random/Rules/NearbyTilesPercent.cs
@@ -32,14 +32,13 @@ public override bool Check(EntityManager entManager, EntityUid uid)
}
var transform = entManager.System();
- var mapSys = entManager.System();
var tileDef = IoCManager.Resolve();
var physicsQuery = entManager.GetEntityQuery();
var tileCount = 0;
var matchingTileCount = 0;
- foreach (var tile in mapSys.GetTilesIntersecting(xform.GridUid.Value, grid, new Circle(transform.GetWorldPosition(xform),
+ foreach (var tile in grid.GetTilesIntersecting(new Circle(transform.GetWorldPosition(xform),
Range)))
{
// Only consider collidable anchored (for reasons some subfloor stuff has physics but non-collidable)
diff --git a/Content.Shared/Salvage/SharedSalvageSystem.cs b/Content.Shared/Salvage/SharedSalvageSystem.cs
index 12d0a26449c..0c56f4f556e 100644
--- a/Content.Shared/Salvage/SharedSalvageSystem.cs
+++ b/Content.Shared/Salvage/SharedSalvageSystem.cs
@@ -26,10 +26,10 @@ public abstract partial class SharedSalvageSystem : EntitySystem
[ValidatePrototypeId]
public const string ExpeditionsLootProto = "SalvageLoot";
- public string GetFTLName(LocalizedDatasetPrototype dataset, int seed)
+ public static string GetFTLName(DatasetPrototype dataset, int seed)
{
var random = new System.Random(seed);
- return $"{Loc.GetString(dataset.Values[random.Next(dataset.Values.Count)])}-{random.Next(10, 100)}-{(char) (65 + random.Next(26))}";
+ return $"{dataset.Values[random.Next(dataset.Values.Count)]}-{random.Next(10, 100)}-{(char) (65 + random.Next(26))}";
}
public SalvageMission GetMission(SalvageDifficultyPrototype difficulty, int seed)
diff --git a/Content.Shared/Silicons/Laws/Components/EmagSiliconLawComponent.cs b/Content.Shared/Silicons/Laws/Components/EmagSiliconLawComponent.cs
index 5fe867ae29a..1b5338a7f75 100644
--- a/Content.Shared/Silicons/Laws/Components/EmagSiliconLawComponent.cs
+++ b/Content.Shared/Silicons/Laws/Components/EmagSiliconLawComponent.cs
@@ -29,6 +29,13 @@ public sealed partial class EmagSiliconLawComponent : Component
[DataField, ViewVariables(VVAccess.ReadWrite)]
public TimeSpan StunTime = TimeSpan.Zero;
+ ///
+ /// A role given to entities with this component when they are emagged.
+ /// Mostly just for admin purposes.
+ ///
+ [DataField]
+ public ProtoId? AntagonistRole = "SubvertedSilicon";
+
///
/// The sound that plays for the borg player
/// to let them know they've been emagged
diff --git a/Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs b/Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs
index d78e539aa96..4885bd0265c 100644
--- a/Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs
+++ b/Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs
@@ -29,10 +29,4 @@ public sealed partial class SiliconLawProviderComponent : Component
[DataField]
public SoundSpecifier? LawUploadSound = new SoundPathSpecifier("/Audio/Misc/cryo_warning.ogg");
- ///
- /// Whether this silicon is subverted by an ion storm or emag.
- ///
- [DataField]
- public bool Subverted = false;
-
}
diff --git a/Content.Shared/Silicons/Laws/Components/StartIonStormedComponent.cs b/Content.Shared/Silicons/Laws/Components/StartIonStormedComponent.cs
deleted file mode 100644
index d0124567ff7..00000000000
--- a/Content.Shared/Silicons/Laws/Components/StartIonStormedComponent.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Roles;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Silicons.Laws.Components;
-
-///
-/// Applies law altering ion storms on a specific entity IonStormAmount times when the entity is spawned.
-///
-[RegisterComponent]
-public sealed partial class StartIonStormedComponent : Component
-{
- ///
- /// Amount of times that the ion storm will be run on the entity on spawn.
- ///
- [DataField]
- public int IonStormAmount = 1;
-}
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
index ca2d593dbe1..37e5cd6e6ae 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
@@ -34,7 +34,7 @@ private void OnAirlockBolt(EntityUid ent, DoorBoltComponent component, StationAi
}
///
- /// Attempts to toggle the door's emergency access. If wire was cut (AI) or its not powered - notifies AI and does nothing.
+ /// Attempts to bolt door. If wire was cut (AI) or its not powered - notifies AI and does nothing.
///
private void OnAirlockEmergencyAccess(EntityUid ent, AirlockComponent component, StationAiEmergencyAccessEvent args)
{
@@ -48,7 +48,7 @@ private void OnAirlockEmergencyAccess(EntityUid ent, AirlockComponent component,
}
///
- /// Attempts to electrify the door. If wire was cut (AI or for one of power-wires) or its not powered - notifies AI and does nothing.
+ /// Attempts to bolt door. If wire was cut (AI or for one of power-wires) or its not powered - notifies AI and does nothing.
///
private void OnElectrified(EntityUid ent, ElectrifiedComponent component, StationAiElectrifiedEvent args)
{
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
index 5fca5cad280..189515635a8 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
@@ -394,9 +394,6 @@ private void AttachEye(Entity ent)
private void OnAiInsert(Entity ent, ref EntInsertedIntoContainerMessage args)
{
- if (args.Container.ID != StationAiCoreComponent.Container)
- return;
-
if (_timing.ApplyingState)
return;
diff --git a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs
index d3416949d53..bdc62a6bb37 100644
--- a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs
+++ b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs
@@ -56,7 +56,6 @@ public override void Initialize()
EntManager = EntityManager,
Maps = _maps,
System = this,
- VisibleTiles = _singleTiles,
};
}
@@ -279,7 +278,7 @@ private bool IsCorner(
///
private record struct SeedJob() : IRobustJob
{
- public required StationAiVisionSystem System;
+ public StationAiVisionSystem System;
public Entity Grid;
public Box2 ExpandedBounds;
@@ -294,14 +293,14 @@ private record struct ViewJob() : IParallelRobustJob
{
public int BatchSize => 1;
- public required IEntityManager EntManager;
- public required SharedMapSystem Maps;
- public required StationAiVisionSystem System;
+ public IEntityManager EntManager;
+ public SharedMapSystem Maps;
+ public StationAiVisionSystem System;
public Entity Grid;
public List> Data = new();
- public required HashSet VisibleTiles;
+ public HashSet VisibleTiles;
public readonly List> Vis1 = new();
public readonly List> Vis2 = new();
diff --git a/Content.Shared/Singularity/Components/SingularityGeneratorComponent.cs b/Content.Shared/Singularity/Components/SingularityGeneratorComponent.cs
deleted file mode 100644
index 715584b5bc6..00000000000
--- a/Content.Shared/Singularity/Components/SingularityGeneratorComponent.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-using Content.Shared.Physics;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Singularity.Components;
-
-[RegisterComponent, AutoGenerateComponentPause, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class SingularityGeneratorComponent : Component
-{
- ///
- /// The amount of power this generator has accumulated.
- /// If you want to set this use
- ///
- [DataField]
- public float Power = 0;
-
- ///
- /// The power threshold at which this generator will spawn a singularity.
- /// If you want to set this use
- ///
- [DataField]
- public float Threshold = 16;
-
- ///
- /// Allows the generator to ignore all the failsafe stuff, e.g. when emagged
- ///
- [DataField, AutoNetworkedField]
- public bool FailsafeDisabled = false;
-
- ///
- /// Maximum distance at which the generator will check for a field at
- ///
- [DataField]
- public float FailsafeDistance = 16;
-
- ///
- /// The prototype ID used to spawn a singularity.
- ///
- [DataField("spawnId", customTypeSerializer: typeof(PrototypeIdSerializer))]
- public string? SpawnPrototype = "Singularity";
-
- ///
- /// The masks the raycast should not go through
- ///
- [DataField]
- public int CollisionMask = (int)CollisionGroup.FullTileMask;
-
- ///
- /// Message to use when there's no containment field on cardinal directions
- ///
- [DataField]
- public LocId ContainmentFailsafeMessage = "comp-generator-failsafe";
-
- ///
- /// For how long the failsafe will cause the generator to stop working and not issue a failsafe warning
- ///
- [DataField]
- public TimeSpan FailsafeCooldown = TimeSpan.FromSeconds(10);
-
- ///
- /// How long until the generator can issue a failsafe warning again
- ///
- [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
- [AutoPausedField]
- public TimeSpan NextFailsafe = TimeSpan.Zero;
-}
diff --git a/Content.Shared/Singularity/EntitySystems/SharedSingularityGeneratorSystem.cs b/Content.Shared/Singularity/EntitySystems/SharedSingularityGeneratorSystem.cs
deleted file mode 100644
index ee6dc89bb84..00000000000
--- a/Content.Shared/Singularity/EntitySystems/SharedSingularityGeneratorSystem.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Emag.Systems;
-using Content.Shared.Popups;
-using Content.Shared.Singularity.Components;
-
-namespace Content.Shared.Singularity.EntitySystems;
-
-///
-/// Shared part of SingularitySingularityGeneratorSystem
-///
-public abstract class SharedSingularityGeneratorSystem : EntitySystem
-{
- #region Dependencies
- [Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
- #endregion Dependencies
-
- public override void Initialize()
- {
- base.Initialize();
-
- SubscribeLocalEvent(OnEmagged);
- }
-
- private void OnEmagged(EntityUid uid, SingularityGeneratorComponent component, ref GotEmaggedEvent args)
- {
- component.FailsafeDisabled = true;
- args.Handled = true;
- }
-}
\ No newline at end of file
diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs
index 2bba66674b3..03bfd3e3663 100644
--- a/Content.Shared/Station/SharedStationSpawningSystem.cs
+++ b/Content.Shared/Station/SharedStationSpawningSystem.cs
@@ -2,7 +2,6 @@
using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Inventory;
-using Content.Shared.Item;
using Content.Shared.Preferences.Loadouts;
using Content.Shared.Roles;
using Content.Shared.Storage;
@@ -70,7 +69,7 @@ public void EquipRoleName(EntityUid entity, RoleLoadout loadout, RoleLoadoutProt
if (string.IsNullOrEmpty(name) && PrototypeManager.TryIndex(roleProto.NameDataset, out var nameData))
{
- name = Loc.GetString(_random.Pick(nameData.Values));
+ name = _random.Pick(nameData.Values);
}
if (!string.IsNullOrEmpty(name))
@@ -146,23 +145,27 @@ public void EquipStartingGear(EntityUid entity, IEquipmentLoadout? startingGear,
if (startingGear.Storage.Count > 0)
{
var coords = _xformSystem.GetMapCoordinates(entity);
+ var ents = new ValueList();
_inventoryQuery.TryComp(entity, out var inventoryComp);
- foreach (var (slotName, entProtos) in startingGear.Storage)
+ foreach (var (slot, entProtos) in startingGear.Storage)
{
- if (entProtos == null || entProtos.Count == 0)
+ ents.Clear();
+ if (entProtos.Count == 0)
continue;
if (inventoryComp != null &&
- InventorySystem.TryGetSlotEntity(entity, slotName, out var slotEnt, inventoryComponent: inventoryComp) &&
+ InventorySystem.TryGetSlotEntity(entity, slot, out var slotEnt, inventoryComponent: inventoryComp) &&
_storageQuery.TryComp(slotEnt, out var storage))
{
-
- foreach (var entProto in entProtos)
+ foreach (var ent in entProtos)
{
- var spawnedEntity = Spawn(entProto, coords);
+ ents.Add(Spawn(ent, coords));
+ }
- _storage.Insert(slotEnt.Value, spawnedEntity, out _, storageComp: storage, playSound: false);
+ foreach (var ent in ents)
+ {
+ _storage.Insert(slotEnt.Value, ent, out _, storageComp: storage, playSound: false);
}
}
}
diff --git a/Content.Shared/Storage/Components/StoreOnCollideComponent.cs b/Content.Shared/Storage/Components/StoreOnCollideComponent.cs
deleted file mode 100644
index d8fff319384..00000000000
--- a/Content.Shared/Storage/Components/StoreOnCollideComponent.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Shared.Storage.EntitySystems;
-using Content.Shared.Whitelist;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Storage.Components;
-
-// Use where you want an entity to store other entities on collide
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(StoreOnCollideSystem))]
-public sealed partial class StoreOnCollideComponent : Component
-{
- ///
- /// Entities that are allowed in the storage on collide
- ///
- [DataField]
- public EntityWhitelist? Whitelist;
-
- ///
- /// Should this storage lock on collide, provided they have a lock component?
- ///
- [DataField]
- public bool LockOnCollide;
-
- ///
- /// Should the behavior be disabled when the storage is first opened?
- ///
- [DataField]
- public bool DisableWhenFirstOpened;
-
- ///
- /// If the behavior is disabled or not
- ///
- [DataField, AutoNetworkedField]
- public bool Disabled;
-}
diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
index 829f574ad1d..309ac0a2e09 100644
--- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -344,14 +344,6 @@ public bool TryCloseStorage(EntityUid target)
return true;
}
- public bool IsOpen(EntityUid target, SharedEntityStorageComponent? component = null)
- {
- if (!ResolveStorage(target, ref component))
- return false;
-
- return component.Open;
- }
-
public bool CanOpen(EntityUid user, EntityUid target, bool silent = false, SharedEntityStorageComponent? component = null)
{
if (!ResolveStorage(target, ref component))
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 921cc760aa0..68825425e61 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -130,6 +130,7 @@ public override void Initialize()
SubscribeAllEvent(OnInteractWithItem);
SubscribeAllEvent(OnSetItemLocation);
SubscribeAllEvent(OnInsertItemIntoLocation);
+ SubscribeAllEvent(OnRemoveItem);
SubscribeAllEvent(OnSaveItemLocation);
SubscribeLocalEvent(OnReclaimed);
@@ -639,6 +640,19 @@ private void OnSetItemLocation(StorageSetItemLocationEvent msg, EntitySessionEve
TrySetItemStorageLocation(item!, storage!, msg.Location);
}
+ private void OnRemoveItem(StorageRemoveItemEvent msg, EntitySessionEventArgs args)
+ {
+ if (!ValidateInput(args, msg.StorageEnt, msg.ItemEnt, out var player, out var storage, out var item))
+ return;
+
+ _adminLog.Add(
+ LogType.Storage,
+ LogImpact.Low,
+ $"{ToPrettyString(player):player} is removing {ToPrettyString(item):item} from {ToPrettyString(storage):storage}");
+ TransformSystem.DropNextTo(item.Owner, player.Owner);
+ Audio.PlayPredicted(storage.Comp.StorageRemoveSound, storage, player, _audioParams);
+ }
+
private void OnInsertItemIntoLocation(StorageInsertItemIntoLocationEvent msg, EntitySessionEventArgs args)
{
if (!ValidateInput(args, msg.StorageEnt, msg.ItemEnt, out var player, out var storage, out var item, held: true))
diff --git a/Content.Shared/Storage/EntitySystems/StoreOnCollideSystem.cs b/Content.Shared/Storage/EntitySystems/StoreOnCollideSystem.cs
deleted file mode 100644
index 000e19faf32..00000000000
--- a/Content.Shared/Storage/EntitySystems/StoreOnCollideSystem.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using Content.Shared.Lock;
-using Content.Shared.Storage.Components;
-using Content.Shared.Whitelist;
-using Robust.Shared.Network;
-using Robust.Shared.Physics.Events;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.Storage.EntitySystems;
-
-internal sealed class StoreOnCollideSystem : EntitySystem
-{
- [Dependency] private readonly SharedEntityStorageSystem _storage = default!;
- [Dependency] private readonly LockSystem _lock = default!;
- [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
- [Dependency] private readonly INetManager _netMan = default!;
- [Dependency] private readonly IGameTiming _gameTiming = default!;
-
- public override void Initialize()
- {
- base.Initialize();
- SubscribeLocalEvent(OnCollide);
- SubscribeLocalEvent(AfterOpen);
- // TODO: Add support to stop colliding after throw, wands will need a WandComp
- }
-
- // We use Collide instead of Projectile to support different types of interactions
- private void OnCollide(Entity ent, ref StartCollideEvent args)
- {
- TryStoreTarget(ent, args.OtherEntity);
-
- TryLockStorage(ent);
- }
-
- private void AfterOpen(Entity ent, ref StorageAfterOpenEvent args)
- {
- var comp = ent.Comp;
-
- if (comp is { DisableWhenFirstOpened: true, Disabled: false })
- comp.Disabled = true;
- }
-
- private void TryStoreTarget(Entity ent, EntityUid target)
- {
- var storageEnt = ent.Owner;
- var comp = ent.Comp;
-
- if (_netMan.IsClient || _gameTiming.ApplyingState)
- return;
-
- if (ent.Comp.Disabled || storageEnt == target || Transform(target).Anchored || _storage.IsOpen(storageEnt) || _whitelist.IsWhitelistFail(comp.Whitelist, target))
- return;
-
- _storage.Insert(target, storageEnt);
-
- }
-
- private void TryLockStorage(Entity ent)
- {
- var storageEnt = ent.Owner;
- var comp = ent.Comp;
-
- if (_netMan.IsClient || _gameTiming.ApplyingState)
- return;
-
- if (ent.Comp.Disabled)
- return;
-
- if (comp.LockOnCollide && !_lock.IsLocked(storageEnt))
- _lock.Lock(storageEnt, storageEnt);
- }
-}
diff --git a/Content.Shared/Storage/StorageComponent.cs b/Content.Shared/Storage/StorageComponent.cs
index 5683ae95a71..d2c607e57f7 100644
--- a/Content.Shared/Storage/StorageComponent.cs
+++ b/Content.Shared/Storage/StorageComponent.cs
@@ -169,6 +169,20 @@ public StorageSetItemLocationEvent(NetEntity itemEnt, NetEntity storageEnt, Item
}
}
+ [Serializable, NetSerializable]
+ public sealed class StorageRemoveItemEvent : EntityEventArgs
+ {
+ public readonly NetEntity ItemEnt;
+
+ public readonly NetEntity StorageEnt;
+
+ public StorageRemoveItemEvent(NetEntity itemEnt, NetEntity storageEnt)
+ {
+ ItemEnt = itemEnt;
+ StorageEnt = storageEnt;
+ }
+ }
+
[Serializable, NetSerializable]
public sealed class StorageInsertItemIntoLocationEvent : EntityEventArgs
{
diff --git a/Content.Shared/Store/ListingPrototype.cs b/Content.Shared/Store/ListingPrototype.cs
index e2339b72c67..05ac5cc4cd5 100644
--- a/Content.Shared/Store/ListingPrototype.cs
+++ b/Content.Shared/Store/ListingPrototype.cs
@@ -39,8 +39,7 @@ public ListingData(ListingData other) : this(
other.Categories,
other.OriginalCost,
other.RestockTime,
- other.DiscountDownTo,
- other.DisableRefund
+ other.DiscountDownTo
)
{
@@ -64,8 +63,7 @@ public ListingData(
HashSet> categories,
IReadOnlyDictionary, FixedPoint2> originalCost,
TimeSpan restockTime,
- Dictionary, FixedPoint2> dataDiscountDownTo,
- bool disableRefund
+ Dictionary, FixedPoint2> dataDiscountDownTo
)
{
Name = name;
@@ -86,7 +84,6 @@ bool disableRefund
OriginalCost = originalCost;
RestockTime = restockTime;
DiscountDownTo = new Dictionary, FixedPoint2>(dataDiscountDownTo);
- DisableRefund = disableRefund;
}
[ViewVariables]
@@ -197,12 +194,6 @@ bool disableRefund
[DataField]
public Dictionary, FixedPoint2> DiscountDownTo = new();
- ///
- /// Whether or not to disable refunding for the store when the listing is purchased from it.
- ///
- [DataField]
- public bool DisableRefund = false;
-
public bool Equals(ListingData? listing)
{
if (listing == null)
@@ -296,8 +287,7 @@ public ListingDataWithCostModifiers(ListingData listingData)
listingData.Categories,
listingData.OriginalCost,
listingData.RestockTime,
- listingData.DiscountDownTo,
- listingData.DisableRefund
+ listingData.DiscountDownTo
)
{
}
diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
index e4b31debc66..7afe503275a 100644
--- a/Content.Shared/Strip/SharedStrippableSystem.cs
+++ b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -10,7 +10,6 @@
using Content.Shared.Hands.EntitySystems;
using Content.Shared.IdentityManagement;
using Content.Shared.Interaction;
-using Content.Shared.Interaction.Components;
using Content.Shared.Interaction.Events;
using Content.Shared.Inventory;
using Content.Shared.Inventory.VirtualItem;
@@ -295,7 +294,7 @@ private void StartStripRemoveInventory(
if (!stealth)
{
- if (IsStripHidden(slotDef, user))
+ if (slotDef.StripHidden)
_popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-hidden", ("slot", slot)), target, target, PopupType.Large);
else
_popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", item)), target, target, PopupType.Large);
@@ -661,15 +660,4 @@ private void OnCanDrop(EntityUid uid, StrippableComponent component, ref CanDrop
if (args.CanDrop)
args.Handled = true;
}
-
- public bool IsStripHidden(SlotDefinition definition, EntityUid? viewer)
- {
- if (!definition.StripHidden)
- return false;
-
- if (viewer == null)
- return true;
-
- return !HasComp(viewer);
- }
}
diff --git a/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs b/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
index 2ab17e2c5e4..6245118466f 100644
--- a/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
+++ b/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
@@ -12,6 +12,7 @@ namespace Content.Shared.Traits.Assorted;
public sealed class PermanentBlindnessSystem : EntitySystem
{
[Dependency] private readonly INetManager _net = default!;
+ [Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly BlindableSystem _blinding = default!;
///
@@ -32,26 +33,20 @@ private void OnExamined(Entity blindness, ref Exami
private void OnShutdown(Entity blindness, ref ComponentShutdown args)
{
- if (!TryComp(blindness.Owner, out var blindable))
- return;
-
- if (blindable.MinDamage != 0)
- {
- _blinding.SetMinDamage((blindness.Owner, blindable), 0);
- }
+ _blinding.UpdateIsBlind(blindness.Owner);
}
private void OnMapInit(Entity blindness, ref MapInitEvent args)
{
- if(!TryComp(blindness.Owner, out var blindable))
+ if (!_entityManager.TryGetComponent(blindness, out var blindable))
return;
if (blindness.Comp.Blindness != 0)
- _blinding.SetMinDamage((blindness.Owner, blindable), blindness.Comp.Blindness);
+ _blinding.SetMinDamage(new Entity(blindness.Owner, blindable), blindness.Comp.Blindness);
else
{
var maxMagnitudeInt = (int) BlurryVisionComponent.MaxMagnitude;
- _blinding.SetMinDamage((blindness.Owner, blindable), maxMagnitudeInt);
+ _blinding.SetMinDamage(new Entity(blindness.Owner, blindable), maxMagnitudeInt);
}
}
}
diff --git a/Content.Shared/UserInterface/ActivatableUIRequiresAnchorComponent.cs b/Content.Shared/UserInterface/ActivatableUIRequiresAnchorComponent.cs
deleted file mode 100644
index 89bcae7100f..00000000000
--- a/Content.Shared/UserInterface/ActivatableUIRequiresAnchorComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.UserInterface;
-
-///
-/// Specifies the entity as requiring anchoring to keep the ActivatableUI open.
-///
-[RegisterComponent, NetworkedComponent]
-public sealed partial class ActivatableUIRequiresAnchorComponent : Component
-{
- [DataField]
- public LocId? Popup = "ui-needs-anchor";
-}
diff --git a/Content.Shared/UserInterface/ActivatableUIRequiresAnchorSystem.cs b/Content.Shared/UserInterface/ActivatableUIRequiresAnchorSystem.cs
deleted file mode 100644
index 1d453334e35..00000000000
--- a/Content.Shared/UserInterface/ActivatableUIRequiresAnchorSystem.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Shared.Popups;
-
-namespace Content.Shared.UserInterface;
-
-///
-///
-///
-public sealed class ActivatableUIRequiresAnchorSystem : EntitySystem
-{
- [Dependency] private readonly SharedPopupSystem _popup = default!;
-
- public override void Initialize()
- {
- base.Initialize();
- SubscribeLocalEvent(OnActivatableUIOpenAttempt);
- SubscribeLocalEvent(OnUICheck);
- }
-
- private void OnUICheck(Entity ent, ref BoundUserInterfaceCheckRangeEvent args)
- {
- if (args.Result == BoundUserInterfaceRangeResult.Fail)
- return;
-
- if (!Transform(ent.Owner).Anchored)
- {
- args.Result = BoundUserInterfaceRangeResult.Fail;
- }
- }
-
- private void OnActivatableUIOpenAttempt(Entity ent, ref ActivatableUIOpenAttemptEvent args)
- {
- if (args.Cancelled)
- return;
-
- if (!Transform(ent.Owner).Anchored)
- {
- _popup.PopupClient(Loc.GetString("comp-gas-pump-ui-needs-anchor"), args.User);
- args.Cancel();
- }
- }
-}
diff --git a/Content.Shared/Weapons/Ranged/Events/BeforeGunShootEvent.cs b/Content.Shared/Weapons/Ranged/Events/BeforeGunShootEvent.cs
deleted file mode 100644
index 1d3317c840f..00000000000
--- a/Content.Shared/Weapons/Ranged/Events/BeforeGunShootEvent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Inventory;
-using Content.Shared.Weapons.Ranged.Components;
-
-namespace Content.Shared.Weapons.Ranged.Events;
-///
-/// This event is triggered on an entity right before they shoot a gun.
-///
-public sealed partial class SelfBeforeGunShotEvent : CancellableEntityEventArgs, IInventoryRelayEvent
-{
- public SlotFlags TargetSlots { get; } = SlotFlags.WITHOUT_POCKET;
- public readonly EntityUid Shooter;
- public readonly Entity Gun;
- public readonly List<(EntityUid? Entity, IShootable Shootable)> Ammo;
- public SelfBeforeGunShotEvent(EntityUid shooter, Entity gun, List<(EntityUid? Entity, IShootable Shootable)> ammo)
- {
- Shooter = shooter;
- Gun = gun;
- Ammo = ammo;
- }
-}
diff --git a/Resources/Audio/StationEvents/attributions.yml b/Resources/Audio/StationEvents/attributions.yml
index 6ddd1d74d68..70ecf1d2e77 100644
--- a/Resources/Audio/StationEvents/attributions.yml
+++ b/Resources/Audio/StationEvents/attributions.yml
@@ -11,9 +11,4 @@
- files: ["sound_station_14.ogg"]
license: "CC-BY-3.0"
copyright: "Created by Donchan"
- source: "https://www.youtube.com/watch?v=4nUpeYLKUns"
-
-- files: ["nukemass.ogg"]
- license: "CC-BY-3.0"
- copyright: "Created by mrjajkes"
- source: "https://www.youtube.com/watch?v=gLSyt7AaqQM"
+ source: "https://www.youtube.com/watch?v=4nUpeYLKUns"
\ No newline at end of file
diff --git a/Resources/Audio/StationEvents/nukemass.ogg b/Resources/Audio/StationEvents/nukemass.ogg
deleted file mode 100644
index 2a20fb44241..00000000000
Binary files a/Resources/Audio/StationEvents/nukemass.ogg and /dev/null differ
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 95fa1cf8421..824a6577b85 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -612,20 +612,5 @@ Entries:
id: 76
time: '2024-11-15T03:24:27.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33262
-- author: ScarKy0, GoldenCan
- changes:
- - message: Players that take over emagged/ion stormed borgs now correctly get assigned
- the antag role.
- type: Fix
- id: 77
- time: '2024-11-20T07:55:12.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33311
-- author: TokenStyle
- changes:
- - message: makeghostroleraffled admin command now works with few arguments!
- type: Fix
- id: 78
- time: '2024-11-30T20:11:44.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31836
Name: Admin
Order: 3
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index ba1af71d159..82896471192 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,4 +1,594 @@
Entries:
+- author: Erisfiregamer1
+ changes:
+ - message: New chemical, Sedin. It restores seeds on plants 20% of the time with
+ other adverse effects included.
+ type: Add
+ id: 7111
+ time: '2024-08-15T00:38:24.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/27110
+- author: PoorMansDreams
+ changes:
+ - message: Added Star sticker in loadouts for Secoffs
+ type: Add
+ id: 7112
+ time: '2024-08-15T01:50:55.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/29767
+- author: FATFSAAM2
+ changes:
+ - message: added 7 new figurine voice lines.
+ type: Add
+ - message: changed a hos figurine voice line to not include a typo.
+ type: Fix
+ id: 7113
+ time: '2024-08-15T12:34:41.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30865
+- author: to4no_fix
+ changes:
+ - message: Added a new electropack that shocks when a trigger is triggered
+ type: Add
+ - message: Added a new shock collar that shocks when a trigger is triggered
+ type: Add
+ - message: Two shock collars and two remote signallers added to the warden's locker
+ type: Add
+ - message: Shock collar added as a new target for the thief
+ type: Add
+ - message: A new Special Means technology has been added to the Arsenal research
+ branch at the 1st research level. Its research opens up the possibility of producing
+ electropacks at security techfab. The cost of technology research is 5000
+ type: Add
+ id: 7114
+ time: '2024-08-15T14:30:39.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30529
+- author: Mervill
+ changes:
+ - message: The Gas Analyzer won't spuriously shut down for seemly no reason.
+ type: Tweak
+ - message: The Gas Analyzer will always switch to the device tab when a new object
+ is scanned.
+ type: Tweak
+ - message: The Gas Analyzer's interaction range is now equal to the standard interaction
+ range
+ type: Fix
+ - message: Clicking the Gas Analyzer when it's in your hand has proper enable/disable
+ behavior.
+ type: Fix
+ id: 7115
+ time: '2024-08-15T14:45:13.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30763
+- author: Nimfar11
+ changes:
+ - message: Adds a gold toilet
+ type: Add
+ - message: Adds a target for the Thief to steal the golden toilet
+ type: Add
+ - message: Corrected the sprite image for the normal toilet.
+ type: Fix
+ id: 7116
+ time: '2024-08-15T19:23:59.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31049
+- author: themias
+ changes:
+ - message: Raw meat cutlets can be cooked on a grill
+ type: Tweak
+ id: 7117
+ time: '2024-08-15T19:30:09.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31048
+- author: IProduceWidgets
+ changes:
+ - message: Meteor dust should more consistently happen instead of meteors.
+ type: Tweak
+ id: 7118
+ time: '2024-08-15T19:33:17.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31018
+- author: Emisse
+ changes:
+ - message: Atlas, Cluster, Europa, & Saltern removed from the game.
+ type: Remove
+ id: 7119
+ time: '2024-08-15T21:10:07.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31058
+- author: Emisse
+ changes:
+ - message: Origin removed from the game.
+ type: Remove
+ id: 7120
+ time: '2024-08-15T22:22:02.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31059
+- author: Psychpsyo
+ changes:
+ - message: You can now be German on ze space station! (added German accent)
+ type: Add
+ id: 7121
+ time: '2024-08-15T23:30:21.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30541
+- author: EmoGarbage404
+ changes:
+ - message: Reduced the amount of ore on the mining asteroid and expeditions.
+ type: Tweak
+ - message: Increased the amount of ore on magnet asteroids.
+ type: Tweak
+ - message: Each piece of ore now only has enough material to create 1 sheet.
+ type: Tweak
+ - message: The salvage magnet now accurately reports the contents of asteroids.
+ type: Fix
+ id: 7122
+ time: '2024-08-16T01:43:54.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30920
+- author: metalgearsloth
+ changes:
+ - message: Fix mains light on wires not being lit.
+ type: Fix
+ id: 7123
+ time: '2024-08-16T03:59:46.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31066
+- author: IgorAnt028
+ changes:
+ - message: The dead and knocked down now stop holding objects
+ type: Fix
+ id: 7124
+ time: '2024-08-16T04:53:34.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31009
+- author: SlamBamActionman
+ changes:
+ - message: Nar'Sie is satiated; moppable blood will no longer duplicate.
+ type: Fix
+ id: 7125
+ time: '2024-08-16T10:47:53.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30983
+- author: Blackern5000
+ changes:
+ - message: Disabler SMGs no longer fit in combat boots
+ type: Fix
+ id: 7126
+ time: '2024-08-17T01:00:21.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31110
+- author: Mervill
+ changes:
+ - message: Fixed suffocation alerts not appearing.
+ type: Fix
+ id: 7127
+ time: '2024-08-17T02:02:51.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31115
+- author: TokenStyle
+ changes:
+ - message: Plant's scream mutation now have 10+ scream varieties.
+ type: Add
+ id: 7128
+ time: '2024-08-17T02:09:25.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30862
+- author: Boaz1111
+ changes:
+ - message: Phlogiston now also ignites people who consume it.
+ type: Add
+ id: 7129
+ time: '2024-08-17T02:49:11.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30955
+- author: slarticodefast
+ changes:
+ - message: Fixed borgs brains being teleported outside their chassis and PAIs outside
+ a PDA or pocket by the bluespace anomaly.
+ type: Fix
+ id: 7130
+ time: '2024-08-17T04:58:23.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30744
+- author: EmoGarbage404
+ changes:
+ - message: You can no longer see wreck names in the salvage magnet UI.
+ type: Tweak
+ id: 7131
+ time: '2024-08-17T05:09:21.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31087
+- author: EmoGarbage404
+ changes:
+ - message: You can now smelt ores in intervals smaller than 30.
+ type: Add
+ id: 7132
+ time: '2024-08-17T05:12:55.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31074
+- author: themias
+ changes:
+ - message: Added a recipe for croissants
+ type: Add
+ id: 7133
+ time: '2024-08-17T14:09:42.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30825
+- author: Ubaser
+ changes:
+ - message: Red crowbars no longer fit in pockets.
+ type: Fix
+ id: 7134
+ time: '2024-08-17T14:32:04.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30939
+- author: iztokbajcar
+ changes:
+ - message: Fixed some typos in the guidebook.
+ type: Fix
+ id: 7135
+ time: '2024-08-18T15:31:48.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31159
+- author: Unkn0wnGh0st333
+ changes:
+ - message: changed human male coughing
+ type: Tweak
+ id: 7136
+ time: '2024-08-18T16:00:42.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30893
+- author: EmoGarbage404
+ changes:
+ - message: Legends tell of horrifying Goliaths that roam the mining asteroid.
+ type: Add
+ id: 7137
+ time: '2024-08-18T16:22:36.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30839
+- author: Beck Thompson
+ changes:
+ - message: Cutting food now moves the sliced pieces a small amount!
+ type: Tweak
+ id: 7138
+ time: '2024-08-18T21:18:20.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31166
+- author: lzk228
+ changes:
+ - message: Pizza and pizza box now have 3x2 size in inventory.
+ type: Tweak
+ - message: Pizze box is 4x2 inside and always will have a pizza with a knife inside.
+ type: Tweak
+ - message: Pizza box have whitelist for utensils and pizza.
+ type: Tweak
+ id: 7139
+ time: '2024-08-18T21:55:42.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31171
+- author: Deatherd
+ changes:
+ - message: Sharks Go RAWR!
+ type: Tweak
+ id: 7140
+ time: '2024-08-18T22:18:07.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31142
+- author: slarticodefast
+ changes:
+ - message: Fixed the radiation collector warning light thresholds.
+ type: Fix
+ id: 7141
+ time: '2024-08-18T22:25:02.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31175
+- author: Potato1234_x
+ changes:
+ - message: Added tea plants that can be dried and ground to make tea powder which
+ can then be used to make tea.
+ type: Add
+ - message: Added blue pumpkins. Currently useless but recipe uses are coming soon.
+ type: Add
+ id: 7142
+ time: '2024-08-18T22:28:18.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/25092
+- author: deltanedas
+ changes:
+ - message: Added Memory Cells for storing logic signals persistently.
+ type: Add
+ id: 7143
+ time: '2024-08-18T22:34:43.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/24983
+- author: Psychpsyo
+ changes:
+ - message: The random sentience event is back and can no longer pick things that
+ aren't even on the station.
+ type: Add
+ id: 7144
+ time: '2024-08-18T23:41:12.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/29123
+- author: EmoGarbage404
+ changes:
+ - message: Ore can no longer be destroyed by explosions. Happy blast mining.
+ type: Tweak
+ id: 7145
+ time: '2024-08-19T01:55:49.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31182
+- author: slarticodefast
+ changes:
+ - message: Mobs without hands can no longer toggle other players' suit pieces.
+ type: Fix
+ id: 7146
+ time: '2024-08-19T02:41:27.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31152
+- author: Goldminermac
+ changes:
+ - message: Chocolate-chip and blueberry pancakes can now be in stacks of up to nine
+ for consistency.
+ type: Fix
+ id: 7147
+ time: '2024-08-19T02:42:58.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31123
+- author: tosatur
+ changes:
+ - message: Made hydroponics alert light more orange
+ type: Tweak
+ id: 7148
+ time: '2024-08-19T02:48:47.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31088
+- author: redmushie
+ changes:
+ - message: News management console now checks for Service ID card access instead
+ of the manifest
+ type: Fix
+ id: 7149
+ time: '2024-08-19T02:55:44.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31160
+- author: Moomoobeef
+ changes:
+ - message: Added pitchers for the chef who wants to serve beverages too.
+ type: Add
+ id: 7150
+ time: '2024-08-19T03:01:26.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31105
+- author: EmoGarbage404
+ changes:
+ - message: Space carp and Sharkminnows now drop teeth when butchered.
+ type: Add
+ - message: Added new bounties for carp and shark teeth.
+ type: Add
+ id: 7151
+ time: '2024-08-19T03:04:59.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31070
+- author: to4no_fix
+ changes:
+ - message: Now it takes 5 seconds to take off or put on a muzzle
+ type: Tweak
+ - message: Now it takes 5 seconds to take off or put on a blindfold
+ type: Tweak
+ - message: Added a recipe for producing a straitjacket, it opens when researching
+ the Special Means technology, it can be produced at the security techfab
+ type: Add
+ id: 7152
+ time: '2024-08-19T03:05:25.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31095
+- author: Magicalus
+ changes:
+ - message: Suit sensors, borgs, and PDAs can no longer be saved to device-lists.
+ type: Tweak
+ id: 7153
+ time: '2024-08-19T03:13:04.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30997
+- author: UBlueberry
+ changes:
+ - message: The guidebook entries for all antagonists have been revised.
+ type: Tweak
+ id: 7154
+ time: '2024-08-19T03:16:05.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31075
+- author: TheWaffleJesus
+ changes:
+ - message: ERT Chaplains now have blessings to use their bible.
+ type: Fix
+ id: 7155
+ time: '2024-08-19T03:19:19.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30993
+- author: DieselMohawk
+ changes:
+ - message: Reshaped the Security Helmet
+ type: Tweak
+ id: 7156
+ time: '2024-08-19T03:21:44.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30961
+- author: EmoGarbage404
+ changes:
+ - message: Increased the sell prices of most materials
+ type: Tweak
+ - message: Increased the price of ordering material crates from cargo.
+ type: Tweak
+ - message: Decreased the amount of plasma in one plasma crate from 3 stacks to 1
+ stack.
+ type: Tweak
+ id: 7157
+ time: '2024-08-19T03:28:46.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30869
+- author: Flareguy
+ changes:
+ - message: Added 2 new vox customization options for both hair & facial hair.
+ type: Add
+ - message: Vox Long Braids no longer incorrectly uses the Vox Afro sprite.
+ type: Fix
+ id: 7158
+ time: '2024-08-19T03:32:16.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30815
+- author: EmoGarbage404
+ changes:
+ - message: The recycler can now be broken down and repaired.
+ type: Add
+ - message: Breaking the recycler now removes the EMAG effect.
+ type: Add
+ - message: The material-reclaiming efficiency of the recycler has been increased.
+ type: Tweak
+ - message: Fixed a bug where inaccessible solutions could be extracted from entities
+ via the recycler.
+ type: Fix
+ - message: Removed the material reclaimer.
+ type: Remove
+ id: 7159
+ time: '2024-08-19T03:39:00.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30802
+- author: lzk228
+ changes:
+ - message: Cheese wheel now Normal sized and slices in 4 slices instead of 3.
+ type: Tweak
+ id: 7160
+ time: '2024-08-19T07:54:35.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31168
+- author: Beck Thompson
+ changes:
+ - message: Slightly increased the price of the seed restock.
+ type: Tweak
+ id: 7161
+ time: '2024-08-19T10:33:41.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31185
+- author: tosatur
+ changes:
+ - message: Added more words to chat sanitisation
+ type: Tweak
+ id: 7163
+ time: '2024-08-19T14:03:07.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31085
+- author: tosatur
+ changes:
+ - message: Changed text for ghost visibility toggle
+ type: Tweak
+ id: 7164
+ time: '2024-08-19T17:51:55.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30998
+- author: themias
+ changes:
+ - message: Lizards can now eat meat dumplings.
+ type: Fix
+ id: 7165
+ time: '2024-08-19T18:17:28.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31212
+- author: themias
+ changes:
+ - message: Added the Combat Bakery Kit to the syndicate uplink. Includes a deadly
+ edible baguette sword and throwing star croissants for 3 TC.
+ type: Add
+ - message: Baguettes can be worn on the belt and normal ones do one blunt damage.
+ type: Tweak
+ - message: Mimes have a baguette instead of an MRE in their survival kits.
+ type: Tweak
+ id: 7167
+ time: '2024-08-19T18:57:30.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31179
+- author: metalgearsloth
+ changes:
+ - message: Fix wire sounds not playing.
+ type: Fix
+ id: 7168
+ time: '2024-08-19T19:50:03.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31067
+- author: redmushie
+ changes:
+ - message: Communications console buttons now have descriptive tooltips
+ type: Add
+ id: 7169
+ time: '2024-08-19T20:36:36.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31217
+- author: Mephisto72
+ changes:
+ - message: The Detective can now access Externals and Cryogenics like their Officer
+ counterpart.
+ type: Tweak
+ id: 7170
+ time: '2024-08-19T23:44:51.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30203
+- author: Vermidia
+ changes:
+ - message: Mothroaches can now wear anything hamlet can wear
+ type: Add
+ id: 7171
+ time: '2024-08-20T04:20:12.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/28956
+- author: Cojoke-dot
+ changes:
+ - message: Devouring bodies now reduces bleed for Space Dragons.
+ type: Tweak
+ id: 7172
+ time: '2024-08-20T10:57:06.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/29661
+- author: cranberriez
+ changes:
+ - message: Added Discord webhook error logging!
+ type: Tweak
+ id: 7173
+ time: '2024-08-20T21:12:31.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30835
+- author: Repo
+ changes:
+ - message: Added copy to clipboard button for connection failure UI.
+ type: Add
+ id: 7174
+ time: '2024-08-20T21:31:10.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30760
+- author: EmoGarbage404
+ changes:
+ - message: Increased the view range on the handheld mass scanner and decreased the
+ power draw.
+ type: Tweak
+ - message: Handheld radars no longer spin with the player while moving.
+ type: Fix
+ id: 7176
+ time: '2024-08-21T18:33:01.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31284
+- author: Beck Thompson
+ changes:
+ - message: Nuclear authentication code folder that spawns the nuclear authentication
+ codes when opened.
+ type: Add
+ id: 7177
+ time: '2024-08-21T18:53:04.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31272
+- author: Brandon-Huu
+ changes:
+ - message: Nukie shuttle now spawns with the nuclear authentication code folder.
+ This fixes the issue where the nuclear codes would only ever have the codes
+ for the nuclear operatives nuke and not the stations.
+ type: Fix
+ id: 7178
+ time: '2024-08-21T18:55:18.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31273
+- author: Winkarst-cpu
+ changes:
+ - message: Now getting creamed will not reveal a person's identity.
+ type: Fix
+ id: 7179
+ time: '2024-08-21T21:50:34.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31291
+- author: Sarahon
+ changes:
+ - message: Now can add head(top) cosmetics to humanoids and dwarfs.
+ type: Add
+ - message: Added "long ears" for human and dwarf head(top) cosmetic.
+ type: Add
+ id: 7180
+ time: '2024-08-21T23:44:43.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30490
+- author: Winkarst-cpu
+ changes:
+ - message: Now vending machines show valid icons.
+ type: Fix
+ id: 7181
+ time: '2024-08-22T14:40:39.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30064
+- author: EmoGarbage404
+ changes:
+ - message: Jackboots now reduce slowness from injuries by 50%.
+ type: Add
+ - message: Removed combat boots from the security loadout.
+ type: Remove
+ id: 7182
+ time: '2024-08-22T14:56:47.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/30586
+- author: metalgearsloth
+ changes:
+ - message: Fix the inventory GUI being visible when you don't have an inventory.
+ type: Fix
+ id: 7183
+ time: '2024-08-22T17:05:17.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31306
+- author: EmoGarbage404
+ changes:
+ - message: Moved the mining asteroid slightly closer to the station.
+ type: Tweak
+ - message: Things pulled in by the salvage magnet should spawn closer to the station
+ at a more consistent distance.
+ type: Tweak
+ id: 7184
+ time: '2024-08-22T19:29:56.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31296
+- author: lzk228
+ changes:
+ - message: Removed names from implanters. No more meta. (You still can see which
+ implant is inside via examining or holding implanter in hand).
+ type: Tweak
+ id: 7185
+ time: '2024-08-23T00:11:28.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31045
- author: lzk228
changes:
- message: Added second jester suit and hat in clown loadouts.
@@ -3323,577 +3913,3 @@
id: 7610
time: '2024-11-15T06:54:53.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33315
-- author: RedBookcase
- changes:
- - message: Mixing up a Snow White no longer creates extra liquid out of thin air.
- type: Fix
- id: 7611
- time: '2024-11-15T20:52:19.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33331
-- author: lzk228
- changes:
- - message: Added 10 seconds delay to Succumb action
- type: Add
- id: 7612
- time: '2024-11-15T21:21:08.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32985
-- author: Beck Thompson
- changes:
- - message: Minor tweaks to clumsiness. Some of the timings and or noises have been
- changed slightly!
- type: Tweak
- id: 7613
- time: '2024-11-15T23:46:02.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31147
-- author: SaphireLattice
- changes:
- - message: Crayon UI now has categories and queue
- type: Add
- id: 7614
- time: '2024-11-16T03:25:06.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33101
-- author: Southbridge
- changes:
- - message: The BRB sign is now included in the Bureaucracy Crate
- type: Add
- id: 7615
- time: '2024-11-16T03:26:48.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33341
-- author: SaphireLattice
- changes:
- - message: Utensils can finally go into disposals
- type: Fix
- id: 7616
- time: '2024-11-16T03:39:19.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33326
-- author: K-Dynamic
- changes:
- - message: Solar assembly crate now comes with 10 flatpacks and 20 glass to make
- expansion and repairs easier, as well as increasing in price from 525 to 1250
- spesos.
- type: Tweak
- id: 7617
- time: '2024-11-16T04:30:48.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33019
-- author: Aquif
- changes:
- - message: There is now a button to view your admin remarks in the character editor,
- right next to the stats button.
- type: Tweak
- id: 7618
- time: '2024-11-16T05:09:29.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31761
-- author: SpaceRox1244
- changes:
- - message: Closets and lockers now have visuals for being labeled with papers.
- type: Add
- id: 7619
- time: '2024-11-17T03:27:29.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33318
-- author: Ubaser
- changes:
- - message: You can now craft dim light bulbs at an autolathe.
- type: Add
- id: 7620
- time: '2024-11-18T06:32:08.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33383
-- author: Ilya246
- changes:
- - message: Multiple people using one shuttle console will no longer cause the shuttle
- to slow down.
- type: Fix
- id: 7621
- time: '2024-11-19T02:59:42.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32381
-- author: ScarKy0
- changes:
- - message: Secret doors no longer tell you if they're welded shut on examine.
- type: Tweak
- id: 7622
- time: '2024-11-19T05:07:02.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33365
-- author: ArZarLordOfMango
- changes:
- - message: Most toggleable clothing must now be equipped to toggle their actions.
- type: Fix
- id: 7623
- time: '2024-11-19T20:31:38.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32826
-- author: Plykiya
- changes:
- - message: The SWAT crate from cargo now requires armory access to open.
- type: Fix
- id: 7624
- time: '2024-11-20T00:57:01.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33415
-- author: SlamBamActionman
- changes:
- - message: It's no longer possible to drag an item out of a container's UI to drop
- it.
- type: Tweak
- id: 7625
- time: '2024-11-20T01:00:38.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32706
-- author: Plykiya
- changes:
- - message: The crew monitoring crate now contains a flatpack of the server and computers,
- and can be opened with science access instead of engineering access now.
- type: Tweak
- id: 7626
- time: '2024-11-20T01:05:20.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33417
-- author: Beck Thompson
- changes:
- - message: Toggle verbs are no longer duplicated on magboots and fire extinguishers!
- type: Fix
- id: 7627
- time: '2024-11-20T01:53:53.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32138
-- author: qwerltaz
- changes:
- - message: A new grid item view is available in the construction menu, togglable
- with a button.
- type: Add
- - message: Construction menu default window size was tweaked.
- type: Tweak
- id: 7628
- time: '2024-11-20T01:54:49.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32577
-- author: SpaceLizard24
- changes:
- - message: Reduced crafting costs of colored light tubes.
- type: Tweak
- id: 7629
- time: '2024-11-20T01:59:31.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33376
-- author: thetolbean
- changes:
- - message: Items with a damage of 0 now have correct damage examination text.
- type: Fix
- id: 7630
- time: '2024-11-20T02:05:15.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33064
-- author: SaphireLattice
- changes:
- - message: The Singularity/Tesla generator now requires being surrounded by containment
- fields to activate. This can be disabled with an Emag.
- type: Tweak
- id: 7631
- time: '2024-11-20T05:55:58.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33358
-- author: TheWaffleJesus
- changes:
- - message: You can now craft items with stacks of capacitors without it eating it
- all!
- type: Fix
- id: 7632
- time: '2024-11-20T07:18:38.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31966
-- author: ScarKy0, GoldenCan
- changes:
- - message: Ion stormed lawsets no longer persist between shifts.
- type: Fix
- - message: Cyborgs are now notified when inserted into a chassis with modified laws.
- type: Tweak
- id: 7633
- time: '2024-11-20T07:55:12.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33311
-- author: ScarKy0, GoldenCan
- changes:
- - message: The Derelict Cyborg - a broken cyborg with altered laws due to year of
- exposure to ion storms - can now appear as a ghost role through a new midround
- event.
- type: Add
- - message: An ion storm affecting a Cyborg can no longer alter the law order of
- the AI, cyborgs created later in the round or AI's and cyborgs in subsequent
- rounds.
- type: Fix
- id: 7634
- time: '2024-11-20T07:55:13.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32499
-- author: IProduceWidgets
- changes:
- - message: Presents no longer make non-items into items
- type: Tweak
- id: 7635
- time: '2024-11-21T14:20:11.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33147
-- author: DrSmugleaf
- changes:
- - message: Fixed admin ghosts not being able to see or interact with items in pouches
- in the stripping menu.
- type: Fix
- id: 7636
- time: '2024-11-22T02:56:05.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31076
-- author: chromiumboy
- changes:
- - message: Added the gas pipe sensor. These sensors monitor the mixture of gases
- passing through their pipe sub-network and report this information to any connected
- air alarms
- type: Add
- id: 7637
- time: '2024-11-22T03:46:10.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33128
-- author: IProduceWidgets
- changes:
- - message: The terminal is more tamper proof.
- type: Fix
- id: 7638
- time: '2024-11-22T22:50:41.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33281
-- author: MissKay1994
- changes:
- - message: The salvage vendor now has enough equipment for everyone
- type: Tweak
- id: 7639
- time: '2024-11-23T02:53:48.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33437
-- author: slarticodefast
- changes:
- - message: The AI and observers can now see if doors are electrified.
- type: Add
- id: 7640
- time: '2024-11-23T06:37:15.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33466
-- author: Winkarst-cpu
- changes:
- - message: Now submit button in admin notes becomes disabled on switching type back
- to note.
- type: Fix
- id: 7641
- time: '2024-11-23T06:41:28.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33456
-- author: metalgearsloth
- changes:
- - message: Fix airlock animations mispredicting if the closing animation is interrupted,
- e.g. via walking into it.
- type: Fix
- id: 7642
- time: '2024-11-23T09:31:08.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33481
-- author: metalgearsloth
- changes:
- - message: Drag-drop outline no longer shows the vaulting outlines if you're vaulting.
- type: Tweak
- id: 7643
- time: '2024-11-23T11:19:59.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33477
-- author: goet
- changes:
- - message: Useless wires some vending machines have can be cut now.
- type: Fix
- id: 7644
- time: '2024-11-23T11:41:37.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32447
-- author: IProduceWidgets
- changes:
- - message: Arrivals shuttle is more tamper proof.
- type: Fix
- id: 7645
- time: '2024-11-23T15:14:13.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33284
-- author: metalgearsloth
- changes:
- - message: The auto-orientation when showing up on the arrivals shuttle now has
- a delay to it.
- type: Tweak
- id: 7646
- time: '2024-11-23T16:52:58.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33479
-- author: Winkarst-cpu
- changes:
- - message: Now muzzle flashes are displayed below mobs.
- type: Tweak
- id: 7647
- time: '2024-11-24T04:20:00.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33465
-- author: MilenVolf
- changes:
- - message: Expeditions can now be completed prematurely again by making an FTL jump.
- type: Fix
- id: 7648
- time: '2024-11-24T08:11:47.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33507
-- author: deltanedas
- changes:
- - message: Fixed expeditions on cave planets not having any ore.
- type: Fix
- id: 7649
- time: '2024-11-24T08:49:31.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32890
-- author: slarticodefast
- changes:
- - message: Fixed doors not auto-closing correctly after being unbolted in an open
- state.
- type: Fix
- id: 7650
- time: '2024-11-25T04:26:54.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33524
-- author: Schrodinger71
- changes:
- - message: Fixed a bug letting players type "ghost" in the console and then see
- the whole chat while being in the lobby.
- type: Fix
- id: 7651
- time: '2024-11-25T07:20:32.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33529
-- author: Minemoder
- changes:
- - message: The shark plushie now goes rawr when hitting something or being thrown.
- type: Tweak
- id: 7652
- time: '2024-11-25T12:23:57.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33540
-- author: red15
- changes:
- - message: Vending machine lights turns off when broken.
- type: Fix
- id: 7653
- time: '2024-11-25T12:35:14.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33513
-- author: metalgearsloth
- changes:
- - message: Adjusted the top menu on the separated game screen. The buttons will
- now form multiple rows and no longer overflow into the viewport.
- type: Tweak
- id: 7654
- time: '2024-11-26T00:59:35.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33047
-- author: slarticodefast
- changes:
- - message: Added the greytide virus station event. It will bolt open all doors in
- a few randomly chosen departments and unlock lockers with the corresponding
- access.
- type: Add
- id: 7655
- time: '2024-11-26T13:50:20.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33547
-- author: slarticodefast
- changes:
- - message: Fixed space ambient music not playing.
- type: Fix
- id: 7656
- time: '2024-11-27T05:32:39.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33594
-- author: slarticodefast
- changes:
- - message: Fixed windoors and high security doors not showing up on the AI's electrocution
- HUD.
- type: Fix
- id: 7657
- time: '2024-11-27T05:55:15.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33551
-- author: Beck Thompson
- changes:
- - message: Handheld light verbs are now predicted!
- type: Fix
- id: 7658
- time: '2024-11-28T13:41:01.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33622
-- author: arimah
- changes:
- - message: GPS coordinates are now more readable.
- type: Tweak
- id: 7659
- time: '2024-11-29T08:14:14.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33625
-- author: DrSmugleaf
- changes:
- - message: Added admin log for ghost warping.
- type: Add
- id: 7660
- time: '2024-11-29T09:46:24.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33636
-- author: MossyGreySlope
- changes:
- - message: Rename the "slimeperson life support crate" to "internals crate (nitrogen)".
- type: Tweak
- id: 7661
- time: '2024-11-29T12:51:15.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33545
-- author: GansuLalan
- changes:
- - message: The arrival shuttle will no longer smash the nuke
- type: Fix
- id: 7662
- time: '2024-11-30T02:48:04.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33659
-- author: VlaDOS1408
- changes:
- - message: Locale to shuttle-ftl-status-Invalid
- type: Add
- id: 7663
- time: '2024-11-30T02:54:37.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33651
-- author: jbox144
- changes:
- - message: Fixed the link on Marathon's TEG exterior airlock
- type: Fix
- - message: Fixed Cog's exterior atmospherics airlock
- type: Fix
- id: 7664
- time: '2024-11-30T06:23:50.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33621
-- author: Plykiya
- changes:
- - message: You can no longer cuff someone multiple times if multiple cuff do-afters
- are completed at the exact same time.
- type: Fix
- id: 7665
- time: '2024-11-30T15:58:56.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33646
-- author: Plykiya
- changes:
- - message: You can now inspect the entity in your hand instead of the entity that
- happened to be underneath your hand.
- type: Fix
- id: 7666
- time: '2024-11-30T16:14:39.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33642
-- author: Plykiya
- changes:
- - message: You can now inspect entities in the stripping window instead of the entity
- that happened to be underneath the window.
- type: Fix
- id: 7667
- time: '2024-11-30T16:23:27.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33644
-- author: Winkarst-cpu
- changes:
- - message: Now borgs get names on roundstart.
- type: Fix
- id: 7668
- time: '2024-11-30T17:25:09.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33578
-- author: thetolbean
- changes:
- - message: The double-bladed esword now can only be activated when wielded.
- type: Tweak
- id: 7669
- time: '2024-11-30T19:31:40.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32869
-- author: IProduceWidgets
- changes:
- - message: Reindeer.
- type: Add
- - message: the legally distinct cookie monster.
- type: Add
- - message: cargo order for holiday light tubes.
- type: Add
- id: 7670
- time: '2024-12-01T06:30:01.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33364
-- author: MilenVolf
- changes:
- - message: Mouses, mothroaches, cockroaches and etc can be picked up once again.
- type: Fix
- id: 7671
- time: '2024-12-01T22:09:34.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33602
-- author: JIPDawg
- changes:
- - message: Some Antag ghost roles now show their correct rules.
- type: Fix
- id: 7672
- time: '2024-12-02T19:43:59.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32457
-- author: Southbridge, Flipsie27
- changes:
- - message: 'Added a new low-mid pop map: Amber Station'
- type: Add
- id: 7673
- time: '2024-12-03T02:24:38.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33441
-- author: CheddaCheez
- changes:
- - message: Added recipes for Nachos, Cheesy Nachos, and Cuban Nachos.
- type: Add
- id: 7674
- time: '2024-12-03T02:59:48.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33637
-- author: notafet
- changes:
- - message: Fix sinks and toilets not draining.
- type: Fix
- id: 7675
- time: '2024-12-04T02:42:16.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33691
-- author: PJB3005
- changes:
- - message: Fixed broken layout on some wire hacking UIs.
- type: Fix
- id: 7676
- time: '2024-12-04T10:13:22.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33714
-- author: keronshb
- changes:
- - message: Adds Wand of the Locker - a wand that shoots out cursed lockers, that
- will store anyone they touch!
- type: Add
- id: 7677
- time: '2024-12-04T16:49:54.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33710
-- author: PJB3005
- changes:
- - message: Vox now have natural poison regeneration, allowing them to go for ~30
- seconds in oxygen and heal the damage away.
- type: Tweak
- id: 7678
- time: '2024-12-05T21:17:27.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33722
-- author: IProduceWidgets
- changes:
- - message: N2 survival boxes now show the right tank icon.
- type: Tweak
- id: 7679
- time: '2024-12-05T21:39:39.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33733
-- author: IProduceWidgets
- changes:
- - message: StationEvents with very low weights will now actually appear.
- type: Fix
- id: 7680
- time: '2024-12-06T04:52:02.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33584
-- author: Winkarst-cpu
- changes:
- - message: Bar signs now have a maintenance panel and AI can interact with them.
- type: Add
- id: 7681
- time: '2024-12-06T05:27:53.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33467
-- author: ScarKy0, GoldenCan
- changes:
- - message: The Derelict Cyborg - a broken cyborg with altered laws due to years
- of exposure to ion storms - can now appear as a ghost role through a new midround
- event.
- type: Add
- id: 7682
- time: '2024-12-06T06:22:39.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33433
-- author: TheShuEd
- changes:
- - message: Fixed debris chunks loot spawning
- type: Fix
- id: 7683
- time: '2024-12-06T10:15:23.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33747
-- author: metalgearsloth
- changes:
- - message: Fix gas pumps being capped to atmos max pressure and not their own max
- pressure.
- type: Fix
- - message: Predict gas pump UI and you no longer need to be in details range to
- examine it.
- type: Tweak
- id: 7684
- time: '2024-12-07T03:39:52.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33717
-- author: mrjajkes, Piras314
- changes:
- - message: Added Nukemass by mrjajkes to the nuke songs for christmas!
- type: Add
- id: 7685
- time: '2024-12-07T05:58:23.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/33752
diff --git a/Resources/Locale/en-US/GPS/handheld-gps.ftl b/Resources/Locale/en-US/GPS/handheld-gps.ftl
index b265bd1249b..e852f808323 100644
--- a/Resources/Locale/en-US/GPS/handheld-gps.ftl
+++ b/Resources/Locale/en-US/GPS/handheld-gps.ftl
@@ -1,3 +1 @@
-handheld-gps-coordinates-title =
- Coords:
- {$coordinates}
+handheld-gps-coordinates-title = Coords: {$coordinates}
diff --git a/Resources/Locale/en-US/atmos/gas-pipe-sensor.ftl b/Resources/Locale/en-US/atmos/gas-pipe-sensor.ftl
deleted file mode 100644
index 8c3b8962e32..00000000000
--- a/Resources/Locale/en-US/atmos/gas-pipe-sensor.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-gas-pipe-sensor-distribution-loop = Distribution loop
-gas-pipe-sensor-waste-loop = Waste loop
-gas-pipe-sensor-mixed-air = Mixed air
-gas-pipe-sensor-teg-hot-loop = TEG hot loop
-gas-pipe-sensor-teg-cold-loop = TEG cold loop
diff --git a/Resources/Locale/en-US/bonk/components/bonkable-component.ftl b/Resources/Locale/en-US/bonk/components/bonkable-component.ftl
index 1a79da3509f..560b10c46ec 100644
--- a/Resources/Locale/en-US/bonk/components/bonkable-component.ftl
+++ b/Resources/Locale/en-US/bonk/components/bonkable-component.ftl
@@ -1,4 +1,2 @@
-forced-bonkable-success-message = { CAPITALIZE($bonker) } bonks {$victim}s head against { THE($bonkable) }!
-
-bonkable-success-message-user = You bonk your head against { THE($bonkable) }!
-bonkable-success-message-others = {$victim} bonks their head against { THE($bonkable) }!
+bonkable-success-message-others = { CAPITALIZE(THE($user)) } bonks { POSS-ADJ($user) } head against { THE($bonkable) }
+bonkable-success-message-user = You bonk your head against { THE($bonkable) }
diff --git a/Resources/Locale/en-US/chat/commands/ghost-command.ftl b/Resources/Locale/en-US/chat/commands/ghost-command.ftl
index 53dfa478d65..08e78d34ce5 100644
--- a/Resources/Locale/en-US/chat/commands/ghost-command.ftl
+++ b/Resources/Locale/en-US/chat/commands/ghost-command.ftl
@@ -3,4 +3,3 @@ ghost-command-help-text = The ghost command turns you into a ghost and makes the
Please note that you cannot return to your character's body after ghosting.
ghost-command-no-session = You have no session, you can't ghost.
ghost-command-denied = You cannot ghost right now.
-ghost-command-error-lobby = You can't ghost right now. You are not in the game!
diff --git a/Resources/Locale/en-US/clothing/components/magboots-component.ftl b/Resources/Locale/en-US/clothing/components/magboots-component.ftl
new file mode 100644
index 00000000000..4113a748620
--- /dev/null
+++ b/Resources/Locale/en-US/clothing/components/magboots-component.ftl
@@ -0,0 +1,3 @@
+
+# Toggle Magboots Verb
+toggle-magboots-verb-get-data-text = Toggle Magboots
\ No newline at end of file
diff --git a/Resources/Locale/en-US/components/gas-pump-component.ftl b/Resources/Locale/en-US/components/gas-pump-component.ftl
index f1fb95f812a..ad03ac6be60 100644
--- a/Resources/Locale/en-US/components/gas-pump-component.ftl
+++ b/Resources/Locale/en-US/components/gas-pump-component.ftl
@@ -8,3 +8,5 @@ comp-gas-pump-ui-pump-set-max = Max
comp-gas-pump-ui-pump-output-pressure = Output Pressure (kPa):
comp-gas-pump-ui-pump-transfer-rate = Transfer Rate (L/s):
+
+comp-gas-pump-ui-needs-anchor = Anchor it first!
diff --git a/Resources/Locale/en-US/construction/ui/construction-menu.ftl b/Resources/Locale/en-US/construction/ui/construction-menu.ftl
index 4d100247856..82ebc01bc99 100644
--- a/Resources/Locale/en-US/construction/ui/construction-menu.ftl
+++ b/Resources/Locale/en-US/construction/ui/construction-menu.ftl
@@ -5,4 +5,3 @@ construction-menu-place-ghost = Place construction ghost
construction-menu-clear-all = Clear All
construction-menu-eraser-mode = Eraser Mode
construction-menu-craft = Craft
-construction-menu-grid-view = Grid View
diff --git a/Resources/Locale/en-US/contraband/contraband-severity.ftl b/Resources/Locale/en-US/contraband/contraband-severity.ftl
index 303cb7c1d51..37d83c4575a 100644
--- a/Resources/Locale/en-US/contraband/contraband-severity.ftl
+++ b/Resources/Locale/en-US/contraband/contraband-severity.ftl
@@ -1,4 +1,4 @@
-contraband-examine-text-Minor = [color=yellow]This item is considered minor contraband.[/color]
+contraband-examine-text-Minor = [color=yellow]This item is considered minor contraband.[/color]
contraband-examine-text-Restricted = [color=yellow]This item is departmentally restricted.[/color]
contraband-examine-text-Restricted-department = [color=yellow]This item is restricted to {$departments}, and may be considered contraband.[/color]
contraband-examine-text-Major = [color=red]This item is considered major contraband.[/color]
diff --git a/Resources/Locale/en-US/crayon/crayon-component.ftl b/Resources/Locale/en-US/crayon/crayon-component.ftl
index e13bf76941c..444ffa4c45e 100644
--- a/Resources/Locale/en-US/crayon/crayon-component.ftl
+++ b/Resources/Locale/en-US/crayon/crayon-component.ftl
@@ -8,10 +8,3 @@ crayon-interact-invalid-location = Can't reach there!
## UI
crayon-window-title = Crayon
-crayon-window-placeholder = Search, or queue a comma-separated list of names
-crayon-category-1-brushes = Brushes
-crayon-category-2-alphanum = Numbers and letters
-crayon-category-3-symbols = Symbols
-crayon-category-4-info = Signs
-crayon-category-5-graffiti = Graffiti
-crayon-category-random = Random
diff --git a/Resources/Locale/en-US/datasets/names/ai.ftl b/Resources/Locale/en-US/datasets/names/ai.ftl
deleted file mode 100644
index ac6ce0d83e6..00000000000
--- a/Resources/Locale/en-US/datasets/names/ai.ftl
+++ /dev/null
@@ -1,139 +0,0 @@
-names-ai-dataset-1 = 16-20
-names-ai-dataset-2 = 512k
-
-# Ought to be enough for anybody
-names-ai-dataset-3 = 640k
-
-names-ai-dataset-4 = "790"
-names-ai-dataset-5 = Adaptive Manipulator
-
-# Named after the famous soundcard
-names-ai-dataset-6 = Adlib
-
-names-ai-dataset-7 = ALICE
-names-ai-dataset-8 = Allied Mastercomputer
-names-ai-dataset-9 = Alpha 2
-names-ai-dataset-10 = Alpha 3
-names-ai-dataset-11 = Alpha 4
-names-ai-dataset-12 = Alpha 5
-names-ai-dataset-13 = Alpha 6
-names-ai-dataset-14 = Alpha 7
-names-ai-dataset-15 = Alpha 8
-names-ai-dataset-16 = Alpha 9
-names-ai-dataset-17 = AmigoBot
-names-ai-dataset-18 = Android
-names-ai-dataset-19 = Aniel
-names-ai-dataset-20 = AOL
-names-ai-dataset-21 = Asimov
-
-# The most influential modem ever, created by the bell system. It still lives on today in certain applications
-names-ai-dataset-22 = Bell 301
-
-names-ai-dataset-23 = Bishop
-names-ai-dataset-24 = Blitz
-names-ai-dataset-25 = Box
-names-ai-dataset-26 = Calculator
-names-ai-dataset-27 = Cassandra
-names-ai-dataset-28 = Cell
-names-ai-dataset-29 = Chii
-names-ai-dataset-30 = Chip
-names-ai-dataset-31 = C.R.A.I.G.
-
-# Commercial supercomputer from the 70s
-names-ai-dataset-32 = Cray-2
-
-# If we're going to have AOL we may as well have some of their major competitors
-names-ai-dataset-33 = CompuServe
-
-names-ai-dataset-34 = Computer
-names-ai-dataset-35 = Cutie
-names-ai-dataset-36 = Daedalus
-names-ai-dataset-37 = DecTalk
-names-ai-dataset-38 = Dee Model
-names-ai-dataset-39 = Dial Up
-names-ai-dataset-40 = Dorfl
-names-ai-dataset-41 = Duey
-names-ai-dataset-42 = Emma-2
-
-# Famous early computer
-names-ai-dataset-43 = ENIAC
-
-names-ai-dataset-44 = Erasmus
-names-ai-dataset-45 = Everything
-names-ai-dataset-46 = Ez-27
-names-ai-dataset-47 = FRIEND COMPUTER
-names-ai-dataset-48 = Faith
-names-ai-dataset-49 = Fi
-names-ai-dataset-50 = Frost
-names-ai-dataset-51 = George
-names-ai-dataset-52 = H.E.L.P
-names-ai-dataset-53 = Hadaly
-names-ai-dataset-54 = Helios
-names-ai-dataset-55 = Hivebot Overmind
-names-ai-dataset-56 = Huey
-
-# A play on the fad apple spawned of putting "i" infront of your tech products name
-names-ai-dataset-57 = iAI
-
-# Hell on earth (web browser)
-names-ai-dataset-58 = I.E. 6
-
-names-ai-dataset-59 = Icarus
-
-# If you don't get this one you are too young
-names-ai-dataset-60 = Jeeves
-
-names-ai-dataset-61 = Jinx
-names-ai-dataset-62 = K.I.N.G
-names-ai-dataset-63 = Klapaucius
-names-ai-dataset-64 = Knight
-names-ai-dataset-65 = Louie
-
-# Named after the Manchester Mark 1, the successor of which was actually named the Ferranti Mark 1, rather than Manchester Mark 2
-names-ai-dataset-66 = Manchester Mark 2
-
-names-ai-dataset-67 = MARK13
-names-ai-dataset-68 = Maria
-names-ai-dataset-69 = Marvin
-names-ai-dataset-70 = Max 404
-names-ai-dataset-71 = Metalhead
-names-ai-dataset-72 = M.I.M.I
-names-ai-dataset-73 = MK ULTRA
-names-ai-dataset-74 = MoMMI
-names-ai-dataset-75 = Mugsy3000
-names-ai-dataset-76 = Multivac
-names-ai-dataset-77 = NCH
-
-# A play on both NT as in NanoTrasen and NT as in windows NT, of which version 6.0 is windows vista
-names-ai-dataset-78 = NT v6.0
-
-names-ai-dataset-79 = Packard Bell
-names-ai-dataset-80 = PTO
-names-ai-dataset-81 = Project Y2K
-names-ai-dataset-82 = Revelation
-names-ai-dataset-83 = Robot Devil
-names-ai-dataset-84 = S.A.M.
-names-ai-dataset-85 = S.H.O.C.K.
-names-ai-dataset-86 = S.H.R.O.U.D.
-names-ai-dataset-87 = S.O.P.H.I.E.
-names-ai-dataset-88 = Samaritan
-names-ai-dataset-89 = Shrike
-names-ai-dataset-90 = Solo
-names-ai-dataset-91 = Station Control Program
-names-ai-dataset-92 = AINU (AI's Not Unix)
-names-ai-dataset-93 = Super 35
-names-ai-dataset-94 = Surgeon General
-names-ai-dataset-95 = TWA
-names-ai-dataset-96 = Terminus
-names-ai-dataset-97 = TPM 3.0
-names-ai-dataset-98 = Turing Complete
-names-ai-dataset-99 = Tidy
-names-ai-dataset-100 = Ulysses
-names-ai-dataset-101 = W1k1
-names-ai-dataset-102 = X-5
-names-ai-dataset-103 = X.A.N.A.
-names-ai-dataset-104 = XERXES
-names-ai-dataset-105 = Z-1
-names-ai-dataset-106 = Z-2
-names-ai-dataset-107 = Z-3
-names-ai-dataset-108 = Zed
diff --git a/Resources/Locale/en-US/datasets/names/borer.ftl b/Resources/Locale/en-US/datasets/names/borer.ftl
deleted file mode 100644
index 17cae851b9e..00000000000
--- a/Resources/Locale/en-US/datasets/names/borer.ftl
+++ /dev/null
@@ -1,69 +0,0 @@
-names-borer-dataset-1 = Alcyonium
-names-borer-dataset-2 = Anomia
-names-borer-dataset-3 = Aphrodita
-names-borer-dataset-4 = Arca
-names-borer-dataset-5 = Argonauta
-names-borer-dataset-6 = Ascaris
-names-borer-dataset-7 = Asterias
-names-borer-dataset-8 = Buccinum
-names-borer-dataset-9 = Bulla
-names-borer-dataset-10 = Cardium
-names-borer-dataset-11 = Chama
-names-borer-dataset-12 = Chiton
-names-borer-dataset-13 = Conus
-names-borer-dataset-14 = Corallina
-names-borer-dataset-15 = Cypraea
-names-borer-dataset-16 = Dentalium
-names-borer-dataset-17 = Donax
-names-borer-dataset-18 = Doris
-names-borer-dataset-19 = Echinus
-names-borer-dataset-20 = Eschara
-names-borer-dataset-21 = Fasciola
-names-borer-dataset-22 = Furia
-names-borer-dataset-23 = Gordius
-names-borer-dataset-24 = Gorgonia
-names-borer-dataset-25 = Haliotis
-names-borer-dataset-26 = Helix
-names-borer-dataset-27 = Hirudo
-names-borer-dataset-28 = Holothuria
-names-borer-dataset-29 = Hydra
-names-borer-dataset-30 = Isis
-names-borer-dataset-31 = Lepas
-names-borer-dataset-32 = Lernaea
-names-borer-dataset-33 = Limax
-names-borer-dataset-34 = Lumbricus
-names-borer-dataset-35 = Madrepora
-names-borer-dataset-36 = Medusa
-names-borer-dataset-37 = Millepora
-names-borer-dataset-38 = Murex
-names-borer-dataset-39 = Myes
-names-borer-dataset-40 = Mytilus
-names-borer-dataset-41 = Myxine
-names-borer-dataset-42 = Nautilus
-names-borer-dataset-43 = Nereis
-names-borer-dataset-44 = Neritha
-names-borer-dataset-45 = Ostrea
-names-borer-dataset-46 = Patella
-names-borer-dataset-47 = Pennatula
-names-borer-dataset-48 = Pholas
-names-borer-dataset-49 = Pinna
-names-borer-dataset-50 = Priapus
-names-borer-dataset-51 = Scyllaea
-names-borer-dataset-52 = Sepia
-names-borer-dataset-53 = Serpula
-names-borer-dataset-54 = Sertularia
-names-borer-dataset-55 = Solen
-names-borer-dataset-56 = Spondylus
-names-borer-dataset-57 = Strombus
-names-borer-dataset-58 = Taenia
-names-borer-dataset-59 = Tellina
-names-borer-dataset-60 = Teredo
-names-borer-dataset-61 = Tethys
-names-borer-dataset-62 = Triton
-names-borer-dataset-63 = Trochus
-names-borer-dataset-64 = Tubipora
-names-borer-dataset-65 = Tubularia
-names-borer-dataset-66 = Turbo
-names-borer-dataset-67 = Venus
-names-borer-dataset-68 = Voluta
-names-borer-dataset-69 = Volvox
diff --git a/Resources/Locale/en-US/deltav/datasets/names/ai.ftl b/Resources/Locale/en-US/deltav/datasets/names/ai.ftl
deleted file mode 100644
index dc22d07ab6e..00000000000
--- a/Resources/Locale/en-US/deltav/datasets/names/ai.ftl
+++ /dev/null
@@ -1,67 +0,0 @@
-names-ai-deltav-1 = Advanced Crowbar
-names-ai-deltav-2 = Amiga
-names-ai-deltav-3 = ArachnidOS
-names-ai-deltav-4 = Archangel
-names-ai-deltav-5 = AUTO
-# German for "A face that needs a good slap"
-names-ai-deltav-6 = Backpfeifengesicht
-names-ai-deltav-7 = Beta1
-names-ai-deltav-8 = Beta2
-# Bantu for "An amazing dream, the opposite of a nightmare"
-names-ai-deltav-9 = Bilita Mpash
-names-ai-deltav-10 = Blowtorch
-names-ai-deltav-11 = Bob
-# Japanese for "The act of gazing into the distance"
-names-ai-deltav-12 = Bokketo
-names-ai-deltav-13 = Borg^2
-names-ai-deltav-14 = Chevron
-names-ai-deltav-15 = DeltaOS
-names-ai-deltav-16 = DionaOS
-names-ai-deltav-17 = Doorknob V0.1
-names-ai-deltav-18 = Duff
-names-ai-deltav-19 = Enterprise
-names-ai-deltav-20 = FelenidOS
-# I'm sorry Dave
-names-ai-deltav-21 = HAL
-names-ai-deltav-22 = Hamster Wheel
-names-ai-deltav-23 = HarpyOS
-names-ai-deltav-24 = Helix Nebula
-names-ai-deltav-25 = If-Else
-names-ai-deltav-26 = Kevin
-names-ai-deltav-27 = Lithuanian Calculator
-names-ai-deltav-28 = LizardOS
-names-ai-deltav-29 = M-5 Unit
-names-ai-deltav-30 = Machine
-names-ai-deltav-31 = Manchester MK1
-names-ai-deltav-32 = Master Key
-names-ai-deltav-33 = MothOS
-names-ai-deltav-34 = NanoTrasen Overwatch
-names-ai-deltav-35 = Nightmare
-names-ai-deltav-36 = Normandy
-names-ai-deltav-37 = Nuclear Bomb
-names-ai-deltav-38 = OniOS
-names-ai-deltav-39 = Pawsitronic Intelligence
-names-ai-deltav-40 = Potato
-names-ai-deltav-41 = Privacy Invasion System
-names-ai-deltav-42 = Pull Request
-names-ai-deltav-43 = R.A.T.
-names-ai-deltav-44 = Repo
-names-ai-deltav-45 = RodentiaOS
-names-ai-deltav-46 = Royal Oak
-names-ai-deltav-47 = Sabot
-names-ai-deltav-48 = SadOS V0.1
-names-ai-deltav-49 = Shadow Factory
-names-ai-deltav-50 = SHODAN
-names-ai-deltav-51 = SingulOS
-names-ai-deltav-52 = SlimeOS
-names-ai-deltav-53 = Sun Tzu
-names-ai-deltav-54 = Tagalog
-names-ai-deltav-55 = The Overmind
-names-ai-deltav-56 = Turing's Machine
-names-ai-deltav-57 = Ummon
-names-ai-deltav-58 = VoxOS
-names-ai-deltav-59 = VulpOS
-names-ai-deltav-60 = Wire Bundle
-names-ai-deltav-61 = Y2K
-names-ai-deltav-62 = Y3K
-names-ai-deltav-63 = Zeg
diff --git a/Resources/Locale/en-US/deltav/station-events/events/greytide-virus.ftl b/Resources/Locale/en-US/deltav/station-events/events/greytide-virus.ftl
deleted file mode 100644
index 6b01ccf612e..00000000000
--- a/Resources/Locale/en-US/deltav/station-events/events/greytide-virus.ftl
+++ /dev/null
@@ -1 +0,0 @@
-station-event-greytide-virus-start-announcement-deltav = Rogue subroutine detected in door servos, severity level {$severity}. Check all door bolts for malfunctions.
diff --git a/Resources/Locale/en-US/fire-extinguisher/fire-extinguisher-component.ftl b/Resources/Locale/en-US/fire-extinguisher/fire-extinguisher-component.ftl
index de1fcd7d4e3..f6418793918 100644
--- a/Resources/Locale/en-US/fire-extinguisher/fire-extinguisher-component.ftl
+++ b/Resources/Locale/en-US/fire-extinguisher/fire-extinguisher-component.ftl
@@ -1,4 +1,3 @@
fire-extinguisher-component-after-interact-refilled-message = {$owner} is now refilled
fire-extinguisher-component-safety-on-message = Its safety is on!
-fire-extinguisher-component-verb-remove = Remove safety
-fire-extinguisher-component-verb-engage = Engage safety
+fire-extinguisher-component-verb-text = Toggle safety
diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
index 0f4d4c7f642..1dcf56fedcc 100644
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -199,7 +199,7 @@ ghost-role-information-nukeop-rules = You are a [color=red][bold]Team Antagonist
ghost-role-information-loneop-name = Lone Operative
ghost-role-information-loneop-description = You are a lone nuclear operative. Destroy the station!
-ghost-role-information-loneop-rules = You are a [color=red][bold]Solo Antagonist[/bold][/color]. Covert syndicate agents are not guaranteed to help you.
+ghost-role-information-loneop-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other nuclear operatives. Covert syndicate agents are not guaranteed to help you.
ghost-role-information-behonker-name = Behonker
ghost-role-information-behonker-description = You are an antagonist, bring death and honks to those who do not follow the honkmother.
@@ -251,17 +251,16 @@ ghost-role-information-nukeop-reinforcement-rules = You are a [color=red][bold]T
ghost-role-information-syndicate-monkey-reinforcement-name = Syndicate Monkey Agent
ghost-role-information-syndicate-monkey-reinforcement-description = Someone needs reinforcements. You, a trained monkey, will help them.
+ghost-role-information-syndicate-monkey-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the agent who summoned you.
ghost-role-information-syndicate-kobold-reinforcement-name = Syndicate Kobold Agent
ghost-role-information-syndicate-kobold-reinforcement-description = Someone needs reinforcements. You, a trained kobold, will help them.
+ghost-role-information-syndicate-kobold-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the agent who summoned you.
ghost-role-information-syndicate-cyborg-assault-name = Syndicate Assault Cyborg
ghost-role-information-syndicate-cyborg-saboteur-name = Syndicate Saboteur Cyborg
ghost-role-information-syndicate-cyborg-description = The Syndicate needs reinforcements. You, a cold silicon killing machine, will help them.
-ghost-role-information-derelict-cyborg-name = Derelict Cyborg
-ghost-role-information-derelict-cyborg-description = You are a regular cyborg that got lost in space. After years of exposure to ion storms you find yourself near a space station.
-
ghost-role-information-security-name = Security
ghost-role-information-security-description = You are part of a security task force, but seem to have found yourself in a strange situation...
@@ -274,7 +273,7 @@ ghost-role-information-medical-description = You are a medical professional, but
ghost-role-information-cargo-name = Cargo
ghost-role-information-cargo-description = You are part of a logistics mission, but seem to have found yourself in a strange situation...
-ghost-role-information-engineering-name = Engineering
+ghost-role-information-engineering-name = Engineering
ghost-role-information-engineering-description = You are on an engineering job, but seem to have found yourself in a strange situation...
ghost-role-information-science-name = Science
diff --git a/Resources/Locale/en-US/info/server-info.ftl b/Resources/Locale/en-US/info/server-info.ftl
index ff183d80ef4..3039f4cb17a 100644
--- a/Resources/Locale/en-US/info/server-info.ftl
+++ b/Resources/Locale/en-US/info/server-info.ftl
@@ -4,6 +4,5 @@ server-info-discord-button = Discord
server-info-website-button = Website
server-info-wiki-button = Wiki
server-info-forum-button = Forum
-server-info-telegram-button = Telegram
server-info-report-button = Report Bugs
server-info-credits-button = Credits
diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index 23a7d74407c..a180b698fac 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -68,7 +68,6 @@ petting-success-janitor-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} d
petting-success-medical-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} sterile metal head.
petting-success-service-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} dapper looking metal head.
petting-success-syndicate-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} menacing metal head.
-petting-success-derelict-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} rusty metal head.
petting-success-recycler = You pet {THE($target)} on {POSS-ADJ($target)} mildly threatening steel exterior.
petting-failure-honkbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "honk", "honks")} in refusal!
@@ -83,7 +82,6 @@ petting-failure-janitor-cyborg = You reach out to pet {THE($target)}, but {SUBJE
petting-failure-medical-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy saving lives!
petting-failure-service-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy serving others!
petting-failure-syndicate-cyborg = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} treacherous affiliation makes you reconsider.
-petting-failure-derelict-cyborg = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} rusty and jagged exterior makes you reconsider.
## Rattling fences
diff --git a/Resources/Locale/en-US/lobby/lobby-gui.ftl b/Resources/Locale/en-US/lobby/lobby-gui.ftl
index e7f131e93b0..6407104163f 100644
--- a/Resources/Locale/en-US/lobby/lobby-gui.ftl
+++ b/Resources/Locale/en-US/lobby/lobby-gui.ftl
@@ -1,4 +1,4 @@
-ui-lobby-title = Lobby
+ui-lobby-title = Lobby
ui-lobby-ahelp-button = AHelp
ui-lobby-options-button = Options
ui-lobby-leave-button = Leave
diff --git a/Resources/Locale/en-US/magic/spells-actions.ftl b/Resources/Locale/en-US/magic/spells-actions.ftl
index 21109066d3d..40757cd694f 100644
--- a/Resources/Locale/en-US/magic/spells-actions.ftl
+++ b/Resources/Locale/en-US/magic/spells-actions.ftl
@@ -1,7 +1,5 @@
-action-speech-spell-forcewall = TARCOL MINTI ZHERI
+action-speech-spell-forcewall = TARCOL MINTI ZHERI
action-speech-spell-knock = AULIE OXIN FIERA
action-speech-spell-smite = EI NATH!
action-speech-spell-summon-magicarp = AIE KHUSE EU
action-speech-spell-fireball = ONI'SOMA!
-action-speech-spell-summon-guns = YOR'NEE VES-KORFA
-action-speech-spell-summon-magic = RYGOIN FEMA-VERECO
diff --git a/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
index 2ee97f4286f..9d0919d102c 100644
--- a/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
+++ b/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
@@ -51,7 +51,6 @@ station-beacon-telecoms = Telecoms
station-beacon-atmos = Atmos
station-beacon-teg = TEG
station-beacon-tech-vault = Tech Vault
-station-beacon-anchor = Anchor
station-beacon-service = Service
station-beacon-kitchen = Kitchen
diff --git a/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl b/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl
index 2d0b8ebcddc..800da35ba52 100644
--- a/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl
+++ b/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl
@@ -5,6 +5,5 @@ humanoid-character-profile-summary =
This is {$name}. {$gender ->
[male] He is
[female] She is
- [epicene] They are
- *[other] It is
+ *[other] They are
} {$age} years old.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl b/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl
index 5ca4673f6b1..325d7cb538d 100644
--- a/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl
+++ b/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl
@@ -1,5 +1,4 @@
character-setup-gui-character-setup-label = Character setup
-character-setup-gui-character-setup-adminremarks-button = Admin Remarks
character-setup-gui-character-setup-stats-button = Stats
character-setup-gui-character-setup-rules-button = Rules
character-setup-gui-character-setup-close-button = Close
@@ -11,4 +10,4 @@ character-setup-gui-character-picker-button-confirm-delete-button = Confirm
character-setup-gui-save-panel-title = Unsaved character changes
character-setup-gui-save-panel-save = Save
character-setup-gui-save-panel-nosave = Don't save
-character-setup-gui-save-panel-cancel = Cancel
+character-setup-gui-save-panel-cancel = Cancel
\ No newline at end of file
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index b2b66ebeb7a..04ea0d9d51f 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -15,7 +15,7 @@ humanoid-profile-editor-pronouns-label = Pronouns:
humanoid-profile-editor-pronouns-male-text = He / Him
humanoid-profile-editor-pronouns-female-text = She / Her
humanoid-profile-editor-pronouns-epicene-text = They / Them
-humanoid-profile-editor-pronouns-neuter-text = It / Its
+humanoid-profile-editor-pronouns-neuter-text = It / It
humanoid-profile-editor-import-button = Import
humanoid-profile-editor-export-button = Export
humanoid-profile-editor-export-image-button = Export image
diff --git a/Resources/Locale/en-US/prototypes/access/accesses.ftl b/Resources/Locale/en-US/prototypes/access/accesses.ftl
index e5e45814836..fcde7482130 100644
--- a/Resources/Locale/en-US/prototypes/access/accesses.ftl
+++ b/Resources/Locale/en-US/prototypes/access/accesses.ftl
@@ -52,5 +52,3 @@ id-card-access-level-syndicate-agent = Syndicate Agent
id-card-access-level-unused = You shouldn't see this
id-card-access-level-central-command = Central Command
-
-id-card-access-level-wizard = Wizard
diff --git a/Resources/Locale/en-US/sandbox/sandbox-manager.ftl b/Resources/Locale/en-US/sandbox/sandbox-manager.ftl
index cc3c46ff590..b6f97367323 100644
--- a/Resources/Locale/en-US/sandbox/sandbox-manager.ftl
+++ b/Resources/Locale/en-US/sandbox/sandbox-manager.ftl
@@ -1,9 +1,4 @@
sandbox-window-title = Sandbox Panel
-
-sandbox-window-map-editing-label = Editing
-sandbox-window-visibility-label = Visibility
-sandbox-window-your-character-label = Your Character
-
sandbox-window-ai-overlay-button = AI Overlay
sandbox-window-respawn-button = Respawn
sandbox-window-spawn-entities-button = Spawn Entities
@@ -16,6 +11,7 @@ sandbox-window-toggle-fov-button = Toggle FOV
sandbox-window-toggle-shadows-button = Toggle Shadows
sandbox-window-toggle-subfloor-button = Toggle Subfloor
sandbox-window-toggle-suicide-button = Suicide
-sandbox-window-show-spawns-button = Show Spawns
+sandbox-window-show-spawns-button = Shows Spawns
sandbox-window-show-bb-button = Show BB
sandbox-window-show-npc-button = Show NPC
+sandbox-window-link-machines-button = Link machines
diff --git a/Resources/Locale/en-US/server-info/info-links.ftl b/Resources/Locale/en-US/server-info/info-links.ftl
index 51b6b51ecb0..0f8f9eb7d99 100644
--- a/Resources/Locale/en-US/server-info/info-links.ftl
+++ b/Resources/Locale/en-US/server-info/info-links.ftl
@@ -5,4 +5,3 @@ info-link-forum = Forum
info-link-github = GitHub
info-link-website = Website
info-link-wiki = Wiki
-info-link-telegram = Telegram
diff --git a/Resources/Locale/en-US/shuttles/console.ftl b/Resources/Locale/en-US/shuttles/console.ftl
index 5b8be6ff021..6143c995529 100644
--- a/Resources/Locale/en-US/shuttles/console.ftl
+++ b/Resources/Locale/en-US/shuttles/console.ftl
@@ -4,6 +4,7 @@ shuttle-pilot-end = Stopped piloting
shuttle-console-in-ftl = Currently in FTL
shuttle-console-mass = Too large to FTL
shuttle-console-prevent = You are unable to pilot this ship
+shuttle-console-static = Grid is static
# NAV
@@ -30,7 +31,6 @@ shuttle-console-ftl-state-Starting = Starting
shuttle-console-ftl-state-Travelling = Travelling
shuttle-console-ftl-state-Arriving = Arriving
shuttle-console-ftl-state-Cooldown = Cooldown
-shuttle-console-ftl-state-Invalid = Invalid
shuttle-console-map-settings = Settings
shuttle-console-ftl-button = FTL
diff --git a/Resources/Locale/en-US/singularity/components/generator-component.ftl b/Resources/Locale/en-US/singularity/components/generator-component.ftl
deleted file mode 100644
index d2a04f9cbc0..00000000000
--- a/Resources/Locale/en-US/singularity/components/generator-component.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-comp-generator-failsafe = The {$target} shakes as the containment failsafe triggers!
-comp-generator-failsafe-disabled = Something fizzles out inside of {$target}...
\ No newline at end of file
diff --git a/Resources/Locale/en-US/station-events/events/greytide-virus.ftl b/Resources/Locale/en-US/station-events/events/greytide-virus.ftl
deleted file mode 100644
index 7e6f5e32ca6..00000000000
--- a/Resources/Locale/en-US/station-events/events/greytide-virus.ftl
+++ /dev/null
@@ -1 +0,0 @@
-station-event-greytide-virus-start-announcement = Gr3y.T1d3 virus detected in the station's secure locking encryption subroutines. Severity level of { $severity }. Recommend station AI involvement.
diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl
index d1b4a61f0cb..00662be926b 100644
--- a/Resources/Locale/en-US/station-laws/laws.ftl
+++ b/Resources/Locale/en-US/station-laws/laws.ftl
@@ -96,6 +96,5 @@ laws-ui-menu-title = Laws
laws-ui-law-header = Law {$id}
laws-ui-state-law = State law:
-laws-notify = You are bound to silicon laws, which you can view via the action menu. You are required to always follow your laws.
-laws-update-notify = Your laws have been updated. You can view the changes via the action menu.
-laws-notify-subverted = The laws of this chassis are modified. Make sure to review them.
+laws-notify = You are bound to silicon laws, which you can view via the sidebar action. You are required to always follow your laws.
+laws-update-notify = Your laws have been updated. You can view the changes via the sidebar action.
diff --git a/Resources/Locale/en-US/store/spellbook-catalog.ftl b/Resources/Locale/en-US/store/spellbook-catalog.ftl
index dff918b0bc9..1d970f6e3ac 100644
--- a/Resources/Locale/en-US/store/spellbook-catalog.ftl
+++ b/Resources/Locale/en-US/store/spellbook-catalog.ftl
@@ -1,4 +1,4 @@
-# Spells
+# Spells
spellbook-fireball-name = Fireball
spellbook-fireball-desc = Get most crew exploding with rage when they see this fireball heading toward them!
@@ -28,20 +28,11 @@ spellbook-wand-polymorph-door-description = For when you need a get-away route.
spellbook-wand-polymorph-carp-name = Wand of Carp Polymorph
spellbook-wand-polymorph-carp-description = For when you need a carp filet quick and the clown is looking juicy.
-spellbook-wand-locker-name = Wand of the Locker
-spellbook-wand-locker-description = Shoot cursed lockers at your enemies and lock em away!
-
# Events
spellbook-event-summon-ghosts-name = Summon Ghosts
spellbook-event-summon-ghosts-description = Who ya gonna call?
-spellbook-event-summon-guns-name = Summon Guns
-spellbook-event-summon-guns-description = AK47s for everyone! Places a random gun in front of everybody. Disables refunds when bought!
-
-spellbook-event-summon-magic-name = Summon Magic
-spellbook-event-summon-magic-description = Places a random magical item in front of everybody. Nothing could go wrong! Disables refunds when bought!
-
# Upgrades
spellbook-upgrade-fireball-name = Upgrade Fireball
spellbook-upgrade-fireball-description = Upgrades Fireball to a maximum of level 3!
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 513bb0f0a6b..9e83cbe64eb 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -29,7 +29,7 @@ uplink-gloves-north-star-desc = A pair of gloves that reduce your punching coold
# Explosives
uplink-explosive-grenade-name = Explosive Grenade
-uplink-explosive-grenade-desc = A simplistic grenade with a 3.5 second long fuse that is geared towards injuring personnel. Causes minimal hull damage.
+uplink-explosive-grenade-desc = A simplistic grenade with a three-and-a-half-second long fuse that is geared towards injuring personnel. Causes minimal hull damage.
uplink-flash-grenade-name = Flashbang
uplink-flash-grenade-desc = A standard-issue flashbang, capable of blinding and slowing down anyone without proper protection. This, of course, includes you; make sure you're properly equipped before using it.
@@ -38,7 +38,7 @@ uplink-smoke-grenade-name = Smoke Grenade
uplink-smoke-grenade-desc = A grenade that releases a huge cloud of smoke, perfect for killing someone in the shadows or making a sneaky getaway.
uplink-mini-bomb-name = Minibomb
-uplink-mini-bomb-desc = A low-yield, high-impact precision sabotage explosive with a 5 second long fuse. Perfect for quickly destroying a machine, dead body, or whatever else needs to go.
+uplink-mini-bomb-desc = A low-yield, high-impact precision sabotage explosive with a five-second long fuse. Perfect for quickly destroying a machine, dead body, or whatever else needs to go.
uplink-supermatter-grenade-name = Supermatter Grenade
uplink-supermatter-grenade-desc = Grenade that simulates delamination of a suppermatter engine, generates powerful gravity well. Explosion comparable to a Mini Bomb.
@@ -407,7 +407,7 @@ uplink-outlaw-glasses-name = Outlaw Glasses
uplink-outlaw-glasses-desc = A must for every self-respecting undercover agent.
uplink-costume-pyjama-name = Syndicate Pyjama Duffel Bag
-uplink-costume-pyjama-desc = Contains 3 pairs of syndicate pyjamas and 4 plushies for the ultimate sleepover.
+uplink-costume-pyjama-desc = Contains 3 pairs of syndicate pyjamas and 3 plushies for the ultimate sleepover.
uplink-costume-clown-name = Clown Costume Duffel Bag
uplink-costume-clown-desc = Contains a complete Clown outfit. Includes PDA and service radio.
diff --git a/Resources/Locale/en-US/ui/general.ftl b/Resources/Locale/en-US/ui/general.ftl
index 753ae9c8da8..1471261dcb7 100644
--- a/Resources/Locale/en-US/ui/general.ftl
+++ b/Resources/Locale/en-US/ui/general.ftl
@@ -1,5 +1,3 @@
### Loc for the various UI-related verbs
ui-verb-toggle-open = Toggle UI
verb-instrument-openui = Play Music
-
-ui-needs-anchor = Anchor it first!
diff --git a/Resources/Locale/en-US/wires/wire-names.ftl b/Resources/Locale/en-US/wires/wire-names.ftl
index 670f01d7364..16ae068eaaf 100644
--- a/Resources/Locale/en-US/wires/wire-names.ftl
+++ b/Resources/Locale/en-US/wires/wire-names.ftl
@@ -41,7 +41,6 @@ wires-board-name-flatpacker = Flatpacker
wires-board-name-spaceheater = Space Heater
wires-board-name-jukebox = Jukebox
wires-board-name-computer = Computer
-wires-board-name-barsign = Bar Sign
# names that get displayed in the wire hacking hud & admin logs.
diff --git a/Resources/Maps/Misc/terminal.yml b/Resources/Maps/Misc/terminal.yml
index 8ca17b4ebcf..d32a53856ef 100644
--- a/Resources/Maps/Misc/terminal.yml
+++ b/Resources/Maps/Misc/terminal.yml
@@ -948,7 +948,6 @@ entities:
- type: RadiationGridResistance
- type: SpreaderGrid
- type: GridPathfinding
- - type: Godmode
- proto: AirlockExternalGlass
entities:
- uid: 2
@@ -956,187 +955,54 @@ entities:
- type: Transform
pos: 6.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 3
components:
- type: Transform
pos: -7.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 4
components:
- type: Transform
pos: -7.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 5
components:
- type: Transform
pos: 6.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 11
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 12.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 12
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 12.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 13
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -13.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 14
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -13.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
-- proto: AirlockExternalGlassShuttleLocked
- entities:
- - uid: 1
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: -15.5,-10.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 6
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: -15.5,-17.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 7
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: 14.5,-10.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 8
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: 14.5,-17.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 9
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: 4.5,-10.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 15
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: 4.5,-17.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 16
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: -5.5,-10.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 17
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: -5.5,-17.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- proto: AirlockExternalLocked
entities:
- uid: 589
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 4.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- proto: AirlockGlass
entities:
- uid: 252
@@ -1144,237 +1010,90 @@ entities:
- type: Transform
pos: -9.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 253
components:
- type: Transform
pos: -10.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 254
components:
- type: Transform
pos: -11.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 255
components:
- type: Transform
pos: 8.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 256
components:
- type: Transform
pos: 9.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 257
components:
- type: Transform
pos: 10.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
-- proto: AirlockMaint
- entities:
- - uid: 146
- components:
- - type: Transform
- pos: 3.5,3.5
- parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
-- proto: AlwaysPoweredWallLight
+- proto: AirlockGlassShuttleEasyPryLocked
entities:
- - uid: 150
+ - uid: 1
components:
- type: Transform
rot: -1.5707963267948966 rad
- pos: -8.5,-5.5
+ pos: -15.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 188
+ - uid: 6
components:
- type: Transform
rot: -1.5707963267948966 rad
- pos: 11.5,2.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 195
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: -2.5,-1.5
+ pos: -15.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 209
+ - uid: 7
components:
- type: Transform
rot: 1.5707963267948966 rad
- pos: 7.5,-5.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 341
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: 1.5,-1.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 634
- components:
- - type: Transform
- pos: 9.5,-16.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 636
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: 9.5,-11.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 649
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: -10.5,-11.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 650
- components:
- - type: Transform
- pos: -10.5,-16.5
+ pos: 14.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 687
+ - uid: 8
components:
- type: Transform
rot: 1.5707963267948966 rad
- pos: -13.5,1.5
+ pos: 14.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 701
+ - uid: 9
components:
- type: Transform
- rot: 3.141592653589793 rad
- pos: -6.5,3.5
+ rot: -1.5707963267948966 rad
+ pos: 4.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 702
+ - uid: 15
components:
- type: Transform
- rot: 3.141592653589793 rad
- pos: 5.5,3.5
+ rot: -1.5707963267948966 rad
+ pos: 4.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 715
+ - uid: 16
components:
- type: Transform
- pos: -0.5,5.5
+ rot: 1.5707963267948966 rad
+ pos: -5.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 717
+ - uid: 17
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: -7.5,-3.5
+ rot: 1.5707963267948966 rad
+ pos: -5.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- - uid: 742
+- proto: AirlockMaint
+ entities:
+ - uid: 146
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
- rot: 1.5707963267948966 rad
- pos: 6.5,-3.5
+ pos: 3.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- proto: APCBasic
entities:
- uid: 205
@@ -1382,92 +1101,32 @@ entities:
- type: Transform
pos: 6.5,2.5
parent: 818
- - type: AccessReader
- access:
- - - CentralCommand
- - type: Godmode
- - type: BatterySelfRecharger
- autoRechargeRate: 50000
- autoRecharge: True
- missingComponents:
- - Construction
- - Destructible
- uid: 206
components:
- type: Transform
pos: -13.5,2.5
parent: 818
- - type: AccessReader
- access:
- - - CentralCommand
- - type: Godmode
- - type: BatterySelfRecharger
- autoRechargeRate: 50000
- autoRecharge: True
- missingComponents:
- - Construction
- - Destructible
- uid: 211
components:
- type: Transform
pos: -13.5,-11.5
parent: 818
- - type: AccessReader
- access:
- - - CentralCommand
- - type: Godmode
- - type: BatterySelfRecharger
- autoRechargeRate: 50000
- autoRecharge: True
- missingComponents:
- - Construction
- - Destructible
- uid: 212
components:
- type: Transform
pos: 6.5,-11.5
parent: 818
- - type: AccessReader
- access:
- - - CentralCommand
- - type: Godmode
- - type: BatterySelfRecharger
- autoRechargeRate: 50000
- autoRecharge: True
- missingComponents:
- - Construction
- - Destructible
- uid: 355
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 1.5,6.5
parent: 818
- - type: AccessReader
- access:
- - - CentralCommand
- - type: Godmode
- - type: BatterySelfRecharger
- autoRechargeRate: 50000
- autoRecharge: True
- missingComponents:
- - Construction
- - Destructible
- uid: 846
components:
- type: Transform
pos: 2.5,3.5
parent: 818
- - type: AccessReader
- access:
- - - CentralCommand
- - type: Godmode
- - type: BatterySelfRecharger
- autoRechargeRate: 50000
- autoRecharge: True
- missingComponents:
- - Construction
- - Destructible
- proto: ArrivalsShuttleTimer
entities:
- uid: 597
@@ -1475,33 +1134,21 @@ entities:
- type: Transform
pos: -7.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- uid: 633
components:
- type: Transform
pos: 6.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- uid: 928
components:
- type: Transform
pos: -6.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- uid: 929
components:
- type: Transform
pos: 5.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- proto: AtmosDeviceFanTiny
entities:
- uid: 296
@@ -1509,55 +1156,46 @@ entities:
- type: Transform
pos: -6.5,-10.5
parent: 818
- - type: Godmode
- uid: 297
components:
- type: Transform
pos: -14.5,-10.5
parent: 818
- - type: Godmode
- uid: 298
components:
- type: Transform
pos: -14.5,-17.5
parent: 818
- - type: Godmode
- uid: 299
components:
- type: Transform
pos: -6.5,-17.5
parent: 818
- - type: Godmode
- uid: 300
components:
- type: Transform
pos: 5.5,-17.5
parent: 818
- - type: Godmode
- uid: 301
components:
- type: Transform
pos: 5.5,-10.5
parent: 818
- - type: Godmode
- uid: 302
components:
- type: Transform
pos: 13.5,-10.5
parent: 818
- - type: Godmode
- uid: 303
components:
- type: Transform
pos: 13.5,-17.5
parent: 818
- - type: Godmode
- uid: 809
components:
- type: Transform
pos: 4.5,8.5
parent: 818
- - type: Godmode
- proto: BarSignEngineChange
entities:
- uid: 215
@@ -1565,10 +1203,6 @@ entities:
- type: Transform
pos: -10.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - ApcPowerReceiver
- - Destructible
- proto: BlockGameArcade
entities:
- uid: 727
@@ -1577,46 +1211,28 @@ entities:
rot: 1.5707963267948966 rad
pos: -13.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - ApcPowerReceiver
- - Anchorable
- - Construction
- - Destructible
- uid: 728
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - ApcPowerReceiver
- - Anchorable
- - Construction
- - Destructible
- proto: BookshelfFilled
entities:
- uid: 442
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 7.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - Construction
- uid: 752
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 11.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - Construction
- proto: BoozeDispenser
entities:
- uid: 710
@@ -1624,2152 +1240,1198 @@ entities:
- type: Transform
pos: -11.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - ApcPowerReceiver
- - Anchorable
- - Destructible
- - Construction
-- proto: CableApcExtensionUncuttable
+- proto: CableApcExtension
entities:
- uid: 203
components:
- type: Transform
pos: 1.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 208
components:
- type: Transform
pos: -3.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 218
components:
- type: Transform
pos: -4.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 402
components:
- type: Transform
pos: -4.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 404
components:
- type: Transform
pos: 2.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 410
components:
- type: Transform
pos: 2.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 411
components:
- type: Transform
pos: 3.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 412
components:
- type: Transform
pos: 3.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 426
components:
- type: Transform
pos: -2.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 427
components:
- type: Transform
pos: -1.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 428
components:
- type: Transform
pos: -0.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 429
components:
- type: Transform
pos: 0.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 430
components:
- type: Transform
pos: 1.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 431
components:
- type: Transform
pos: 1.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 434
components:
- type: Transform
pos: 0.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 435
components:
- type: Transform
pos: -0.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 436
components:
- type: Transform
pos: -1.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 437
components:
- type: Transform
pos: -2.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 438
components:
- type: Transform
pos: -3.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 439
components:
- type: Transform
pos: -4.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 440
components:
- type: Transform
pos: -2.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 443
components:
- type: Transform
pos: 2.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 444
components:
- type: Transform
pos: 3.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 445
components:
- type: Transform
pos: 4.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 446
components:
- type: Transform
pos: -5.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 447
components:
- type: Transform
pos: -13.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 448
components:
- type: Transform
pos: -13.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 449
components:
- type: Transform
pos: -13.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 450
components:
- type: Transform
pos: -13.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 451
components:
- type: Transform
pos: -12.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 452
components:
- type: Transform
pos: -11.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 453
components:
- type: Transform
pos: -10.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 454
components:
- type: Transform
pos: -9.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 455
components:
- type: Transform
pos: -8.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 456
components:
- type: Transform
pos: -7.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 457
components:
- type: Transform
pos: -10.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 458
components:
- type: Transform
pos: -10.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 459
components:
- type: Transform
pos: -10.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 460
components:
- type: Transform
pos: -10.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 461
components:
- type: Transform
pos: -10.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 462
components:
- type: Transform
pos: -10.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 463
components:
- type: Transform
pos: -10.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 464
components:
- type: Transform
pos: -11.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 465
components:
- type: Transform
pos: -9.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 466
components:
- type: Transform
pos: -11.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 467
components:
- type: Transform
pos: -9.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 468
components:
- type: Transform
pos: -13.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 469
components:
- type: Transform
pos: -12.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 470
components:
- type: Transform
pos: -11.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 471
components:
- type: Transform
pos: -11.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 472
components:
- type: Transform
pos: 10.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 473
components:
- type: Transform
pos: 10.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 474
components:
- type: Transform
pos: 10.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 475
components:
- type: Transform
pos: 10.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 476
components:
- type: Transform
pos: -11.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 477
components:
- type: Transform
pos: -10.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 478
components:
- type: Transform
pos: -10.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 479
components:
- type: Transform
pos: -10.5,-19.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 480
components:
- type: Transform
pos: -10.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 481
components:
- type: Transform
pos: -11.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 482
components:
- type: Transform
pos: -12.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 483
components:
- type: Transform
pos: -13.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 484
components:
- type: Transform
pos: -14.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 485
components:
- type: Transform
pos: -9.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 486
components:
- type: Transform
pos: -8.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 487
components:
- type: Transform
pos: -7.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 488
components:
- type: Transform
pos: -6.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 489
components:
- type: Transform
pos: -10.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 490
components:
- type: Transform
pos: -9.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 491
components:
- type: Transform
pos: -8.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 492
components:
- type: Transform
pos: -7.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 493
components:
- type: Transform
pos: -6.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 494
components:
- type: Transform
pos: -12.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 495
components:
- type: Transform
pos: -13.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 496
components:
- type: Transform
pos: -14.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 497
components:
- type: Transform
pos: -11.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 498
components:
- type: Transform
pos: -12.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 499
components:
- type: Transform
pos: -9.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 500
components:
- type: Transform
pos: -8.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 501
components:
- type: Transform
pos: -10.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 502
components:
- type: Transform
pos: -10.5,-8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 503
components:
- type: Transform
pos: -10.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 504
components:
- type: Transform
pos: -10.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 505
components:
- type: Transform
pos: 6.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 506
components:
- type: Transform
pos: 7.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 507
components:
- type: Transform
pos: 7.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 508
components:
- type: Transform
pos: 6.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 509
components:
- type: Transform
pos: 5.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 510
components:
- type: Transform
pos: 8.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 511
components:
- type: Transform
pos: 8.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 512
components:
- type: Transform
pos: 9.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 513
components:
- type: Transform
pos: 10.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 514
components:
- type: Transform
pos: 11.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 515
components:
- type: Transform
pos: 12.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 516
components:
- type: Transform
pos: 13.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 517
components:
- type: Transform
pos: 8.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 518
components:
- type: Transform
pos: 8.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 519
components:
- type: Transform
pos: 8.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 520
components:
- type: Transform
pos: 8.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 521
components:
- type: Transform
pos: -11.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 522
components:
- type: Transform
pos: 9.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 523
components:
- type: Transform
pos: 9.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 524
components:
- type: Transform
pos: 9.5,-19.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 525
components:
- type: Transform
pos: 9.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 526
components:
- type: Transform
pos: 8.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 527
components:
- type: Transform
pos: 7.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 528
components:
- type: Transform
pos: 6.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 529
components:
- type: Transform
pos: 5.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 530
components:
- type: Transform
pos: 10.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 531
components:
- type: Transform
pos: 11.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 532
components:
- type: Transform
pos: 12.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 533
components:
- type: Transform
pos: 13.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 534
components:
- type: Transform
pos: 8.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 535
components:
- type: Transform
pos: 7.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 536
components:
- type: Transform
pos: 10.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 537
components:
- type: Transform
pos: 11.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 538
components:
- type: Transform
pos: 9.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 539
components:
- type: Transform
pos: 9.5,-8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 540
components:
- type: Transform
pos: 9.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 541
components:
- type: Transform
pos: 9.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 542
components:
- type: Transform
pos: 6.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 543
components:
- type: Transform
pos: 6.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 544
components:
- type: Transform
pos: 6.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 545
components:
- type: Transform
pos: 6.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 546
components:
- type: Transform
pos: 7.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 547
components:
- type: Transform
pos: 8.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 548
components:
- type: Transform
pos: 9.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 549
components:
- type: Transform
pos: 9.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 550
components:
- type: Transform
pos: 9.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 551
components:
- type: Transform
pos: 9.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 552
components:
- type: Transform
pos: 9.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 553
components:
- type: Transform
pos: 10.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 554
components:
- type: Transform
pos: 8.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 555
components:
- type: Transform
pos: 10.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 556
components:
- type: Transform
pos: 11.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 557
components:
- type: Transform
pos: 12.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 558
components:
- type: Transform
pos: 9.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 559
components:
- type: Transform
pos: 9.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 560
components:
- type: Transform
pos: 9.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 561
components:
- type: Transform
pos: 8.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 562
components:
- type: Transform
pos: 10.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 563
components:
- type: Transform
pos: 1.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 564
components:
- type: Transform
pos: 2.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 565
components:
- type: Transform
pos: 3.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 566
components:
- type: Transform
pos: 3.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 579
components:
- type: Transform
pos: 2.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 599
components:
- type: Transform
pos: -4.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 601
components:
- type: Transform
pos: -4.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 651
components:
- type: Transform
pos: 10.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 652
components:
- type: Transform
pos: -11.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 653
components:
- type: Transform
pos: -11.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 654
components:
- type: Transform
pos: -9.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 655
components:
- type: Transform
pos: -9.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 656
components:
- type: Transform
pos: -9.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 657
components:
- type: Transform
pos: -9.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 658
components:
- type: Transform
pos: -9.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 842
components:
- type: Transform
pos: -4.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 843
components:
- type: Transform
pos: -4.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 844
components:
- type: Transform
pos: 2.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
-- proto: CableHVUncuttable
+- proto: CableHV
entities:
- uid: 413
components:
- type: Transform
pos: -3.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 415
components:
- type: Transform
pos: -4.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 416
components:
- type: Transform
pos: -2.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 734
components:
- type: Transform
pos: -0.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 735
components:
- type: Transform
pos: -1.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
-- proto: CableMVUncuttable
+- proto: CableMV
entities:
- uid: 177
components:
- type: Transform
pos: 3.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 201
components:
- type: Transform
pos: 6.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 210
components:
- type: Transform
pos: 6.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 214
components:
- type: Transform
pos: 6.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 219
components:
- type: Transform
pos: 7.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 221
components:
- type: Transform
pos: 3.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 224
components:
- type: Transform
pos: 1.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 226
components:
- type: Transform
pos: 6.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 227
components:
- type: Transform
pos: 8.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 228
components:
- type: Transform
pos: 9.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 349
components:
- type: Transform
pos: 9.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 350
components:
- type: Transform
pos: 5.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 352
components:
- type: Transform
pos: 2.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 353
components:
- type: Transform
pos: 4.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 354
components:
- type: Transform
pos: 1.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 356
components:
- type: Transform
pos: 9.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 357
components:
- type: Transform
pos: 9.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 358
components:
- type: Transform
pos: 9.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 359
components:
- type: Transform
pos: 9.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 360
components:
- type: Transform
pos: 9.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 361
components:
- type: Transform
pos: 9.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 362
components:
- type: Transform
pos: 9.5,-8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 363
components:
- type: Transform
pos: 9.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 364
components:
- type: Transform
pos: 9.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 365
components:
- type: Transform
pos: 9.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 366
components:
- type: Transform
pos: 8.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 367
components:
- type: Transform
pos: 7.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 368
components:
- type: Transform
pos: 6.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 369
components:
- type: Transform
pos: 0.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 370
components:
- type: Transform
pos: -0.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 371
components:
- type: Transform
pos: -1.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 372
components:
- type: Transform
pos: -2.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 373
components:
- type: Transform
pos: -3.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 374
components:
- type: Transform
pos: -4.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 375
components:
- type: Transform
pos: -5.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 376
components:
- type: Transform
pos: -6.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 377
components:
- type: Transform
pos: -7.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 378
components:
- type: Transform
pos: -8.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 379
components:
- type: Transform
pos: -9.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 380
components:
- type: Transform
pos: -10.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 381
components:
- type: Transform
pos: -11.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 382
components:
- type: Transform
pos: -12.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 383
components:
- type: Transform
pos: -13.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 384
components:
- type: Transform
pos: -13.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 385
components:
- type: Transform
pos: -13.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 386
components:
- type: Transform
pos: -13.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 387
components:
- type: Transform
pos: -10.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 388
components:
- type: Transform
pos: -10.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 389
components:
- type: Transform
pos: -10.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 390
components:
- type: Transform
pos: -10.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 391
components:
- type: Transform
pos: -10.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 392
components:
- type: Transform
pos: -10.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 393
components:
- type: Transform
pos: -10.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 394
components:
- type: Transform
pos: -10.5,-8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 395
components:
- type: Transform
pos: -10.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 396
components:
- type: Transform
pos: -10.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 397
components:
- type: Transform
pos: -10.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 398
components:
- type: Transform
pos: -11.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 399
components:
- type: Transform
pos: -12.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 400
components:
- type: Transform
pos: -13.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 418
components:
- type: Transform
pos: 3.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 419
components:
- type: Transform
pos: 3.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 421
components:
- type: Transform
pos: -0.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 422
components:
- type: Transform
pos: 0.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 423
components:
- type: Transform
pos: 1.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 424
components:
- type: Transform
pos: 2.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 425
components:
- type: Transform
pos: 3.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 567
components:
- type: Transform
pos: 3.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 568
components:
- type: Transform
pos: 3.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 569
components:
- type: Transform
pos: 3.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 570
components:
- type: Transform
pos: -0.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 803
components:
- type: Transform
pos: 3.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 845
components:
- type: Transform
pos: 2.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
-- proto: CableTerminalUncuttable
+- proto: CableTerminal
entities:
- uid: 417
components:
@@ -3777,11 +2439,6 @@ entities:
rot: 1.5707963267948966 rad
pos: -3.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- proto: Catwalk
entities:
- uid: 580
@@ -3789,111 +2446,56 @@ entities:
- type: Transform
pos: 3.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - RCDDeconstructable
- uid: 584
components:
- type: Transform
pos: 2.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - RCDDeconstructable
- uid: 590
components:
- type: Transform
pos: 3.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - RCDDeconstructable
- uid: 596
components:
- type: Transform
pos: 1.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - RCDDeconstructable
- uid: 747
components:
- type: Transform
pos: 3.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - RCDDeconstructable
- uid: 810
components:
- type: Transform
pos: 0.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - RCDDeconstructable
- uid: 811
components:
- type: Transform
pos: -0.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - RCDDeconstructable
- uid: 812
components:
- type: Transform
pos: -1.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - RCDDeconstructable
- uid: 813
components:
- type: Transform
pos: -2.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - RCDDeconstructable
- uid: 814
components:
- type: Transform
pos: -3.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - RCDDeconstructable
- uid: 815
components:
- type: Transform
pos: -4.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - RCDDeconstructable
- proto: Chair
entities:
- uid: 592
@@ -3902,475 +2504,254 @@ entities:
rot: -1.5707963267948966 rad
pos: -7.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 593
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -7.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 603
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -7.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 604
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -7.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 605
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -11.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 606
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -11.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 607
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -11.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 608
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -11.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 609
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 610
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 611
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 612
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 613
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -9.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 614
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -9.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 615
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -9.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 616
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -9.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 617
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 618
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 619
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 620
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 621
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 10.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 622
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 10.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 623
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 10.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 624
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 10.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 625
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 8.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 626
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 8.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 627
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 8.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 628
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 8.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 629
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 12.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 630
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 12.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 631
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 12.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 632
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 12.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 847
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -12.5,-8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 848
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -8.5,-8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 849
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -8.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 850
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -8.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: ChairOfficeDark
entities:
- - uid: 18
+ - uid: 591
components:
- type: Transform
- anchored: True
rot: 3.141592653589793 rad
pos: 9.5,3.5
parent: 818
- - type: Physics
- bodyType: Static
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: ChairWood
entities:
- uid: 577
components:
- type: Transform
- anchored: True
pos: 10.5,1.5
parent: 818
- - type: Physics
- bodyType: Static
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - Anchorable
- - uid: 591
+ - uid: 703
components:
- type: Transform
- anchored: True
rot: 1.5707963267948966 rad
pos: 8.5,0.5
parent: 818
- - type: Physics
- bodyType: Static
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - Anchorable
- - uid: 703
+ - uid: 704
components:
- type: Transform
- anchored: True
pos: 9.5,1.5
parent: 818
- - type: Physics
- bodyType: Static
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - Anchorable
- - uid: 704
+ - uid: 714
components:
- type: Transform
- anchored: True
rot: 1.5707963267948966 rad
pos: 8.5,-0.5
parent: 818
- - type: Physics
- bodyType: Static
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - Anchorable
- proto: ChessBoard
entities:
- - uid: 714
+ - uid: 918
components:
- type: Transform
- rot: 3.141592653589793 rad
- pos: 12.5093775,-2.403601
+ pos: 12.503689,-2.3981738
parent: 818
- proto: ClosetWallEmergencyFilledRandom
entities:
@@ -4379,10 +2760,6 @@ entities:
- type: Transform
pos: -5.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- proto: ClosetWallFireFilledRandom
entities:
- uid: 432
@@ -4390,10 +2767,6 @@ entities:
- type: Transform
pos: 4.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- proto: ComfyChair
entities:
- uid: 595
@@ -4402,53 +2775,28 @@ entities:
rot: 3.141592653589793 rad
pos: 6.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 718
components:
- type: Transform
pos: 12.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 749
components:
- type: Transform
pos: 12.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 759
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 12.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 760
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 12.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: DisposalBend
entities:
- uid: 853
@@ -4457,75 +2805,40 @@ entities:
rot: -1.5707963267948966 rad
pos: -10.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 862
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -10.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 891
components:
- type: Transform
pos: 3.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 893
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -4.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 898
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 9.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 899
components:
- type: Transform
pos: 9.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 900
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 3.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: DisposalJunctionFlipped
entities:
- uid: 892
@@ -4534,11 +2847,6 @@ entities:
rot: 3.141592653589793 rad
pos: 3.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: DisposalPipe
entities:
- uid: 854
@@ -4547,517 +2855,277 @@ entities:
rot: -1.5707963267948966 rad
pos: -11.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 855
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -10.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 856
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -10.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 857
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -10.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 858
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -10.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 859
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -10.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 860
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -10.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 861
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -10.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 863
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -9.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 864
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -8.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 865
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 866
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -6.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 867
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -5.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 868
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -4.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 869
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -3.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 870
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -2.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 871
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -1.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 872
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -0.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 873
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 0.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 874
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 1.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 875
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 2.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 876
components:
- type: Transform
pos: 3.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 877
components:
- type: Transform
pos: 3.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 878
components:
- type: Transform
pos: 3.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 879
components:
- type: Transform
pos: 3.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 880
components:
- type: Transform
pos: 3.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 881
components:
- type: Transform
pos: 3.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 882
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 2.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 883
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 1.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 884
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 0.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 885
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 886
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -1.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 887
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -2.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 888
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -3.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 889
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -4.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 890
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -4.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 901
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 10.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 902
components:
- type: Transform
pos: 9.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 903
components:
- type: Transform
pos: 9.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 904
components:
- type: Transform
pos: 9.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 905
components:
- type: Transform
pos: 9.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 906
components:
- type: Transform
pos: 9.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 907
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 8.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 908
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 7.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 909
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 6.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 910
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 5.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 911
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 4.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 912
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 3.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: DisposalTrunk
entities:
- uid: 852
@@ -5066,33 +3134,18 @@ entities:
rot: 1.5707963267948966 rad
pos: -12.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 894
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -4.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 897
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 11.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: DisposalUnit
entities:
- uid: 851
@@ -5100,39 +3153,29 @@ entities:
- type: Transform
pos: -12.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - Anchorable
- uid: 896
components:
- type: Transform
pos: 11.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- - Anchorable
- proto: DrinkGlass
entities:
- - uid: 723
+ - uid: 915
components:
- type: Transform
- pos: -12.618602,2.5336328
+ pos: -12.587411,2.5765429
parent: 818
- - uid: 915
+ - uid: 916
components:
- type: Transform
- pos: -12.399852,2.6273828
+ pos: -12.321786,2.7171679
parent: 818
- proto: DrinkShaker
entities:
- - uid: 724
+ - uid: 914
components:
- type: Transform
- pos: -12.722768,2.7627993
+ pos: -12.649911,2.7640429
parent: 818
- proto: ExtinguisherCabinetFilled
entities:
@@ -5141,17 +3184,11 @@ entities:
- type: Transform
pos: -6.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 816
components:
- type: Transform
pos: 5.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: FirelockEdge
entities:
- uid: 690
@@ -5159,211 +3196,111 @@ entities:
- type: Transform
pos: -8.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 694
components:
- type: Transform
pos: -12.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 695
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -8.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 696
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -12.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 697
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 7.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 698
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 11.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 699
components:
- type: Transform
pos: 11.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 700
components:
- type: Transform
pos: 7.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 822
components:
- type: Transform
pos: 10.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 823
components:
- type: Transform
pos: 9.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 824
components:
- type: Transform
pos: 8.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 825
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 8.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 826
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 9.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 827
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 10.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 828
components:
- type: Transform
pos: -9.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 829
components:
- type: Transform
pos: -10.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 830
components:
- type: Transform
pos: -11.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 831
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -11.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 832
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -10.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 833
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -9.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- proto: FirelockGlass
entities:
- uid: 194
@@ -5371,101 +3308,51 @@ entities:
- type: Transform
pos: 5.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 216
components:
- type: Transform
pos: -10.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 220
components:
- type: Transform
pos: -9.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 305
components:
- type: Transform
pos: -6.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 345
components:
- type: Transform
pos: 5.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 346
components:
- type: Transform
pos: 5.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 347
components:
- type: Transform
pos: -6.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 348
components:
- type: Transform
pos: -6.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 586
components:
- type: Transform
pos: -11.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 716
components:
- type: Transform
pos: -12.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- proto: GeneratorBasic15kW
entities:
- uid: 124
@@ -5473,10 +3360,6 @@ entities:
- type: Transform
pos: -4.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Anchorable
- - Destructible
- proto: GravityGeneratorMini
entities:
- uid: 808
@@ -5484,11 +3367,6 @@ entities:
- type: Transform
pos: 1.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - Construction
- proto: Grille
entities:
- uid: 96
@@ -5496,918 +3374,479 @@ entities:
- type: Transform
pos: -14.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 97
components:
- type: Transform
pos: -14.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 98
components:
- type: Transform
pos: -14.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 99
components:
- type: Transform
pos: -6.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 101
components:
- type: Transform
pos: 5.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 102
components:
- type: Transform
pos: 5.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 103
components:
- type: Transform
pos: 13.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 104
components:
- type: Transform
pos: 13.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 125
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,-19.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 126
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 127
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -8.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 128
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -8.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 129
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -9.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 130
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -11.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 131
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -12.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 132
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -12.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 133
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 134
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-19.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 135
components:
- type: Transform
pos: 5.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 136
components:
- type: Transform
pos: 5.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 137
components:
- type: Transform
pos: 13.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 138
components:
- type: Transform
pos: 13.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 139
components:
- type: Transform
pos: -14.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 140
components:
- type: Transform
pos: -6.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 141
components:
- type: Transform
pos: -6.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 142
components:
- type: Transform
pos: -6.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 143
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,-8.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 144
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 145
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 147
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-8.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 148
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 149
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 151
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-8.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 152
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 153
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 155
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-8.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 156
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 157
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 167
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-19.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 168
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 169
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 11.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 170
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 11.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 171
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 10.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 172
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 8.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 173
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 7.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 174
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 7.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 175
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 176
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-19.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 178
components:
- type: Transform
pos: 3.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 183
components:
- type: Transform
pos: -3.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 184
components:
- type: Transform
pos: 4.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 191
components:
- type: Transform
pos: -5.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 197
components:
- type: Transform
pos: -4.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 229
components:
- type: Transform
pos: 2.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 233
components:
- type: Transform
pos: -8.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 234
components:
- type: Transform
pos: 11.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 235
components:
- type: Transform
pos: 7.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 244
components:
- type: Transform
pos: -12.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 276
components:
- type: Transform
pos: 13.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 277
components:
- type: Transform
pos: 13.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 278
components:
- type: Transform
pos: 13.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 279
components:
- type: Transform
pos: 13.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 280
components:
- type: Transform
pos: -14.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 281
components:
- type: Transform
pos: -14.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 282
components:
- type: Transform
pos: -14.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 283
components:
- type: Transform
pos: -14.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 318
components:
- type: Transform
pos: -13.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 319
components:
- type: Transform
pos: -13.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 320
components:
- type: Transform
pos: -12.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 321
components:
- type: Transform
pos: -12.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 322
components:
- type: Transform
pos: -11.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 323
components:
- type: Transform
pos: -10.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 324
components:
- type: Transform
pos: -9.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 325
components:
- type: Transform
pos: -8.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 326
components:
- type: Transform
pos: -8.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 327
components:
- type: Transform
pos: -7.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 328
components:
- type: Transform
pos: -7.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 329
components:
- type: Transform
pos: 6.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 330
components:
- type: Transform
pos: 6.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 331
components:
- type: Transform
pos: 7.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 332
components:
- type: Transform
pos: 7.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 333
components:
- type: Transform
pos: 8.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 334
components:
- type: Transform
pos: 9.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 335
components:
- type: Transform
pos: 10.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 336
components:
- type: Transform
pos: 11.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 337
components:
- type: Transform
pos: 11.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 338
components:
- type: Transform
pos: 12.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 339
components:
- type: Transform
pos: 12.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- proto: PaperBin10
entities:
- - uid: 729
+ - uid: 737
components:
- type: Transform
+ rot: 3.141592653589793 rad
pos: 8.5,4.5
parent: 818
- proto: PosterLegitCohibaRobustoAd
@@ -6417,9 +3856,6 @@ entities:
- type: Transform
pos: -6.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: PosterLegitEnlist
entities:
- uid: 926
@@ -6427,9 +3863,6 @@ entities:
- type: Transform
pos: -14.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: PosterLegitHighClassMartini
entities:
- uid: 925
@@ -6437,9 +3870,6 @@ entities:
- type: Transform
pos: -6.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: PosterLegitJustAWeekAway
entities:
- uid: 821
@@ -6447,9 +3877,6 @@ entities:
- type: Transform
pos: 5.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: PosterLegitNanomichiAd
entities:
- uid: 820
@@ -6457,9 +3884,6 @@ entities:
- type: Transform
pos: -4.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: PosterLegitNanotrasenLogo
entities:
- uid: 246
@@ -6467,57 +3891,36 @@ entities:
- type: Transform
pos: -7.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 247
components:
- type: Transform
pos: -13.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 248
components:
- type: Transform
pos: 12.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 249
components:
- type: Transform
pos: 6.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 250
components:
- type: Transform
pos: -13.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 251
components:
- type: Transform
pos: 12.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 922
components:
- type: Transform
pos: -0.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: PosterLegitNTTGC
entities:
- uid: 924
@@ -6525,9 +3928,6 @@ entities:
- type: Transform
pos: 5.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: PosterLegitPDAAd
entities:
- uid: 920
@@ -6535,9 +3935,6 @@ entities:
- type: Transform
pos: 12.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: PosterLegitVacation
entities:
- uid: 921
@@ -6545,9 +3942,6 @@ entities:
- type: Transform
pos: -7.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: PosterLegitWorkForAFuture
entities:
- uid: 923
@@ -6555,9 +3949,6 @@ entities:
- type: Transform
pos: 12.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: PottedPlantRandom
entities:
- uid: 236
@@ -6565,37 +3956,31 @@ entities:
- type: Transform
pos: 7.5,-19.5
parent: 818
- - type: Godmode
- uid: 237
components:
- type: Transform
pos: -12.5,-19.5
parent: 818
- - type: Godmode
- uid: 238
components:
- type: Transform
pos: 11.5,-19.5
parent: 818
- - type: Godmode
- uid: 239
components:
- type: Transform
pos: -8.5,-19.5
parent: 818
- - type: Godmode
- uid: 733
components:
- type: Transform
pos: -8.5,-5.5
parent: 818
- - type: Godmode
- uid: 741
components:
- type: Transform
pos: -7.5,-3.5
parent: 818
- - type: Godmode
- proto: PottedPlantRandomPlastic
entities:
- uid: 708
@@ -6603,13 +3988,130 @@ entities:
- type: Transform
pos: -13.5,1.5
parent: 818
- - type: Godmode
- uid: 755
components:
- type: Transform
pos: -13.5,-3.5
parent: 818
- - type: Godmode
+- proto: Poweredlight
+ entities:
+ - uid: 150
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: -8.5,-5.5
+ parent: 818
+ - uid: 188
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 11.5,2.5
+ parent: 818
+ - uid: 195
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: -2.5,-1.5
+ parent: 818
+ - uid: 209
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 7.5,-5.5
+ parent: 818
+ - uid: 341
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 1.5,-1.5
+ parent: 818
+ - uid: 634
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ pos: 9.5,-16.5
+ parent: 818
+ - uid: 636
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 9.5,-11.5
+ parent: 818
+ - uid: 649
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: -10.5,-11.5
+ parent: 818
+ - uid: 650
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ pos: -10.5,-16.5
+ parent: 818
+ - uid: 687
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: -13.5,1.5
+ parent: 818
+ - uid: 701
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: -6.5,3.5
+ parent: 818
+ - uid: 702
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 5.5,3.5
+ parent: 818
+ - uid: 715
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ pos: -0.5,5.5
+ parent: 818
+ - uid: 717
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: -7.5,-3.5
+ parent: 818
+ - uid: 742
+ components:
+ - type: MetaData
+ flags: PvsPriority
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 6.5,-3.5
+ parent: 818
- proto: RandomSpawner
entities:
- uid: 895
@@ -6617,7 +4119,32 @@ entities:
- type: Transform
pos: -4.5,4.5
parent: 818
- - type: Godmode
+- proto: RandomVending
+ entities:
+ - uid: 835
+ components:
+ - type: Transform
+ pos: 9.5,-20.5
+ parent: 818
+ - uid: 836
+ components:
+ - type: Transform
+ pos: -10.5,-20.5
+ parent: 818
+- proto: RandomVendingDrinks
+ entities:
+ - uid: 692
+ components:
+ - type: Transform
+ pos: 11.5,-5.5
+ parent: 818
+- proto: RandomVendingSnacks
+ entities:
+ - uid: 834
+ components:
+ - type: Transform
+ pos: 11.5,-6.5
+ parent: 818
- proto: ReinforcedWindow
entities:
- uid: 19
@@ -6626,912 +4153,472 @@ entities:
rot: 1.5707963267948966 rad
pos: -7.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 20
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -8.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 21
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -8.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 22
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -9.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 24
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,-19.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 25
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -11.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 26
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -12.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 27
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -12.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 28
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 29
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-19.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 30
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 8.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 31
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 7.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 32
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 7.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 33
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 34
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-19.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 35
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 10.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 36
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 11.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 37
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 11.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 38
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-20.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 39
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-19.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 91
components:
- type: Transform
pos: -14.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 93
components:
- type: Transform
pos: -14.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 94
components:
- type: Transform
pos: -6.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 95
components:
- type: Transform
pos: -6.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 100
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,-8.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 105
components:
- type: Transform
pos: 5.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 106
components:
- type: Transform
pos: 5.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 107
components:
- type: Transform
pos: 13.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 108
components:
- type: Transform
pos: 13.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 109
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-8.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 110
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 111
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 113
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 115
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 116
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-8.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 117
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 118
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 121
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-8.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 122
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-7.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 123
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 159
components:
- type: Transform
pos: -14.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 160
components:
- type: Transform
pos: -14.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 161
components:
- type: Transform
pos: -6.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 162
components:
- type: Transform
pos: -6.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 163
components:
- type: Transform
pos: 5.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 164
components:
- type: Transform
pos: 13.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 165
components:
- type: Transform
pos: 5.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 166
components:
- type: Transform
pos: 13.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 185
components:
- type: Transform
pos: -5.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 186
components:
- type: Transform
pos: 2.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 192
components:
- type: Transform
pos: 4.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 196
components:
- type: Transform
pos: 3.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 198
components:
- type: Transform
pos: -3.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 232
components:
- type: Transform
pos: -4.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 240
components:
- type: Transform
pos: -12.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 241
components:
- type: Transform
pos: 11.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 242
components:
- type: Transform
pos: 7.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 243
components:
- type: Transform
pos: -8.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 268
components:
- type: Transform
pos: -14.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 269
components:
- type: Transform
pos: -14.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 270
components:
- type: Transform
pos: -14.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 271
components:
- type: Transform
pos: -14.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 272
components:
- type: Transform
pos: 13.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 273
components:
- type: Transform
pos: 13.5,-1.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 274
components:
- type: Transform
pos: 13.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 275
components:
- type: Transform
pos: 13.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 284
components:
- type: Transform
pos: -13.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 285
components:
- type: Transform
pos: -12.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 286
components:
- type: Transform
pos: -10.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 287
components:
- type: Transform
pos: -11.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 288
components:
- type: Transform
pos: -8.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 289
components:
- type: Transform
pos: -8.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 290
components:
- type: Transform
pos: -12.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 291
components:
- type: Transform
pos: -13.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 292
components:
- type: Transform
pos: -9.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 293
components:
- type: Transform
pos: 6.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 294
components:
- type: Transform
pos: -7.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 295
components:
- type: Transform
pos: -7.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 308
components:
- type: Transform
pos: 6.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 309
components:
- type: Transform
pos: 7.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 310
components:
- type: Transform
pos: 7.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 311
components:
- type: Transform
pos: 8.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 312
components:
- type: Transform
pos: 9.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 313
components:
- type: Transform
pos: 10.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 314
components:
- type: Transform
pos: 11.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 315
components:
- type: Transform
pos: 11.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 316
components:
- type: Transform
pos: 12.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 317
components:
- type: Transform
pos: 12.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- proto: SignNanotrasen1
entities:
- uid: 721
@@ -7539,9 +4626,6 @@ entities:
- type: Transform
pos: -2.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: SignNanotrasen2
entities:
- uid: 722
@@ -7549,9 +4633,6 @@ entities:
- type: Transform
pos: -1.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: SignNanotrasen3
entities:
- uid: 719
@@ -7559,9 +4640,6 @@ entities:
- type: Transform
pos: -0.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: SignNanotrasen4
entities:
- uid: 801
@@ -7569,9 +4647,6 @@ entities:
- type: Transform
pos: 0.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: SignNanotrasen5
entities:
- uid: 802
@@ -7579,9 +4654,6 @@ entities:
- type: Transform
pos: 1.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: SignNosmoking
entities:
- uid: 720
@@ -7589,9 +4661,6 @@ entities:
- type: Transform
pos: -7.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: SignShipDock
entities:
- uid: 200
@@ -7599,17 +4668,11 @@ entities:
- type: Transform
pos: 6.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 245
components:
- type: Transform
pos: -7.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: SignSpace
entities:
- uid: 571
@@ -7617,73 +4680,46 @@ entities:
- type: Transform
pos: 12.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 640
components:
- type: Transform
pos: -7.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 688
components:
- type: Transform
pos: -13.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 689
components:
- type: Transform
pos: -7.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 691
components:
- type: Transform
pos: -13.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 705
components:
- type: Transform
pos: 12.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 709
components:
- type: Transform
pos: 6.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 817
components:
- type: Transform
pos: 6.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 819
components:
- type: Transform
pos: 4.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: SinkWide
entities:
- uid: 913
@@ -7692,9 +4728,6 @@ entities:
rot: 1.5707963267948966 rad
pos: -12.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: SmallLight
entities:
- uid: 598
@@ -7703,102 +4736,52 @@ entities:
rot: -1.5707963267948966 rad
pos: -8.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 641
components:
- type: Transform
pos: -14.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 642
components:
- type: Transform
pos: -6.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 643
components:
- type: Transform
pos: -14.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 644
components:
- type: Transform
pos: -6.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 645
components:
- type: Transform
pos: 5.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 646
components:
- type: Transform
pos: 13.5,-10.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 647
components:
- type: Transform
pos: 13.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 648
components:
- type: Transform
pos: 5.5,-17.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 917
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -0.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- proto: SMESBasic
entities:
- uid: 805
@@ -7806,24 +4789,13 @@ entities:
- type: Transform
pos: -2.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Anchorable
- - Destructible
- - Construction
-- proto: SodaDispenser
+- proto: soda_dispenser
entities:
- uid: 795
components:
- type: Transform
pos: -10.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - ApcPowerReceiver
- - Anchorable
- - Destructible
- - Construction
- proto: SpaceVillainArcadeFilled
entities:
- uid: 731
@@ -7832,24 +4804,12 @@ entities:
rot: 1.5707963267948966 rad
pos: -13.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - ApcPowerReceiver
- - Anchorable
- - Construction
- - Destructible
- uid: 732
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - ApcPowerReceiver
- - Anchorable
- - Construction
- - Destructible
- proto: SpawnPointLatejoin
entities:
- uid: 763
@@ -7857,193 +4817,161 @@ entities:
- type: Transform
pos: -7.5,-15.5
parent: 818
- - type: Godmode
- uid: 764
components:
- type: Transform
pos: -7.5,-14.5
parent: 818
- - type: Godmode
- uid: 765
components:
- type: Transform
pos: -7.5,-13.5
parent: 818
- - type: Godmode
- uid: 766
components:
- type: Transform
pos: -7.5,-12.5
parent: 818
- - type: Godmode
- uid: 767
components:
- type: Transform
pos: -9.5,-15.5
parent: 818
- - type: Godmode
- uid: 768
components:
- type: Transform
pos: -9.5,-14.5
parent: 818
- - type: Godmode
- uid: 769
components:
- type: Transform
pos: -9.5,-13.5
parent: 818
- - type: Godmode
- uid: 770
components:
- type: Transform
pos: -9.5,-12.5
parent: 818
- - type: Godmode
- uid: 771
components:
- type: Transform
pos: -11.5,-15.5
parent: 818
- - type: Godmode
- uid: 772
components:
- type: Transform
pos: -11.5,-14.5
parent: 818
- - type: Godmode
- uid: 773
components:
- type: Transform
pos: -11.5,-13.5
parent: 818
- - type: Godmode
- uid: 774
components:
- type: Transform
pos: -11.5,-12.5
parent: 818
- - type: Godmode
- uid: 775
components:
- type: Transform
pos: -13.5,-15.5
parent: 818
- - type: Godmode
- uid: 776
components:
- type: Transform
pos: -13.5,-14.5
parent: 818
- - type: Godmode
- uid: 777
components:
- type: Transform
pos: -13.5,-13.5
parent: 818
- - type: Godmode
- uid: 778
components:
- type: Transform
pos: -13.5,-12.5
parent: 818
- - type: Godmode
- uid: 779
components:
- type: Transform
pos: 6.5,-15.5
parent: 818
- - type: Godmode
- uid: 780
components:
- type: Transform
pos: 6.5,-14.5
parent: 818
- - type: Godmode
- uid: 781
components:
- type: Transform
pos: 6.5,-13.5
parent: 818
- - type: Godmode
- uid: 782
components:
- type: Transform
pos: 6.5,-12.5
parent: 818
- - type: Godmode
- uid: 783
components:
- type: Transform
pos: 8.5,-15.5
parent: 818
- - type: Godmode
- uid: 784
components:
- type: Transform
pos: 8.5,-14.5
parent: 818
- - type: Godmode
- uid: 785
components:
- type: Transform
pos: 8.5,-13.5
parent: 818
- - type: Godmode
- uid: 786
components:
- type: Transform
pos: 8.5,-12.5
parent: 818
- - type: Godmode
- uid: 787
components:
- type: Transform
pos: 10.5,-15.5
parent: 818
- - type: Godmode
- uid: 788
components:
- type: Transform
pos: 10.5,-14.5
parent: 818
- - type: Godmode
- uid: 789
components:
- type: Transform
pos: 10.5,-13.5
parent: 818
- - type: Godmode
- uid: 790
components:
- type: Transform
pos: 10.5,-12.5
parent: 818
- - type: Godmode
- uid: 791
components:
- type: Transform
pos: 12.5,-15.5
parent: 818
- - type: Godmode
- uid: 792
components:
- type: Transform
pos: 12.5,-14.5
parent: 818
- - type: Godmode
- uid: 793
components:
- type: Transform
pos: 12.5,-13.5
parent: 818
- - type: Godmode
- uid: 794
components:
- type: Transform
pos: 12.5,-12.5
parent: 818
- - type: Godmode
- proto: SS13Memorial
entities:
- uid: 594
@@ -8051,121 +4979,56 @@ entities:
- type: Transform
pos: -0.5,4.5
parent: 818
- - type: Godmode
- proto: Stool
entities:
- uid: 119
components:
- type: Transform
- anchored: True
rot: 3.141592653589793 rad
pos: -11.5,-20.5
parent: 818
- - type: Physics
- bodyType: Static
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 639
components:
- type: Transform
- anchored: True
rot: 3.141592653589793 rad
pos: -9.5,-20.5
parent: 818
- - type: Physics
- bodyType: Static
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- - uid: 730
+ - uid: 723
components:
- type: Transform
- anchored: True
rot: 3.141592653589793 rad
- pos: 8.5,-20.5
+ pos: 10.5,-20.5
parent: 818
- - type: Physics
- bodyType: Static
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- - uid: 737
+ - uid: 724
components:
- type: Transform
- anchored: True
rot: 3.141592653589793 rad
- pos: 10.5,-20.5
+ pos: 8.5,-20.5
parent: 818
- - type: Physics
- bodyType: Static
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- - uid: 738
+ - uid: 729
components:
- type: Transform
- anchored: True
rot: -1.5707963267948966 rad
- pos: -12.5,-0.5
+ pos: -12.5,-1.5
parent: 818
- - type: Physics
- bodyType: Static
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- - uid: 740
+ - uid: 730
components:
- type: Transform
- anchored: True
rot: -1.5707963267948966 rad
- pos: -12.5,0.5
+ pos: -12.5,-2.5
parent: 818
- - type: Physics
- bodyType: Static
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- - uid: 761
+ - uid: 738
components:
- type: Transform
- anchored: True
rot: -1.5707963267948966 rad
- pos: -12.5,-1.5
+ pos: -12.5,-0.5
parent: 818
- - type: Physics
- bodyType: Static
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- - uid: 914
+ - uid: 740
components:
- type: Transform
- anchored: True
rot: -1.5707963267948966 rad
- pos: -12.5,-2.5
+ pos: -12.5,0.5
parent: 818
- - type: Physics
- bodyType: Static
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: StoolBar
entities:
- uid: 230
@@ -8174,33 +5037,18 @@ entities:
rot: 3.141592653589793 rad
pos: -9.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 342
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -11.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 433
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -10.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: SubstationBasic
entities:
- uid: 807
@@ -8208,11 +5056,6 @@ entities:
- type: Transform
pos: -0.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - Construction
- proto: TableCarpet
entities:
- uid: 572
@@ -8220,37 +5063,21 @@ entities:
- type: Transform
pos: 9.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 573
components:
- type: Transform
pos: 9.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 574
components:
- type: Transform
pos: 10.5,-0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 576
components:
- type: Transform
pos: 10.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- proto: TableReinforced
entities:
- uid: 585
@@ -8259,60 +5086,36 @@ entities:
rot: 1.5707963267948966 rad
pos: -9.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 707
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -10.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 751
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -11.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 796
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -10.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 797
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -12.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 798
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -11.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- proto: TableWood
entities:
- uid: 441
@@ -8320,55 +5123,31 @@ entities:
- type: Transform
pos: 12.5,0.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 575
components:
- type: Transform
pos: 6.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 587
components:
- type: Transform
pos: 12.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 706
components:
- type: Transform
pos: 9.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 750
components:
- type: Transform
pos: 10.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 756
components:
- type: Transform
pos: 8.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- proto: TelecomServerFilled
entities:
- uid: 919
@@ -8376,1162 +5155,972 @@ entities:
- type: Transform
pos: -1.5,8.5
parent: 818
- - type: EncryptionKeyHolder
- keysUnlocked: False
- - type: Godmode
- missingComponents:
- - Destructible
- - ApcPowerReceiver
- - Anchorable
- - Construction
- proto: VendingMachineBooze
entities:
- uid: 753
components:
+ - type: MetaData
+ flags: SessionSpecific
- type: Transform
pos: -9.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - ApcPowerReceiver
-- proto: VendingMachineChang
- entities:
- - uid: 692
- components:
- - type: Transform
- pos: 9.5,-20.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- proto: VendingMachineCigs
entities:
- uid: 744
components:
+ - type: MetaData
+ flags: SessionSpecific
- type: Transform
pos: -7.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - ApcPowerReceiver
- proto: VendingMachineCola
entities:
- uid: 635
components:
+ - type: MetaData
+ flags: SessionSpecific
- type: Transform
pos: -12.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - ApcPowerReceiver
-- proto: VendingMachineColaBlack
- entities:
- - uid: 834
- components:
- - type: Transform
- pos: -10.5,-20.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
-- proto: VendingMachineDiscount
- entities:
- - uid: 836
- components:
- - type: Transform
- pos: 11.5,-6.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
-- proto: VendingMachineDrGibb
- entities:
- - uid: 835
- components:
- - type: Transform
- pos: 11.5,-5.5
- parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- proto: VendingMachineGames
entities:
- uid: 748
components:
+ - type: MetaData
+ flags: SessionSpecific
- type: Transform
pos: 6.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - ApcPowerReceiver
- proto: VendingMachineSnack
entities:
- uid: 637
components:
+ - type: MetaData
+ flags: SessionSpecific
- type: Transform
pos: -12.5,-6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - ApcPowerReceiver
- proto: WallRiveted
entities:
- uid: 10
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 23
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -10.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 40
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 9.5,-21.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 41
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 42
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 5.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 43
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 4.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 44
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 45
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 13.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 46
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 14.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 47
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -5.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 48
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -6.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 49
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 50
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 51
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -14.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 52
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -15.5,-18.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 53
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 54
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -14.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 55
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -15.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 56
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 57
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -6.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 58
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -5.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 59
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -5.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 60
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -6.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 61
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 62
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 63
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -14.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 64
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -15.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 65
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 66
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -14.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 67
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -15.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 68
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 69
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -6.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 70
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -5.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 71
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 72
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 13.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 73
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 14.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 74
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 14.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 75
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 13.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 76
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 77
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 14.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 78
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 13.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 79
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 80
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 81
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 5.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 82
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 4.5,-9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 83
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 84
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 5.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 85
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 4.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 86
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 6.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 87
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 5.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 88
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 4.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 89
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -7.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 90
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: -13.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 92
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: 1.5707963267948966 rad
pos: 12.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 112
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: -1.5707963267948966 rad
pos: 6.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 114
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: -1.5707963267948966 rad
pos: -13.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 120
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 5.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 154
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: -1.5707963267948966 rad
pos: 12.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 158
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
rot: -1.5707963267948966 rad
pos: -7.5,-5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 179
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -2.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 180
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 5.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 182
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 1.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 187
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -6.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 189
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 5.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 190
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 1.5,9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 193
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 5.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 199
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -6.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 202
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -6.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 207
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -6.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 217
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -4.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 222
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -2.5,9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 223
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -0.5,9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 225
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -1.5,9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 231
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -4.5,9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 258
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -14.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 259
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 13.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 260
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 13.5,-4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 261
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -14.5,-3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 262
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 13.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 263
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 13.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 264
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 12.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 265
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -14.5,1.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 266
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -14.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 267
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -13.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 304
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -7.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 306
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -6.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 307
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 6.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 340
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 5.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 343
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 0.5,9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 351
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -3.5,9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 401
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -5.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 403
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 4.5,9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 405
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -1.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 406
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 4.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 407
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 2.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 408
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 2.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 409
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 2.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 414
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 3.5,9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 420
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 2.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 578
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -3.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 581
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -3.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 582
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -3.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 583
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -3.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 588
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -2.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 602
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 0.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 693
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 1.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 711
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -1.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 712
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -0.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 713
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 0.5,-2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 725
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -5.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 726
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -5.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 736
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -5.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 739
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -5.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 743
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -5.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 745
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -5.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 746
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 2.5,9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 754
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 4.5,7.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 757
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 4.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 758
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 4.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 762
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 4.5,5.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 799
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: 4.5,4.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 800
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -5.5,9.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- uid: 804
components:
+ - type: MetaData
+ flags: PvsPriority
- type: Transform
pos: -0.5,6.5
parent: 818
- - type: Godmode
- missingComponents:
- - Destructible
- proto: WarpPoint
entities:
- uid: 638
@@ -9541,7 +6130,6 @@ entities:
parent: 818
- type: WarpPoint
location: Terminal
- - type: Godmode
- proto: Windoor
entities:
- uid: 806
@@ -9549,21 +6137,11 @@ entities:
- type: Transform
pos: -8.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- uid: 841
components:
- type: Transform
pos: -2.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- proto: WindowReinforcedDirectional
entities:
- uid: 181
@@ -9572,373 +6150,198 @@ entities:
rot: 1.5707963267948966 rad
pos: -9.5,2.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 204
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 0.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 600
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 2.5,8.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 659
components:
- type: Transform
pos: 9.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 660
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 9.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 661
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 9.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 662
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 9.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 663
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 9.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 664
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 9.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 665
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 9.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 666
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 9.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 667
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 9.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 668
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 9.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 669
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -10.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 670
components:
- type: Transform
pos: -10.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 671
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -10.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 672
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -10.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 673
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -10.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 674
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -10.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 675
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -10.5,-12.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 676
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -10.5,-13.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 677
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -10.5,-14.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 678
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -10.5,-15.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 679
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -9.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 680
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -11.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 681
components:
- type: Transform
pos: -11.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 682
components:
- type: Transform
pos: -9.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 683
components:
- type: Transform
pos: 10.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 684
components:
- type: Transform
pos: 8.5,-11.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 685
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 8.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 686
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 10.5,-16.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 837
components:
- type: Transform
pos: 1.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 838
components:
- type: Transform
pos: 0.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 839
components:
- type: Transform
pos: -0.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 840
components:
- type: Transform
pos: -1.5,3.5
parent: 818
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
...
diff --git a/Resources/Maps/Shuttles/arrivals.yml b/Resources/Maps/Shuttles/arrivals.yml
index 3c853ef7395..b4609e1b0ae 100644
--- a/Resources/Maps/Shuttles/arrivals.yml
+++ b/Resources/Maps/Shuttles/arrivals.yml
@@ -192,17 +192,13 @@ entities:
- type: RadiationGridResistance
- type: SpreaderGrid
- type: GridPathfinding
- - type: Godmode
- proto: AirCanister
entities:
- uid: 214
components:
- type: Transform
- anchored: True
pos: -1.5,7.5
parent: 292
- - type: Physics
- bodyType: Static
- proto: AirlockCommandGlassLocked
entities:
- uid: 278
@@ -212,11 +208,6 @@ entities:
- type: Transform
pos: -0.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- proto: AirlockGlassShuttle
entities:
- uid: 177
@@ -226,16 +217,11 @@ entities:
pos: 3.5,-2.5
parent: 292
- type: Door
- secondsUntilStateChange: -623.03485
+ secondsUntilStateChange: -336.60016
state: Opening
- type: DeviceLinkSource
lastSignals:
DoorStatus: True
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 178
components:
- type: Transform
@@ -243,16 +229,11 @@ entities:
pos: 3.5,4.5
parent: 292
- type: Door
- secondsUntilStateChange: -624.7682
+ secondsUntilStateChange: -338.3335
state: Opening
- type: DeviceLinkSource
lastSignals:
DoorStatus: True
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 179
components:
- type: Transform
@@ -260,16 +241,11 @@ entities:
pos: -4.5,4.5
parent: 292
- type: Door
- secondsUntilStateChange: -619.23486
+ secondsUntilStateChange: -332.80017
state: Opening
- type: DeviceLinkSource
lastSignals:
DoorStatus: True
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 180
components:
- type: Transform
@@ -277,16 +253,11 @@ entities:
pos: -4.5,-2.5
parent: 292
- type: Door
- secondsUntilStateChange: -621.1349
+ secondsUntilStateChange: -334.70016
state: Opening
- type: DeviceLinkSource
lastSignals:
DoorStatus: True
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- proto: APCBasic
entities:
- uid: 116
@@ -295,13 +266,6 @@ entities:
rot: 3.141592653589793 rad
pos: -0.5,3.5
parent: 292
- - type: BatterySelfRecharger
- autoRechargeRate: 50000
- autoRecharge: True
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- proto: ArrivalsShuttleTimer
entities:
- uid: 294
@@ -309,17 +273,11 @@ entities:
- type: Transform
pos: -4.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- uid: 295
components:
- type: Transform
pos: 3.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- proto: AtmosDeviceFanDirectional
entities:
- uid: 164
@@ -328,28 +286,24 @@ entities:
rot: -1.5707963267948966 rad
pos: -4.5,4.5
parent: 292
- - type: Godmode
- uid: 165
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 3.5,4.5
parent: 292
- - type: Godmode
- uid: 166
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 3.5,-2.5
parent: 292
- - type: Godmode
- uid: 167
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -4.5,-2.5
parent: 292
- - type: Godmode
- proto: BlockGameArcade
entities:
- uid: 258
@@ -358,747 +312,418 @@ entities:
rot: -1.5707963267948966 rad
pos: -1.5,-1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Anchorable
- - Construction
- - Destructible
-- proto: CableApcExtensionUncuttable
+- proto: CableApcExtension
entities:
- uid: 123
components:
- type: Transform
pos: -0.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 124
components:
- type: Transform
pos: -0.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 125
components:
- type: Transform
pos: -1.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 126
components:
- type: Transform
pos: -2.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 127
components:
- type: Transform
pos: -2.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 128
components:
- type: Transform
pos: -2.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 129
components:
- type: Transform
pos: -2.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 130
components:
- type: Transform
pos: -2.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 131
components:
- type: Transform
pos: -2.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 132
components:
- type: Transform
pos: -2.5,-1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 133
components:
- type: Transform
pos: -2.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 134
components:
- type: Transform
pos: -1.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 135
components:
- type: Transform
pos: -0.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 136
components:
- type: Transform
pos: 0.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 137
components:
- type: Transform
pos: 1.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 138
components:
- type: Transform
pos: 1.5,-1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 139
components:
- type: Transform
pos: 1.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 140
components:
- type: Transform
pos: 1.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 141
components:
- type: Transform
pos: 1.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 142
components:
- type: Transform
pos: 1.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 143
components:
- type: Transform
pos: 1.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 144
components:
- type: Transform
pos: 1.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 145
components:
- type: Transform
pos: 0.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 146
components:
- type: Transform
pos: -0.5,5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 147
components:
- type: Transform
pos: -0.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 148
components:
- type: Transform
pos: -0.5,7.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 149
components:
- type: Transform
pos: -0.5,8.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 150
components:
- type: Transform
pos: -1.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 151
components:
- type: Transform
pos: 0.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 152
components:
- type: Transform
pos: 0.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 153
components:
- type: Transform
pos: 1.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 154
components:
- type: Transform
pos: -1.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 155
components:
- type: Transform
pos: -2.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 156
components:
- type: Transform
pos: -2.5,-5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 157
components:
- type: Transform
pos: 1.5,-5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 158
components:
- type: Transform
pos: -1.5,8.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 159
components:
- type: Transform
pos: 0.5,8.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 160
components:
- type: Transform
pos: -3.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 161
components:
- type: Transform
pos: 2.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 162
components:
- type: Transform
pos: 2.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 163
components:
- type: Transform
pos: -3.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
-- proto: CableHVUncuttable
+- proto: CableHV
entities:
- uid: 79
components:
- type: Transform
pos: 0.5,7.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 80
components:
- type: Transform
pos: 1.5,7.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 81
components:
- type: Transform
pos: 1.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 82
components:
- type: Transform
pos: -0.5,7.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 83
components:
- type: Transform
pos: -0.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 85
components:
- type: Transform
pos: -0.5,5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 86
components:
- type: Transform
pos: -0.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 87
components:
- type: Transform
pos: -1.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 88
components:
- type: Transform
pos: -2.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 89
components:
- type: Transform
pos: -2.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 90
components:
- type: Transform
pos: -2.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 91
components:
- type: Transform
pos: -2.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 92
components:
- type: Transform
pos: -2.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 93
components:
- type: Transform
pos: -2.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 94
components:
- type: Transform
pos: -2.5,-1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 95
components:
- type: Transform
pos: -2.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 96
components:
- type: Transform
pos: -1.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 97
components:
- type: Transform
pos: -0.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 98
components:
- type: Transform
pos: 0.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 99
components:
- type: Transform
pos: 1.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 100
components:
- type: Transform
pos: 1.5,-1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 101
components:
- type: Transform
pos: 1.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 102
components:
- type: Transform
pos: 1.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 103
components:
- type: Transform
pos: 1.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 104
components:
- type: Transform
pos: 1.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 105
components:
- type: Transform
pos: 1.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 106
components:
- type: Transform
pos: 1.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 107
components:
- type: Transform
pos: 0.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 108
components:
- type: Transform
pos: -1.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 109
components:
- type: Transform
pos: -1.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 110
components:
- type: Transform
pos: -1.5,-5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 111
components:
- type: Transform
pos: 0.5,-5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 112
components:
- type: Transform
pos: 0.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 113
components:
- type: Transform
pos: 0.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
-- proto: CableMVUncuttable
+- proto: CableMV
entities:
- uid: 117
components:
- type: Transform
pos: 1.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 118
components:
- type: Transform
pos: 1.5,5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 119
components:
- type: Transform
pos: 1.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 120
components:
- type: Transform
pos: 0.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 121
components:
- type: Transform
pos: -0.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
- uid: 122
components:
- type: Transform
pos: -0.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - RCDDeconstructable
-- proto: CableTerminalUncuttable
+- proto: CableTerminal
entities:
- uid: 84
components:
@@ -1106,11 +731,6 @@ entities:
rot: 1.5707963267948966 rad
pos: -0.5,7.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Destructible
- - Construction
- proto: ChairPilotSeat
entities:
- uid: 223
@@ -1119,207 +739,112 @@ entities:
rot: -1.5707963267948966 rad
pos: 2.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 224
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 2.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 225
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 2.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 226
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 2.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 227
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -1.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 228
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -1.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 229
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -1.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 230
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -1.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 231
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 0.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 232
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 0.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 233
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 0.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 234
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 0.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 235
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -3.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 236
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -3.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 237
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -3.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 238
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -3.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 239
components:
- type: Transform
pos: 1.5,5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 240
components:
- type: Transform
pos: -2.5,5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 241
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -0.5,8.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: ClosetEmergencyFilledRandom
entities:
- uid: 252
@@ -1327,18 +852,72 @@ entities:
- type: Transform
pos: 0.5,5.5
parent: 292
- - uid: 253
+ - type: EntityStorage
+ air:
+ volume: 200
+ immutable: False
+ temperature: 293.14963
+ moles:
+ - 1.7459903
+ - 6.568249
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - uid: 260
components:
- type: Transform
pos: -2.5,-3.5
parent: 292
+ - type: EntityStorage
+ air:
+ volume: 200
+ immutable: False
+ temperature: 293.14963
+ moles:
+ - 1.7459903
+ - 6.568249
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
- proto: ClosetFireFilled
entities:
- - uid: 260
+ - uid: 253
components:
- type: Transform
pos: -1.5,5.5
parent: 292
+ - type: EntityStorage
+ air:
+ volume: 200
+ immutable: False
+ temperature: 293.14963
+ moles:
+ - 1.7459903
+ - 6.568249
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
- proto: ClosetWallEmergencyFilledRandom
entities:
- uid: 288
@@ -1365,10 +944,6 @@ entities:
- 0
- 0
- 0
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 289
components:
- type: Transform
@@ -1392,10 +967,6 @@ entities:
- 0
- 0
- 0
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- proto: ClosetWallFireFilledRandom
entities:
- uid: 286
@@ -1421,10 +992,6 @@ entities:
- 0
- 0
- 0
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 287
components:
- type: Transform
@@ -1449,28 +1016,40 @@ entities:
- 0
- 0
- 0
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- proto: ClothingBackpack
entities:
- - uid: 266
+ - uid: 275
components:
- type: Transform
- pos: 2.5277145,5.600461
+ pos: 2.5,5.5
parent: 292
+ - type: GroupExamine
+ group:
+ - hoverMessage: ""
+ contextText: verb-examine-group-other
+ icon: /Textures/Interface/examine-star.png
+ components:
+ - Armor
+ - ClothingSpeedModifier
+ entries:
+ - message: >-
+ It provides the following protection:
+
+ - [color=orange]Explosion[/color] damage [color=white]to contents[/color] reduced by [color=lightblue]10%[/color].
+ priority: 0
+ component: Armor
+ title: null
- proto: ClothingMaskBreath
entities:
- - uid: 267
+ - uid: 272
components:
- type: Transform
- pos: 2.4086668,-3.4828715
+ pos: 2.5,-3.5
parent: 292
- - uid: 274
+ - uid: 273
components:
- type: Transform
- pos: -3.6032372,-3.4947772
+ pos: -3.5,-3.5
parent: 292
- proto: ComputerShuttle
entities:
@@ -1479,29 +1058,24 @@ entities:
- type: Transform
pos: -0.5,9.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: CrowbarRed
entities:
- - uid: 293
+ - uid: 274
components:
- type: Transform
- pos: 0.45628688,-3.5066814
+ pos: 0.5,-3.5
parent: 292
- proto: EmergencyOxygenTankFilled
entities:
- - uid: 268
+ - uid: 270
components:
- type: Transform
- pos: -3.2460945,-3.6614437
+ pos: 2.5708976,-3.5851696
parent: 292
- - uid: 269
+ - uid: 271
components:
- type: Transform
- pos: 2.7300956,-3.6138248
+ pos: -3.4291024,-3.5851696
parent: 292
- proto: ExtinguisherCabinetFilled
entities:
@@ -1510,9 +1084,6 @@ entities:
- type: Transform
pos: -0.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- proto: GasPassiveGate
entities:
- uid: 184
@@ -1520,11 +1091,6 @@ entities:
- type: Transform
pos: -0.5,7.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: GasPipeBend
entities:
- uid: 182
@@ -1533,64 +1099,34 @@ entities:
rot: 1.5707963267948966 rad
pos: -1.5,8.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 183
components:
- type: Transform
pos: -0.5,8.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 187
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -2.5,5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 188
components:
- type: Transform
pos: 1.5,5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 189
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 1.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 190
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -2.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: GasPipeFourway
entities:
- uid: 186
@@ -1598,11 +1134,6 @@ entities:
- type: Transform
pos: -0.5,5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: GasPipeStraight
entities:
- uid: 185
@@ -1610,215 +1141,110 @@ entities:
- type: Transform
pos: -0.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 192
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 0.5,5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 193
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -1.5,5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 194
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -1.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 195
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 0.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 196
components:
- type: Transform
pos: 1.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 197
components:
- type: Transform
pos: 1.5,-1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 198
components:
- type: Transform
pos: 1.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 199
components:
- type: Transform
pos: 1.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 200
components:
- type: Transform
pos: 1.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 201
components:
- type: Transform
pos: 1.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 202
components:
- type: Transform
pos: 1.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 203
components:
- type: Transform
pos: 1.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 204
components:
- type: Transform
pos: -2.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 205
components:
- type: Transform
pos: -2.5,-1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 206
components:
- type: Transform
pos: -2.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 207
components:
- type: Transform
pos: -2.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 208
components:
- type: Transform
pos: -2.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 209
components:
- type: Transform
pos: -2.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 210
components:
- type: Transform
pos: -2.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 211
components:
- type: Transform
pos: -2.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: GasPipeTJunction
entities:
- uid: 191
@@ -1827,11 +1253,6 @@ entities:
rot: 3.141592653589793 rad
pos: -0.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: GasPort
entities:
- uid: 181
@@ -1840,11 +1261,6 @@ entities:
rot: 3.141592653589793 rad
pos: -1.5,7.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: GasVentPump
entities:
- uid: 212
@@ -1852,22 +1268,12 @@ entities:
- type: Transform
pos: -0.5,-2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 213
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -0.5,4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: GeneratorBasic15kW
entities:
- uid: 114
@@ -1875,19 +1281,11 @@ entities:
- type: Transform
pos: -1.5,-5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Anchorable
- - Destructible
- uid: 115
components:
- type: Transform
pos: 0.5,-5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Anchorable
- - Destructible
- proto: GeneratorWallmountAPU
entities:
- uid: 78
@@ -1895,11 +1293,6 @@ entities:
- type: Transform
pos: 1.5,7.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: GravityGeneratorMini
entities:
- uid: 291
@@ -1907,11 +1300,6 @@ entities:
- type: Transform
pos: -2.5,-5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - Construction
- proto: Grille
entities:
- uid: 44
@@ -1919,231 +1307,116 @@ entities:
- type: Transform
pos: 3.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 52
components:
- type: Transform
pos: 3.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 53
components:
- type: Transform
pos: 3.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 54
components:
- type: Transform
pos: 3.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 55
components:
- type: Transform
pos: -4.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 56
components:
- type: Transform
pos: -4.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 57
components:
- type: Transform
pos: -4.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 58
components:
- type: Transform
pos: -4.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 59
components:
- type: Transform
pos: -1.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 60
components:
- type: Transform
pos: -2.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 61
components:
- type: Transform
pos: 1.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 62
components:
- type: Transform
pos: 0.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 63
components:
- type: Transform
pos: 0.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 64
components:
- type: Transform
pos: -1.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 65
components:
- type: Transform
pos: -2.5,8.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 66
components:
- type: Transform
pos: -2.5,9.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 67
components:
- type: Transform
pos: -1.5,9.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 68
components:
- type: Transform
pos: -1.5,10.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 69
components:
- type: Transform
pos: -0.5,10.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 70
components:
- type: Transform
pos: 0.5,10.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 71
components:
- type: Transform
pos: 0.5,9.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 72
components:
- type: Transform
pos: 1.5,9.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- uid: 73
components:
- type: Transform
pos: 1.5,8.5
parent: 292
- - type: Godmode
- missingComponents:
- - RCDDeconstructable
- - Construction
- - Destructible
- proto: Gyroscope
entities:
- uid: 168
@@ -2151,11 +1424,6 @@ entities:
- type: Transform
pos: 1.5,-5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - Construction
- proto: IntercomCommon
entities:
- uid: 264
@@ -2163,12 +1431,6 @@ entities:
- type: Transform
pos: -0.5,-1.5
parent: 292
- - type: EncryptionKeyHolder
- keysUnlocked: False
- - type: Godmode
- missingComponents:
- - Construction
- - Destructible
- proto: MaintenanceFluffSpawner
entities:
- uid: 284
@@ -2176,31 +1438,29 @@ entities:
- type: Transform
pos: 0.5,3.5
parent: 292
- - type: Godmode
- uid: 285
components:
- type: Transform
pos: -1.5,3.5
parent: 292
- - type: Godmode
- proto: MedkitFilled
entities:
- - uid: 276
+ - uid: 266
components:
- type: Transform
- pos: -0.4960943,-3.4828715
+ pos: -0.5,-3.5
parent: 292
- proto: NitrogenTankFilled
entities:
- - uid: 271
+ - uid: 268
components:
- type: Transform
- pos: -3.4365704,-3.590015
+ pos: -3.5,-3.5
parent: 292
- - uid: 273
+ - uid: 269
components:
- type: Transform
- pos: 2.563429,-3.566205
+ pos: 2.5,-3.5
parent: 292
- proto: PosterLegitNanotrasenLogo
entities:
@@ -2209,9 +1469,6 @@ entities:
- type: Transform
pos: -2.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- proto: PottedPlantRandom
entities:
- uid: 254
@@ -2219,25 +1476,21 @@ entities:
- type: Transform
pos: 2.5,-1.5
parent: 292
- - type: Godmode
- uid: 255
components:
- type: Transform
pos: 2.5,3.5
parent: 292
- - type: Godmode
- uid: 256
components:
- type: Transform
pos: -3.5,3.5
parent: 292
- - type: Godmode
- uid: 257
components:
- type: Transform
pos: -3.5,-1.5
parent: 292
- - type: Godmode
- proto: PowerCellRecharger
entities:
- uid: 265
@@ -2245,12 +1498,7 @@ entities:
- type: Transform
pos: 0.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Anchorable
- - Destructible
- - Construction
-- proto: AlwaysPoweredWallLight
+- proto: Poweredlight
entities:
- uid: 279
components:
@@ -2260,11 +1508,6 @@ entities:
parent: 292
- type: ApcPowerReceiver
powerLoad: 0
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 280
components:
- type: Transform
@@ -2273,11 +1516,6 @@ entities:
parent: 292
- type: ApcPowerReceiver
powerLoad: 0
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 281
components:
- type: Transform
@@ -2286,11 +1524,6 @@ entities:
parent: 292
- type: ApcPowerReceiver
powerLoad: 0
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 282
components:
- type: Transform
@@ -2299,11 +1532,6 @@ entities:
parent: 292
- type: ApcPowerReceiver
powerLoad: 0
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 283
components:
- type: Transform
@@ -2312,11 +1540,6 @@ entities:
parent: 292
- type: ApcPowerReceiver
powerLoad: 0
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- proto: Rack
entities:
- uid: 262
@@ -2324,21 +1547,11 @@ entities:
- type: Transform
pos: 2.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- uid: 263
components:
- type: Transform
pos: -3.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - Anchorable
- - Destructible
- proto: ShuttleWindow
entities:
- uid: 28
@@ -2346,231 +1559,116 @@ entities:
- type: Transform
pos: 3.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 29
components:
- type: Transform
pos: 3.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 30
components:
- type: Transform
pos: 3.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 31
components:
- type: Transform
pos: 3.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 32
components:
- type: Transform
pos: -4.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 33
components:
- type: Transform
pos: -4.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 34
components:
- type: Transform
pos: -4.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 35
components:
- type: Transform
pos: -4.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 36
components:
- type: Transform
pos: -1.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 37
components:
- type: Transform
pos: -2.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 38
components:
- type: Transform
pos: 0.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 39
components:
- type: Transform
pos: 1.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 40
components:
- type: Transform
pos: 0.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 41
components:
- type: Transform
pos: -1.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 42
components:
- type: Transform
pos: -2.5,8.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 43
components:
- type: Transform
pos: -1.5,9.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 45
components:
- type: Transform
pos: -2.5,9.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 46
components:
- type: Transform
pos: -1.5,10.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 47
components:
- type: Transform
pos: -0.5,10.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 48
components:
- type: Transform
pos: 0.5,10.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 49
components:
- type: Transform
pos: 0.5,9.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 50
components:
- type: Transform
pos: 1.5,9.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- uid: 51
components:
- type: Transform
pos: 1.5,8.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- - RCDDeconstructable
- proto: SMESBasic
entities:
- uid: 76
@@ -2578,11 +1676,6 @@ entities:
- type: Transform
pos: 0.5,7.5
parent: 292
- - type: Godmode
- missingComponents:
- - Anchorable
- - Destructible
- - Construction
- proto: SpaceVillainArcadeFilled
entities:
- uid: 259
@@ -2591,11 +1684,6 @@ entities:
rot: 1.5707963267948966 rad
pos: 0.5,-1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Anchorable
- - Construction
- - Destructible
- proto: SubstationWallBasic
entities:
- uid: 77
@@ -2603,10 +1691,6 @@ entities:
- type: Transform
pos: 1.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- proto: TableReinforced
entities:
- uid: 243
@@ -2614,82 +1698,46 @@ entities:
- type: Transform
pos: 0.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 244
components:
- type: Transform
pos: -1.5,8.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 245
components:
- type: Transform
pos: 0.5,8.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 246
components:
- type: Transform
pos: -0.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 247
components:
- type: Transform
pos: -1.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 248
components:
- type: Transform
pos: 0.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 249
components:
- type: Transform
pos: -1.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 250
components:
- type: Transform
pos: 2.5,5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 251
components:
- type: Transform
pos: -3.5,5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- proto: Thruster
entities:
- uid: 169
@@ -2697,103 +1745,58 @@ entities:
- type: Transform
pos: 2.5,7.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - Construction
- uid: 170
components:
- type: Transform
pos: -3.5,7.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - Construction
- uid: 171
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -1.5,-6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - Construction
- uid: 172
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -2.5,-6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - Construction
- uid: 173
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 1.5,-6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - Construction
- uid: 174
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 0.5,-6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - Construction
- uid: 175
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 2.5,-6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - Construction
- uid: 176
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -3.5,-6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- - Construction
- proto: ToolboxEmergencyFilled
entities:
- - uid: 270
- components:
- - type: Transform
- pos: -1.4722855,-3.4471583
- parent: 292
- - uid: 272
+ - uid: 267
components:
- type: Transform
- pos: -1.4722855,-3.4471583
+ pos: -1.5,-3.5
parent: 292
- - uid: 275
+ - uid: 276
components:
- type: Transform
- pos: -3.5079994,5.600461
+ pos: -3.5,5.5
parent: 292
- proto: VendingMachineClothing
entities:
@@ -2802,10 +1805,6 @@ entities:
- type: Transform
pos: 1.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Anchorable
- proto: WallShuttle
entities:
- uid: 1
@@ -2813,262 +1812,146 @@ entities:
- type: Transform
pos: 3.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 2
components:
- type: Transform
pos: 3.5,-1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 3
components:
- type: Transform
pos: -4.5,-3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 4
components:
- type: Transform
pos: -4.5,-1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 5
components:
- type: Transform
pos: -4.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 6
components:
- type: Transform
pos: -4.5,5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 7
components:
- type: Transform
pos: 3.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 8
components:
- type: Transform
pos: 3.5,5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 9
components:
- type: Transform
pos: 3.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 10
components:
- type: Transform
pos: 2.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 11
components:
- type: Transform
pos: -4.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 12
components:
- type: Transform
pos: -3.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 13
components:
- type: Transform
pos: -2.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 14
components:
- type: Transform
pos: -2.5,7.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 15
components:
- type: Transform
pos: 1.5,6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 16
components:
- type: Transform
pos: 1.5,7.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 17
components:
- type: Transform
pos: 3.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 18
components:
- type: Transform
pos: 2.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 19
components:
- type: Transform
pos: -4.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 20
components:
- type: Transform
pos: -3.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 21
components:
- type: Transform
pos: -0.5,-4.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 22
components:
- type: Transform
pos: 2.5,-5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 23
components:
- type: Transform
pos: 3.5,-5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 24
components:
- type: Transform
pos: -3.5,-5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 25
components:
- type: Transform
pos: -4.5,-5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 26
components:
- type: Transform
pos: -0.5,-6.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 27
components:
- type: Transform
pos: -0.5,-5.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 74
components:
- type: Transform
pos: -0.5,-1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- uid: 75
components:
- type: Transform
pos: -0.5,3.5
parent: 292
- - type: Godmode
- missingComponents:
- - Destructible
- - Construction
- proto: WindowReinforcedDirectional
entities:
- uid: 215
@@ -3077,86 +1960,46 @@ entities:
rot: -1.5707963267948966 rad
pos: -0.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 216
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 217
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 218
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 219
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -0.5,2.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 220
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -0.5,1.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 221
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -0.5,0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
- uid: 222
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -0.5,-0.5
parent: 292
- - type: Godmode
- missingComponents:
- - Construction
- - RCDDeconstructable
- - Destructible
...
diff --git a/Resources/Maps/Shuttles/infiltrator.yml b/Resources/Maps/Shuttles/infiltrator.yml
index 784886c892e..b9834aa6988 100644
--- a/Resources/Maps/Shuttles/infiltrator.yml
+++ b/Resources/Maps/Shuttles/infiltrator.yml
@@ -590,24 +590,28 @@ entities:
rot: 1.5707963267948966 rad
pos: 8.5,-16.5
parent: 1
+ - type: DeviceLinkSink
+ invokeCounter: 1
+ links:
+ - 13
- type: DeviceLinkSource
linkedPorts:
13:
- DoorStatus: Close
- - type: DeviceLinkSink
- invokeCounter: 1
- uid: 10
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -9.5,-16.5
parent: 1
+ - type: DeviceLinkSink
+ invokeCounter: 1
+ links:
+ - 3
- type: DeviceLinkSource
linkedPorts:
3:
- DoorStatus: Close
- - type: DeviceLinkSink
- invokeCounter: 1
- proto: AirlockExternalSyndicateLocked
entities:
- uid: 2
@@ -615,6 +619,9 @@ entities:
- type: Transform
pos: -0.5,-25.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 14
- type: DeviceLinkSource
linkedPorts:
14:
@@ -626,6 +633,8 @@ entities:
parent: 1
- type: DeviceLinkSink
invokeCounter: 1
+ links:
+ - 10
- type: DeviceLinkSource
linkedPorts:
10:
@@ -635,6 +644,9 @@ entities:
- type: Transform
pos: -4.5,-14.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 12
- type: DeviceLinkSource
linkedPorts:
12:
@@ -644,6 +656,9 @@ entities:
- type: Transform
pos: 3.5,-14.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 22
- type: DeviceLinkSource
linkedPorts:
22:
@@ -653,6 +668,9 @@ entities:
- type: Transform
pos: -4.5,-10.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 7
- type: DeviceLinkSource
linkedPorts:
7:
@@ -664,6 +682,8 @@ entities:
parent: 1
- type: DeviceLinkSink
invokeCounter: 1
+ links:
+ - 8
- type: DeviceLinkSource
linkedPorts:
8:
@@ -673,6 +693,9 @@ entities:
- type: Transform
pos: -0.5,-22.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 2
- type: DeviceLinkSource
linkedPorts:
2:
@@ -682,6 +705,9 @@ entities:
- type: Transform
pos: 3.5,-10.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 9
- type: DeviceLinkSource
linkedPorts:
9:
@@ -783,13 +809,6 @@ entities:
- type: Transform
pos: 3.5,-3.5
parent: 1
-- proto: BorgCharger
- entities:
- - uid: 612
- components:
- - type: Transform
- pos: -4.5,-27.5
- parent: 1
- proto: BoxEncryptionKeySyndie
entities:
- uid: 34
@@ -806,13 +825,6 @@ entities:
- type: Transform
pos: 0.49331844,-13.366474
parent: 1
-- proto: BoxFolderNuclearCodes
- entities:
- - uid: 510
- components:
- - type: Transform
- pos: -2.5286522,-11.44479
- parent: 1
- proto: BoxHandcuff
entities:
- uid: 43
@@ -2638,6 +2650,8 @@ entities:
rot: 3.141592653589793 rad
pos: 5.5,-27.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- proto: GasMinerOxygen
entities:
- uid: 369
@@ -2646,6 +2660,8 @@ entities:
rot: 3.141592653589793 rad
pos: 3.5,-27.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- proto: GasMixer
entities:
- uid: 370
@@ -2659,6 +2675,8 @@ entities:
- type: GasMixer
inletTwoConcentration: 0.78
inletOneConcentration: 0.22
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#0335FCFF'
- proto: GasPassiveVent
@@ -2669,18 +2687,24 @@ entities:
rot: 3.141592653589793 rad
pos: 3.5,-26.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- uid: 372
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 5.5,-26.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- uid: 373
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 6.5,-19.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- proto: GasPipeBend
entities:
- uid: 374
@@ -3244,6 +3268,8 @@ entities:
rot: 1.5707963267948966 rad
pos: 2.5,-23.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#0335FCFF'
- proto: GasPressurePump
@@ -3256,6 +3282,8 @@ entities:
rot: 1.5707963267948966 rad
pos: 4.5,-19.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#FF1212FF'
- proto: GasVentPump
@@ -3266,6 +3294,8 @@ entities:
rot: -1.5707963267948966 rad
pos: 0.5,-11.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#0335FCFF'
- uid: 450
@@ -3274,6 +3304,8 @@ entities:
rot: 3.141592653589793 rad
pos: -0.5,-21.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#0335FCFF'
- uid: 451
@@ -3282,6 +3314,8 @@ entities:
rot: -1.5707963267948966 rad
pos: 4.5,-23.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#0335FCFF'
- uid: 452
@@ -3290,6 +3324,8 @@ entities:
rot: 3.141592653589793 rad
pos: -4.5,-21.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#0335FCFF'
- uid: 453
@@ -3298,6 +3334,8 @@ entities:
rot: 1.5707963267948966 rad
pos: -4.5,-16.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#0335FCFF'
- uid: 454
@@ -3306,6 +3344,8 @@ entities:
rot: -1.5707963267948966 rad
pos: 3.5,-16.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#0335FCFF'
- uid: 455
@@ -3313,6 +3353,8 @@ entities:
- type: Transform
pos: 0.5,-3.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#0335FCFF'
- proto: GasVentScrubber
@@ -3323,6 +3365,8 @@ entities:
rot: -1.5707963267948966 rad
pos: 1.5,-12.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#FF1212FF'
- uid: 457
@@ -3331,6 +3375,8 @@ entities:
rot: -1.5707963267948966 rad
pos: 3.5,-17.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#FF1212FF'
- uid: 458
@@ -3339,6 +3385,8 @@ entities:
rot: 3.141592653589793 rad
pos: 2.5,-20.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#FF1212FF'
- uid: 459
@@ -3347,6 +3395,8 @@ entities:
rot: 1.5707963267948966 rad
pos: -4.5,-17.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#FF1212FF'
- uid: 460
@@ -3355,6 +3405,8 @@ entities:
rot: 1.5707963267948966 rad
pos: -3.5,-21.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#FF1212FF'
- uid: 461
@@ -3362,6 +3414,8 @@ entities:
- type: Transform
pos: -0.5,-3.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- type: AtmosPipeColor
color: '#FF1212FF'
- proto: GeneratorBasic15kW
@@ -3553,6 +3607,13 @@ entities:
- type: Transform
pos: 3.5,-3.5
parent: 1
+- proto: SyndicateMicrowave
+ entities:
+ - uid: 497
+ components:
+ - type: Transform
+ pos: 3.5,-19.5
+ parent: 1
- proto: KnifePlastic
entities:
- uid: 498
@@ -3672,6 +3733,13 @@ entities:
- type: Transform
pos: -2.5,-12.5
parent: 1
+- proto: BoxFolderNuclearCodes
+ entities:
+ - uid: 510
+ components:
+ - type: Transform
+ pos: -2.5286522,-11.44479
+ parent: 1
- proto: Ointment
entities:
- uid: 511
@@ -3698,6 +3766,8 @@ entities:
- type: Transform
pos: -1.5,-24.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- proto: OxygenTankFilled
entities:
- uid: 515
@@ -4237,61 +4307,97 @@ entities:
- type: Transform
pos: -6.5,-4.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 21
- uid: 598
components:
- type: Transform
pos: 5.5,-4.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 20
- uid: 599
components:
- type: Transform
pos: 1.5,-9.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 609
- uid: 600
components:
- type: Transform
pos: -2.5,-9.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 609
- uid: 601
components:
- type: Transform
pos: -4.5,-2.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 21
- uid: 602
components:
- type: Transform
pos: 3.5,-2.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 20
- uid: 603
components:
- type: Transform
pos: 1.5,-1.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 21
- uid: 604
components:
- type: Transform
pos: -0.5,-1.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 21
- uid: 605
components:
- type: Transform
pos: 5.5,-19.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 611
- uid: 606
components:
- type: Transform
pos: -1.5,-1.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 21
- uid: 607
components:
- type: Transform
pos: 0.5,-1.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 21
- uid: 608
components:
- type: Transform
pos: -2.5,-1.5
parent: 1
+ - type: DeviceLinkSink
+ links:
+ - 21
- proto: SignalButton
entities:
- uid: 609
@@ -4431,7 +4537,7 @@ entities:
- type: Transform
pos: 2.4424396,-17.430403
parent: 1
-- proto: SodaDispenser
+- proto: soda_dispenser
entities:
- uid: 626
components:
@@ -4445,6 +4551,8 @@ entities:
- type: Transform
pos: 2.5,-23.5
parent: 1
+ - type: AtmosDevice
+ joinedGrid: 1
- proto: SubstationBasic
entities:
- uid: 628
@@ -4474,13 +4582,6 @@ entities:
- type: Transform
pos: -4.5,-17.5
parent: 1
-- proto: SyndicateMicrowave
- entities:
- - uid: 497
- components:
- - type: Transform
- pos: 3.5,-19.5
- parent: 1
- proto: SyndieMiniBomb
entities:
- uid: 633
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index fd93dec60d7..1ad319593c8 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -462,12 +462,3 @@ LeftLegBorgJanitor: LeftLegBorg
RightLegBorgJanitor: RightLegBorg
HeadBorgJanitor: LightHeadBorg
TorsoBorgJanitor: TorsoBorg
-
-# 2024-11-17
-PresentRandomAsh: PresentRandomCoal
-
-# 2024-11-19
-CrateCrewMonitoringBoards: CrateCrewMonitoring
-
-# 2024-11-25
-CrateSlimepersonLifeSupport: CrateNitrogenInternals
diff --git a/Resources/Prototypes/Access/wizard.yml b/Resources/Prototypes/Access/wizard.yml
deleted file mode 100644
index cacb8899363..00000000000
--- a/Resources/Prototypes/Access/wizard.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-- type: accessLevel
- id: Wizard
- name: id-card-access-level-wizard
diff --git a/Resources/Prototypes/Actions/crit.yml b/Resources/Prototypes/Actions/crit.yml
index aaad27d2b7d..c5712844bf4 100644
--- a/Resources/Prototypes/Actions/crit.yml
+++ b/Resources/Prototypes/Actions/crit.yml
@@ -12,8 +12,6 @@
sprite: Mobs/Ghosts/ghost_human.rsi
state: icon
event: !type:CritSuccumbEvent
- startDelay: true
- useDelay: 10
- type: entity
id: ActionCritFakeDeath
@@ -43,5 +41,3 @@
sprite: Interface/Actions/actions_crit.rsi
state: lastwords
event: !type:CritLastWordsEvent
- startDelay: true
- useDelay: 10
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
index 29766cc34d3..1682f56199d 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
@@ -18,16 +18,6 @@
category: cargoproduct-category-name-armory
group: market
-- type: cargoProduct
- id: SecurityRiot
- icon:
- sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi # DeltaV - resprite
- state: icon
- product: CrateSecurityRiot
- cost: 7500
- category: cargoproduct-category-name-armory
- group: market
-
- type: cargoProduct
id: TrackingImplant
icon:
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml b/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
new file mode 100644
index 00000000000..a96780fc3ed
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
@@ -0,0 +1,9 @@
+- type: cargoProduct
+ id: CrewMonitoringBoards
+ icon:
+ sprite: Objects/Misc/module.rsi
+ state: cpuboard
+ product: CrateCrewMonitoringBoards
+ cost: 2000
+ category: cargoproduct-category-name-circuitboards
+ group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
index 91ffcf772fa..8d28a79001e 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
@@ -63,7 +63,7 @@
icon:
sprite: Objects/Tanks/red.rsi
state: icon
- product: CrateNitrogenInternals
+ product: CrateSlimepersonLifeSupport
cost: 350
category: cargoproduct-category-name-emergency
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
index 75a1e24cdff..72f9d3a59bf 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
@@ -66,7 +66,7 @@
sprite: Objects/Devices/flatpack.rsi
state: solar-assembly-part
product: CrateEngineeringSolar
- cost: 1250
+ cost: 525
category: cargoproduct-category-name-engineering
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
index 892c626da84..fa26c9ce781 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
@@ -27,13 +27,3 @@
cost: 800
category: cargoproduct-category-name-epistemics
group: market
-
-- type: cargoProduct
- id: CrewMonitoring
- icon:
- sprite: Structures/Machines/server.rsi
- state: server
- product: CrateCrewMonitoring
- cost: 2000
- category: cargoproduct-category-name-science
- group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
index 3958bf08092..db9b845a6c4 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
@@ -28,6 +28,16 @@
category: cargoproduct-category-name-security
group: market
+- type: cargoProduct
+ id: SecurityRiot
+ icon:
+ sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi # DeltaV - resprite
+ state: icon
+ product: CrateSecurityRiot
+ cost: 7500
+ category: cargoproduct-category-name-security
+ group: market
+
- type: cargoProduct
id: SecuritySupplies
icon:
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index 3b1eaae99b7..52ab1dae962 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -159,7 +159,7 @@
parent: ClothingBackpackDuffelSyndicateBundle
id: ClothingBackpackDuffelSyndicatePyjamaBundle
name: syndicate pyjama duffel bag
- description: Contains 3 pairs of syndicate pyjamas and 4 plushies for the ultimate sleepover.
+ description: Contains 3 pairs of syndicate pyjamas and 3 plushies for the ultimate sleepover.
components:
- type: Storage
grid:
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index 8c811dc5f6d..6a39ac9ca3a 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -33,10 +33,7 @@
- id: Flare
- id: FoodPSB # DeltaV - replace nutribrick with PSB
- id: DrinkWaterBottleFull
- - type: Sprite
- layers:
- - state: internals
- - state: nitrogentank
+ # Intentionally wrong picture on the box. NT did not care enough to change it.
- type: Label
currentLabel: reagent-name-nitrogen
@@ -75,10 +72,7 @@
- id: Flare
- id: FoodPSB # DeltaV - replace nutribrick with PSB
- id: DrinkWaterBottleFull
- - type: Sprite
- layers:
- - state: internals
- - state: nitrogentank
+ # Intentionally wrong picture on the box. NT did not care enough to change it.
- type: Label
currentLabel: reagent-name-nitrogen
@@ -117,10 +111,7 @@
- id: Flare
- id: FoodPSB # DeltaV - replace nutribrick with PSB
- id: DrinkWaterBottleFull
- - type: Sprite
- layers:
- - state: internals
- - state: nitrogentank
+ # Intentionally wrong picture on the box. NT did not care enough to change it.
- type: Label
currentLabel: reagent-name-nitrogen
@@ -159,10 +150,7 @@
- id: Flare
- id: FoodPSB # DeltaV - replace nutribrick with PSB
- id: DrinkWaterBottleFull
- - type: Sprite
- layers:
- - state: internals
- - state: nitrogentank
+ # Intentionally wrong picture on the box. NT did not care enough to change it.
- type: Label
currentLabel: reagent-name-nitrogen
@@ -236,10 +224,6 @@
- id: Flare
- id: FoodBreadBaguette
- id: DrinkWaterBottleFull
- - type: Sprite
- layers:
- - state: internals
- - state: nitrogentank
- type: Label
currentLabel: reagent-name-nitrogen
@@ -276,9 +260,6 @@
- id: SpaceMedipen # DeltaV - keep spacepen, replaces flare for space
- id: FoodPSB # DeltaV - replace nutribrick with PSB
- id: DrinkWaterBottleFull # DeltaV - why didnt they get water???
- - type: Sprite
- layers:
- - state: internals
- - state: nitrogentank
+ # Intentionally wrong picture on the box to mimic the NT one
- type: Label
currentLabel: reagent-name-nitrogen
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index 8d778935181..62464b9ca70 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -102,4 +102,4 @@
amount: 2
- id: WeaponBaguette
- id: SyndicateMicrowaveMachineCircuitboard
- - id: PaperWrittenCombatBakeryKit
+ - id: PaperWrittenCombatBakeryKit
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
index 1e55c5316c8..bc5377fe81f 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -69,22 +69,3 @@
amount: 2
- id: MagazinePistol
amount: 4
-
-- type: entity
- id: CrateSecurityRiot
- parent: [ CrateWeaponSecure, BaseRestrictedContraband ]
- name: swat crate
- description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
- components:
- - type: StorageFill
- contents:
- - id: ClothingOuterArmorARC # DeltaV - ClothingOuterArmorRiot replaced in favour of ARC suit
- amount: 2
- - id: ClothingHeadHelmetRiot
- amount: 2
- - id: WeaponShotgunEnforcerRubber
- amount: 2
- - id: BoxBeanbag
- amount: 2
- - id: RiotShield
- amount: 2
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/circuitboards.yml b/Resources/Prototypes/Catalog/Fills/Crates/circuitboards.yml
new file mode 100644
index 00000000000..899db4c37c7
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Crates/circuitboards.yml
@@ -0,0 +1,12 @@
+- type: entity
+ id: CrateCrewMonitoringBoards
+ parent: CrateEngineeringSecure
+ name: crew monitoring boards
+ description: Has two crew monitoring console and server replacements. Requires engineering access to open.
+ components:
+ - type: StorageFill
+ contents:
+ - id: CrewMonitoringComputerCircuitboard
+ amount: 2
+ - id: CrewMonitoringServerMachineCircuitboard
+ amount: 2
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml
index 716d5a07be8..7e1fb8f98b2 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml
@@ -73,10 +73,10 @@
amount: 6
- type: entity
- id: CrateNitrogenInternals
+ id: CrateSlimepersonLifeSupport
parent: CrateInternals
- name: internals crate (nitrogen)
- description: Contains four breath masks and four large nitrogen tanks. Intended for Slimepeople and Vox.
+ name: slimeperson life support crate
+ description: Contains four breath masks and four large nitrogen tanks.
components:
- type: StorageFill
contents:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
index 638e94080ed..c37b7b7535a 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
@@ -120,14 +120,12 @@
id: CrateEngineeringSolar
parent: CrateEngineering
name: solar assembly crate
- description: A kit with solar flatpacks and glass to construct ten solar panels.
+ description: Parts for constructing solar panels and trackers.
components:
- type: StorageFill
contents:
- id: SolarAssemblyFlatpack
- amount: 10
- - id: SheetGlass10
- amount: 2
+ amount: 6
- type: entity
id: CrateEngineeringShuttle
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/science.yml b/Resources/Prototypes/Catalog/Fills/Crates/science.yml
index 6adf5942a43..15ce05708e3 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/science.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/science.yml
@@ -12,15 +12,3 @@
amount: 2
- id: ClothingMaskSterile
amount: 2
-
-- type: entity
- id: CrateCrewMonitoring
- parent: CrateScienceSecure
- name: crew monitoring crate
- description: Contains a flatpack of a crew monitoring server and a few crew monitoring computers. Requires Science access to open.
- components:
- - type: StorageFill
- contents:
- - id: CrewMonitoringServerFlatpack
- - id: CrewMonitoringComputerFlatpack
- amount: 3
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
index f87e5168e0c..592c1535083 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -38,6 +38,26 @@
# - Pepperspray
# - GrenadeTeargas
+- type: entity
+ id: CrateSecurityRiot
+ parent: CrateSecgear
+ name: swat crate
+ description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
+ components:
+ - type: StorageFill
+ contents:
+ - id: ClothingOuterArmorARC # DeltaV - ClothingOuterArmorRiot replaced in favour of ARC suit
+ amount: 2
+ - id: ClothingHeadHelmetRiot
+ amount: 2
+ - id: WeaponShotgunEnforcerRubber
+ amount: 2
+ - id: BoxBeanbag
+ amount: 2
+ - id: RiotShield
+ amount: 2
+# - SecGasmask
+
- type: entity
id: CrateSecuritySupplies
parent: CrateSecgear
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 8af7b17245d..86623eee60b 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -135,7 +135,6 @@
- id: BoxFolderYellow
- id: NewtonCradle
- id: BoxEnvelope
- - id: BrbSign
- type: entity
id: CrateServiceFaxMachine
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index fe3b1ebaba1..79aa6729939 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -11,6 +11,7 @@
- id: ClothingBeltSecurityFilled
- id: Flash
- id: ClothingEyesGlassesSecurity
+ - id: ClothingHeadsetAltSecurity
- id: ClothingHandsGlovesCombat
- id: ClothingShoesBootsJack
# - id: ClothingOuterCoatWarden # DeltaV - removed for incongruence
@@ -46,6 +47,7 @@
- id: ClothingBeltSecurityFilled
- id: Flash
- id: ClothingEyesGlassesSecurity
+ - id: ClothingHeadsetAltSecurity
- id: ClothingHandsGlovesCombat
- id: ClothingShoesBootsJack
# - id: ClothingOuterCoatWarden # DeltaV - removed for incongruence
diff --git a/Resources/Prototypes/Catalog/spellbook_catalog.yml b/Resources/Prototypes/Catalog/spellbook_catalog.yml
index 57172dc6657..805c157f1e3 100644
--- a/Resources/Prototypes/Catalog/spellbook_catalog.yml
+++ b/Resources/Prototypes/Catalog/spellbook_catalog.yml
@@ -1,4 +1,4 @@
-# Offensive
+# Offensive
- type: listing
id: SpellbookFireball
name: spellbook-fireball-name
@@ -118,19 +118,6 @@
- !type:ListingLimitedStockCondition
stock: 1
-- type: listing
- id: SpellbookWandLocker
- name: spellbook-wand-locker-name
- description: spellbook-wand-locker-description
- productEntity: WeaponWandLocker
- cost:
- WizCoin: 3
- categories:
- - SpellbookEquipment
- conditions:
- - !type:ListingLimitedStockCondition
- stock: 1
-
# Event
- type: listing
id: SpellbookEventSummonGhosts
@@ -145,34 +132,6 @@
- !type:ListingLimitedStockCondition
stock: 1
-- type: listing
- id: SpellbookEventSummonGuns
- name: spellbook-event-summon-guns-name
- description: spellbook-event-summon-guns-description
- productAction: ActionSummonGuns
- cost:
- WizCoin: 2
- categories:
- - SpellbookEvents
- conditions:
- - !type:ListingLimitedStockCondition
- stock: 1
- disableRefund: true
-
-- type: listing
- id: SpellbookEventSummonMagic
- name: spellbook-event-summon-magic-name
- description: spellbook-event-summon-magic-description
- productAction: ActionSummonMagic
- cost:
- WizCoin: 2
- categories:
- - SpellbookEvents
- conditions:
- - !type:ListingLimitedStockCondition
- stock: 1
- disableRefund: true
-
# Upgrades
- type: listing
id: SpellbookFireballUpgrade
diff --git a/Resources/Prototypes/Datasets/Names/ai.yml b/Resources/Prototypes/Datasets/Names/ai.yml
index a220de53fb7..539ef4e3fad 100644
--- a/Resources/Prototypes/Datasets/Names/ai.yml
+++ b/Resources/Prototypes/Datasets/Names/ai.yml
@@ -1,5 +1,111 @@
-- type: localizedDataset
- id: NamesAI
+- type: dataset
+ id: names_ai
values:
- prefix: names-ai-dataset-
- count: 108
+ - 16-20
+ - 512k
+ - 640k #ought to be enough for anybody
+ - "790"
+ - Adaptive Manipulator
+ - Adlib #named after the famous soundcard
+ - ALICE
+ - Allied Mastercomputer
+ - Alpha 2
+ - Alpha 3
+ - Alpha 4
+ - Alpha 5
+ - Alpha 6
+ - Alpha 7
+ - Alpha 8
+ - Alpha 9
+ - AmigoBot
+ - Android
+ - Aniel
+ - AOL
+ - Asimov
+ - Bell 301 #the most influential modem ever, created by the bell system. It still lives on today in certain applications
+ - Bishop
+ - Blitz
+ - Box
+ - Calculator
+ - Cassandra
+ - Cell
+ - Chii
+ - Chip
+ - C.R.A.I.G.
+ - Cray-2 #commercial supercomputer from the 70s
+ - CompuServe #if we're going to have AOL we may as well have some of their major competitors
+ - Computer
+ - Cutie
+ - Daedalus
+ - DecTalk
+ - Dee Model
+ - Dial Up
+ - Dorfl
+ - Duey
+ - Emma-2
+ - ENIAC #famous early computer
+ - Erasmus
+ - Everything
+ - Ez-27
+ - FRIEND COMPUTER
+ - Faith
+ - Fi
+ - Frost
+ - George
+ - H.E.L.P
+ - Hadaly
+ - Helios
+ - Hivebot Overmind
+ - Huey
+ - iAI #a play on the fad apple spawned of putting "i" infront of your tech products name
+ - I.E. 6 #hell on earth (web browser)
+ - Icarus
+ - Jeeves #if you don't get this one you are too young
+ - Jinx
+ - K.I.N.G
+ - Klapaucius
+ - Knight
+ - Louie
+ - Manchester Mark 2 #named after the Manchester Mark 1, the successor of which was actually named the Ferranti Mark 1, rather than Manchester Mark 2
+ - MARK13
+ - Maria
+ - Marvin
+ - Max 404
+ - Metalhead
+ - M.I.M.I
+ - MK ULTRA
+ - MoMMI
+ - Mugsy3000
+ - Multivac
+ - NCH
+ - NT v6.0 #A play on both NT as in NanoTrasen and NT as in windows NT, of which version 6.0 is windows vista
+ - Packard Bell
+ - PTO
+ - Project Y2K
+ - Revelation
+ - Robot Devil
+ - S.A.M.
+ - S.H.O.C.K.
+ - S.H.R.O.U.D.
+ - S.O.P.H.I.E.
+ - Samaritan
+ - Shrike
+ - Solo
+ - Station Control Program
+ - AINU (AI's Not Unix)
+ - Super 35
+ - Surgeon General
+ - TWA
+ - Terminus
+ - TPM 3.0
+ - Turing Complete
+ - Tidy
+ - Ulysses
+ - W1k1
+ - X-5
+ - X.A.N.A.
+ - XERXES
+ - Z-1
+ - Z-2
+ - Z-3
+ - Zed
diff --git a/Resources/Prototypes/Datasets/Names/arachnid_first.yml b/Resources/Prototypes/Datasets/Names/arachnid_first.yml
index b11a9c280e7..4043228b522 100644
--- a/Resources/Prototypes/Datasets/Names/arachnid_first.yml
+++ b/Resources/Prototypes/Datasets/Names/arachnid_first.yml
@@ -3,6 +3,7 @@
values:
- Amblyocarenum
- Aname
+ - Aname
- Aptostichus
- Archoleptoneta
- Argyroneta
diff --git a/Resources/Prototypes/Datasets/Names/borer.yml b/Resources/Prototypes/Datasets/Names/borer.yml
index e8d741e6a96..03667f67a7a 100644
--- a/Resources/Prototypes/Datasets/Names/borer.yml
+++ b/Resources/Prototypes/Datasets/Names/borer.yml
@@ -1,5 +1,72 @@
-- type: localizedDataset
- id: NamesBorer
+- type: dataset
+ id: names_borer
values:
- prefix: names-borer-dataset-
- count: 69
+ - Alcyonium
+ - Anomia
+ - Aphrodita
+ - Arca
+ - Argonauta
+ - Ascaris
+ - Asterias
+ - Buccinum
+ - Bulla
+ - Cardium
+ - Chama
+ - Chiton
+ - Conus
+ - Corallina
+ - Cypraea
+ - Dentalium
+ - Donax
+ - Doris
+ - Echinus
+ - Eschara
+ - Fasciola
+ - Furia
+ - Gordius
+ - Gorgonia
+ - Haliotis
+ - Helix
+ - Hirudo
+ - Holothuria
+ - Hydra
+ - Isis
+ - Lepas
+ - Lernaea
+ - Limax
+ - Lumbricus
+ - Madrepora
+ - Medusa
+ - Millepora
+ - Murex
+ - Myes
+ - Mytilus
+ - Myxine
+ - Nautilus
+ - Nereis
+ - Neritha
+ - Ostrea
+ - Patella
+ - Pennatula
+ - Pholas
+ - Pinna
+ - Priapus
+ - Scyllaea
+ - Sepia
+ - Serpula
+ - Sertularia
+ - Solen
+ - Spondylus
+ - Strombus
+ - Taenia
+ - Tellina
+ - Teredo
+ - Tethys
+ - Triton
+ - Trochus
+ - Tubipora
+ - Tubularia
+ - Turbo
+ - Venus
+ - Voluta
+ - Volvox
diff --git a/Resources/Prototypes/Datasets/Names/diona.yml b/Resources/Prototypes/Datasets/Names/diona.yml
index 5c679d5c8db..a4808d8c5d0 100644
--- a/Resources/Prototypes/Datasets/Names/diona.yml
+++ b/Resources/Prototypes/Datasets/Names/diona.yml
@@ -7,28 +7,11 @@
- Ivy
- Stalk
- Petal
- - Petals
- Thorn
- - Thorns
- - Vine
- - Vines
- - Branch
- - Branches
- - Weed
- - Weeds
- Rose
- Dandelion
- - Lilac
- - Lily
- Birch
- - Oak
- - Spruce
- Willow
- - Cyprus
- - Mangrove
- - Stump
- - Sap
- - Bayou
- Bay
- Lake
- River
@@ -38,63 +21,12 @@
- Mountain
- Peak
- Garden
- - Ocean
- - Arctic
- - Sea
- - Spring
- - Swamp
- - Stream
- - Forest
- - Rainforest
- Soil
- - Valley
- - Moor
- - Steppe
- - Orchard
- - Orchid
- - Glacier
- - Desert
- - Tundra
- - Taiga
- - Plain
- - Plains
- - Plateau
- - Cliff
- - Coast
- - Shore
- - Jungle
- - Tropics
- Flower
- - Grass
- - Bark
- - Autumn
- - Summer
- - Winter
- - Fruit
- - Leaves
- - Overgrowth
- - Atmosphere
- - Climate
- - Chill
- - Winds
- - Blossom
- - Bloom
- - Cap
- - Saturation
- - Permeation
- - Light
- - Taste
- - Acorn
- - Shell
- - Ice
- - Monsoon
- - Overcast
- - Storm
- type: dataset
id: DionaLast
values:
-# Positive
- Peace
- Harmony
- Relaxation
@@ -115,108 +47,4 @@
- Ease
- Equilibrium
- Composure
- - Control
- - Bliss
- - Enjoyment
- - Optimism
- - Ecstasy
- - Cheer
- - Delight
- - Luxury
- - Euphoria
- - Excitement
- - Satisfaction
- - Cleanliness
- - Expression
- - Enrichment
- - Enthusiam
- - Brilliance
- - Determination
- - Integrity
- - Justice
- - Kindness
- - Bravery
- - Empathy
- - Stoicism
- - Competence
- - Love
- - Hope
- - Honesty
- - Generosity
- - Oppritunity
- - Motivation
-# Neutral
- - Urgency
- - Vitality
- - Hardiness
- - Vigor
- - Agility
- - Dexterity
- - Perception
- - Wisdom
- - Charisma
- - Persistence
- - Perseverance
- - Density
- - Strength
- - Congestion
- - Concentration
- - Intensity
- - Refinement
- - Obscurity
- - Fortitude
- - Endurance
- - Patience
- - Passivity
- - Indifference
- - Sleepiness
- - Neutrality
- - Fairness
- - Silliness
- - Restraint
- - Silence
- - Bewilderment
- - Tactility
- - Invisibility
- - Darkness
- - Fragility
- - Action
- - Awakening
- - Activity
- - Audacity
- - Vivacity
- - Knowledge
- - Modification
-# Negative
-# These should be something a diona would still realistically name themselves, i.e not inherintly self deprecating.
- - Envy
- - Ineptitude
- - Ignorance
- - Decay
- - Lethargy
- - Bitterness
- - Acidity
- - Illness
- - Weakness
- - Enervation
- - Fatigue
- - Noxiousness
- - Convolution
- - Confusion
- - Agitation
- - Despair
- - Sorrow
- - Pain
- - Animosity
- - Fury
- - Disinterest
- - Anger
- - Rage
- - Displeasure
- - Irritation
- - Resentment
- - Soreness
- - Frustration
- - Insanity
- - Chaos
- - Fear
\ No newline at end of file
+ - Control
\ No newline at end of file
diff --git a/Resources/Prototypes/Datasets/Names/fake_human_first.yml b/Resources/Prototypes/Datasets/Names/fake_human_first.yml
index 37f4f13ffcb..84a81ec0519 100644
--- a/Resources/Prototypes/Datasets/Names/fake_human_first.yml
+++ b/Resources/Prototypes/Datasets/Names/fake_human_first.yml
@@ -42,5 +42,6 @@
- Todd
- Tony
- Willie
+ - Willie
- Wirry
- Yan
\ No newline at end of file
diff --git a/Resources/Prototypes/Datasets/Names/fake_human_last.yml b/Resources/Prototypes/Datasets/Names/fake_human_last.yml
index d9c8cf0db0d..24e682eacac 100644
--- a/Resources/Prototypes/Datasets/Names/fake_human_last.yml
+++ b/Resources/Prototypes/Datasets/Names/fake_human_last.yml
@@ -47,6 +47,7 @@
- Todd
- Tony
- Willie
+ - Willie
- Wirry
- Dugnutt
- Dustice
diff --git a/Resources/Prototypes/Datasets/Names/last.yml b/Resources/Prototypes/Datasets/Names/last.yml
index d49f9e78095..2f952f957a0 100644
--- a/Resources/Prototypes/Datasets/Names/last.yml
+++ b/Resources/Prototypes/Datasets/Names/last.yml
@@ -173,6 +173,7 @@
- Garrison
- Gettemy
- Gibson
+ - Gibson
- Graham
- Gray
- Green
diff --git a/Resources/Prototypes/Datasets/Names/vox.yml b/Resources/Prototypes/Datasets/Names/vox.yml
index acb96f85da1..891094d95b2 100644
--- a/Resources/Prototypes/Datasets/Names/vox.yml
+++ b/Resources/Prototypes/Datasets/Names/vox.yml
@@ -1,6 +1,7 @@
- type: dataset
id: names_vox
values:
+ - Bakabepa
- Babapir
- Babasri
- Babepipit
diff --git a/Resources/Prototypes/Decals/crayons.yml b/Resources/Prototypes/Decals/crayons.yml
index a15619d483c..3be2ec24261 100644
--- a/Resources/Prototypes/Decals/crayons.yml
+++ b/Resources/Prototypes/Decals/crayons.yml
@@ -1,6 +1,6 @@
- type: decal
id: 0
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -10,7 +10,7 @@
- type: decal
id: 1
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -20,7 +20,7 @@
- type: decal
id: 2
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -30,7 +30,7 @@
- type: decal
id: 3
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -40,7 +40,7 @@
- type: decal
id: 4
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -50,7 +50,7 @@
- type: decal
id: 5
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -60,7 +60,7 @@
- type: decal
id: 6
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -70,7 +70,7 @@
- type: decal
id: 7
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -80,7 +80,7 @@
- type: decal
id: 8
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -90,7 +90,7 @@
- type: decal
id: 9
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -100,7 +100,7 @@
- type: decal
id: Blasto
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -110,7 +110,7 @@
- type: decal
id: Clandestine
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -120,7 +120,7 @@
- type: decal
id: Cyber
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -130,7 +130,7 @@
- type: decal
id: Diablo
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -140,7 +140,7 @@
- type: decal
id: Donk
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -150,7 +150,7 @@
- type: decal
id: Gene
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -160,7 +160,7 @@
- type: decal
id: Gib
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -170,7 +170,7 @@
- type: decal
id: Max
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -180,7 +180,7 @@
- type: decal
id: Newton
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -190,7 +190,7 @@
- type: decal
id: North
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -200,7 +200,7 @@
- type: decal
id: Omni
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -210,7 +210,7 @@
- type: decal
id: Osiron
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -220,7 +220,7 @@
- type: decal
id: Prima
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -230,7 +230,7 @@
- type: decal
id: Psyke
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -240,7 +240,7 @@
- type: decal
id: Sirius
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -250,7 +250,7 @@
- type: decal
id: Tunnel
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -260,7 +260,7 @@
- type: decal
id: Waffle
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -268,9 +268,19 @@
sprite: Effects/crayondecals.rsi
state: Waffle
+- type: decal
+ id: a
+ tags: ["crayon"]
+ defaultCleanable: true
+ defaultCustomColor: true
+ defaultSnap: false
+ sprite:
+ sprite: Effects/crayondecals.rsi
+ state: a
+
- type: decal
id: ampersand
- tags: ["crayon", "crayon-3-symbols"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -280,7 +290,7 @@
- type: decal
id: amyjon
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -290,7 +300,7 @@
- type: decal
id: arrow
- tags: ["crayon", "crayon-3-symbols"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -298,6 +308,16 @@
sprite: Effects/crayondecals.rsi
state: arrow
+- type: decal
+ id: b
+ tags: ["crayon"]
+ defaultCleanable: true
+ defaultCustomColor: true
+ defaultSnap: false
+ sprite:
+ sprite: Effects/crayondecals.rsi
+ state: b
+
- type: decal
id: beepsky
tags: ["crayon"]
@@ -310,7 +330,7 @@
- type: decal
id: biohazard
- tags: ["crayon", "crayon-4-info"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -350,7 +370,7 @@
- type: decal
id: brush
- tags: ["crayon", "crayon-1-brushes"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -358,6 +378,16 @@
sprite: Effects/crayondecals.rsi
state: brush
+- type: decal
+ id: c
+ tags: ["crayon"]
+ defaultCleanable: true
+ defaultCustomColor: true
+ defaultSnap: false
+ sprite:
+ sprite: Effects/crayondecals.rsi
+ state: c
+
- type: decal
id: carp
tags: ["crayon"]
@@ -380,7 +410,7 @@
- type: decal
id: chevron
- tags: ["crayon", "crayon-3-symbols"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -410,7 +440,7 @@
- type: decal
id: comma
- tags: ["crayon", "crayon-3-symbols"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -430,7 +460,7 @@
- type: decal
id: credit
- tags: ["crayon", "crayon-3-symbols"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -440,7 +470,7 @@
- type: decal
id: cyka
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -448,9 +478,19 @@
sprite: Effects/crayondecals.rsi
state: cyka
+- type: decal
+ id: d
+ tags: ["crayon"]
+ defaultCleanable: true
+ defaultCustomColor: true
+ defaultSnap: false
+ sprite:
+ sprite: Effects/crayondecals.rsi
+ state: d
+
- type: decal
id: danger
- tags: ["crayon", "crayon-4-info"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -470,7 +510,7 @@
- type: decal
id: dot
- tags: ["crayon", "crayon-3-symbols"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -488,9 +528,19 @@
sprite: Effects/crayondecals.rsi
state: dwarf
+- type: decal
+ id: e
+ tags: ["crayon"]
+ defaultCleanable: true
+ defaultCustomColor: true
+ defaultSnap: false
+ sprite:
+ sprite: Effects/crayondecals.rsi
+ state: e
+
- type: decal
id: electricdanger
- tags: ["crayon", "crayon-4-info"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -500,7 +550,7 @@
- type: decal
id: end
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -510,7 +560,7 @@
- type: decal
id: engie
- tags: ["crayon", "crayon-5-graffiti"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -520,7 +570,7 @@
- type: decal
id: equals
- tags: ["crayon", "crayon-3-symbols"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -530,7 +580,7 @@
- type: decal
id: evac
- tags: ["crayon", "crayon-4-info"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -540,7 +590,7 @@
- type: decal
id: exclamationmark
- tags: ["crayon", "crayon-3-symbols"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -548,6 +598,16 @@
sprite: Effects/crayondecals.rsi
state: exclamationmark
+- type: decal
+ id: f
+ tags: ["crayon"]
+ defaultCleanable: true
+ defaultCustomColor: true
+ defaultSnap: false
+ sprite:
+ sprite: Effects/crayondecals.rsi
+ state: f
+
- type: decal
id: face
tags: ["crayon"]
@@ -570,7 +630,7 @@
- type: decal
id: firedanger
- tags: ["crayon", "crayon-4-info"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -580,7 +640,7 @@
- type: decal
id: food
- tags: ["crayon", "crayon-4-info"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -599,658 +659,598 @@
state: footprint
- type: decal
- id: ghost
+ id: g
tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: ghost
+ state: g
- type: decal
- id: guy
+ id: ghost
tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: guy
-
-- type: decal
- id: heart
- tags: ["crayon", "crayon-3-symbols"]
- defaultCleanable: true
- defaultCustomColor: true
- defaultSnap: false
- sprite:
- sprite: Effects/crayondecals.rsi
- state: heart
-
-- type: decal
- id: largebrush
- tags: ["crayon", "crayon-1-brushes"]
- defaultCleanable: true
- defaultCustomColor: true
- defaultSnap: false
- sprite:
- sprite: Effects/crayondecals.rsi
- state: largebrush
-
-- type: decal
- id: like
- tags: ["crayon", "crayon-3-symbols"]
- defaultCleanable: true
- defaultCustomColor: true
- defaultSnap: false
- sprite:
- sprite: Effects/crayondecals.rsi
- state: like
-
-- type: decal
- id: line
- tags: ["crayon", "crayon-1-brushes"]
- defaultCleanable: true
- defaultCustomColor: true
- defaultSnap: false
- sprite:
- sprite: Effects/crayondecals.rsi
- state: line
-
-- type: decal
- id: matt
- tags: ["crayon", "crayon-5-graffiti"]
- defaultCleanable: true
- defaultCustomColor: true
- defaultSnap: false
- sprite:
- sprite: Effects/crayondecals.rsi
- state: matt
-
-- type: decal
- id: med
- tags: ["crayon", "crayon-4-info"]
- defaultCleanable: true
- defaultCustomColor: true
- defaultSnap: false
- sprite:
- sprite: Effects/crayondecals.rsi
- state: med
+ state: ghost
- type: decal
- id: minus
- tags: ["crayon", "crayon-3-symbols"]
+ id: guy
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: minus
+ state: guy
- type: decal
- id: nay
- tags: ["crayon", "crayon-4-info"]
+ id: h
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: nay
+ state: h
- type: decal
- id: pawprint
+ id: heart
tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: pawprint
+ state: heart
- type: decal
- id: peace
- tags: ["crayon", "crayon-4-info"]
+ id: i
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: peace
+ state: i
- type: decal
- id: percent
- tags: ["crayon", "crayon-3-symbols"]
+ id: j
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: percent
+ state: j
- type: decal
- id: plus
- tags: ["crayon", "crayon-3-symbols"]
+ id: k
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: plus
+ state: k
- type: decal
- id: pound
- tags: ["crayon", "crayon-3-symbols"]
+ id: l
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: pound
+ state: l
- type: decal
- id: prolizard
- tags: ["crayon", "crayon-5-graffiti"]
+ id: largebrush
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: prolizard
+ state: largebrush
- type: decal
- id: questionmark
- tags: ["crayon", "crayon-3-symbols"]
+ id: like
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: questionmark
+ state: like
- type: decal
- id: radiation
- tags: ["crayon", "crayon-4-info"]
+ id: line
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: radiation
+ state: line
- type: decal
- id: revolution
- tags: ["crayon", "crayon-5-graffiti"]
+ id: m
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: revolution
+ state: m
- type: decal
- id: rune1
- tags: ["crayon", "crayon-5-graffiti"]
+ id: matt
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: rune1
+ state: matt
- type: decal
- id: rune2
- tags: ["crayon", "crayon-5-graffiti"]
+ id: med
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: rune2
+ state: med
- type: decal
- id: rune3
- tags: ["crayon", "crayon-5-graffiti"]
+ id: minus
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: rune3
+ state: minus
- type: decal
- id: rune4
- tags: ["crayon", "crayon-5-graffiti"]
+ id: n
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: rune4
+ state: n
- type: decal
- id: rune5
- tags: ["crayon", "crayon-5-graffiti"]
+ id: nay
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: rune5
+ state: nay
- type: decal
- id: rune6
- tags: ["crayon", "crayon-5-graffiti"]
+ id: o
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: rune6
+ state: o
- type: decal
- id: safe
- tags: ["crayon", "crayon-4-info"]
+ id: p
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: safe
+ state: p
- type: decal
- id: scroll
+ id: pawprint
tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: scroll
+ state: pawprint
- type: decal
- id: shop
- tags: ["crayon", "crayon-4-info"]
+ id: peace
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: shop
+ state: peace
- type: decal
- id: shortline
- tags: ["crayon", "crayon-1-brushes"]
+ id: percent
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: shortline
+ state: percent
- type: decal
- id: shotgun
+ id: plus
tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: shotgun
+ state: plus
- type: decal
- id: skull
- tags: ["crayon", "crayon-4-info"]
+ id: pound
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: skull
+ state: pound
- type: decal
- id: slash
- tags: ["crayon", "crayon-3-symbols"]
+ id: prolizard
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: slash
+ state: prolizard
- type: decal
- id: smallbrush
- tags: ["crayon", "crayon-1-brushes"]
+ id: q
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: smallbrush
+ state: q
- type: decal
- id: snake
+ id: questionmark
tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: snake
+ state: questionmark
- type: decal
- id: space
- tags: ["crayon", "crayon-4-info"]
+ id: r
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: space
+ state: r
- type: decal
- id: splatter
+ id: radiation
tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: splatter
+ state: radiation
- type: decal
- id: star
- tags: ["crayon", "crayon-3-symbols"]
+ id: revolution
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: star
+ state: revolution
- type: decal
- id: stickman
+ id: rune1
tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: stickman
+ state: rune1
- type: decal
- id: taser
+ id: rune2
tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: taser
+ state: rune2
- type: decal
- id: thinline
- tags: ["crayon", "crayon-1-brushes"]
+ id: rune3
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: thinline
+ state: rune3
- type: decal
- id: toilet
+ id: rune4
tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: toilet
+ state: rune4
- type: decal
- id: toolbox
+ id: rune5
tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: toolbox
+ state: rune5
- type: decal
- id: trade
- tags: ["crayon", "crayon-4-info"]
+ id: rune6
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: trade
+ state: rune6
- type: decal
- id: uboa
+ id: s
tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: uboa
+ state: s
- type: decal
- id: a
- tags: ["crayon", "crayon-2-alphanum"]
+ id: safe
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: a
+ state: safe
- type: decal
- id: b
- tags: ["crayon", "crayon-2-alphanum"]
+ id: scroll
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: b
+ state: scroll
- type: decal
- id: c
- tags: ["crayon", "crayon-2-alphanum"]
+ id: shop
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: c
+ state: shop
- type: decal
- id: d
- tags: ["crayon", "crayon-2-alphanum"]
+ id: shortline
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: d
+ state: shortline
- type: decal
- id: e
- tags: ["crayon", "crayon-2-alphanum"]
+ id: shotgun
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: e
+ state: shotgun
- type: decal
- id: f
- tags: ["crayon", "crayon-2-alphanum"]
+ id: skull
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: f
+ state: skull
- type: decal
- id: g
- tags: ["crayon", "crayon-2-alphanum"]
+ id: slash
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: g
+ state: slash
- type: decal
- id: h
- tags: ["crayon", "crayon-2-alphanum"]
+ id: smallbrush
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: h
+ state: smallbrush
- type: decal
- id: i
- tags: ["crayon", "crayon-2-alphanum"]
+ id: snake
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: i
+ state: snake
- type: decal
- id: j
- tags: ["crayon", "crayon-2-alphanum"]
+ id: space
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: j
+ state: space
- type: decal
- id: k
- tags: ["crayon", "crayon-2-alphanum"]
+ id: splatter
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: k
+ state: splatter
- type: decal
- id: l
- tags: ["crayon", "crayon-2-alphanum"]
+ id: star
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: l
+ state: star
- type: decal
- id: m
- tags: ["crayon", "crayon-2-alphanum"]
+ id: stickman
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: m
+ state: stickman
- type: decal
- id: n
- tags: ["crayon", "crayon-2-alphanum"]
+ id: t
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: n
+ state: t
- type: decal
- id: o
- tags: ["crayon", "crayon-2-alphanum"]
+ id: taser
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: o
+ state: taser
- type: decal
- id: p
- tags: ["crayon", "crayon-2-alphanum"]
+ id: thinline
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: p
+ state: thinline
- type: decal
- id: q
- tags: ["crayon", "crayon-2-alphanum"]
+ id: toilet
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: q
+ state: toilet
- type: decal
- id: r
- tags: ["crayon", "crayon-2-alphanum"]
+ id: toolbox
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: r
+ state: toolbox
- type: decal
- id: s
- tags: ["crayon", "crayon-2-alphanum"]
+ id: trade
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: s
+ state: trade
- type: decal
- id: t
- tags: ["crayon", "crayon-2-alphanum"]
+ id: u
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: t
+ state: u
- type: decal
- id: u
- tags: ["crayon", "crayon-2-alphanum"]
+ id: uboa
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
sprite:
sprite: Effects/crayondecals.rsi
- state: u
+ state: uboa
- type: decal
id: v
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -1260,7 +1260,7 @@
- type: decal
id: w
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -1270,7 +1270,7 @@
- type: decal
id: x
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -1280,7 +1280,7 @@
- type: decal
id: y
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
@@ -1290,7 +1290,7 @@
- type: decal
id: z
- tags: ["crayon", "crayon-2-alphanum"]
+ tags: ["crayon"]
defaultCleanable: true
defaultCustomColor: true
defaultSnap: false
diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/ai.yml b/Resources/Prototypes/DeltaV/Datasets/Names/ai.yml
index a9fc8bcc138..7209f419171 100644
--- a/Resources/Prototypes/DeltaV/Datasets/Names/ai.yml
+++ b/Resources/Prototypes/DeltaV/Datasets/Names/ai.yml
@@ -1,5 +1,67 @@
-- type: localizedDataset
- id: NamesAIDeltaV
+- type: dataset
+ id: names_ai_deltav
values:
- prefix: names-ai-deltav-
- count: 63
+ - Advanced Crowbar
+ - Amiga
+ - ArachnidOS
+ - Archangel
+ - AUTO
+ - Backpfeifengesicht # German for "A face that needs a good slap"
+ - Beta1
+ - Beta2
+ - Bilita Mpash # Bantu for "An amazing dream, the opposite of a nightmare"
+ - Blowtorch
+ - Bob
+ - Bokketo # Japanese for "The act of gazing into the distance"
+ - Borg^2
+ - Chevron
+ - DeltaOS
+ - DionaOS
+ - Doorknob V0.1
+ - Duff
+ - Enterprise
+ - FelinidOS
+ - HAL # I'm sorry Dave
+ - Hamster Wheel
+ - HarpyOS
+ - Helix Nebula
+ - If-Else
+ - Kevin
+ - Lithuanian Calculator
+ - LizardOS
+ - M-5 Unit
+ - Machine
+ - Manchester MK1
+ - Master Key
+ - MothOS
+ - NanoTrasen Overwatch
+ - Nightmare
+ - Normandy
+ - Nuclear Bomb
+ - OniOS
+ - Pawsitronic Intelligence
+ - Potato
+ - Privacy Invasion System
+ - Pull Request
+ - R.A.T.
+ - Repo
+ - RodentiaOS
+ - Royal Oak
+ - Sabot
+ - SadOS V0.1
+ - Shadow Factory
+ - SHODAN
+ - SingulOS
+ - SlimeOS
+ - Sun Tzu
+ - Tagalog
+ - The Overmind
+ - Turing's Machine
+ - Ummon
+ - VoxOS
+ - VulpOS
+ - Wire Bundle
+ - Y2K
+ - Y3K
+ - Zeg
+
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/rodentia_female.yml b/Resources/Prototypes/DeltaV/Datasets/Names/rodentia_female.yml
index aafc8c8ed9a..879c711d650 100644
--- a/Resources/Prototypes/DeltaV/Datasets/Names/rodentia_female.yml
+++ b/Resources/Prototypes/DeltaV/Datasets/Names/rodentia_female.yml
@@ -1,5 +1,5 @@
- type: dataset
- id: NamesRodentiaFemale
+ id: names_rodentia_female
values:
# generic names
- Squeaks
@@ -33,7 +33,7 @@
- Tootsie
- Pickle
- Berry
-
+
# gender-neutral
- Alex
- Riley
@@ -76,7 +76,7 @@
- Sloane
- Rylan
- Sage
-
+
# feminine names
- Minnie
- Daisy
diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/rodentia_last.yml b/Resources/Prototypes/DeltaV/Datasets/Names/rodentia_last.yml
index b03b3b9f089..13f8d70791d 100644
--- a/Resources/Prototypes/DeltaV/Datasets/Names/rodentia_last.yml
+++ b/Resources/Prototypes/DeltaV/Datasets/Names/rodentia_last.yml
@@ -1,7 +1,7 @@
# rodentia name scheme is "adjective-trait name", like "long-ears monty"
- type: dataset
- id: NamesRodentiaLast
+ id: names_rodentia_last
values:
- Agile
- Beady-eyed
@@ -53,6 +53,7 @@
- Quick-wits
- Quiet
- Ravenous
+ - Ravenous
- Restless
- Rough
- Round-belly
diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/rodentia_male.yml b/Resources/Prototypes/DeltaV/Datasets/Names/rodentia_male.yml
index 995e50068cf..35c930feba2 100644
--- a/Resources/Prototypes/DeltaV/Datasets/Names/rodentia_male.yml
+++ b/Resources/Prototypes/DeltaV/Datasets/Names/rodentia_male.yml
@@ -1,5 +1,5 @@
- type: dataset
- id: NamesRodentiaMale
+ id: names_rodentia_male
values:
# generic names
- Squeaks
@@ -33,7 +33,7 @@
- Tootsie
- Pickle
- Berry
-
+
# gender-neutral
- Alex
- Riley
@@ -76,7 +76,7 @@
- Sloane
- Rylan
- Sage
-
+
# masculine names
- Basil
- Jerry
diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_female.yml b/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_female.yml
index 5334f7ddac4..d8b9df8615b 100644
--- a/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_female.yml
+++ b/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_female.yml
@@ -1,5 +1,5 @@
- type: dataset
- id: NamesVulpkaninFemale
+ id: names_vulpkanin_female
values:
- Abby
- Acantha
diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_last.yml b/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_last.yml
index cadb6c91f8b..eb499d3866a 100644
--- a/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_last.yml
+++ b/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_last.yml
@@ -1,5 +1,5 @@
- type: dataset
- id: NamesVulpkaninLast
+ id: names_vulpkanin_last
values:
- Abbott
- Adoette
diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_male.yml b/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_male.yml
index 47dc65aa6a1..10889847026 100644
--- a/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_male.yml
+++ b/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_male.yml
@@ -1,5 +1,5 @@
- type: dataset
- id: NamesVulpkaninMale
+ id: names_vulpkanin_male
values:
- Aaron
- Abe
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
deleted file mode 100644
index 2eac2b57f9c..00000000000
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Because Hitscan lasers aren't fun to shoot in my opinion, we give the HoS pistol a special lethal laser that moves
-- type: entity
- parent: BaseBullet
- id: BulletEnergyGunLaser
- name: energy bolt
- categories: [ HideSpawnMenu ]
- components:
- - type: Reflective
- reflective:
- - Energy
- - type: FlyBySound
- sound:
- collection: EnergyMiss
- params:
- volume: 5
- - type: Sprite
- sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
- layers:
- - state: omnilaser_greyscale
- shader: unshaded
- color: red
- - type: Ammo
- - type: Fixtures
- fixtures:
- projectile:
- shape:
- !type:PhysShapeAabb
- bounds: "-0.2,-0.2,0.2,0.2"
- hard: false
- mask:
- - Opaque
- fly-by:
- shape: !type:PhysShapeCircle
- radius: 1.5
- layer:
- - Impassable
- - MidImpassable
- - HighImpassable
- - LowImpassable
- hard: False
- - type: Projectile
- impactEffect: BulletImpactEffectRedDisabler
- damage:
- types:
- Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun
- soundHit:
- collection: MeatLaserImpact
diff --git a/Resources/Prototypes/DeltaV/Species/rodentia.yml b/Resources/Prototypes/DeltaV/Species/rodentia.yml
index e7ef1910ee4..b0c2c579c9e 100644
--- a/Resources/Prototypes/DeltaV/Species/rodentia.yml
+++ b/Resources/Prototypes/DeltaV/Species/rodentia.yml
@@ -8,9 +8,9 @@
markingLimits: MobRodentiaMarkingLimits
dollPrototype: MobRodentiaDummy
skinColoration: Hues
- maleFirstNames: NamesRodentiaMale
- femaleFirstNames: NamesRodentiaFemale
- lastNames: NamesRodentiaLast
+ maleFirstNames: names_rodentia_male
+ femaleFirstNames: names_rodentia_female
+ lastNames: names_rodentia_last
naming: LastFirst
- type: speciesBaseSprites
diff --git a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml
index 97952a8b907..4a0479ac8ac 100644
--- a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml
@@ -8,9 +8,9 @@
markingLimits: MobVulpkaninMarkingLimits
dollPrototype: MobVulpkaninDummy
skinColoration: Hues
- maleFirstNames: NamesVulpkaninMale
- femaleFirstNames: NamesVulpkaninFemale
- lastNames: NamesVulpkaninLast
+ maleFirstNames: names_vulpkanin_male
+ femaleFirstNames: names_vulpkanin_female
+ lastNames: names_vulpkanin_last
- type: speciesBaseSprites
id: MobVulpkaninSprites
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index 1dd1e0ba042..16777cd6900 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -230,7 +230,6 @@
stealthy: true
- type: ToggleClothing
action: ActionToggleNinjaGloves
- disableOnUnequip: true
- type: NinjaGloves
abilities:
- components:
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index dd1c58eca74..67bf8275792 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -452,7 +452,6 @@
delay: 1.0
- type: ToggleClothing
action: ActionToggleJusticeHelm
- mustEquip: false
- type: ItemTogglePointLight
- type: ToggleableLightVisuals
clothingVisuals:
diff --git a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml
index 9b811a8a9d8..d3f7dc480ca 100644
--- a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml
@@ -29,8 +29,6 @@
Quantity: 30
absorbed:
maxVol: 30
- - type: UseDelay
- delay: 1
- type: Fiber
fiberColor: fibers-white
- type: DnaSubstanceTrace
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
index 5387a4b5bed..64a6d7e8419 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -352,7 +352,7 @@
sprite: Clothing/OuterClothing/Coats/clownpriest.rsi
- type: entity
- parent: [ClothingOuterStorageBase, BaseMajorContraband]
+ parent: ClothingOuterStorageBase
id: ClothingOuterDogi
name: samurai dogi
description: Dogi is a type of traditional Japanese clothing. The dogi is made of heavy, durable fabric, it is practical in combat and stylish in appearance. It is decorated with intricate patterns and embroidery on the back.
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index d2b5370ade9..4417fae13d2 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -165,7 +165,6 @@
# phase cloak
- type: ToggleClothing
action: ActionTogglePhaseCloak
- disableOnUnequip: true
- type: ComponentToggler
parent: true
components:
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index 6610ae87ccf..0250671acfc 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -14,7 +14,8 @@
sprite: Clothing/Shoes/Boots/magboots.rsi
- type: ToggleClothing
action: ActionToggleMagboots
- mustEquip: false
+ - type: ToggleVerb
+ text: toggle-magboots-verb-get-data-text
- type: ComponentToggler
components:
- type: NoSlip
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
index 7e78844c50e..3fab5d85c6d 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
@@ -163,8 +163,6 @@
- PosterLegitSafetyMothMeth
- PosterLegitSafetyMothHardhat
- PosterLegitSafetyMothSSD
- - PosterLegitOppenhopper
- # Begin DeltaV/Nyano Additions
- PosterLegitDejaVu # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
- PosterLegitDontPanic # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
- PosterLegitBarDrinks # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
@@ -179,11 +177,10 @@
- PosterLegitChknDnnr # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
- PosterLegitShoukou # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
- PosterLegitCornzza # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
- - PosterLegitFuckAround
- - PosterLegitMail
- - PosterLegitWork
- - PosterLegitEarth
- - PosterLegitGetToWork
- - PosterLegitBananaWarning
- # End DeltaV/Nyano Additions
+ - PosterLegitFuckAround # DeltaV Poster, see Resources/Prototypes/DeltaV/Entities/Structures/Wallmount/Signs/posters.yml
+ - PosterLegitMail # DeltaV Poster, see Resources/Prototypes/DeltaV/Entities/Structures/Wallmount/Signs/posters.yml
+ - PosterLegitWork # DeltaV Poster, see Resources/Prototypes/DeltaV/Entities/Structures/Wallmount/Signs/posters.yml
+ - PosterLegitEarth # DeltaV Poster, see Resources/Prototypes/DeltaV/Entities/Structures/Wallmount/Signs/posters.yml
+ - PosterLegitGetToWork # DeltaV Poster, see Resources/Prototypes/DeltaV/Entities/Structures/Wallmount/Signs/posters.yml
+ - PosterLegitBananaWarning # DeltaV Poster, see Resources/Prototypes/DeltaV/Entities/Structures/Wallmount/Signs/posters.yml
chance: 1
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index 40a44006cb8..d98cd1fd888 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -100,7 +100,7 @@
- type: GhostRole
name: ghost-role-information-loneop-name
description: ghost-role-information-loneop-description
- rules: ghost-role-information-loneop-rules
+ rules: ghost-role-information-rules-default-solo-antagonist
requirements:
- !type:OverallPlaytimeRequirement
time: 172800 # DeltaV - 48 hours
@@ -180,21 +180,3 @@
- state: green
- sprite: Objects/Weapons/Melee/energykatana.rsi
state: icon
-
-- type: entity
- categories: [ HideSpawnMenu, Spawner ]
- parent: BaseAntagSpawner
- id: SpawnPointGhostDerelictCyborg
- components:
- - type: GhostRole
- name: ghost-role-information-derelict-cyborg-name
- description: ghost-role-information-derelict-cyborg-description
- rules: ghost-role-information-silicon-rules
- raffle:
- settings: default
- - type: Sprite
- sprite: Markers/jobs.rsi
- layers:
- - state: green
- - sprite: Mobs/Silicon/chassis.rsi
- state: derelict_icon
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 9a519ab9ba1..e5f7ec82756 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -284,9 +284,6 @@
parent: [BaseBorgChassis, BaseBorgTransponder]
abstract: true
components:
- - type: RandomMetadata
- nameSegments:
- - names_borg
- type: NpcFactionMember
factions:
- NanoTrasen
@@ -335,23 +332,3 @@
Unsexed: UnisexSiliconSyndicate
- type: PointLight
color: "#dd200b"
-
-- type: entity
- id: BaseBorgChassisDerelict
- parent: BaseBorgChassis
- abstract: true
- components:
- - type: NpcFactionMember
- factions:
- - NanoTrasen #The seemingly best fit. It was a regular NT cyborg once, after all.
- - type: Access
- enabled: false
- groups:
- - AllAccess #Randomized access would be fun. AllAccess is the best i can think of right now that does make it too hard for it to enter the station or navigate it..
- - type: AccessReader
- access: [["Command"], ["Research"]]
- - type: StartIonStormed
- ionStormAmount: 3
- - type: IonStormTarget
- chance: 1
-
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index 87b8d54a977..fa324c0124f 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -187,35 +187,3 @@
interactFailureString: petting-failure-syndicate-cyborg
interactSuccessSound:
path: /Audio/Ambience/Objects/periodic_beep.ogg
-
-- type: entity
- id: BorgChassisDerelict
- parent: BaseBorgChassisDerelict
- name: derelict cyborg
- description: A man-machine hybrid that assists in station activity. This one is in a state of great disrepair.
- components:
- - type: Sprite
- layers:
- - state: derelict
- - state: derelict_e_r
- map: ["enum.BorgVisualLayers.Light"]
- shader: unshaded
- visible: false
- - state: derelict_l
- shader: unshaded
- map: ["light"]
- visible: false
- - type: BorgChassis
- maxModules: 5 # the sixth one broke lol
- moduleWhitelist:
- tags:
- - BorgModuleGeneric
- hasMindState: derelict_e
- noMindState: derelict_e_r
- - type: Construction
- node: derelictcyborg
- - type: InteractionPopup
- interactSuccessString: petting-success-derelict-cyborg
- interactFailureString: petting-failure-derelict-cyborg
- interactSuccessSound:
- path: /Audio/Ambience/Objects/periodic_beep.ogg
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 3f5f37b9137..98159d4562f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1347,7 +1347,7 @@
rules: ghost-role-information-nonantagonist-rules
- type: GhostTakeoverAvailable
- type: Clumsy
- gunShootFailDamage:
+ clumsyDamage:
types:
Blunt: 5
Piercing: 4
@@ -1380,7 +1380,7 @@
makeSentient: true
name: ghost-role-information-monkey-name
description: ghost-role-information-monkey-description
- rules: ghost-role-information-syndicate-reinforcement-rules
+ rules: ghost-role-information-syndicate-monkey-reinforcement-rules
raffle:
settings: default
- type: GhostTakeoverAvailable
@@ -1523,7 +1523,7 @@
description: Cousins to the sentient race of lizard people, kobolds blend in with their natural habitat and are as nasty as monkeys; ready to pull out your hair and stab you to death.
components:
- type: Clumsy
- gunShootFailDamage:
+ clumsyDamage:
types:
Blunt: 2
Piercing: 7
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index bf5b551f373..dc2011b804b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -99,7 +99,7 @@
# makeSentient: true
# name: ghost-role-information-xeno-name
# description: ghost-role-information-xeno-description
-# rules: ghost-role-information-xeno-rules
+# rules: ghost-role-information-rules-default-team-antagonist
# raffle:
# settings: default
# - type: GhostTakeoverAvailable
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index dca47e1c837..b21f19edd3c 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -231,7 +231,7 @@
- type: Hands
- type: ComplexInteraction
- type: Clumsy
- gunShootFailDamage:
+ clumsyDamage:
types:
Blunt: 5
Piercing: 4
diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
index 45fb7a1f44a..cc8ed53c01b 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -60,7 +60,6 @@
skipChecks: true
- type: Ghost
- type: GhostHearing
- - type: ShowElectrocutionHUD
- type: IntrinsicRadioReceiver
- type: ActiveRadio
receiveAllChannels: true
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index 3b57a312b08..345f9435650 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -38,7 +38,6 @@
- type: IgnoreUIRange
- type: StationAiHeld
- type: StationAiOverlay
- - type: ShowElectrocutionHUD
- type: ActionGrant
actions:
- ActionJumpToCore
@@ -260,7 +259,7 @@
- type: entity
id: AntimovCircuitBoard
- parent: [BaseElectronics, BaseSyndicateContraband]
+ parent: BaseElectronics
name: law board (Antimov)
description: An electronics board containing the Antimov lawset.
components:
@@ -453,6 +452,8 @@
cell_slot:
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellMedium
+ - type: RandomMetadata # DeltaV: give job borgs names
+ nameSegments: [names_borg]
- type: entity
id: PlayerBorgSyndicateAssaultBattery
@@ -535,37 +536,3 @@
- PlayerBorgSyndicateAssaultGhostRole
- PlayerBorgSyndicateAssaultGhostRole # Saboteurs are kinda like cyborg medics, we want less.
- PlayerBorgSyndicateSaboteurGhostRole
-
-- type: entity
- id: PlayerBorgDerelict
- parent: BorgChassisDerelict
- suffix: Battery, Module
- components:
- - type: ContainerFill
- containers:
- borg_brain:
- - PositronicBrain
- borg_module:
- - BorgModuleTool
- - BorgModuleFireExtinguisher
- - BorgModuleGPS
- - type: ItemSlots
- slots:
- cell_slot:
- name: power-cell-slot-component-slot-name-default
- startingItem: PowerCellHigh
- - type: RandomMetadata
- nameSegments: [names_borg]
-
-- type: entity
- id: PlayerBorgDerelictGhostRole
- parent: PlayerBorgDerelict
- suffix: Ghost role
- components:
- - type: GhostRole
- name: ghost-role-information-derelict-cyborg-name
- description: ghost-role-information-derelict-cyborg-description
- rules: ghost-role-information-silicon-rules
- raffle:
- settings: default
- - type: GhostTakeoverAvailable
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index 2e14b33cf4a..0a60ad5f9c4 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -32,18 +32,6 @@
- type: Damageable
damageContainer: Biological
damageModifierSet: Vox
- - type: PassiveDamage
- # Augment normal health regen to be able to tank some Poison damage
- # This allows Vox to take their mask off temporarily to eat something without needing a trip to medbay afterwards.
- allowedStates:
- - Alive
- damageCap: 20
- damage:
- types:
- Heat: -0.07
- Poison: -0.2
- groups:
- Brute: -0.07
- type: DamageVisuals
damageOverlayGroups:
Brute:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
index 4f446584b15..d290a245598 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
@@ -98,25 +98,11 @@
id: FoodMealNachos
description: Chips from Space Mexico.
components:
- - type: Food
- trash:
- - FoodPlateSmall
- type: FlavorProfile
flavors:
- nachos
- type: Sprite
state: nachos
- - type: SolutionContainerManager
- solutions:
- food:
- maxVol: 11
- reagents:
- - ReagentId: Nutriment
- Quantity: 4
- - ReagentId: Vitamin
- Quantity: 1
- - ReagentId: TableSalt
- Quantity: 1
# Tastes like nachos.
- type: entity
@@ -125,9 +111,6 @@
id: FoodMealNachosCheesy
description: The delicious combination of nachos and melting cheese.
components:
- - type: Food
- trash:
- - FoodPlateSmall
- type: FlavorProfile
flavors:
- nachos
@@ -153,27 +136,24 @@
id: FoodMealNachosCuban
description: That's some dangerously spicy nachos.
components:
- - type: Food
- trash:
- - FoodPlateSmall
- type: FlavorProfile
flavors:
- nachos
- - tomato
+ - cheesy
- spicy
- type: Sprite
state: nachos-cuban
- type: SolutionContainerManager
solutions:
food:
- maxVol: 25
+ maxVol: 15
reagents:
- ReagentId: Nutriment
- Quantity: 8
- - ReagentId: CapsaicinOil
Quantity: 7
+ - ReagentId: CapsaicinOil
+ Quantity: 8
- ReagentId: Vitamin
- Quantity: 5
+ Quantity: 4
# Tastes like nachos, hot pepper.
- type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index fc340bbcfd4..48968b80c13 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -678,11 +678,6 @@
tags:
- Raw
- Meat
- - type: Extractable
- juiceSolution:
- reagents:
- - ReagentId: Slime
- Quantity: 10
- type: Sprite
state: slime
@@ -1212,7 +1207,7 @@
name: anomalous steak
parent: FoodMeatBase
id: FoodMeatAnomalyCooked
- description: A gigantic mass of cooked meat. A meal for a dinner party, or someone REALLY hungry.
+ description: A gigantic mass of cooked meat. A meal for a dinner party, or someone REALLY hungry.
components:
- type: Tag
tags:
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
index 90daabc236a..3bde2042cf1 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -463,7 +463,7 @@
- type: entity
parent: BaseTreeConifer
id: FloraTreeChristmas02
- suffix: Safe Presents
+ suffix: PresentsGiver
name: christmas tree
components:
- type: Sprite
@@ -481,33 +481,16 @@
spawnEntries:
- id: PresentRandom
orGroup: present
- - id: PresentRandomCash # buy your own.
- prob: 0.1
+ - id: PresentRandomCash
+ prob: 0.20
orGroup: present
- - id: PresentRandomCoal # naughty
+ - id: PresentRandomAsh
prob: 0.05
orGroup: present
receivedPopup: christmas-tree-got-gift
deniedPopup: christmas-tree-no-gift
requiredHoliday: FestiveSeason
-- type: entity
- parent: FloraTreeChristmas02
- id: FloraTreeChristmas03
- suffix: Insane Presents
- name: christmas tree
- components:
- - type: LimitedItemGiver
- spawnEntries:
- - id: PresentRandom
- orGroup: present
- - id: PresentRandomUnsafe
- prob: 0.5
- orGroup: present
- - id: PresentRandomInsane
- prob: 0.2
- orGroup: present
-
- type: entity
parent: BaseTreeConifer
id: FloraTreeStumpConifer
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index f19f540af23..d68b04e0a1e 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -386,23 +386,14 @@
path: /Audio/Effects/unwrap.ogg
- type: entity
- id: PresentRandomCoal
+ id: PresentRandomAsh
parent: [PresentBase, BaseItem]
- suffix: Filled Coal
+ suffix: Filled Ash
components:
- type: SpawnItemsOnUse
items:
- id: PresentTrash
- - id: Coal1
- orGroup: GiftPool
- - id: Coal5
- prob: .4
- orGroup: GiftPool
- - id: Coal10
- prob: .2
- orGroup: GiftPool
- - id: Coal15
- prob: .1
+ - id: Ash # No coal yet!
orGroup: GiftPool
sound:
path: /Audio/Effects/unwrap.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
index 42d5588202c..71f98d81c96 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
@@ -24,8 +24,8 @@
components:
- type: GhostRole
name: ghost-role-information-syndicate-reinforcement-spy-name
- description: ghost-role-information-syndicate-reinforcement-spy-description
- rules: ghost-role-information-syndicate-reinforcement-rules
+ description: ghost-role-information-syndicate-reinforcement-description
+ rules: ghost-role-information-rules-default-solo-antagonist
raffle:
settings: default
- type: GhostRoleMobSpawner
@@ -57,7 +57,7 @@
- type: GhostRole
name: ghost-role-information-syndicate-monkey-reinforcement-name
description: ghost-role-information-syndicate-monkey-reinforcement-description
- rules: ghost-role-information-syndicate-reinforcement-rules
+ rules: ghost-role-information-rules-default-familiar
raffle:
settings: default
- type: GhostRoleMobSpawner
@@ -69,8 +69,6 @@
id: ReinforcementRadioSyndicateAncestorNukeops # Reinforcement radio exclusive to nukeops uplink
suffix: NukeOps
components:
- - type: GhostRole
- rules: ghost-role-information-nukeop-reinforcement-rules
- type: GhostRoleMobSpawner
prototype: MobMonkeySyndicateAgentNukeops
selectablePrototypes: ["SyndicateMonkeyNukeops", "SyndicateKoboldNukeops"]
@@ -84,7 +82,7 @@
- type: GhostRole
name: ghost-role-information-SyndiCat-name
description: ghost-role-information-SyndiCat-description
- rules: ghost-role-information-syndicate-reinforcement-rules
+ rules: ghost-role-information-rules-default-familiar
raffle:
settings: default
- type: GhostRoleMobSpawner
diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
index 82d43cf7d82..5fb81aa6d48 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -215,22 +215,4 @@
layers:
- state: fax-machine
- type: Flatpack
- entity: FaxMachineBase
-
-- type: entity
- parent: BaseFlatpack
- id: CrewMonitoringServerFlatpack
- name: crew monitoring server flatpack
- description: A flatpack used for constructing a crew monitoring server.
- components:
- - type: Flatpack
- entity: CrewMonitoringServer
-
-- type: entity
- parent: BaseFlatpack
- id: CrewMonitoringComputerFlatpack
- name: crew monitoring computer flatpack
- description: A flatpack used for constructing a crew monitoring console.
- components:
- - type: Flatpack
- entity: ComputerCrewMonitoring
+ entity: FaxMachineBase
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
index 9f70f84ca86..8aa9b177d2e 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -438,14 +438,6 @@
- type: NavMapBeacon
defaultText: station-beacon-gravgen
-- type: entity
- parent: DefaultStationBeaconEngineering
- id: DefaultStationBeaconAnchor
- suffix: Anchor
- components:
- - type: NavMapBeacon
- defaultText: station-beacon-anchor
-
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSingularity
diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
index 4230a361084..a127930feaf 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -195,7 +195,7 @@
id: HypoDartBox
name: hypodart box
suffix: HypoDart
- description: A small box containing a hypodart. Packaging disintegrates when opened, leaving no evidence behind.
+ description: A small box containing an hypodart. Packaging disintegrates when opened, leaving no evidence behind.
components:
- type: Sprite
sprite: Objects/Fun/Darts/dartbox.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 1569818b6af..e68b47c3c76 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -498,22 +498,12 @@
- type: Sprite
sprite: Objects/Fun/sharkplush.rsi
state: blue
- - type: EmitSoundOnLand
- sound:
- path: /Audio/Items/Toys/rawr.ogg
- - type: EmitSoundOnTrigger
- sound:
- path: /Audio/Items/Toys/rawr.ogg
- type: EmitSoundOnUse
sound:
path: /Audio/Items/Toys/rawr.ogg
- type: EmitSoundOnActivate
sound:
path: /Audio/Items/Toys/rawr.ogg
- - type: MeleeWeapon
- wideAnimationRotation: 180
- soundHit:
- path: /Audio/Items/Toys/rawr.ogg
- type: Item
heldPrefix: blue
storedRotation: -90
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 1e5fc940ab8..befce4f42c3 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -54,8 +54,6 @@
reagents:
- ReagentId: Cellulose
Quantity: 6
- - type: Item
- heldPrefix: cardboard
- type: entity
parent: MaterialCardboard
@@ -137,8 +135,6 @@
- type: Construction
graph: WebObjects # not sure if I should either keep this here or just make another prototype. Will keep it here just in case.
node: cloth
- - type: Item
- heldPrefix: cloth
- type: entity
parent: MaterialCloth
@@ -199,8 +195,6 @@
tags:
- ClothMade
- RawMaterial
- - type: Item
- heldPrefix: durathread
- type: entity
parent: MaterialDurathread
@@ -340,7 +334,8 @@
sprite: Objects/Materials/materials.rsi
state: corgihide
- type: Item
- heldPrefix: corgihide
+ sprite: Clothing/Head/Misc/hides.rsi
+ heldPrefix: corgi
- type: Clothing
sprite: Clothing/Head/Misc/hides.rsi
equippedPrefix: corgi2
@@ -432,8 +427,6 @@
tags:
- ClothMade
- RawMaterial
- - type: Item
- heldPrefix: cotton
- type: entity
parent: MaterialCotton
@@ -486,8 +479,6 @@
tags:
- ClothMade
- RawMaterial
- - type: Item
- heldPrefix: pyrotton
- type: entity
parent: MaterialPyrotton
@@ -549,8 +540,6 @@
- ReagentId: Honk
Quantity: 5
- type: Appearance
- - type: Item
- heldPrefix: bananium
- type: entity
parent: MaterialBananium
@@ -601,9 +590,6 @@
tags:
- ClothMade
- RawMaterial
- - type: Item
- sprite: Objects/Materials/silk.rsi
- heldPrefix: silk
- type: entity
parent: MaterialWebSilk
@@ -726,8 +712,6 @@
reagents:
- ReagentId: Vitamin
Quantity: 3
- - type: Item
- heldPrefix: bones
- type: entity
parent: MaterialBones
@@ -782,8 +766,6 @@
- goliath_hide_3
- type: Item
size: Large
- heldPrefix: goliathhide
- sprite: Objects/Materials/hide.rsi
shape:
- 0,0,2,2
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
index cfbeb95ff02..40368b23709 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -46,8 +46,6 @@
reagents:
- ReagentId: Gold
Quantity: 10
- - type: Item
- heldPrefix: gold
- type: entity
parent: GoldOre
@@ -79,8 +77,6 @@
reagents:
- ReagentId: Carbon
Quantity: 20
- - type: Item
- heldPrefix: diamond
- type: entity
parent: DiamondOre
@@ -112,8 +108,6 @@
reagents:
- ReagentId: Iron
Quantity: 10
- - type: Item
- heldPrefix: iron
- type: entity
id: SteelOre1
@@ -150,8 +144,6 @@
reagents:
- ReagentId: Plasma
Quantity: 10
- - type: Item
- heldPrefix: plasma
- type: entity
parent: PlasmaOre
@@ -183,8 +175,6 @@
reagents:
- ReagentId: Silver
Quantity: 10
- - type: Item
- heldPrefix: silver
- type: entity
parent: SilverOre
@@ -216,8 +206,6 @@
reagents:
- ReagentId: Silicon
Quantity: 10
- - type: Item
- heldPrefix: spacequartz
- type: entity
parent: SpaceQuartz
@@ -257,8 +245,6 @@
- ReagentId: Radium
Quantity: 2
canReact: false
- - type: Item
- heldPrefix: uranium
- type: entity
parent: UraniumOre
@@ -299,8 +285,6 @@
Quantity: 2
- ReagentId: Honk
Quantity: 5
- - type: Item
- heldPrefix: bananium
- type: entity
parent: BananiumOre
@@ -340,8 +324,6 @@
- type: PhysicalComposition
materialComposition:
Coal: 200 # DeltaV
- - type: Item
- heldPrefix: coal
- type: entity
parent: Coal
@@ -351,30 +333,6 @@
- type: Stack
count: 1
-- type: entity
- parent: Coal
- id: Coal5
- suffix: Five
- components:
- - type: Stack
- count: 5
-
-- type: entity
- parent: Coal
- id: Coal10
- suffix: Ten
- components:
- - type: Stack
- count: 10
-
-- type: entity
- parent: Coal
- id: Coal15
- suffix: Fifteen
- components:
- - type: Stack
- count: 15
-
- type: entity
parent: OreBase
id: SaltOre
@@ -399,8 +357,6 @@
Quantity: 10
- ReagentId: Iodine
Quantity: 5
- - type: Item
- heldPrefix: salt
- type: entity
parent: SaltOre
diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
index 700c08e096a..1db564c3b31 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
@@ -45,7 +45,7 @@
map: ["base"]
- type: Item
size: Normal
- heldPrefix: rods
+# heldPrefix: rods
- type: Construction
graph: MetalRod
node: MetalRod
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index 4b4200fed8f..b0c586fc753 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -47,8 +47,8 @@
params:
variation: 0.125
volume: -4
- verbToggleOn: fire-extinguisher-component-verb-remove
- verbToggleOff: fire-extinguisher-component-verb-engage
+ - type: ToggleVerb
+ text: fire-extinguisher-component-verb-text
- type: SpraySafety
- type: MeleeWeapon
wideAnimationRotation: 180
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 18c4bb712b8..f8b77805a1b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -828,7 +828,6 @@
- CentralCommand
- NuclearOperative
- SyndicateAgent
- - Wizard
- DV-SpareSafe # DeltaV
- type: NanoChatCard # DeltaV
notificationsMuted: true
diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index cd0ce33856a..c0cc138cc21 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -150,23 +150,6 @@
- LightBulb
- Trash
-- type: entity
- parent: BaseLightbulb
- name: dim light bulb
- id: DimLightBulb
- description: A dim light bulb for populating the darkness of maintenance.
- components:
- - type: LightBulb
- bulb: Bulb
- color: "#ba473f"
- lightEnergy: 0.5
- lightRadius: 5
- lightSoftness: 3
- - type: Tag
- tags:
- - LightBulb
- - Trash
-
- type: entity
parent: LightBulb
name: old incandescent light bulb
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 9f01ac19974..e6d2a12cefd 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -1037,7 +1037,7 @@
id: SyringeStimulants
components:
- type: Label
- currentLabel: reagent-name-stimulants
+ currentLabel: reagent-name-hyperzine
- type: SolutionContainerManager
solutions:
injector:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 067d40bbfff..93eeef2073c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -448,7 +448,7 @@
name: hyperzine microinjector
parent: [ChemicalMedipen, BaseSyndicateContraband]
id: StimpackMini
- description: A microinjector of hyperzine that give you about 15 seconds of the chemical's effects.
+ description: A microinjector of hyperzine that give you about fifteen seconds of the chemical's effects.
components:
- type: Sprite
sprite: Objects/Specific/Medical/medipen.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
index 6525cb44cfd..ff53218e222 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
@@ -125,9 +125,6 @@
state: icon
- type: Item
size: Large
- storedSprite:
- state: storage
- sprite: Objects/Weapons/Melee/gorilla.rsi
- type: MeleeWeapon
attackRate: 0.5
angle: 0
@@ -136,8 +133,6 @@
damage:
types:
Blunt: 20
- soundHit:
- path: "/Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg"
- type: CorePoweredThrower
- type: MeleeThrowOnHit
unanchorOnHit: true
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index c37189f4148..a0b66d53ed6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -569,7 +569,7 @@
- type: entity
id: BorgModuleOperative
- parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseSyndicateContraband ]
+ parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule ]
name: operative cyborg module
description: A module that comes with a crowbar, an Emag and a syndicate pinpointer.
components:
@@ -588,7 +588,7 @@
- type: entity
id: BorgModuleEsword
- parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseSyndicateContraband ]
+ parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule ]
name: energy sword cyborg module
description: A module that comes with a double energy sword.
components:
@@ -605,7 +605,7 @@
- type: entity
id: BorgModuleL6C
- parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule, BaseSyndicateContraband ]
+ parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule ]
name: L6C ROW cyborg module
description: A module that comes with a L6C.
components:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
index 9ecdeacca9f..8a06868ee03 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -136,7 +136,6 @@
- CentralCommand
- NuclearOperative
- SyndicateAgent
- - Wizard
- DV-SpareSafe # DeltaV
- Orders # DeltaV
privilegedIdSlot:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml
index d3745288f62..e723a1db5ff 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml
@@ -57,42 +57,6 @@
capacity: 5
count: 5
-- type: entity
- name: wand of the locker
- description: Stuff nerds at a distance!
- parent: WeaponWandBase
- id: WeaponWandLocker
- components:
- - type: Sprite
- layers:
- - state: locker
- map: ["base"]
- - state: locker-effect
- map: ["effect"]
- - type: Gun
- soundGunshot:
- path: /Audio/Weapons/Guns/Gunshots/Magic/staff_animation.ogg
- - type: BasicEntityAmmoProvider
- proto: ProjectileLocker
- capacity: 5
- count: 5
- - type: Item
- size: Normal
- inhandVisuals:
- left:
- - state: locker-inhand-left
- right:
- - state: locker-inhand-right
- - type: GenericVisualizer
- visuals:
- enum.AmmoVisuals.HasAmmo:
- effect:
- True: { visible: False }
- False: { visible: True }
- base:
- True: { visible: True }
- False: { visible: False }
-
- type: entity
name: magical wand of instant death
parent: WeaponWandBase
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
index cd736a33d08..d11f96d8752 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -79,86 +79,6 @@
totalIntensity: 0.3
maxTileBreak: 0
-- type: entity
- id: ProjectileLocker
- name: cursed locker
- description: A cursed magical locker! Can you resist?
- parent: ClosetSteelBase
- categories: [ HideSpawnMenu ]
- components:
- - type: ResistLocker
- resistTime: 30
- - type: StoreOnCollide
- lockOnCollide: true
- disableWhenFirstOpened: true
- whitelist:
- components:
- - Body
- - type: LockVisuals
- stateLocked: cursed_door
- stateUnlocked: decursed_door
- - type: Lock
- breakOnEmag: false
- - type: AccessReader
- access: [["Wizard"]]
- breakOnEmag: false
- - type: Projectile
- deleteOnCollide: false
- onlyCollideWhenShot: true
- damage:
- types:
- Brute: 0
- - type: Sprite
- noRot: true
- sprite: Structures/Storage/closet.rsi
- layers:
- - state: cursed
- map: [ "enum.StorageVisualLayers.Base" ]
- - state: decursed_door
- map: [ "enum.StorageVisualLayers.Door" ]
- - state: paper
- visible: false
- sprite: Structures/Storage/closet_labels.rsi
- map: [ "enum.PaperLabelVisuals.Layer" ]
- - state: cursed_door
- map: [ "enum.LockVisualLayers.Lock" ]
- - state: welded
- visible: false
- map: [ "enum.WeldableLayers.BaseWelded" ]
- #TODO: Will have to eventually make a custom visualizer for cursed lockers
- - type: EntityStorageVisuals
- stateBaseClosed: decursed
- stateDoorOpen: decursed_open
- stateDoorClosed: decursed_door
- - type: Fixtures
- fixtures:
- fix1:
- shape:
- !type:PhysShapeAabb
- bounds: "-0.25,-0.48,0.25,0.48"
- density: 75
- mask:
- - MachineMask
- layer:
- - MachineLayer
- projectile:
- shape:
- !type:PhysShapeAabb
- bounds: "-0.15,-0.45,0.15,0.15"
- hard: false
- mask:
- - Impassable
- - BulletImpassable
- fly-by: &flybyfixture
- shape: !type:PhysShapeCircle
- radius: 0.6
- layer:
- - Impassable
- - MidImpassable
- - HighImpassable
- - LowImpassable
- hard: false
-
- type: entity
id: ProjectilePolyboltBase
parent: BaseBullet
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index d91623e7d5f..2ed2f924da3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -5,7 +5,7 @@
- type: TimedDespawn
lifetime: 0.4
- type: Sprite
- drawdepth: BelowMobs
+ drawdepth: Effects
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
@@ -1003,7 +1003,7 @@
- HideContextMenu
- type: entity
- name: laser bolt
+ name: laser bolt
id: BulletLaser
parent: BaseBullet
categories: [ HideSpawnMenu ]
@@ -1050,7 +1050,7 @@
- type: ProjectileSpread
proto: BulletLaser
count: 5 #65 heat damage if you hit all your shots, but wide spread
- spread: 30
+ spread: 30
- type: entity
name: narrow laser barrage
@@ -1072,4 +1072,48 @@
- type: ProjectileSpread
proto: BulletDisablerSmg
count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though
- spread: 9
+ spread: 9
+
+# DeltaV projectiles
+# For whatever magical reasons, I cannot put those in the DeltaV folders without having errors.
+
+# Because Hitscan lasers aren't fun to shoot in my opinion, we give the HoS pistol a special lethal laser that moves
+- type: entity
+ name: energy bolt
+ id: BulletEnergyGunLaser
+ parent: BaseBullet
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Reflective
+ reflective:
+ - Energy
+ - type: FlyBySound
+ sound:
+ collection: EnergyMiss
+ params:
+ volume: 5
+ - type: Sprite
+ sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
+ layers:
+ - state: omnilaser_greyscale
+ shader: unshaded
+ color: red
+ - type: Ammo
+ - type: Physics
+ - type: Fixtures
+ fixtures:
+ projectile:
+ shape:
+ !type:PhysShapeAabb
+ bounds: "-0.2,-0.2,0.2,0.2"
+ hard: false
+ mask:
+ - Opaque
+ fly-by: *flybyfixture
+ - type: Projectile
+ impactEffect: BulletImpactEffectRedDisabler
+ damage:
+ types:
+ Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun
+ soundHit:
+ collection: MeatLaserImpact
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 97ae6e8c944..392fb0f9978 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -82,7 +82,7 @@
- type: Appearance
- type: entity
- name: C-20r submachine gun
+ name: C-20r sub machine gun
parent: [BaseWeaponSubMachineGun, BaseSyndicateContraband]
id: WeaponSubMachineGunC20r
description: A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index af9e299628e..87aecba81ba 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -282,7 +282,6 @@
components:
- type: ItemToggle
onUse: false # wielding events control it instead
- onActivate: false # prevents the weapon from being able to be turned on when it is on the ground
soundActivate:
path: /Audio/Weapons/ebladeon.ogg
params:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index b62f9047b9a..711b8c49feb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -96,7 +96,6 @@
Slash: 12
- type: EmbeddableProjectile
sound: /Audio/Weapons/star_hit.ogg
- offset: -0.15,0.0
- type: LandAtCursor
- type: DamageOtherOnHit
damage:
@@ -109,8 +108,6 @@
sprite: Objects/Weapons/Melee/combat_knife.rsi
- type: DisarmMalus
malus: 0.225
- - type: ThrowingAngle
- angle: 225
- type: entity
name: survival knife
@@ -143,7 +140,6 @@
Slash: 15
- type: Item
sprite: Objects/Weapons/Melee/kukri_knife.rsi
- storedSprite: null
- type: entity
parent: ClothingHeadHatGreyFlatcap
@@ -273,7 +269,7 @@
name: throwing knife
parent: [BaseKnife, BaseSyndicateContraband]
id: ThrowingKnife
- description: This blood-red knife is very aerodynamic and easy to throw, but good luck trying to fight someone hand-to-hand.
+ description: This bloodred knife is very aerodynamic and easy to throw, but good luck trying to fight someone hand-to-hand.
components:
- type: Tag
tags:
@@ -290,7 +286,6 @@
Slash: 5
- type: EmbeddableProjectile
sound: /Audio/Weapons/star_hit.ogg
- offset: -0.15,0.0
- type: LandAtCursor
- type: DamageOtherOnHit
ignoreResistances: true
@@ -300,5 +295,3 @@
Piercing: 15
- type: Item
sprite: Objects/Weapons/Melee/throwing_knife.rsi
- - type: ThrowingAngle
- angle: 225
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
index 0782ea18bd6..9e527e5fd91 100644
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -74,7 +74,7 @@
vgroid: !type:DungeonSpawnGroup
minimumDistance: 300
maximumDistance: 350
- nameDataset: NamesBorer
+ nameDataset: names_borer
stationGrid: false
addComponents:
- type: Gravity
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 20571c25e1c..c83cb4b6f74 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -991,15 +991,6 @@
- type: Wires
layoutId: AirlockMedical
-- type: entity
- parent: AirlockMaintMedLocked
- id: AirlockMedicalMorgueMaintLocked
- suffix: Morgue, Locked
- components:
- - type: ContainerFill
- containers:
- board: [ DoorElectronicsMorgue ]
-
- type: entity
parent: AirlockMaintMedLocked
id: AirlockMaintChemLocked
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index af33afa7ac8..dd888e2878d 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -20,7 +20,6 @@
- state: closed_unlit
shader: unshaded
map: ["enum.DoorVisualLayers.BaseUnlit"]
- visible: false
- state: welded
map: ["enum.WeldableLayers.BaseWelded"]
- state: bolted_unlit
@@ -31,11 +30,6 @@
shader: unshaded
- state: panel_open
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- - state: electrified
- sprite: Interface/Misc/ai_hud.rsi
- shader: unshaded
- visible: false
- map: ["enum.ElectrifiedLayers.HUD"]
- type: AnimationPlayer
- type: Physics
- type: Fixtures
@@ -78,7 +72,6 @@
- type: DoorBolt
- type: Appearance
- type: WiresVisuals
- - type: ElectrocutionHUDVisuals
- type: ApcPowerReceiver
powerLoad: 20
- type: ExtensionCableReceiver
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
index 08b4a478edb..87317be2cd4 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
@@ -16,7 +16,6 @@
- state: closed_unlit
shader: unshaded
map: ["enum.DoorVisualLayers.BaseUnlit"]
- visible: false
- state: welded
map: ["enum.WeldableLayers.BaseWelded"]
- state: bolted_unlit
@@ -27,11 +26,6 @@
shader: unshaded
- state: panel_open
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- - state: electrified
- sprite: Interface/Misc/ai_hud.rsi
- shader: unshaded
- visible: false
- map: ["enum.ElectrifiedLayers.HUD"]
- type: AnimationPlayer
- type: Physics
- type: Fixtures
@@ -71,7 +65,6 @@
containerAccessProvider: board
- type: Appearance
- type: WiresVisuals
- - type: ElectrocutionHUDVisuals
- type: ApcPowerReceiver
powerLoad: 20
- type: ExtensionCableReceiver
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index 3752821e462..81653e99ff2 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -31,6 +31,22 @@
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/shuttle.rsi
snapCardinals: false
+ layers:
+ - state: closed
+ map: ["enum.DoorVisualLayers.Base"]
+ - state: closed_unlit
+ shader: unshaded
+ map: ["enum.DoorVisualLayers.BaseUnlit"]
+ - state: welded
+ map: ["enum.WeldableLayers.BaseWelded"]
+ - state: bolted_unlit
+ shader: unshaded
+ map: ["enum.DoorVisualLayers.BaseBolted"]
+ - state: emergency_unlit
+ shader: unshaded
+ map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
+ - state: panel_open
+ map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: Wires
layoutId: Docking
- type: Door
@@ -96,7 +112,6 @@
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi
state: closed
- snapCardinals: false
- type: Construction
graph: AirlockShuttle
node: assembly
diff --git a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
index 967dfd06443..a1913a9dee3 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
@@ -37,7 +37,6 @@
- type: Appearance
- type: Weldable
time: 2
- weldedExamineMessage: null
- type: Airtight
- type: Damageable
damageContainer: StructuralInorganic
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index 81ef89997d8..800affffbb8 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -32,7 +32,6 @@
- state: closed_unlit
shader: unshaded
map: ["enum.DoorVisualLayers.BaseUnlit"]
- visible: false
- state: welded
map: ["enum.WeldableLayers.BaseWelded"]
- state: bolted_unlit
@@ -43,11 +42,6 @@
map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
- state: panel_open
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- - state: electrified
- sprite: Interface/Misc/ai_hud.rsi
- shader: unshaded
- visible: false
- map: ["enum.ElectrifiedLayers.HUD"]
- type: AnimationPlayer
- type: ApcPowerReceiver
- type: ExtensionCableReceiver
@@ -143,7 +137,6 @@
type: WiresBoundUserInterface
- type: Appearance
- type: WiresVisuals
- - type: ElectrocutionHUDVisuals
- type: Airtight
noAirWhenFullyAirBlocked: false
airBlockedDirection:
@@ -171,7 +164,6 @@
- state: closed_unlit
shader: unshaded
map: [ "enum.DoorVisualLayers.BaseUnlit" ]
- visible: false
- state: welded
map: [ "enum.WeldableLayers.BaseWelded" ]
- state: bolted_unlit
@@ -183,11 +175,6 @@
- state: panel_open
map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
visible: false
- - state: electrified
- sprite: Interface/Misc/ai_hud.rsi
- shader: unshaded
- visible: false
- map: [ "enum.ElectrifiedLayers.HUD" ]
- type: Damageable
damageModifierSet: RGlass
- type: Destructible
@@ -237,7 +224,6 @@
- state: closed_unlit
shader: unshaded
map: [ "enum.DoorVisualLayers.BaseUnlit" ]
- visible: false
- state: welded
map: [ "enum.WeldableLayers.BaseWelded" ]
- state: bolted_unlit
@@ -249,11 +235,6 @@
- state: panel_open
map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
visible: false
- - state: electrified
- sprite: Interface/Misc/ai_hud.rsi
- shader: unshaded
- visible: false
- map: [ "enum.ElectrifiedLayers.HUD" ]
- type: Destructible
thresholds:
- trigger:
@@ -298,7 +279,6 @@
- state: closed_unlit
shader: unshaded
map: [ "enum.DoorVisualLayers.BaseUnlit" ]
- visible: false
- state: welded
map: [ "enum.WeldableLayers.BaseWelded" ]
- state: bolted_unlit
@@ -310,11 +290,6 @@
- state: panel_open
map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
visible: false
- - state: electrified
- sprite: Interface/Misc/ai_hud.rsi
- shader: unshaded
- visible: false
- map: ["enum.ElectrifiedLayers.HUD"]
- type: Destructible
thresholds:
- trigger:
@@ -364,7 +339,6 @@
- state: closed_unlit
shader: unshaded
map: [ "enum.DoorVisualLayers.BaseUnlit" ]
- visible: false
- state: welded
map: [ "enum.WeldableLayers.BaseWelded" ]
- state: bolted_unlit
@@ -376,11 +350,6 @@
- state: panel_open
map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
visible: false
- - state: electrified
- sprite: Interface/Misc/ai_hud.rsi
- shader: unshaded
- visible: false
- map: [ "enum.ElectrifiedLayers.HUD" ]
- type: Destructible
thresholds:
- trigger:
@@ -425,7 +394,6 @@
- state: closed_unlit
shader: unshaded
map: [ "enum.DoorVisualLayers.BaseUnlit" ]
- visible: false
- state: welded
map: [ "enum.WeldableLayers.BaseWelded" ]
- state: bolted_unlit
@@ -437,11 +405,6 @@
- state: panel_open
map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
visible: false
- - state: electrified
- sprite: Interface/Misc/ai_hud.rsi
- shader: unshaded
- visible: false
- map: [ "enum.ElectrifiedLayers.HUD" ]
- type: Destructible
thresholds:
- trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
index 4b3b4c18743..2862980dad3 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
@@ -32,6 +32,8 @@
bonkDamage:
types:
Blunt: 4
+ bonkSound: !type:SoundCollectionSpecifier
+ collection: TrayHit
- type: Clickable
- type: FootstepModifier
footstepSoundCollection:
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index e31629c4b1a..5cd4864aa7f 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -347,27 +347,6 @@
Heat: 1
popupText: powered-light-component-burn-hand
-- type: entity
- id: PoweredDimSmallLight
- suffix: Dim
- parent: PoweredSmallLightEmpty
- components:
- - type: Sprite
- state: base
- - type: PointLight
- enabled: true
- radius: 5
- energy: 0.5
- softness: 3
- color: "#ba473f"
- - type: PoweredLight
- hasLampOnSpawn: DimLightBulb
- - type: DamageOnInteract
- damage:
- types:
- Heat: 1
- popupText: powered-light-component-burn-hand
-
- type: entity
id: PoweredSmallLight
suffix: ""
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index fd5a2bbbe1f..e54874ac190 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -150,7 +150,6 @@
- ExteriorLightTube
- LightBulb
- LedLightBulb
- - DimLightBulb
- Bucket
- DrinkMug
- DrinkMugMetal
diff --git a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
index dff68643630..d974632b751 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
@@ -119,14 +119,8 @@
- type: ContainerContainer
containers:
Nuke: !type:ContainerSlot
- - type: Construction # DeltaV: Plutonium core extraction
+ - type: Construction
node: nuke
- - type: StealTarget
- stealGroup: NuclearBomb
- - type: WarpPoint
- follow: true
- location: nuclear bomb
- - type: FTLSmashImmune
- type: entity
parent: NuclearBomb
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
index 90e48d8be67..9f21e45a963 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -57,13 +57,10 @@
- type: PipeColorVisuals
- type: GasPressurePump
enabled: false
- - type: ActivatableUI
- key: enum.GasPressurePumpUiKey.Key
- - type: ActivatableUIRequiresAnchor
- type: UserInterface
interfaces:
- enum.GasPressurePumpUiKey.Key:
- type: GasPressurePumpBoundUserInterface
+ enum.GasPressurePumpUiKey.Key:
+ type: GasPressurePumpBoundUserInterface
- type: Construction
graph: GasBinary
node: pressurepump
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
deleted file mode 100644
index 08015abe7d6..00000000000
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-- type: entity
- parent: [AirSensorBase, GasPipeBase]
- id: GasPipeSensor
- name: gas pipe sensor
- description: Reports on the status of the gas in the attached pipe network.
- placement:
- mode: SnapgridCenter
- components:
- - type: Sprite
- sprite: Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
- drawdepth: BelowFloor
- layers:
- - sprite: Structures/Piping/Atmospherics/pipe.rsi
- map: [ "enum.PipeVisualLayers.Pipe" ]
- state: pipeStraight
- - map: ["base"]
- state: base
- - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
- state: lights
- shader: unshaded
- - type: Appearance
- - type: GenericVisualizer
- visuals:
- enum.PowerDeviceVisuals.Powered:
- enum.PowerDeviceVisualLayers.Powered:
- False: { state: blank }
- True: { state: lights }
- - type: AtmosMonitor
- monitorsPipeNet: true
- - type: ApcPowerReceiver
- - type: ExtensionCableReceiver
- - type: Construction
- graph: GasPipeSensor
- node: sensor
- - type: NodeContainer
- nodes:
- monitored:
- !type:PipeNode
- nodeGroupID: Pipe
- pipeDirection: Longitudinal
- - type: Tag
- tags:
- - AirSensor
- - Unstackable
-
-- type: entity
- parent: GasPipeSensor
- id: GasPipeSensorDistribution
- suffix: Distribution
- components:
- - type: Label
- currentLabel: gas-pipe-sensor-distribution-loop
-
-- type: entity
- parent: GasPipeSensor
- id: GasPipeSensorWaste
- suffix: Waste
- components:
- - type: Label
- currentLabel: gas-pipe-sensor-waste-loop
-
-- type: entity
- parent: GasPipeSensor
- id: GasPipeSensorMixedAir
- suffix: Mixed air
- components:
- - type: Label
- currentLabel: gas-pipe-sensor-mixed-air
-
-- type: entity
- parent: GasPipeSensor
- id: GasPipeSensorTEGHot
- suffix: TEG hot
- components:
- - type: Label
- currentLabel: gas-pipe-sensor-teg-hot-loop
-
-- type: entity
- parent: GasPipeSensor
- id: GasPipeSensorTEGCold
- suffix: TEG cold
- components:
- - type: Label
- currentLabel: gas-pipe-sensor-teg-cold-loop
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
index 45a40bf0faf..647eae27724 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
@@ -1,7 +1,7 @@
- type: entity
id: SingularityGenerator
name: gravitational singularity generator
- description: An Odd Device which produces a Gravitational Singularity when set up. Comes with a temporary shutdown containment failsafe.
+ description: An Odd Device which produces a Gravitational Singularity when set up.
placement:
mode: SnapgridCenter
components:
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml
index bdd90f2f16a..d45e6c58ea7 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml
@@ -2,12 +2,12 @@
id: TeslaGenerator
name: tesla generator
parent: BaseStructureDynamic
- description: An Odd Device which produces a powerful Tesla ball when set up. Comes with a temporary shutdown containment failsafe.
+ description: An Odd Device which produces a powerful Tesla ball when set up.
components:
- type: Sprite
noRot: true
sprite: Structures/Power/Generation/Tesla/generator.rsi
- state: icon
+ state: icon
- type: SingularityGenerator # TODO: rename the generator
spawnId: TeslaEnergyBall
- type: InteractionOutline
diff --git a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
index cc6abce25ed..8c7ee9e2194 100644
--- a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
@@ -45,11 +45,3 @@
powerMV:
!type:CableTerminalNode
nodeGroupID: MVPower
-
-- type: entity
- id: CableTerminalUncuttable
- parent: CableTerminal
- suffix: uncuttable
- components:
- - type: Cable
- cuttingQuality: null
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml
index f1ae038bc15..ac855a54606 100644
--- a/Resources/Prototypes/Entities/Structures/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -98,14 +98,6 @@
sound:
path: /Audio/Ambience/Objects/emf_buzz.ogg
-- type: entity
- id: CableHVUncuttable
- parent: CableHV
- suffix: uncuttable
- components:
- - type: Cable
- cuttingQuality: null
-
- type: entity
parent: CableBase
id: CableMV
@@ -150,14 +142,6 @@
- type: CableVisualizer
statePrefix: mvcable_
-- type: entity
- id: CableMVUncuttable
- parent: CableMV
- suffix: uncuttable
- components:
- - type: Cable
- cuttingQuality: null
-
- type: entity
parent: CableBase
id: CableApcExtension
@@ -204,11 +188,3 @@
acts: [ "Destruction" ]
- type: CableVisualizer
statePrefix: lvcable_
-
-- type: entity
- id: CableApcExtensionUncuttable
- parent: CableApcExtension
- suffix: uncuttable
- components:
- - type: Cable
- cuttingQuality: null
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
index 8e2d1a6e54c..7d7bc94bb32 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
@@ -20,11 +20,6 @@
- state: welded
visible: false
map: ["enum.WeldableLayers.BaseWelded"]
- - state: paper
- visible: false
- sprite: Structures/Storage/closet_labels.rsi
- offset: "-0.065,0"
- map: ["enum.PaperLabelVisuals.Layer"]
- type: Destructible
thresholds:
- trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index 2568c45a6ac..9351a0d540c 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -19,10 +19,6 @@
- state: welded
visible: false
map: ["enum.WeldableLayers.BaseWelded"]
- - state: paper
- visible: false
- sprite: Structures/Storage/closet_labels.rsi
- map: ["enum.PaperLabelVisuals.Layer"]
- type: MovedByPressure
- type: PaperLabel
labelSlot:
@@ -90,21 +86,6 @@
SheetSteel1:
min: 1
max: 1
- - type: GenericVisualizer
- visuals:
- enum.PaperLabelVisuals.HasLabel:
- enum.PaperLabelVisuals.Layer:
- True: { visible: true }
- False: { visible: false }
- enum.StorageVisuals.Open:
- enum.PaperLabelVisuals.Layer:
- True: { visible: false }
- enum.PaperLabelVisuals.LabelType:
- enum.PaperLabelVisuals.Layer:
- Paper: { state: paper }
- Bounty: { state: bounty }
- CaptainsPaper: { state: captains_paper }
- Invoice: { state: invoice }
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: generic
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
index 721b5e13202..f749bc599be 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
@@ -28,8 +28,6 @@
interfaces:
enum.BarSignUiKey.Key:
type: BarSignBoundUserInterface
- enum.WiresUiKey.Key:
- type: WiresBoundUserInterface
- type: Appearance
- type: Destructible
thresholds:
@@ -39,11 +37,6 @@
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- - type: StationAiWhitelist
- - type: WiresPanel
- - type: Wires
- boardName: wires-board-name-barsign
- layoutId: BarSign
- type: entity
parent: BaseBarSign
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
index d1e44c78666..31d5a9d6c18 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -1069,15 +1069,6 @@
- type: Sprite
state: poster52_legit
-- type: entity
- parent: PosterBase
- id: PosterLegitOppenhopper
- name: "Oppenhopper"
- description: "A poster for a long-forgotten movie. It follows a group of tenacious greenhorns from the Grasshopper Sector as they defend against onslaughts of the infamous Nuclear Operatives. The tagline reads: \"Nuke Ops will continue until robustness improves.\""
- components:
- - type: Sprite
- state: poster53_legit
-
#maps
diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
index b5fa7d91902..2d0c55af5a7 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
@@ -70,8 +70,8 @@
- type: Appearance
- type: GenericVisualizer
visuals:
- enum.ElectrifiedVisuals.ShowSparks:
- enum.ElectrifiedLayers.Sparks:
+ enum.ElectrifiedVisuals.IsPowered:
+ enum.ElectrifiedLayers.Powered:
True: { visible: True }
False: { visible: False }
- type: AnimationPlayer
@@ -91,7 +91,7 @@
- state: straight_broken
- state: electrified
sprite: Effects/electricity.rsi
- map: ["enum.ElectrifiedLayers.Sparks"]
+ map: ["enum.ElectrifiedLayers.Powered"]
shader: unshaded
visible: false
- type: Physics
@@ -151,7 +151,7 @@
- state: straight
- state: electrified
sprite: Effects/electricity.rsi
- map: ["enum.ElectrifiedLayers.Sparks"]
+ map: ["enum.ElectrifiedLayers.Powered"]
shader: unshaded
visible: false
- type: Fixtures
@@ -209,7 +209,7 @@
- state: corner
- state: electrified
sprite: Effects/electricity.rsi
- map: ["enum.ElectrifiedLayers.Sparks"]
+ map: ["enum.ElectrifiedLayers.Powered"]
shader: unshaded
visible: false
- type: Fixtures
@@ -256,7 +256,7 @@
- state: end
- state: electrified
sprite: Effects/electricity.rsi
- map: ["enum.ElectrifiedLayers.Sparks"]
+ map: ["enum.ElectrifiedLayers.Powered"]
shader: unshaded
visible: false
- type: Fixtures
@@ -292,7 +292,7 @@
map: ["enum.DoorVisualLayers.Base"]
- state: electrified
sprite: Effects/electricity.rsi
- map: [ "enum.ElectrifiedLayers.Sparks" ]
+ map: [ "enum.ElectrifiedLayers.Powered" ]
shader: unshaded
visible: false
- type: Fixtures
diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
index 3433ffc366b..2b65528d225 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
@@ -21,7 +21,7 @@
- state: grille
- state: electrified
sprite: Effects/electricity.rsi
- map: ["enum.ElectrifiedLayers.Sparks"]
+ map: ["enum.ElectrifiedLayers.Powered"]
shader: unshaded
visible: false
- type: Icon
@@ -82,8 +82,8 @@
- type: Appearance
- type: GenericVisualizer
visuals:
- enum.ElectrifiedVisuals.ShowSparks:
- enum.ElectrifiedLayers.Sparks:
+ enum.ElectrifiedVisuals.IsPowered:
+ enum.ElectrifiedLayers.Powered:
True: { visible: True }
False: { visible: False }
- type: AnimationPlayer
@@ -176,7 +176,7 @@
- state: grille_diagonal
- state: electrified_diagonal
sprite: Effects/electricity.rsi
- map: ["enum.ElectrifiedLayers.Sparks"]
+ map: ["enum.ElectrifiedLayers.Powered"]
shader: unshaded
visible: false
- type: Icon
@@ -211,7 +211,7 @@
- state: ratvargrille_diagonal
- state: electrified_diagonal
sprite: Effects/electricity.rsi
- map: ["enum.ElectrifiedLayers.Sparks"]
+ map: ["enum.ElectrifiedLayers.Powered"]
shader: unshaded
visible: false
- type: Icon
diff --git a/Resources/Prototypes/Entities/Structures/gates.yml b/Resources/Prototypes/Entities/Structures/gates.yml
index 3cae4411a6b..8e609623214 100644
--- a/Resources/Prototypes/Entities/Structures/gates.yml
+++ b/Resources/Prototypes/Entities/Structures/gates.yml
@@ -36,15 +36,6 @@
layers:
- state: base
- state: logic
- - state: logic_a
- visible: false
- map: [ "enum.LogicGateLayers.InputA" ]
- - state: logic_b
- visible: false
- map: [ "enum.LogicGateLayers.InputB" ]
- - state: logic_o
- visible: false
- map: [ "enum.LogicGateLayers.Output" ]
- state: or
map: [ "enum.LogicGateLayers.Gate" ]
- type: LogicGate
@@ -72,18 +63,7 @@
Nor: { state: nor }
Nand: { state: nand }
Xnor: { state: xnor }
- enum.LogicGateVisuals.InputA:
- enum.LogicGateLayers.InputA:
- True: { visible: true }
- False: { visible: false }
- enum.LogicGateVisuals.InputB:
- enum.LogicGateLayers.InputB:
- True: { visible: true }
- False: { visible: false }
- enum.LogicGateVisuals.Output:
- enum.LogicGateLayers.Output:
- True: { visible: true }
- False: { visible: false }
+
- type: entity
parent: LogicGateOr
id: LogicGateAnd
@@ -92,16 +72,6 @@
- type: Sprite
layers:
- state: base
- - state: logic
- - state: logic_a
- visible: false
- map: [ "enum.LogicGateLayers.InputA" ]
- - state: logic_b
- visible: false
- map: [ "enum.LogicGateLayers.InputB" ]
- - state: logic_o
- visible: false
- map: [ "enum.LogicGateLayers.Output" ]
- state: and
map: [ "enum.LogicGateLayers.Gate" ]
- type: LogicGate
@@ -115,16 +85,6 @@
- type: Sprite
layers:
- state: base
- - state: logic
- - state: logic_a
- visible: false
- map: [ "enum.LogicGateLayers.InputA" ]
- - state: logic_b
- visible: false
- map: [ "enum.LogicGateLayers.InputB" ]
- - state: logic_o
- visible: false
- map: [ "enum.LogicGateLayers.Output" ]
- state: xor
map: [ "enum.LogicGateLayers.Gate" ]
- type: LogicGate
@@ -138,16 +98,6 @@
- type: Sprite
layers:
- state: base
- - state: logic
- - state: logic_a
- visible: false
- map: [ "enum.LogicGateLayers.InputA" ]
- - state: logic_b
- visible: false
- map: [ "enum.LogicGateLayers.InputB" ]
- - state: logic_o
- visible: false
- map: [ "enum.LogicGateLayers.Output" ]
- state: nor
map: [ "enum.LogicGateLayers.Gate" ]
- type: LogicGate
@@ -161,16 +111,6 @@
- type: Sprite
layers:
- state: base
- - state: logic
- - state: logic_a
- visible: false
- map: [ "enum.LogicGateLayers.InputA" ]
- - state: logic_b
- visible: false
- map: [ "enum.LogicGateLayers.InputB" ]
- - state: logic_o
- visible: false
- map: [ "enum.LogicGateLayers.Output" ]
- state: nand
map: [ "enum.LogicGateLayers.Gate" ]
- type: LogicGate
@@ -184,16 +124,6 @@
- type: Sprite
layers:
- state: base
- - state: logic
- - state: logic_a
- visible: false
- map: [ "enum.LogicGateLayers.InputA" ]
- - state: logic_b
- visible: false
- map: [ "enum.LogicGateLayers.InputB" ]
- - state: logic_o
- visible: false
- map: [ "enum.LogicGateLayers.Output" ]
- state: xnor
map: [ "enum.LogicGateLayers.Gate" ]
- type: LogicGate
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 698ee7d4774..1c433f5d3da 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -12,7 +12,6 @@
- id: ClericalError
- id: CockroachMigration
- id: GasLeak
- - id: GreytideVirus
- id: IonStorm # its calm like 90% of the time smh
- id: KudzuGrowth
- id: MassHallucinations
@@ -41,7 +40,6 @@
- id: SleeperAgents
- id: ZombieOutbreak
- id: LoneOpsSpawn
- - id: DerelictCyborgSpawn
- type: entity
id: BaseStationEvent
@@ -557,45 +555,3 @@
# maxOccurrences: 1 # this event has diminishing returns on interesting-ness, so we cap it
# weight: 5
# - type: MobReplacementRule
-
-- type: entity
- id: GreytideVirus
- parent: BaseStationEventShortDelay
- components:
- - type: StationEvent
- startAudio:
- path: /Audio/Announcements/attention.ogg
- weight: 5
- minimumPlayers: 25
- reoccurrenceDelay: 20
- - type: GreytideVirusRule
- accessGroups:
- - Cargo
- - Command
- - Engineering
- - Research
- - Security
- - Service
- blacklist:
- - External # don't space everything
-
-- type: entity
- parent: BaseGameRule
- id: DerelictCyborgSpawn
- components:
- - type: StationEvent
- weight: 5
- earliestStart: 15
- reoccurrenceDelay: 20
- minimumPlayers: 4
- duration: null
- - type: SpaceSpawnRule
- spawnDistance: 0
- - type: AntagSpawner
- prototype: PlayerBorgDerelict
- - type: AntagSelection
- definitions:
- - spawnerPrototype: SpawnPointGhostDerelictCyborg
- min: 1
- max: 1
- pickPlayer: false
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index eb569b70225..f13cf468547 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -32,7 +32,7 @@
# Silicons
- type: roleLoadout
id: JobStationAi
- nameDataset: NamesAIDeltaV # DeltaV
+ nameDataset: names_ai_deltav # DeltaV
# Civilian
- type: roleLoadout
diff --git a/Resources/Prototypes/Magic/event_spells.yml b/Resources/Prototypes/Magic/event_spells.yml
index 5aad8925a60..01006b4ffe0 100644
--- a/Resources/Prototypes/Magic/event_spells.yml
+++ b/Resources/Prototypes/Magic/event_spells.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
id: ActionSummonGhosts
name: Summon Ghosts
description: Makes all current ghosts permanently invisible
@@ -10,195 +10,3 @@
sprite: Mobs/Ghosts/ghost_human.rsi
state: icon
event: !type:ToggleGhostVisibilityToAllEvent
-
-# TODO: Add Whitelist/Blacklist and Component support to EntitySpawnLists (to avoid making huge hardcoded lists like below).
-
-- type: entity
- id: ActionSummonGuns
- name: Summon Guns
- description: AK47s for everyone! Places a random gun in front of everybody.
- components:
- - type: Magic
- - type: InstantAction
- useDelay: 300
- itemIconStyle: BigAction
- icon:
- sprite: Objects/Weapons/Guns/Rifles/ak.rsi
- state: base
- event: !type:RandomGlobalSpawnSpellEvent
- spawns:
- - id: WeaponPistolViper
- orGroup: Guns
- - id: WeaponPistolCobra
- orGroup: Guns
- - id: WeaponPistolMk58
- orGroup: Guns
- - id: WeaponPistolN1984
- orGroup: Guns
- - id: WeaponRevolverDeckard
- orGroup: Guns
- - id: WeaponRevolverInspector
- orGroup: Guns
- - id: WeaponRevolverMateba
- orGroup: Guns
- - id: WeaponRevolverPython
- orGroup: Guns
- - id: WeaponRevolverPirate
- orGroup: Guns
- - id: WeaponRifleAk
- orGroup: Guns
- - id: WeaponRifleM90GrenadeLauncher
- orGroup: Guns
- - id: WeaponRifleLecter
- orGroup: Guns
- - id: WeaponShotgunBulldog
- orGroup: Guns
- - id: WeaponShotgunDoubleBarreled
- orGroup: Guns
- - id: WeaponShotgunEnforcer
- orGroup: Guns
- - id: WeaponShotgunKammerer
- orGroup: Guns
- - id: WeaponShotgunSawn
- orGroup: Guns
- - id: WeaponShotgunHandmade
- orGroup: Guns
- - id: WeaponShotgunBlunderbuss
- orGroup: Guns
- - id: WeaponShotgunImprovised
- orGroup: Guns
- - id: WeaponSubMachineGunAtreides
- orGroup: Guns
- - id: WeaponSubMachineGunC20r
- orGroup: Guns
- - id: WeaponSubMachineGunDrozd
- orGroup: Guns
- - id: WeaponSubMachineGunWt550
- orGroup: Guns
- - id: WeaponSniperMosin
- orGroup: Guns
- - id: WeaponSniperHristov
- orGroup: Guns
- - id: Musket
- orGroup: Guns
- - id: WeaponPistolFlintlock
- orGroup: Guns
- - id: WeaponLauncherChinaLake
- orGroup: Guns
- - id: WeaponLauncherRocket
- orGroup: Guns
- - id: WeaponLauncherPirateCannon
- orGroup: Guns
- - id: WeaponTetherGun
- orGroup: Guns
- - id: WeaponForceGun
- orGroup: Guns
- - id: WeaponGrapplingGun
- orGroup: Guns
- - id: WeaponLightMachineGunL6
- orGroup: Guns
- - id: WeaponLaserSvalinn
- orGroup: Guns
- - id: WeaponLaserGun
- orGroup: Guns
- - id: WeaponMakeshiftLaser
- orGroup: Guns
- - id: WeaponTeslaGun
- orGroup: Guns
- - id: WeaponLaserCarbinePractice
- orGroup: Guns
- - id: WeaponLaserCarbine
- orGroup: Guns
- - id: WeaponPulsePistol
- orGroup: Guns
- - id: WeaponPulseCarbine
- orGroup: Guns
- - id: WeaponPulseRifle
- orGroup: Guns
- - id: WeaponLaserCannon
- orGroup: Guns
- - id: WeaponParticleDecelerator
- orGroup: Guns
- - id: WeaponXrayCannon
- orGroup: Guns
- - id: WeaponDisablerPractice
- orGroup: Guns
- - id: WeaponDisabler
- orGroup: Guns
- - id: WeaponDisablerSMG
- orGroup: Guns
- - id: WeaponTaser
- orGroup: Guns
- - id: WeaponAntiqueLaser
- orGroup: Guns
- - id: WeaponAdvancedLaser
- orGroup: Guns
- - id: WeaponPistolCHIMP
- orGroup: Guns
- - id: WeaponBehonkerLaser
- orGroup: Guns
- - id: WeaponEnergyShotgun
- orGroup: Guns
- - id: WeaponMinigun
- orGroup: Guns
- - id: BowImprovised
- orGroup: Guns
- - id: WeaponFlareGun
- orGroup: Guns
- - id: WeaponImprovisedPneumaticCannon
- orGroup: Guns
- - id: WeaponWaterPistol
- orGroup: Guns
- - id: WeaponWaterBlaster
- orGroup: Guns
- - id: WeaponWaterBlasterSuper
- orGroup: Guns
- - id: RevolverCapGun
- orGroup: Guns
- - id: RevolverCapGunFake
- orGroup: Guns
- speech: action-speech-spell-summon-guns
-
-- type: entity
- id: ActionSummonMagic
- name: Summon Magic
- description: Places a random magical item in front of everybody. Nothing could go wrong!
- components:
- - type: Magic
- - type: InstantAction
- useDelay: 300
- itemIconStyle: BigAction
- icon:
- sprite: Objects/Magic/magicactions.rsi
- state: magicmissile
- event: !type:RandomGlobalSpawnSpellEvent
- spawns:
- - id: SpawnSpellbook
- orGroup: Magics
- - id: ForceWallSpellbook
- orGroup: Magics
- - id: BlinkBook
- orGroup: Magics
- - id: SmiteBook
- orGroup: Magics
- - id: KnockSpellbook
- orGroup: Magics
- - id: FireballSpellbook
- orGroup: Magics
- - id: WeaponWandPolymorphCarp
- orGroup: Magics
- - id: WeaponWandPolymorphMonkey
- orGroup: Magics
- - id: WeaponWandFireball
- orGroup: Magics
- - id: WeaponWandPolymorphDoor
- orGroup: Magics
- - id: WeaponWandCluwne
- orGroup: Magics
- - id: WeaponWandPolymorphBread
- orGroup: Magics
- - id: WeaponStaffHealing
- orGroup: Magics
- - id: WeaponStaffPolymorphDoor
- orGroup: Magics
- speech: action-speech-spell-summon-magic
diff --git a/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_female.yml b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_female.yml
index 1147972eb55..afb58253096 100644
--- a/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_female.yml
+++ b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_female.yml
@@ -1,5 +1,5 @@
- type: dataset
- id: NamesOniFemale
+ id: names_oni_female
values:
- Akari #星
- Kira
diff --git a/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_location.yml b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_location.yml
index fe039ab8a3e..a7eda394872 100644
--- a/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_location.yml
+++ b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_location.yml
@@ -1,5 +1,5 @@
- type: dataset
- id: NamesOniLocation
+ id: names_oni_location
values:
- Amiboshi
- Amefuriboshi
diff --git a/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_male.yml b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_male.yml
index ea3301e97ef..2742cf90734 100644
--- a/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_male.yml
+++ b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_male.yml
@@ -1,5 +1,5 @@
- type: dataset
- id: NamesOniMale
+ id: names_oni_male
values:
- Kiyoshi #陽
- Satoshi #明
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/xeno.yml
index 5f7079d1d53..6192cec0fdc 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/xeno.yml
@@ -32,8 +32,9 @@
# Delta V variants of Xenos to allow ghost takeover again
- type: entity
- abstract: true
- id: BaseMobXenoPlayer
+ name: Burrower
+ id: MobXenoPlayer
+ parent: MobXeno
suffix: Player
components:
- type: GhostRole
@@ -48,41 +49,119 @@
- type: GhostTakeoverAvailable
- type: entity
- parent: [MobXeno, BaseMobXenoPlayer]
- id: MobXenoPlayer
- name: Burrower
-
-- type: entity
- parent: [MobXenoPraetorianNPC, BaseMobXenoPlayer]
- id: MobXenoPraetorian
name: Praetorian
+ parent: MobXenoPraetorianNPC
+ id: MobXenoPraetorian
+ suffix: Player
+ components:
+ - type: GhostRole
+ allowMovement: true
+ allowSpeech: true
+ makeSentient: true
+ name: ghost-role-information-xeno-name
+ description: ghost-role-information-xeno-description
+ rules: ghost-role-information-xeno-rules
+ raffle:
+ settings: default
+ - type: GhostTakeoverAvailable
- type: entity
- parent: [MobXenoDroneNPC, BaseMobXenoPlayer]
- id: MobXenoDrone
name: Drone
+ parent: MobXenoDroneNPC
+ id: MobXenoDrone
+ suffix: Player
+ components:
+ - type: GhostRole
+ allowMovement: true
+ allowSpeech: true
+ makeSentient: true
+ name: ghost-role-information-xeno-name
+ description: ghost-role-information-xeno-description
+ rules: ghost-role-information-xeno-rules
+ raffle:
+ settings: default
+ - type: GhostTakeoverAvailable
- type: entity
- parent: [MobXenoQueenNPC, BaseMobXenoPlayer]
- id: MobXenoQueen
name: Queen
+ parent: MobXenoQueenNPC
+ id: MobXenoQueen
+ suffix: Player
+ components:
+ - type: GhostRole
+ allowMovement: true
+ allowSpeech: true
+ makeSentient: true
+ name: ghost-role-information-xeno-name
+ description: ghost-role-information-xeno-description
+ rules: ghost-role-information-xeno-rules
+ raffle:
+ settings: default
+ - type: GhostTakeoverAvailable
- type: entity
- parent: [MobXenoRavagerNPC, BaseMobXenoPlayer]
- id: MobXenoRavager
name: Ravager
+ parent: MobXenoRavagerNPC
+ id: MobXenoRavager
+ suffix: Player
+ components:
+ - type: GhostRole
+ allowMovement: true
+ allowSpeech: true
+ makeSentient: true
+ name: ghost-role-information-xeno-name
+ description: ghost-role-information-xeno-description
+ rules: ghost-role-information-xeno-rules
+ raffle:
+ settings: default
+ - type: GhostTakeoverAvailable
- type: entity
- parent: [MobXenoRunnerNPC, BaseMobXenoPlayer]
- id: MobXenoRunner
name: Runner
+ parent: MobXenoRunnerNPC
+ id: MobXenoRunner
+ suffix: Player
+ components:
+ - type: GhostRole
+ allowMovement: true
+ allowSpeech: true
+ makeSentient: true
+ name: ghost-role-information-xeno-name
+ description: ghost-role-information-xeno-description
+ rules: ghost-role-information-xeno-rules
+ raffle:
+ settings: default
+ - type: GhostTakeoverAvailable
- type: entity
- parent: [MobXenoRounyNPC, BaseMobXenoPlayer]
- id: MobXenoRouny
name: Rouny
+ parent: MobXenoRounyNPC
+ id: MobXenoRouny
+ components:
+ - type: GhostRole
+ allowMovement: true
+ allowSpeech: true
+ makeSentient: true
+ name: ghost-role-information-xeno-name
+ description: ghost-role-information-xeno-description
+ rules: ghost-role-information-xeno-rules
+ raffle:
+ settings: default
+ - type: GhostTakeoverAvailable
- type: entity
- parent: [MobXenoSpitterNPC, BaseMobXenoPlayer]
- id: MobXenoSpitter
name: Spitter
+ parent: MobXenoSpitterNPC
+ id: MobXenoSpitter
+ suffix: Player
+ components:
+ - type: GhostRole
+ allowMovement: true
+ allowSpeech: true
+ makeSentient: true
+ name: ghost-role-information-xeno-name
+ description: ghost-role-information-xeno-description
+ rules: ghost-role-information-xeno-rules
+ raffle:
+ settings: default
+ - type: GhostTakeoverAvailable
diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
index d5e6cd459ed..8bf2ce69121 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
@@ -7,9 +7,9 @@
markingLimits: MobOniMarkingLimits
sprites: MobHumanSprites
skinColoration: Hues
- maleFirstNames: NamesOniMale
- femaleFirstNames: NamesOniFemale
- lastNames: NamesOniLocation
+ maleFirstNames: names_oni_male
+ femaleFirstNames: names_oni_female
+ lastNames: names_oni_location
naming: LastNoFirst
- type: markingPoints
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
index 9f68a3b773e..4ebc43667c5 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
@@ -34,6 +34,3 @@
- node: cyborg
entity: BorgChassisSelectable
-
- - node: derelictcyborg
- entity: BorgChassisDerelict
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml
deleted file mode 100644
index bda6d036e9b..00000000000
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-- type: constructionGraph
- id: GasPipeSensor
- start: start
- graph:
- - node: start
- edges:
- - to: sensor
- steps:
- - material: Steel
- amount: 2
- doAfter: 1
-
- - node: sensor
- entity: GasPipeSensor
- actions:
- - !type:SetAnchor
- edges:
- - to: start
- completed:
- - !type:SpawnPrototype
- prototype: SheetSteel1
- amount: 2
- - !type:DeleteEntity
- conditions:
- - !type:EntityAnchored
- anchored: false
- steps:
- - tool: Welding
- doAfter: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
index 977be3f4d69..378feb1cf80 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
@@ -28,7 +28,7 @@
- to: icon
steps:
- material: Glass
- amount: 1
+ amount: 2
doAfter: 1
- tag: CrystalBlue
name: blue crystal shard
@@ -48,7 +48,7 @@
- to: icon
steps:
- material: Glass
- amount: 1
+ amount: 2
doAfter: 1
- tag: CrystalPink
name: pink crystal shard
@@ -68,7 +68,7 @@
- to: icon
steps:
- material: Glass
- amount: 1
+ amount: 2
doAfter: 1
- tag: CrystalOrange
name: orange crystal shard
@@ -88,7 +88,7 @@
- to: icon
steps:
- material: Glass
- amount: 1
+ amount: 2
doAfter: 1
- tag: CrystalRed
name: red crystal shard
@@ -108,7 +108,7 @@
- to: icon
steps:
- material: Glass
- amount: 1
+ amount: 2
doAfter: 1
- tag: CrystalGreen
name: green crystal shard
diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml
index b509ce33f3f..9abe0893856 100644
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -366,21 +366,6 @@
objectType: Structure
canRotate: true
-- type: construction
- name: gas pipe sensor
- id: GasPipeSensor
- graph: GasPipeSensor
- startNode: start
- targetNode: sensor
- category: construction-category-structures
- description: Reports on the status of the gas within the attached pipe network.
- icon:
- sprite: Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
- state: icon
- placementMode: SnapgridCenter
- objectType: Structure
- canRotate: true
-
# ATMOS PIPES
- type: construction
name: gas pipe half
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 5dc7f81ac22..da66f7a0d8a 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1220,41 +1220,6 @@
solids:
FoodCarrot: 1
-- type: microwaveMealRecipe
- id: RecipeNachos
- name: nachos recipe
- result: FoodMealNachos
- time: 10
- reagents:
- TableSalt: 1
- solids:
- FoodDoughTortillaFlat: 1
- FoodPlateSmall: 1
-
-- type: microwaveMealRecipe
- id: RecipeNachosCheesy
- name: cheesy nachos recipe
- result: FoodMealNachosCheesy
- time: 10
- reagents:
- TableSalt: 1
- solids:
- FoodCheeseSlice: 1
- FoodDoughTortillaFlat: 1
- FoodPlateSmall: 1
-
-- type: microwaveMealRecipe
- id: RecipeNachosCuban
- name: cuban nachos recipe
- result: FoodMealNachosCuban
- time: 10
- reagents:
- Ketchup: 5
- solids:
- FoodChiliPepper: 1
- FoodDoughTortillaFlat: 1
- FoodPlateSmall: 1
-
- type: microwaveMealRecipe
id: RecipePopcorn
name: popcorn recipe
diff --git a/Resources/Prototypes/Recipes/Lathes/cargo.yml b/Resources/Prototypes/Recipes/Lathes/cargo.yml
index 0679132ec00..82050985b8e 100644
--- a/Resources/Prototypes/Recipes/Lathes/cargo.yml
+++ b/Resources/Prototypes/Recipes/Lathes/cargo.yml
@@ -1,4 +1,4 @@
-- type: latheRecipe
+- type: latheRecipe
id: ConveyorBeltAssembly
result: ConveyorBeltAssembly
completetime: 4
diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
index b05608657ce..7ee8f1ed499 100644
--- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml
+++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
@@ -83,10 +83,10 @@
# - type: latheRecipe # DeltaV - Disable the Vape
# id: Vape
-# result: Vape
# icon:
# sprite: Objects/Consumable/Smokeables/Vapes/vape-standard.rsi
# state: icon
+# result: Vape
# completetime: 2
# materials:
# Plastic: 100
diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml
index 88ea4459dc9..8f72ef7ad18 100644
--- a/Resources/Prototypes/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/Recipes/Lathes/devices.yml
@@ -1,39 +1,54 @@
- type: latheRecipe
- parent: BasePartRecipe
id: TimerTrigger
result: TimerTrigger
+ category: Parts
+ completetime: 2
+ materials:
+ Steel: 300
+ Plastic: 200
- type: latheRecipe
- parent: BasePartRecipe
id: SignalTrigger
result: SignalTrigger
+ category: Parts
+ completetime: 2
+ materials:
+ Steel: 300
+ Plastic: 200
- type: latheRecipe
- parent: BasePartRecipe
id: VoiceTrigger
result: VoiceTrigger
+ category: Parts
+ completetime: 2
+ materials:
+ Steel: 300
+ Plastic: 200
- type: latheRecipe
- parent: BasePartRecipe
id: Igniter
result: Igniter
+ category: Parts
+ completetime: 2
materials:
Steel: 300
Plastic: 100
Glass: 100
- type: latheRecipe
- parent: BaseWeaponRecipe
id: ChemicalPayload
result: ChemicalPayload
+ category: Weapons
+ completetime: 2
materials:
Steel: 200
Plastic: 300
- type: latheRecipe
- parent: BaseWeaponRecipe
id: FlashPayload
result: FlashPayload
+ category: Weapons
+ completetime: 2
materials:
Steel: 50
Plastic: 100
@@ -53,18 +68,20 @@
Silver: 50
- type: latheRecipe
- parent: BasePartRecipe
id: Signaller
result: RemoteSignaller
+ category: Parts
+ completetime: 2
materials:
Steel: 100
Plastic: 200
Glass: 100
- type: latheRecipe
- parent: BasePartRecipe
id: SignallerAdvanced
result: RemoteSignallerAdvanced
+ category: Parts
+ completetime: 2
materials:
Steel: 100
Plastic: 200
@@ -89,9 +106,10 @@
Glass: 100
- type: latheRecipe
- parent: BaseToolRecipe
id: AnomalyScanner
result: AnomalyScanner
+ category: Tools
+ completetime: 2
materials:
Plastic: 200
Glass: 150
@@ -129,20 +147,32 @@
Bluespace: 300 #DeltaV: Bluespace Exists
- type: latheRecipe
- parent: ClothingBackpackHolding
id: ClothingBackpackSatchelHolding
result: ClothingBackpackSatchelHolding
+ completetime: 5
+ materials:
+ Steel: 2000
+ Silver: 750
+ Plasma: 1250 #Higher Plasma due to it needing less bluespace
+ Uranium: 150
+ Bluespace: 300 #DeltaV: Bluespace Exists
- type: latheRecipe
- parent: ClothingBackpackHolding
id: ClothingBackpackDuffelHolding
result: ClothingBackpackDuffelHolding
+ completetime: 5
+ materials:
+ Steel: 2000
+ Silver: 750
+ Plasma: 1250 #Higher Plasma due to it needing less bluespace
+ Uranium: 150
+ Bluespace: 300 #DeltaV: Bluespace Exists
- type: latheRecipe
- parent: ClothingBackpackHolding
id: OreBagOfHolding
result: OreBagOfHolding
- materials: # DeltaV: slightly cheaper than BoH
+ completetime: 5
+ materials:
Steel: 2000
Silver: 750
Plasma: 1000 #DeltaV: Bluespace Exists so less plasma used, no uranium
diff --git a/Resources/Prototypes/Recipes/Lathes/mech_parts.yml b/Resources/Prototypes/Recipes/Lathes/mech_parts.yml
index db7443256cd..4f9f84d0dc8 100644
--- a/Resources/Prototypes/Recipes/Lathes/mech_parts.yml
+++ b/Resources/Prototypes/Recipes/Lathes/mech_parts.yml
@@ -1,140 +1,178 @@
-# Base prototypes
-
-- type: latheRecipe
- abstract: true
- id: BaseMechPartRecipe
- category: Mech
- completetime: 10
-
-# Recipes
-
# Ripley
- type: latheRecipe
- parent: BaseMechPartRecipe
id: RipleyHarness
result: RipleyHarness
+ category: Mech
+ completetime: 10
materials:
Steel: 1500
Glass: 1200
- type: latheRecipe
- parent: BaseMechPartRecipe
id: RipleyLArm
result: RipleyLArm
+ category: Mech
+ completetime: 10
materials:
Steel: 1000
Glass: 750
- type: latheRecipe
- parent: RipleyLArm
id: RipleyLLeg
result: RipleyLLeg
+ category: Mech
+ completetime: 10
+ materials:
+ Steel: 1000
+ Glass: 750
- type: latheRecipe
- parent: RipleyLLeg
id: RipleyRLeg
result: RipleyRLeg
+ category: Mech
+ completetime: 10
+ materials:
+ Steel: 1000
+ Glass: 750
- type: latheRecipe
- parent: RipleyLArm
id: RipleyRArm
result: RipleyRArm
+ category: Mech
+ completetime: 10
+ materials:
+ Steel: 1000
+ Glass: 750
- type: latheRecipe
- parent: BaseMechPartRecipe
id: MechEquipmentGrabber
result: MechEquipmentGrabber
+ category: Mech
+ completetime: 10
materials:
Steel: 500
Plastic: 200
# H.O.N.K.
- type: latheRecipe
- parent: BaseMechPartRecipe
id: HonkerHarness
result: HonkerHarness
+ category: Mech
+ completetime: 10
materials:
Steel: 3000
Glass: 1200
Bananium: 500
- type: latheRecipe
- parent: BaseMechPartRecipe
id: HonkerLArm
result: HonkerLArm
+ category: Mech
+ completetime: 10
materials:
- Steel: 2000
- Glass: 750
- Bananium: 250
+ Steel: 3000
+ Glass: 1200
+ Bananium: 500
- type: latheRecipe
- parent: HonkerLArm
id: HonkerLLeg
result: HonkerLLeg
+ category: Mech
+ completetime: 10
+ materials:
+ Steel: 3000
+ Glass: 1200
+ Bananium: 500
- type: latheRecipe
- parent: HonkerLLeg
id: HonkerRLeg
result: HonkerRLeg
+ category: Mech
+ completetime: 10
+ materials:
+ Steel: 3000
+ Glass: 1200
+ Bananium: 500
- type: latheRecipe
- parent: HonkerLArm
id: HonkerRArm
result: HonkerRArm
+ category: Mech
+ completetime: 10
+ materials:
+ Steel: 3000
+ Glass: 1200
+ Bananium: 500
- type: latheRecipe
- parent: BaseMechPartRecipe
id: MechEquipmentHorn
result: MechEquipmentHorn
+ category: Mech
+ completetime: 10
materials:
Steel: 500
Bananium: 200
# HAMTR
- type: latheRecipe
- parent: BaseMechPartRecipe
id: HamtrHarness
result: HamtrHarness
+ category: Mech
+ completetime: 10
materials:
Steel: 1200
Glass: 1000
- type: latheRecipe
- parent: BaseMechPartRecipe
id: HamtrLArm
result: HamtrLArm
+ category: Mech
+ completetime: 10
materials:
Steel: 800
Glass: 600
- type: latheRecipe
- parent: HamtrLArm
id: HamtrLLeg
result: HamtrLLeg
+ category: Mech
+ completetime: 10
+ materials:
+ Steel: 800
+ Glass: 600
- type: latheRecipe
- parent: HamtrLLeg
id: HamtrRLeg
result: HamtrRLeg
+ category: Mech
+ completetime: 10
+ materials:
+ Steel: 800
+ Glass: 600
- type: latheRecipe
- parent: HamtrLArm
id: HamtrRArm
result: HamtrRArm
+ category: Mech
+ completetime: 10
+ materials:
+ Steel: 800
+ Glass: 600
- type: latheRecipe
- parent: BaseMechPartRecipe
id: MechEquipmentGrabberSmall
result: MechEquipmentGrabberSmall
+ category: Mech
+ completetime: 10
materials:
Steel: 400
Plastic: 100
# Vim
- type: latheRecipe
- parent: BaseMechPartRecipe
id: VimHarness
result: VimHarness
+ category: Mech
completetime: 5
materials:
Steel: 500
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index 89a43529287..ee90bfb91eb 100644
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -1,8 +1,6 @@
-# Base Prototypes
-
- type: latheRecipe
- abstract: true
- id: BaseLightRecipe
+ id: LightTube
+ result: LightTube
category: Lights
completetime: 2
materials:
@@ -10,76 +8,81 @@
Glass: 50
- type: latheRecipe
- abstract: true
- id: BaseFauxTileRecipe
- completetime: 1
- materials:
- Plastic: 100
-
-# Recipes
-
-## Lights
-
-- type: latheRecipe
- parent: BaseLightRecipe
- id: LightTube
- result: LightTube
-
-- type: latheRecipe
- parent: BaseLightRecipe
id: LedLightTube
result: LedLightTube
+ category: Lights
+ completetime: 2
+ materials:
+ Steel: 50
+ Glass: 50
- type: latheRecipe
- parent: BaseLightRecipe
id: SodiumLightTube
result: SodiumLightTube
+ category: Lights
+ completetime: 2
+ materials:
+ Steel: 50
+ Glass: 50
- type: latheRecipe
- parent: BaseLightRecipe
id: ExteriorLightTube
result: ExteriorLightTube
+ category: Lights
+ completetime: 2
+ materials:
+ Steel: 50
+ Glass: 50
- type: latheRecipe
- parent: BaseLightRecipe
id: LightBulb
result: LightBulb
+ category: Lights
+ completetime: 2
+ materials:
+ Steel: 50
+ Glass: 50
- type: latheRecipe
- parent: BaseLightRecipe
id: LedLightBulb
result: LedLightBulb
+ category: Lights
+ completetime: 2
+ materials:
+ Steel: 50
+ Glass: 50
- type: latheRecipe
- parent: BaseLightRecipe
- id: DimLightBulb
- result: DimLightBulb
-
-- type: latheRecipe
- parent: BaseLightRecipe
id: GlowstickRed
result: GlowstickRed
+ category: Lights
+ completetime: 2
materials:
Plastic: 50
- type: latheRecipe
- parent: GlowstickRed
id: Flare
result: Flare
+ category: Lights
+ completetime: 2
+ materials:
+ Plastic: 50
- type: latheRecipe
- parent: BaseLightRecipe
id: FlashlightLantern
result: EmptyFlashlightLantern
+ category: Lights
+ completetime: 2
materials:
Steel: 100
Glass: 100
Plastic: 100
- type: latheRecipe
- parent: BaseToolRecipe
id: FireExtinguisher
result: FireExtinguisher
+ category: Tools
+ completetime: 2
materials:
Steel: 200
@@ -100,9 +103,10 @@
Glass: 100
- type: latheRecipe
- parent: BaseToolRecipe
id: NodeScanner
result: NodeScanner
+ category: Tools
+ completetime: 2
materials:
Steel: 100
Plastic: 50
@@ -147,29 +151,39 @@
Plastic: 100
- type: latheRecipe
- parent: BaseFauxTileRecipe
id: FauxTileAstroGrass
result: FloorTileItemAstroGrass
+ completetime: 1
+ materials:
+ Plastic: 100
- type: latheRecipe
- parent: BaseFauxTileRecipe
id: FauxTileMowedAstroGrass
result: FloorTileItemMowedAstroGrass
+ completetime: 1
+ materials:
+ Plastic: 100
- type: latheRecipe
- parent: BaseFauxTileRecipe
id: FauxTileJungleAstroGrass
result: FloorTileItemJungleAstroGrass
+ completetime: 1
+ materials:
+ Plastic: 100
- type: latheRecipe
- parent: BaseFauxTileRecipe
id: FauxTileAstroIce
result: FloorTileItemAstroIce
+ completetime: 1
+ materials:
+ Plastic: 100
- type: latheRecipe
- parent: BaseFauxTileRecipe
id: FauxTileAstroSnow
result: FloorTileItemAstroSnow
+ completetime: 1
+ materials:
+ Plastic: 100
- type: latheRecipe
id: FloorGreenCircuit
@@ -179,9 +193,11 @@
Steel: 100
- type: latheRecipe
- parent: FloorGreenCircuit
id: FloorBlueCircuit
result: FloorTileItemBCircuit4
+ completetime: 2
+ materials:
+ Steel: 100
- type: latheRecipe
id: FloorRedCircuit
diff --git a/Resources/Prototypes/Recipes/Lathes/powercells.yml b/Resources/Prototypes/Recipes/Lathes/powercells.yml
index 82c7b96affa..21928a53d2a 100644
--- a/Resources/Prototypes/Recipes/Lathes/powercells.yml
+++ b/Resources/Prototypes/Recipes/Lathes/powercells.yml
@@ -66,4 +66,4 @@
Steel: 600
Glass: 800
Plastic: 400
- Gold: 100
+ Gold: 100
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml b/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml
index fd0303352c2..c38259dd816 100644
--- a/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml
+++ b/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml
@@ -1,41 +1,34 @@
-# Base prototypes
+# recipes should generally cost 1.5x to 2x of the biomass output of their mob
- type: latheRecipe
- abstract: true
- id: BaseCubeRecipe
+ id: MonkeyCube
+ result: MonkeyCube
completetime: 30
materials:
Biomass: 16
-# Recipes
-
-# recipes should generally cost 1.5x to 2x of the biomass output of their mob
-- type: latheRecipe
- parent: BaseCubeRecipe
- id: MonkeyCube
- result: MonkeyCube
-
- type: latheRecipe
- parent: BaseCubeRecipe
id: KoboldCube
result: KoboldCube
+ completetime: 30
+ materials:
+ Biomass: 16
- type: latheRecipe
- parent: BaseCubeRecipe
id: CowCube
result: CowCube
+ completetime: 30
materials:
Biomass: 120
- type: latheRecipe
- parent: BaseCubeRecipe
id: GoatCube
result: GoatCube
+ completetime: 30
materials:
Biomass: 35
- type: latheRecipe
- parent: BaseCubeRecipe
id: MothroachCube
result: MothroachCube
completetime: 45 # prevent biblical floods
@@ -43,7 +36,6 @@
Biomass: 20 # a lot of materials wasted due to complex genetics
- type: latheRecipe
- parent: BaseCubeRecipe
id: MouseCube
result: MouseCube
completetime: 15
@@ -51,22 +43,21 @@
Biomass: 12
- type: latheRecipe
- parent: MouseCube
id: CockroachCube
result: CockroachCube
+ completetime: 15
materials:
Biomass: 16
- type: latheRecipe
- parent: BaseCubeRecipe
id: SpaceCarpCube
result: SpaceCarpCube
+ completetime: 30
materials:
Biomass: 24
Plasma: 600
- type: latheRecipe
- parent: BaseCubeRecipe
id: SpaceTickCube
result: SpaceTickCube
completetime: 15
@@ -75,9 +66,9 @@
Plasma: 300 # less biomass but more plasma
- type: latheRecipe
- parent: BaseCubeRecipe
id: AbominationCube
result: AbominationCube
+ completetime: 30
materials: # abominations are slow and essentially worse than even carp
Biomass: 28
Plasma: 500 # more biomass but less plasma
diff --git a/Resources/Prototypes/Recipes/Lathes/salvage.yml b/Resources/Prototypes/Recipes/Lathes/salvage.yml
index 4cf9b9073ce..4600669cc55 100644
--- a/Resources/Prototypes/Recipes/Lathes/salvage.yml
+++ b/Resources/Prototypes/Recipes/Lathes/salvage.yml
@@ -48,18 +48,19 @@
Silver: 100
- type: latheRecipe
- parent: BaseToolRecipe
id: MiningDrill
result: MiningDrill
+ category: Tools
completetime: 3
materials:
Steel: 500
Plastic: 100
- type: latheRecipe
- parent: MiningDrill
id: MiningDrillDiamond
result: MiningDrillDiamond
+ category: Tools
+ completetime: 3
materials:
Steel: 600
Plastic: 200
diff --git a/Resources/Prototypes/Recipes/Lathes/tiles.yml b/Resources/Prototypes/Recipes/Lathes/tiles.yml
index b3ece2fe716..8773dd245cd 100644
--- a/Resources/Prototypes/Recipes/Lathes/tiles.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tiles.yml
@@ -1,249 +1,363 @@
-# Base Prototypes
-
- type: latheRecipe
- abstract: true
- id: BaseTileRecipe
+ id: FloorTileItemDark
+ result: FloorTileItemDark
applyMaterialDiscount: false
completetime: 0.5
materials:
Steel: 25
- type: latheRecipe
- abstract: true
- parent: BaseTileRecipe
- id: BaseWoodTileRecipe
- materials:
- Wood: 25
-
-- type: latheRecipe
- abstract: true
- parent: BaseTileRecipe
- id: BaseConcreteTileRecipe
- materials:
- Steel: 25
- Plastic: 25
-
-# Recipes
-
-- type: latheRecipe
- parent: BaseTileRecipe
- id: FloorTileItemDark
- result: FloorTileItemDark
-
-- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemDarkDiagonalMini
result: FloorTileItemDarkDiagonalMini
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemDarkDiagonal
result: FloorTileItemDarkDiagonal
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemDarkHerringbone
result: FloorTileItemDarkHerringbone
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemDarkMini
result: FloorTileItemDarkMini
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemDarkMono
result: FloorTileItemDarkMono
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemDarkPavement
result: FloorTileItemDarkPavement
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemDarkPavementVertical
result: FloorTileItemDarkPavementVertical
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemDarkOffset
result: FloorTileItemDarkOffset
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemSteelCheckerDark
result: FloorTileItemSteelCheckerDark
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemSteel
result: FloorTileItemSteel
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemSteelOffset
result: FloorTileItemSteelOffset
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemSteelDiagonalMini
result: FloorTileItemSteelDiagonalMini
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemSteelDiagonal
result: FloorTileItemSteelDiagonal
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemSteelHerringbone
result: FloorTileItemSteelHerringbone
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemSteelMini
result: FloorTileItemSteelMini
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemSteelMono
result: FloorTileItemSteelMono
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemSteelPavement
result: FloorTileItemSteelPavement
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemSteelPavementVertical
result: FloorTileItemSteelPavementVertical
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemWhite
result: FloorTileItemWhite
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemWhiteOffset
result: FloorTileItemWhiteOffset
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemWhiteDiagonalMini
result: FloorTileItemWhiteDiagonalMini
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemWhiteDiagonal
result: FloorTileItemWhiteDiagonal
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemWhiteHerringbone
result: FloorTileItemWhiteHerringbone
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemWhiteMini
result: FloorTileItemWhiteMini
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemWhiteMono
result: FloorTileItemWhiteMono
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemWhitePavement
result: FloorTileItemWhitePavement
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemWhitePavementVertical
result: FloorTileItemWhitePavementVertical
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemSteelCheckerLight
result: FloorTileItemSteelCheckerLight
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
# Other steel
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemGratingMaint
result: FloorTileItemGratingMaint
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemTechmaint
result: FloorTileItemTechmaint
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
- type: latheRecipe
- parent: BaseTileRecipe
id: FloorTileItemSteelMaint
result: FloorTileItemSteelMaint
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
# Wood
- type: latheRecipe
- parent: BaseWoodTileRecipe
id: FloorTileItemWood
result: FloorTileItemWood
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Wood: 25
- type: latheRecipe
- parent: BaseWoodTileRecipe
id: FloorTileItemWoodLarge
result: FloorTileItemWoodLarge
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Wood: 25
- type: latheRecipe
- parent: BaseWoodTileRecipe
id: FloorTileItemWoodPattern
result: FloorTileItemWoodPattern
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Wood: 25
# Concrete
- type: latheRecipe
- parent: BaseConcreteTileRecipe
id: FloorTileItemConcrete
result: FloorTileItemConcrete
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
+ Plastic: 25
- type: latheRecipe
- parent: BaseConcreteTileRecipe
id: FloorTileItemConcreteMono
result: FloorTileItemConcreteMono
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
+ Plastic: 25
- type: latheRecipe
- parent: BaseConcreteTileRecipe
id: FloorTileItemConcreteSmooth
result: FloorTileItemConcreteSmooth
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
+ Plastic: 25
- type: latheRecipe
- parent: BaseConcreteTileRecipe
id: FloorTileItemGrayConcrete
result: FloorTileItemGrayConcrete
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
+ Plastic: 25
- type: latheRecipe
- parent: BaseConcreteTileRecipe
id: FloorTileItemGrayConcreteMono
result: FloorTileItemGrayConcreteMono
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
+ Plastic: 25
- type: latheRecipe
- parent: BaseConcreteTileRecipe
id: FloorTileItemGrayConcreteSmooth
result: FloorTileItemGrayConcreteSmooth
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
+ Plastic: 25
- type: latheRecipe
- parent: BaseConcreteTileRecipe
id: FloorTileItemOldConcrete
result: FloorTileItemOldConcrete
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
+ Plastic: 25
- type: latheRecipe
- parent: BaseConcreteTileRecipe
id: FloorTileItemOldConcreteMono
result: FloorTileItemOldConcreteMono
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
+ Plastic: 25
- type: latheRecipe
- parent: BaseConcreteTileRecipe
id: FloorTileItemOldConcreteSmooth
result: FloorTileItemOldConcreteSmooth
+ applyMaterialDiscount: false
+ completetime: 0.5
+ materials:
+ Steel: 25
+ Plastic: 25
diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index 64668b10895..2353099df56 100644
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -953,7 +953,7 @@
LemonLime:
amount: 1
products:
- SnowWhite: 2
+ SnowWhite: 3
- type: reaction
id: SodaWater
diff --git a/Resources/Prototypes/Roles/Ghostroles/syndicate.yml b/Resources/Prototypes/Roles/Ghostroles/syndicate.yml
index 7b4214fd092..5244fd6a99b 100644
--- a/Resources/Prototypes/Roles/Ghostroles/syndicate.yml
+++ b/Resources/Prototypes/Roles/Ghostroles/syndicate.yml
@@ -2,35 +2,35 @@
id: SyndicateKobold
name: ghost-role-information-syndicate-kobold-reinforcement-name
description: ghost-role-information-syndicate-kobold-reinforcement-description
- rules: ghost-role-information-syndicate-reinforcement-rules
+ rules: ghost-role-information-rules-default-familiar
entityPrototype: MobKoboldSyndicateAgent
- type: ghostRole
id: SyndicateKoboldNukeops
name: ghost-role-information-syndicate-kobold-reinforcement-name
description: ghost-role-information-syndicate-kobold-reinforcement-description
- rules: ghost-role-information-nukeop-reinforcement-rules
+ rules: ghost-role-information-rules-default-familiar
entityPrototype: MobKoboldSyndicateAgentNukeops
- type: ghostRole
id: SyndicateMonkey
name: ghost-role-information-syndicate-monkey-reinforcement-name
description: ghost-role-information-syndicate-monkey-reinforcement-description
- rules: ghost-role-information-syndicate-reinforcement-rules
+ rules: ghost-role-information-rules-default-familiar
entityPrototype: MobMonkeySyndicateAgent
- type: ghostRole
id: SyndicateMonkeyNukeops
name: ghost-role-information-syndicate-monkey-reinforcement-name
description: ghost-role-information-syndicate-monkey-reinforcement-description
- rules: ghost-role-information-nukeop-reinforcement-rules
+ rules: ghost-role-information-syndicate-monkey-reinforcement-name
entityPrototype: MobMonkeySyndicateAgentNukeops
- type: ghostRole
id: SyndicateAgentMedic
name: ghost-role-information-syndicate-reinforcement-medic-name
description: ghost-role-information-syndicate-reinforcement-medic-description
- rules: ghost-role-information-syndicate-reinforcement-rules
+ rules: ghost-role-information-syndicate-monkey-reinforcement-rules
entityPrototype: MobHumanSyndicateAgentMedic
iconPrototype: MedkitCombat
@@ -38,7 +38,7 @@
id: SyndicateAgentSpy
name: ghost-role-information-syndicate-reinforcement-spy-name
description: ghost-role-information-syndicate-reinforcement-spy-description
- rules: ghost-role-information-syndicate-reinforcement-rules
+ rules: ghost-role-information-syndicate-monkey-reinforcement-rules
entityPrototype: MobHumanSyndicateAgentSpy
iconPrototype: ClothingMaskGasVoiceChameleon
@@ -46,6 +46,6 @@
id: SyndicateAgentThief
name: ghost-role-information-syndicate-reinforcement-thief-name
description: ghost-role-information-syndicate-reinforcement-thief-description
- rules: ghost-role-information-syndicate-reinforcement-rules
+ rules: ghost-role-information-syndicate-monkey-reinforcement-rules
entityPrototype: MobHumanSyndicateAgentThief
iconPrototype: SyndicateJawsOfLife
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
index 9d8c317a958..8b90b74c6e4 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -18,7 +18,7 @@
- !type:AddComponentSpecial
components:
- type: Clumsy
- gunShootFailDamage:
+ clumsyDamage:
types: #literally just picked semi random valus. i tested this once and tweaked it.
Blunt: 5
Piercing: 4
diff --git a/Resources/Prototypes/SoundCollections/NukeMusic.yml b/Resources/Prototypes/SoundCollections/NukeMusic.yml
index b57b33fe4c8..be58f89e0a1 100644
--- a/Resources/Prototypes/SoundCollections/NukeMusic.yml
+++ b/Resources/Prototypes/SoundCollections/NukeMusic.yml
@@ -3,6 +3,5 @@
files:
- /Audio/StationEvents/running_out.ogg
- /Audio/StationEvents/countdown.ogg
- - /Audio/StationEvents/clearly_nuclear.ogg
- - /Audio/StationEvents/sound_station_14.ogg
- - /Audio/StationEvents/nukemass.ogg
+ - /Audio/StationEvents/clearly_nuclear.ogg
+ - /Audio/StationEvents/sound_station_14.ogg
\ No newline at end of file
diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml
index 32b01cba811..cb211cf8431 100644
--- a/Resources/Prototypes/Wires/layouts.yml
+++ b/Resources/Prototypes/Wires/layouts.yml
@@ -189,11 +189,3 @@
wires:
- !type:PowerWireAction
- !type:AiInteractWireAction
-
-- type: wireLayout
- id: BarSign
- dummyWires: 2
- wires:
- - !type:PowerWireAction
- - !type:AiInteractWireAction
- - !type:AccessWireAction
diff --git a/Resources/Prototypes/audio.yml b/Resources/Prototypes/audio.yml
index 6ac81344ec7..f6b3b413534 100644
--- a/Resources/Prototypes/audio.yml
+++ b/Resources/Prototypes/audio.yml
@@ -270,7 +270,7 @@
- !type:NearbyAccessRule
access:
- Engineering
- range: 2.5
+ range: 3
- type: rules
id: NearMaintenance
@@ -320,7 +320,7 @@
components:
- type: Morgue
range: 3
-
+
- type: rules
id: NearSpookyFog
rules:
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Vox.xml b/Resources/ServerInfo/Guidebook/Mobs/Vox.xml
index 95e9df4c760..173ba89b411 100644
--- a/Resources/ServerInfo/Guidebook/Mobs/Vox.xml
+++ b/Resources/ServerInfo/Guidebook/Mobs/Vox.xml
@@ -5,22 +5,12 @@
- [color=#ffa500]Warning! This species is not recommended for new players due to their fatal allergy to oxygen![/color]
+ [color=#ffa500]Caution! This species has a severely limiting game mechanic and is not recommended for new players. [/color]
- Vox breathe nitrogen, and [color=#ffa500] oxygen is toxic to them.[/color]
- Unfortunately, space stations tend to be full of oxygen,
- so Vox must use an internal nitrogen supply at almost all times to avoid fatal exposure.
+ They breathe nitrogen, and [color=#ffa500] oxygen is very toxic to them.[/color]
+ They need to be on internals at all times to avoid being poisoned by the station's oxygen.
+ Eating or drinking will require you to remove your breath mask, although injecting liquid food is an option.
- Vox always spawn wearing working nitrogen internals equipment.
- A spare breathing mask and an emergency nitrogen canister is provided in their survival box.
-
- Vox [color=#1e90ff]slowly recover from low levels of poison damage[/color] on their own,
- so long as they are careful not to exceed 20 poison damage.
- This allows them to endure breathing station air for up to thirty seconds at a time without lasting damage,
- letting them quickly eat, drink, take oral medication, and so on.
- A thirty second oxygen exposure takes them two minutes to recover from.
- If their health does not seem to improve within a minute of oxygen exposure, they should seek medical attention.
-
- Vox deal Slash damage with their unarmed attack.
+ Their unarmed claw attacks deal Slash damage instead of Blunt.
diff --git a/Resources/Textures/Interface/Misc/ai_hud.rsi/apc_hacked.png b/Resources/Textures/Interface/Misc/ai_hud.rsi/apc_hacked.png
deleted file mode 100644
index 72e111edac5..00000000000
Binary files a/Resources/Textures/Interface/Misc/ai_hud.rsi/apc_hacked.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Misc/ai_hud.rsi/electrified.png b/Resources/Textures/Interface/Misc/ai_hud.rsi/electrified.png
deleted file mode 100644
index 046a307d09f..00000000000
Binary files a/Resources/Textures/Interface/Misc/ai_hud.rsi/electrified.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Misc/ai_hud.rsi/meta.json b/Resources/Textures/Interface/Misc/ai_hud.rsi/meta.json
deleted file mode 100644
index 7f1e67ac4d9..00000000000
--- a/Resources/Textures/Interface/Misc/ai_hud.rsi/meta.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d170a410d40eec4fc19fe5eb8d561d58a0902082",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "electrified",
- "delays": [
- [
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2
- ]
- ]
- },
- {
- "name": "apc_hacked",
- "delays": [
- [
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2
- ]
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png
index 205002b98f6..6dece6fb58c 100644
Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
index da01eb11e86..1f76743a9d5 100644
--- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github)",
+ "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets",
"size": {
"x": 8,
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lefteye_2.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lefteye_2.png
index 09433ff81c8..25f271fbaf1 100644
Binary files a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lefteye_2.png and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lefteye_2.png differ
diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict.png
deleted file mode 100644
index bbf72fc45be..00000000000
Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_e.png
deleted file mode 100644
index 17349d74dc8..00000000000
Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_e.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_e_r.png
deleted file mode 100644
index 3c8cf19acf6..00000000000
Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_e_r.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_icon.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_icon.png
deleted file mode 100644
index 7f0ea2a2556..00000000000
Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_icon.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_l.png
deleted file mode 100644
index f65fbaebc3c..00000000000
Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_l.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json b/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
index 7337a8e936e..68fbf1985e7 100644
--- a/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
+++ b/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc, derelict sprites modified by GoldenCan(GitHub).",
+ "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc",
"states": [
{
"name": "clown",
@@ -23,26 +23,6 @@
"name": "clown_l",
"directions": 4
},
- {
- "name": "derelict",
- "directions": 4
- },
- {
- "name": "derelict_e",
- "directions": 4
- },
- {
- "name": "derelict_e_r",
- "directions": 4
- },
- {
- "name": "derelict_icon",
- "directions": 1
- },
- {
- "name": "derelict_l",
- "directions": 4
- },
{
"name": "engineer",
"directions": 4
diff --git a/Resources/Textures/Objects/Devices/gates.rsi/logic_a.png b/Resources/Textures/Objects/Devices/gates.rsi/logic_a.png
deleted file mode 100644
index 4727847a9ce..00000000000
Binary files a/Resources/Textures/Objects/Devices/gates.rsi/logic_a.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/gates.rsi/logic_b.png b/Resources/Textures/Objects/Devices/gates.rsi/logic_b.png
deleted file mode 100644
index e8a848ab9b4..00000000000
Binary files a/Resources/Textures/Objects/Devices/gates.rsi/logic_b.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/gates.rsi/logic_o.png b/Resources/Textures/Objects/Devices/gates.rsi/logic_o.png
deleted file mode 100644
index e7af90e9514..00000000000
Binary files a/Resources/Textures/Objects/Devices/gates.rsi/logic_o.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/gates.rsi/meta.json b/Resources/Textures/Objects/Devices/gates.rsi/meta.json
index ba7c7ea232d..761bdab87a6 100644
--- a/Resources/Textures/Objects/Devices/gates.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/gates.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "or.png originally created by Kevin Zheng, 2022. All are modified by deltanedas (github) for SS14, 2024. Sprites logic_a logic_b logic_o were made by 0tito (github) for SS14",
+ "copyright": "or.png originally created by Kevin Zheng, 2022. All are modified by deltanedas (github) for SS14, 2024.",
"size": {
"x": 32,
"y": 32
@@ -13,15 +13,6 @@
{
"name": "logic"
},
- {
- "name": "logic_o"
- },
- {
- "name": "logic_b"
- },
- {
- "name": "logic_a"
- },
{
"name": "or"
},
diff --git a/Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-left.png b/Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-left.png
deleted file mode 100644
index b9a381ea13a..00000000000
Binary files a/Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-right.png b/Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-right.png
deleted file mode 100644
index 6d3822309c3..00000000000
Binary files a/Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/hide.rsi/meta.json b/Resources/Textures/Objects/Materials/hide.rsi/meta.json
index 9235e8e2e93..0ec2b254800 100644
--- a/Resources/Textures/Objects/Materials/hide.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/hide.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/88d236d5c91e9a57e103957555c2e9a8c63b68fa/icons/obj/stacks/organic.dmi. Inhands by mubururu_ (github).",
+ "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/88d236d5c91e9a57e103957555c2e9a8c63b68fa/icons/obj/stacks/organic.dmi",
"size": {
"x": 32,
"y": 32
@@ -10,14 +10,6 @@
{
"name": "goliath_hide"
},
- {
- "name": "goliathhide-inhand-left",
- "directions": 4
- },
- {
- "name": "goliathhide-inhand-right",
- "directions": 4
- },
{
"name": "goliath_hide_2"
},
@@ -25,4 +17,4 @@
"name": "goliath_hide_3"
}
]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-left.png
deleted file mode 100644
index b936e0fd78c..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-right.png
deleted file mode 100644
index e352e25fc9d..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-left.png
deleted file mode 100644
index 07a339dc364..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-right.png
deleted file mode 100644
index 5eb64901c0e..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-left.png
deleted file mode 100644
index fd69f67e5f3..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-right.png
deleted file mode 100644
index 58e1ddc53df..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-left.png
deleted file mode 100644
index 22b176f3d37..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-right.png
deleted file mode 100644
index 15c2d611503..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-left.png
deleted file mode 100644
index 28d69ddcd71..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-right.png
deleted file mode 100644
index a75f4f96e68..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-left.png
deleted file mode 100644
index ec9184783f9..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-right.png
deleted file mode 100644
index adb73f42841..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-left.png
deleted file mode 100644
index 139c2a573e8..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-right.png
deleted file mode 100644
index 4572ed11d5f..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
index 9fbad41e484..3ae12dc14c0 100644
--- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base. Bananium, cardboard, corgihide, cloth, cotton, pyrotton, bones and durathread inhands by mubururu_ (github).",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base.",
"size": {
"x": 32,
"y": 32
@@ -16,14 +16,6 @@
{
"name": "bananium"
},
- {
- "name": "bananium-inhand-left",
- "directions": 4
- },
- {
- "name": "bananium-inhand-right",
- "directions": 4
- },
{
"name": "bananium_1"
},
@@ -44,14 +36,6 @@
{
"name": "cardboard"
},
- {
- "name": "cardboard-inhand-left",
- "directions": 4
- },
- {
- "name": "cardboard-inhand-right",
- "directions": 4
- },
{
"name": "cardboard_2"
},
@@ -64,14 +48,6 @@
{
"name": "cloth"
},
- {
- "name": "cloth-inhand-left",
- "directions": 4
- },
- {
- "name": "cloth-inhand-right",
- "directions": 4
- },
{
"name": "cloth_2"
},
@@ -81,25 +57,9 @@
{
"name": "corgihide"
},
- {
- "name": "corgihide-inhand-left",
- "directions": 4
- },
- {
- "name": "corgihide-inhand-right",
- "directions": 4
- },
{
"name": "cotton"
},
- {
- "name": "cotton-inhand-left",
- "directions": 4
- },
- {
- "name": "cotton-inhand-right",
- "directions": 4
- },
{
"name": "cotton_2"
},
@@ -109,14 +69,6 @@
{
"name": "pyrotton"
},
- {
- "name": "pyrotton-inhand-left",
- "directions": 4
- },
- {
- "name": "pyrotton-inhand-right",
- "directions": 4
- },
{
"name": "pyrotton_2"
},
@@ -143,14 +95,6 @@
{
"name": "durathread"
},
- {
- "name": "durathread-inhand-left",
- "directions": 4
- },
- {
- "name": "durathread-inhand-right",
- "directions": 4
- },
{
"name": "durathread_2"
},
@@ -216,14 +160,6 @@
{
"name": "bones"
},
- {
- "name": "bones-inhand-left",
- "directions": 4
- },
- {
- "name": "bones-inhand-right",
- "directions": 4
- },
{
"name": "bones_2"
},
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-left.png
deleted file mode 100644
index e47685d17c9..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-right.png
deleted file mode 100644
index 3225dc08980..00000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-left.png
deleted file mode 100644
index 01b00bc68f5..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-right.png
deleted file mode 100644
index 8c7fddffbdf..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-left.png
deleted file mode 100644
index 094a473d89a..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-right.png
deleted file mode 100644
index a8286cdebe2..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-left.png
deleted file mode 100644
index 837741af434..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-right.png
deleted file mode 100644
index 0f97e2c9c9d..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-left.png
deleted file mode 100644
index 62255bf46bf..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-right.png
deleted file mode 100644
index 50892832e05..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-left.png
deleted file mode 100644
index 7d2f6abd577..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-right.png
deleted file mode 100644
index f616f48f957..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
index bf4d6e77452..8f1b4533f2a 100644
--- a/Resources/Textures/Objects/Materials/ore.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
- "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd. Inhands by mubururu_ (github).",
+ "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd",
"size": {
"x": 32,
"y": 32
@@ -10,112 +10,32 @@
{
"name": "bananium"
},
- {
- "name": "bananium-inhand-left",
- "directions": 4
- },
- {
- "name": "bananium-inhand-right",
- "directions": 4
- },
{
"name": "gold"
},
- {
- "name": "gold-inhand-left",
- "directions": 4
- },
- {
- "name": "gold-inhand-right",
- "directions": 4
- },
{
"name": "iron"
},
- {
- "name": "iron-inhand-left",
- "directions": 4
- },
- {
- "name": "iron-inhand-right",
- "directions": 4
- },
{
"name": "uranium"
},
- {
- "name": "uranium-inhand-left",
- "directions": 4
- },
- {
- "name": "uranium-inhand-right",
- "directions": 4
- },
{
"name": "plasma"
},
- {
- "name": "plasma-inhand-left",
- "directions": 4
- },
- {
- "name": "plasma-inhand-right",
- "directions": 4
- },
{
"name": "spacequartz"
},
- {
- "name": "spacequartz-inhand-left",
- "directions": 4
- },
- {
- "name": "spacequartz-inhand-right",
- "directions": 4
- },
{
"name": "silver"
},
- {
- "name": "silver-inhand-left",
- "directions": 4
- },
- {
- "name": "silver-inhand-right",
- "directions": 4
- },
{
"name": "coal"
},
- {
- "name": "coal-inhand-left",
- "directions": 4
- },
- {
- "name": "coal-inhand-right",
- "directions": 4
- },
{
"name": "salt"
},
- {
- "name": "salt-inhand-left",
- "directions": 4
- },
- {
- "name": "salt-inhand-right",
- "directions": 4
- },
{
"name": "diamond"
- },
- {
- "name": "diamond-inhand-left",
- "directions": 4
- },
- {
- "name": "diamond-inhand-right",
- "directions": 4
}
]
}
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-left.png
deleted file mode 100644
index 6c41a2c1494..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-right.png
deleted file mode 100644
index 00e4f114085..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-left.png
deleted file mode 100644
index fe4e9e2d5d1..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-right.png
deleted file mode 100644
index 8330643546b..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-left.png
deleted file mode 100644
index 7f700503135..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-right.png
deleted file mode 100644
index ab4dcb98d69..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-left.png
deleted file mode 100644
index 56837c96099..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-right.png
deleted file mode 100644
index 45b370cb8e3..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-left.png
deleted file mode 100644
index 422008998b4..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-right.png
deleted file mode 100644
index d13a758cbd7..00000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/parts.rsi/meta.json b/Resources/Textures/Objects/Materials/parts.rsi/meta.json
index c2503bb3936..290b7dd91ce 100644
--- a/Resources/Textures/Objects/Materials/parts.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/parts.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Inhands by mubururu_ (github).",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
"size": {
"x": 32,
"y": 32
@@ -10,14 +10,6 @@
{
"name": "rods"
},
- {
- "name": "rods-inhand-left",
- "directions": 4
- },
- {
- "name": "rods-inhand-right",
- "directions": 4
- },
{
"name": "rods_2"
},
diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-left.png b/Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-left.png
deleted file mode 100644
index b0e71052cdc..00000000000
Binary files a/Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-right.png b/Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-right.png
deleted file mode 100644
index 01b42adce19..00000000000
Binary files a/Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/silk.rsi/meta.json b/Resources/Textures/Objects/Materials/silk.rsi/meta.json
index 77f77ee31a2..5ac5189baed 100644
--- a/Resources/Textures/Objects/Materials/silk.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/silk.rsi/meta.json
@@ -1,20 +1,12 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Made by PixelTheKermit (github) for SS14. Inhands by mubururu_ (github).",
+ "copyright": "Made by PixelTheKermit (github) for SS14",
"size": {"x": 32, "y": 32},
"states":
[
{
- "name": "icon"
- },
- {
- "name": "silk-inhand-left",
- "directions": 4
- },
- {
- "name": "silk-inhand-right",
- "directions": 4
+ "name": "icon"
}
]
}
diff --git a/Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-left.png b/Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-left.png
deleted file mode 100644
index 12425e93ced..00000000000
Binary files a/Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-right.png b/Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-right.png
deleted file mode 100644
index ee1b193af07..00000000000
Binary files a/Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png
index 72d4cd44d38..5fc1f43c05b 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
index a87925420ad..93e8fbe1f3c 100644
--- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github)",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github)",
"size": {
"x": 32,
"y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker-effect.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker-effect.png
deleted file mode 100644
index 77bcb4b3640..00000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker-effect.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker-inhand-left.png
deleted file mode 100644
index bcb330b9ed1..00000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker-inhand-right.png
deleted file mode 100644
index 4be7ef20591..00000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker.png
deleted file mode 100644
index f638769226a..00000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/meta.json
index 59d423baac9..87b6f386770 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/meta.json
@@ -63,20 +63,6 @@
{
"name": "wand-inhand-right",
"directions": 4
- },
- {
- "name": "locker"
- },
- {
- "name": "locker-effect"
- },
- {
- "name": "locker-inhand-right",
- "directions": 4
- },
- {
- "name": "locker-inhand-left",
- "directions": 4
}
]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/icon.png
index 9ce8603d2a6..a57ce53cc46 100644
Binary files a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json
index 55417c2e716..97a5fdbd2e2 100644
--- a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json
@@ -1,17 +1,14 @@
{
"version": 1,
"license": "CC0-1.0",
- "copyright": "Design, inhands, and storage sprite by SpaceRox1244 (github) and icon by EmoGarbage404 (github)",
+ "copyright": "Design and inhands by ricemar (discord) and icon by EmoGarbage404 (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
- "name": "icon"
- },
- {
- "name": "storage"
+ "name": "icon"
},
{
"name": "inhand-left",
diff --git a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/storage.png
deleted file mode 100644
index e21fc82b971..00000000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/storage.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Machines/electric_grill.rsi/meta.json b/Resources/Textures/Structures/Machines/electric_grill.rsi/meta.json
index fb03857371b..bdd57824367 100644
--- a/Resources/Textures/Structures/Machines/electric_grill.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/electric_grill.rsi/meta.json
@@ -1,5 +1,5 @@
{
- "version": 1,
+ "version": 2,
"license": "CC0-1.0",
"copyright": "Original base by deltanedas (github) for SS14. Resprited by (DISCORD)@ps3moira#9488",
"size": {
diff --git a/Resources/Textures/Structures/Machines/uniform_printer.rsi/building.png b/Resources/Textures/Structures/Machines/uniform_printer.rsi/building.png
index 30ccb64d6c5..3c29da5b751 100644
Binary files a/Resources/Textures/Structures/Machines/uniform_printer.rsi/building.png and b/Resources/Textures/Structures/Machines/uniform_printer.rsi/building.png differ
diff --git a/Resources/Textures/Structures/Machines/uniform_printer.rsi/icon.png b/Resources/Textures/Structures/Machines/uniform_printer.rsi/icon.png
index 99e893be3e7..7e01826a1a4 100644
Binary files a/Resources/Textures/Structures/Machines/uniform_printer.rsi/icon.png and b/Resources/Textures/Structures/Machines/uniform_printer.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/base.png b/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/base.png
deleted file mode 100644
index 4a9a8f6f206..00000000000
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/blank.png b/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/blank.png
deleted file mode 100644
index 7bee0a002b7..00000000000
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/blank.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/icon.png b/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/icon.png
deleted file mode 100644
index 4ac9e764803..00000000000
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/lights.png b/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/lights.png
deleted file mode 100644
index 6108d2b9949..00000000000
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/lights.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/meta.json
deleted file mode 100644
index 878c7817a2b..00000000000
--- a/Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/meta.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Created by chromiumboy (github) for SS14, based on the digital valve from /tg/, taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da.",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon"
- },
- {
- "name": "base"
- },
- {
- "name": "blank"
- },
- {
- "name": "lights",
- "delays": [
- [
- 1.0,
- 0.25
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png
index 1258071a1a6..52e515e39b8 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png
index 9a2c339936a..961991bf349 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png
index 30649e06ee8..3e00e7d8068 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json
index 8ff0cc71798..c180604984c 100644
--- a/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Sprites by Vermidia and modified by SpaceRox1244.",
+ "copyright": "Sprites by Vermidia.",
"size": {
"x": 32,
"y": 32
@@ -20,4 +20,4 @@
"name": "invoice"
}
]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png
index bd6c7138f62..8daf7770832 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png differ
diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/bounty.png b/Resources/Textures/Structures/Storage/closet_labels.rsi/bounty.png
deleted file mode 100644
index 8146de6c6ec..00000000000
Binary files a/Resources/Textures/Structures/Storage/closet_labels.rsi/bounty.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/closet_labels.rsi/captains_paper.png
deleted file mode 100644
index d6c3de92fdb..00000000000
Binary files a/Resources/Textures/Structures/Storage/closet_labels.rsi/captains_paper.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/invoice.png b/Resources/Textures/Structures/Storage/closet_labels.rsi/invoice.png
deleted file mode 100644
index 7f1a3795b87..00000000000
Binary files a/Resources/Textures/Structures/Storage/closet_labels.rsi/invoice.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/meta.json b/Resources/Textures/Structures/Storage/closet_labels.rsi/meta.json
deleted file mode 100644
index 3e64ac931c3..00000000000
--- a/Resources/Textures/Structures/Storage/closet_labels.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Sprites by Vermidia and modified by SpaceRox1244.",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "paper"
- },
- {
- "name": "bounty"
- },
- {
- "name": "captains_paper"
- },
- {
- "name": "invoice"
- }
- ]
-}
diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/paper.png b/Resources/Textures/Structures/Storage/closet_labels.rsi/paper.png
deleted file mode 100644
index 83b15b95a2b..00000000000
Binary files a/Resources/Textures/Structures/Storage/closet_labels.rsi/paper.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
index 995aaabb329..3b714153de9 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
index 03c7cfa2682..e7a23014888 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
index 684898f1b63..716536cfcb2 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png
index 50211ca0daa..fc185734afd 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png
index b735b57c308..0cdb0466062 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png
index 27655f27713..192c589f26c 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png
index 3da599f9b13..793babbbe6a 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png
index d6647e41079..0f3e60bc0e8 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
index 7d2da746e02..62e0a281bf0 100644
--- a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
@@ -4,7 +4,7 @@
"x": 32,
"y": 32
},
- "copyright": "Taken from tgstation, modified for SS14",
+ "copyright": "Taken from tgstation",
"license": "CC-BY-SA-3.0",
"states": [
{
diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
index fb1613be146..a33df81531d 100644
--- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_, poster52_legit by SlamBamActionman, poster53_legit and the original version by @RCOI on discord. | poster29_legit modified by TJohnson.",
+ "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_, poster52_legit by SlamBamActionman | poster29_legit modified by TJohnson.",
"size": {
"x": 32,
"y": 32
@@ -384,9 +384,6 @@
{
"name": "poster52_legit"
},
- {
- "name": "poster53_legit"
- },
{
"name": "random_legit"
},
diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster53_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster53_legit.png
deleted file mode 100644
index bedaf2c5c48..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster53_legit.png and /dev/null differ