diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index 2f0872ee84..9ba10252e5 100644
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -199,7 +199,7 @@ public sealed class RadioSystem : EntitySystem
private string GetIdCardName(EntityUid senderUid)
{
var idCardTitle = Loc.GetString("chat-radio-no-id");
- idCardTitle = GetIdCard(senderUid)?.JobTitle ?? idCardTitle;
+ idCardTitle = GetIdCard(senderUid)?.LocalizedJobTitle ?? idCardTitle;
var textInfo = CultureInfo.CurrentCulture.TextInfo;
idCardTitle = textInfo.ToTitleCase(idCardTitle);
diff --git a/Content.Server/Supermatter/Components/SupermatterComponent.cs b/Content.Server/Supermatter/Components/SupermatterComponent.cs
index 9843a09747..f356abe6f6 100644
--- a/Content.Server/Supermatter/Components/SupermatterComponent.cs
+++ b/Content.Server/Supermatter/Components/SupermatterComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
using Robust.Shared.Audio;
namespace Content.Server.Supermatter.Components;
@@ -6,6 +6,36 @@ namespace Content.Server.Supermatter.Components;
[RegisterComponent]
public sealed partial class SupermatterComponent : Component
{
+ ///
+ /// The damage taken from direct hits, e.g. laser weapons
+ ///
+ [ViewVariables(VVAccess.ReadOnly)]
+ public float AVExternalDamage = 0f;
+
+ //
+ [ViewVariables(VVAccess.ReadOnly)]
+ public float HeatAccumulatorRate = 0.5f;
+
+ [ViewVariables(VVAccess.ReadOnly)]
+ public float AVHeatAccumulator = 0f;
+
+ [ViewVariables(VVAccess.ReadOnly)]
+ public float RadiationAccumulatorRate = 0.3f;
+
+ [ViewVariables(VVAccess.ReadOnly)]
+ public float AVRadiationAccumulator = 0f;
+
+ [ViewVariables(VVAccess.ReadOnly)]
+ public float LightingAccumulatorThreshold = 2f;
+
+ [ViewVariables(VVAccess.ReadOnly)]
+ public float LightingAccumulatorRate = 0.1f;
+
+ [ViewVariables(VVAccess.ReadOnly)]
+ public float AVLightingAccumulator = 0f;
+
+ [ViewVariables(VVAccess.ReadOnly)]
+ public float InternalEnergyAccumulatorRate = 0.1f;
///
/// Lightning prototype IDs that the supermatter should spit out.
///
@@ -64,8 +94,6 @@ public sealed partial class SupermatterComponent : Component
public float UpdateTimerAccumulator = 0f;
- public float ZapTimerAccumulator = 0f;
-
public float AnnouncementTimerAccumulator = 0f;
///
@@ -74,12 +102,6 @@ public sealed partial class SupermatterComponent : Component
[DataField("updateTimer")]
public float UpdateTimer = 1f;
- ///
- /// Amount of seconds to pass before SM does it's zap.
- ///
- [DataField("zapTimer")]
- public float ZapTimer = 10f;
-
///
/// Amount of seconds to pass before makes an announcement.
///
@@ -123,12 +145,6 @@ public sealed partial class SupermatterComponent : Component
///
public float DamageArchive = 0f;
- ///
- /// The damage taken from direct hits, e.g. laser weapons
- ///
- [ViewVariables(VVAccess.ReadOnly)]
- public float ExternalDamage = 0f;
-
///
/// The temperature at which the supermatter crystal will begin to take damage.
///
@@ -168,11 +184,8 @@ public sealed partial class SupermatterComponent : Component
///
[ViewVariables(VVAccess.ReadOnly)]
public float GasPowerlossInhibition = 0f;
- ///
- /// Affects the amount of power the main SM zap makes.
- ///
[ViewVariables(VVAccess.ReadOnly)]
- public float PowerTransmissionRate = 0f;
+ public float ThermalСonductivity = 0f;
///
/// Affects the power gain the SM experiences from heat.
///
@@ -199,15 +212,15 @@ public sealed partial class SupermatterComponent : Component
[ViewVariables(VVAccess.ReadOnly)]
public GasFact[] GasFacts =
{
- new (transmissionRate: .15f, heatPowerGeneration: 1f), // o2
- new (heatModifier: -2.5f, heatPowerGeneration: -1), // n2
- new (heatModifier: 1f, heatPowerGeneration: 1f, powerlossInhibition: 1f), // co2
- new (transmissionRate: .4f, heatModifier: 14f, heatPowerGeneration: 1f), // plasma
- new (transmissionRate: 3f, heatModifier: 9f, heatPowerGeneration: 1f), // tritium
- new (transmissionRate: -.25f, heatModifier: 11f, heatPowerGeneration: 1f), // vapor
- new (heatPowerGeneration: .5f), // ommonium
- new (heatResistance: 5f), // n2o
- new (transmissionRate: -3f, heatModifier: 9f, heatResistance: 1f, heatPowerGeneration: 1f), // frezon
+ new (thermalConductivity: 2.4f, heatPowerGeneration: 1f), // o2
+ new (thermalConductivity: 2.0f, heatModifier: -2.5f, heatPowerGeneration: -1), // n2
+ new (thermalConductivity: 1.2f, heatModifier: 1f, heatPowerGeneration: 1f, powerlossInhibition: 1f), // co2
+ new (thermalConductivity: 6.0f, heatModifier: 14f, heatPowerGeneration: 1f), // plasma
+ new (thermalConductivity: 3.0f, heatModifier: 9f, heatPowerGeneration: 1f), // tritium
+ new (thermalConductivity: 1.4f, heatModifier: 11f, heatPowerGeneration: 1f), // vapor
+ new (thermalConductivity: 1.6f, heatPowerGeneration: .5f), // ommonium
+ new (thermalConductivity: 1.3f, heatResistance: 5f), // n2o
+ new (thermalConductivity: 9.9f, heatModifier: 9f, heatResistance: 1f, heatPowerGeneration: 1f), // frezon
};
}
@@ -222,7 +235,7 @@ public sealed partial class GasFact
/// Affects the amount of power the main SM zap makes.
///
[ViewVariables(VVAccess.ReadWrite)]
- public float PowerTransmissionRate;
+ public float ThermalСonductivity;
///
/// Affects the heat SM makes.
///
@@ -244,9 +257,9 @@ public sealed partial class GasFact
[ViewVariables(VVAccess.ReadWrite)]
public float PowerlossInhibition;
- public GasFact(float? transmissionRate = null, float? heatModifier = null, float? heatResistance = null, float? heatPowerGeneration = null, float? powerlossInhibition = null)
+ public GasFact(float? thermalConductivity = null, float? heatModifier = null, float? heatResistance = null, float? heatPowerGeneration = null, float? powerlossInhibition = null)
{
- PowerTransmissionRate = transmissionRate ?? 1;
+ ThermalСonductivity = thermalConductivity ?? 1;
HeatModifier = heatModifier ?? 1;
HeatResistance = heatResistance ?? 0;
HeatPowerGeneration = heatPowerGeneration ?? 0;
diff --git a/Content.Server/Supermatter/EntitySystems/SupermatterSystem.cs b/Content.Server/Supermatter/EntitySystems/SupermatterSystem.cs
index 1cf41b6563..a0f37771d8 100644
--- a/Content.Server/Supermatter/EntitySystems/SupermatterSystem.cs
+++ b/Content.Server/Supermatter/EntitySystems/SupermatterSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
using Content.Server.Supermatter.Components;
using Content.Shared.Atmos;
using Content.Server.Lightning;
@@ -26,6 +26,8 @@ using Content.Shared.Examine;
using Content.Server.DoAfter;
using Content.Server.Explosion.EntitySystems;
using Content.Server.Kitchen.Components;
+using Content.Shared.Singularity.Components;
+using System;
namespace Content.Server.Supermatter.EntitySystems;
@@ -39,6 +41,7 @@ public sealed class SupermatterSystem : EntitySystem
[Dependency] private readonly PopupSystem _popup = default!;
[Dependency] private readonly AmbientSoundSystem _ambience = default!;
[Dependency] private readonly IRobustRandom _random = default!;
+ [Dependency] private readonly TagSystem _tagSystem = default!;
[Dependency] private readonly StationSystem _station = default!;
[Dependency] private readonly AnomalySystem _anomaly = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
@@ -81,17 +84,10 @@ public sealed class SupermatterSystem : EntitySystem
public void Cycle(EntityUid uid, SupermatterComponent sm)
{
- sm.ZapTimerAccumulator++;
sm.AnnouncementTimerAccumulator++;
ProcessAtmos(uid, sm);
-
- if (sm.ZapTimerAccumulator >= sm.ZapTimer)
- {
- sm.ZapTimerAccumulator = 0f;
- ProcessPower(uid, sm);
- }
-
+ ProcessPower(uid, sm);
ProcessDamage(uid, sm);
// due to how damage calculation works, it will do the announcement only if sm is consistently taking damage
@@ -104,7 +100,7 @@ public sealed class SupermatterSystem : EntitySystem
if (sm.Damage > sm.DamageEmergencyPoint)
loc = "critical";
- SupermatterAlert(uid, Loc.GetString($"supermatter-announcement-{loc}", ("integrity", Math.Round(sm.DelaminationPoint - sm.Damage, 1))));
+ SupermatterAlert(uid, Loc.GetString($"supermatter-announcement-{loc}", ("integrity", (int)(sm.DelaminationPoint - sm.Damage))));
}
}
@@ -127,7 +123,7 @@ public sealed class SupermatterSystem : EntitySystem
// calculate gases
var gasPercentages = new float[Enum.GetValues(typeof(Gas)).Length];
- var powerTransmissionRate = 0f;
+ var thermalСonductivity = 0f;
var heatModifier = 0f;
var heatResistance = 0f;
var heatPowerGeneration = 0f;
@@ -148,7 +144,7 @@ public sealed class SupermatterSystem : EntitySystem
gasPercentages[i] = moleCount / moles;
var smGas = sm.GasFacts[i];
- powerTransmissionRate += smGas.PowerTransmissionRate * gasPercentages[i];
+ thermalСonductivity += smGas.ThermalСonductivity * gasPercentages[i];
heatModifier += smGas.HeatModifier * gasPercentages[i];
heatResistance += smGas.HeatResistance * gasPercentages[i];
heatPowerGeneration += smGas.HeatPowerGeneration * gasPercentages[i];
@@ -159,7 +155,7 @@ public sealed class SupermatterSystem : EntitySystem
powerlossInhibition = Math.Clamp(powerlossInhibition, 0, 1);
sm.AbsorbedGasMix = absorbedMix;
- sm.PowerTransmissionRate = powerTransmissionRate;
+ sm.ThermalСonductivity = thermalСonductivity;
sm.GasHeatModifier = heatModifier;
sm.GasHeatResistance = heatResistance;
sm.HeatPowerGeneration = heatPowerGeneration;
@@ -172,17 +168,32 @@ public sealed class SupermatterSystem : EntitySystem
{
var powerHeat = sm.HeatPowerGeneration * sm.AbsorbedGasMix.Temperature * SupermatterComponent.GasHeatPowerScaling;
var powerloss = -1 * sm.GasPowerlossInhibition;
- var atmosStrength = Math.Clamp((powerHeat + powerloss) * sm.PowerTransmissionRate, 0, 2);
+ var atmosStrength = Math.Clamp((powerHeat + powerloss) * 0.2f, 0, 2);
var damageStrength = Math.Clamp(sm.Damage / sm.DelaminationPoint, 0, 1);
var strength = Math.Clamp(atmosStrength + damageStrength, 0, 4);
+ var damageExternal = sm.AVExternalDamage + strength;
+ sm.AVExternalDamage = 0f;
- sm.InternalEnergy = strength;
- var lightningProto = sm.LightningPrototypeIDs[(int) Math.Clamp(strength, 0, 3)];
+ sm.AVHeatAccumulator = Math.Clamp(sm.AVHeatAccumulator + (damageExternal * sm.HeatAccumulatorRate), 0, 10);
+ sm.AVRadiationAccumulator = Math.Clamp(sm.AVRadiationAccumulator + (damageExternal * sm.RadiationAccumulatorRate), 0, 10);
+ sm.AVLightingAccumulator = Math.Clamp(sm.AVLightingAccumulator + (damageExternal * sm.LightingAccumulatorRate), 0, 10);
+ sm.InternalEnergy = Math.Clamp(sm.InternalEnergy + (damageExternal * sm.InternalEnergyAccumulatorRate), 0, 10);
- _sound.PlayPvs(SupermatterComponent.SupermatterZapSound, uid);
- _lightning.ShootRandomLightnings(uid, 3, (int) strength < 1 ? 1 : (int) strength, lightningProto);
- Comp(uid).Intensity = 1 + strength;
+ if (sm.AVLightingAccumulator > sm.LightingAccumulatorThreshold)
+ {
+ var lightningProto = sm.LightningPrototypeIDs[(int)Math.Clamp(sm.AVLightingAccumulator, 0, 3)];
+ _lightning.ShootRandomLightnings(uid, 3, (int)sm.AVLightingAccumulator, lightningProto);
+ sm.AVLightingAccumulator = 0;
+ }
+
+ Comp(uid).Intensity = 1 + sm.AVRadiationAccumulator;
+ sm.AVRadiationAccumulator /= 2;
+ sm.InternalEnergy /= 2;
+
+ var mix = _atmos.GetContainingMixture((uid, Transform(uid)), true, true) ?? new();
+ mix.Temperature += sm.AVHeatAccumulator * 4;
+ sm.AVHeatAccumulator /= sm.ThermalСonductivity;
}
///
/// React to damage dealt by all doodads.
@@ -196,11 +207,8 @@ public sealed class SupermatterSystem : EntitySystem
sm.TempLimit = Math.Max(tempLimitBase + tempLimitGas + tempLimitMoles, Atmospherics.TCMB);
- var damageExternal = sm.ExternalDamage * Math.Clamp((sm.DamageEmergencyPoint - sm.Damage) / sm.DamageEmergencyPoint, 0, 1);
- sm.ExternalDamage = 0f;
-
var damageHeat = Math.Clamp((sm.AbsorbedGasMix.Temperature - sm.TempLimit) / 24000, 0, .15f);
- var damagePower = Math.Clamp((sm.InternalEnergy - SupermatterComponent.PowerPenaltyThreshold) / 40000, 0, .1f);
+ var damagePower = Math.Clamp((sm.InternalEnergy - SupermatterComponent.PowerPenaltyThreshold), 0, .1f);
var damageMoles = Math.Clamp((sm.AbsorbedGasMix.TotalMoles - SupermatterComponent.MolePenaltyThreshold) / 3200, 0, .1f);
var damageHealHeat = 0f;
@@ -208,7 +216,7 @@ public sealed class SupermatterSystem : EntitySystem
if (sm.AbsorbedGasMix.TotalMoles > 0)
damageHealHeat = Math.Clamp((sm.AbsorbedGasMix.TotalMoles - sm.TempLimit) / 6000, -.1f, 0);
- var totalDamage = damageExternal + damageHeat + damagePower + damageMoles + damageHealHeat;
+ var totalDamage = damageHeat + damagePower + damageMoles + damageHealHeat;
sm.Damage += Math.Max(totalDamage, 0);
@@ -235,7 +243,7 @@ public sealed class SupermatterSystem : EntitySystem
mergeMix.Temperature = Math.Clamp(mergeMix.Temperature, Atmospherics.TCMB, 2500 * sm.WasteMultiplier);
mergeMix.AdjustMoles(Gas.Plasma, Math.Max(.65f * sm.InternalEnergy * sm.WasteMultiplier * SupermatterComponent.PlasmaReleaseModifier, 0));
- mergeMix.AdjustMoles(Gas.Oxygen, Math.Max((.65f + mergeMix.Temperature * sm.WasteMultiplier - Atmospherics.T0C) * SupermatterComponent.OxygenReleaseModifier, 0));
+ mergeMix.AdjustMoles(Gas.Oxygen, Math.Max(.65f * sm.InternalEnergy * sm.WasteMultiplier * SupermatterComponent.OxygenReleaseModifier, 0));
_atmos.Merge(mix, mergeMix);
}
@@ -282,7 +290,7 @@ public sealed class SupermatterSystem : EntitySystem
for (var i = 0; i < amount; i++)
{
- _anomaly.SpawnOnRandomGridLocation((EntityUid) grid, "RandomAnomalySpawner");
+ _anomaly.SpawnOnRandomGridLocation((EntityUid)grid, "RandomAnomalySpawner");
_adminLogger.Add(LogType.Anomaly, LogImpact.Medium, $"An anomaly has been spawned by the supermatter crystal.");
}
}
@@ -295,6 +303,13 @@ public sealed class SupermatterSystem : EntitySystem
if (EntityManager.IsQueuedForDeletion(uid))
return;
+ if (_tagSystem.HasTag(uid, "EmitterBolt")
+ || HasComp(uid))
+ return;
+
+ if (TryComp(smUid, out var sm))
+ sm.AVExternalDamage += 1f;
+
_sound.PlayPvs(SupermatterComponent.VaporizeSound, smUid);
EntityManager.QueueDeleteEntity(uid);
@@ -302,14 +317,13 @@ public sealed class SupermatterSystem : EntitySystem
_adminLogger.Add(LogType.Action, LogImpact.High, $"{EntityManager.ToPrettyString(uid):player} has been vaporized by the supermatter.");
}
-
///
/// Handle supermatter delamination and the end of the station.
///
private void Delaminate(EntityUid uid, SupermatterComponent sm)
{
- sm.PreferredDelamType = sm.PreferredDelamType ?? (int) ChooseDelam(sm);
- Delaminate(uid, sm, (DelamType) sm.PreferredDelamType);
+ sm.PreferredDelamType = sm.PreferredDelamType ?? (int)ChooseDelam(sm);
+ Delaminate(uid, sm, (DelamType)sm.PreferredDelamType);
}
///
@@ -413,8 +427,6 @@ public sealed class SupermatterSystem : EntitySystem
sm.DelamCountdownAccumulator++;
}
-
-
private void OnCollide(EntityUid uid, SupermatterComponent sm, StartCollideEvent args)
{
if (!sm.Activated)
@@ -446,7 +458,7 @@ public sealed class SupermatterSystem : EntitySystem
private void OnGetSliver(EntityUid uid, SupermatterComponent sm, SupermatterDoAfterEvent args)
{
sm.Damage += 10; // your criminal actions will not go unnoticed
- SupermatterAlert(uid, Loc.GetString("supermatter-announcement-tamper", ("integrity", (int) (100 - sm.Damage))));
+ SupermatterAlert(uid, Loc.GetString("supermatter-announcement-tamper", ("integrity", (int)(100 - sm.Damage))));
Spawn(sm.SliverPrototype, _transform.GetMapCoordinates(args.User));
_popup.PopupClient(Loc.GetString("supermatter-tamper-end"), args.User);
@@ -457,17 +469,14 @@ public sealed class SupermatterSystem : EntitySystem
if (!sm.Activated)
sm.Activated = true;
- sm.ExternalDamage += args.DamageDelta?.GetTotal().Value / 1000 ?? 0;
-
- Cycle(uid, sm);
- ProcessPower(uid, sm);
+ sm.AVExternalDamage += args.DamageDelta?.GetTotal().Value / 100 ?? 0;
}
private void OnExamine(EntityUid uid, SupermatterComponent sm, ExaminedEvent args)
{
if (args.IsInDetailsRange) // get all close to it
{
- args.PushMarkup(Loc.GetString("supermatter-examine-integrity", ("integrity", (int) (100 - sm.Damage))));
+ args.PushMarkup(Loc.GetString("supermatter-examine-integrity", ("integrity", (int)(100 - sm.Damage))));
}
}
}
diff --git a/Content.Shared/Actions/ActionContainerSystem.cs b/Content.Shared/Actions/ActionContainerSystem.cs
index dbac6063fa..840a16fa13 100644
--- a/Content.Shared/Actions/ActionContainerSystem.cs
+++ b/Content.Shared/Actions/ActionContainerSystem.cs
@@ -238,16 +238,16 @@ public sealed class ActionContainerSystem : EntitySystem
DebugTools.AssertOwner(uid, comp);
comp ??= EnsureComp(uid);
- ///if (!TryComp(actionId, out var actionData))
- /// return false;
- ///if (!TryPrototype(actionId, out var actionProto, actionData))
- /// return false;
+ if (!TryComp(actionId, out var actionData))
+ return false;
+ if (!TryPrototype(actionId, out var actionProto, actionData))
+ return false;
- ///if (HasAction(uid, actionProto.ID))
- ///{
- /// Log.Debug($"Tried to insert action {ToPrettyString(actionId)} into {ToPrettyString(uid)}. Failed due to duplicate actions.");
- /// return false;
- ///}
+ if (HasAction(uid, actionProto.ID, comp))
+ {
+ Log.Debug($"Tried to insert action {ToPrettyString(actionId)} into {ToPrettyString(uid)}. Failed due to duplicate actions.");
+ return false;
+ }
if (!_container.Insert(actionId, comp.Container))
{
diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs
index 0e29fcd98a..57b93f390c 100644
--- a/Content.Shared/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs
@@ -28,6 +28,7 @@ public sealed partial class SleepingSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+ [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
[Dependency] private readonly BlindableSystem _blindableSystem = default!;
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -241,6 +242,8 @@ public sealed partial class SleepingSystem : EntitySystem
{
RemComp(ent);
_actionsSystem.RemoveAction(ent, ent.Comp.WakeAction);
+ if (ent.Comp.WakeAction != null)
+ _actionContainer.RemoveAction(ent.Comp.WakeAction.Value);
var ev = new SleepStateChangedEvent(false);
RaiseLocalEvent(ent, ref ev);
diff --git a/Content.Shared/Weapons/Reflect/ReflectComponent.cs b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
index 8418c1f3ef..724b4ae697 100644
--- a/Content.Shared/Weapons/Reflect/ReflectComponent.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
@@ -25,6 +25,9 @@ public sealed partial class ReflectComponent : Component
[DataField("spread"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
public Angle Spread = Angle.FromDegrees(45);
+ [DataField("overrideAngle"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+ public Angle? OverrideAngle = null;
+
[DataField("soundOnReflect")]
public SoundSpecifier? SoundOnReflect = new SoundPathSpecifier("/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg");
}
diff --git a/Content.Shared/Weapons/Reflect/ReflectSystem.cs b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
index 881b547f27..1c682678ec 100644
--- a/Content.Shared/Weapons/Reflect/ReflectSystem.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
@@ -104,19 +104,35 @@ public sealed class ReflectSystem : EntitySystem
return false;
}
- var rotation = _random.NextAngle(-reflect.Spread / 2, reflect.Spread / 2).Opposite();
- var existingVelocity = _physics.GetMapLinearVelocity(projectile, component: physics);
- var relativeVelocity = existingVelocity - _physics.GetMapLinearVelocity(user);
- var newVelocity = rotation.RotateVec(relativeVelocity);
+ if (reflect.OverrideAngle is not null)
+ {
+ var overrideAngle = _transform.GetWorldRotation(reflector) + reflect.OverrideAngle.Value;
- // Have the velocity in world terms above so need to convert it back to local.
- var difference = newVelocity - existingVelocity;
+ var existingVelocity = _physics.GetMapLinearVelocity(projectile, component: physics);
+ var relativeVelocity = existingVelocity - _physics.GetMapLinearVelocity(user);
+ var speed = relativeVelocity.Length();
- _physics.SetLinearVelocity(projectile, physics.LinearVelocity + difference, body: physics);
+ var newVelocity = new Vector2((float)Math.Cos(overrideAngle), (float)Math.Sin(overrideAngle)) * speed;
- var locRot = Transform(projectile).LocalRotation;
- var newRot = rotation.RotateVec(locRot.ToVec());
- _transform.SetLocalRotation(projectile, newRot.ToAngle());
+ var difference = newVelocity - existingVelocity;
+ _physics.SetLinearVelocity(projectile, physics.LinearVelocity + difference, body: physics);
+ _transform.SetLocalRotation(projectile, overrideAngle);
+ }
+ else
+ {
+ var rotation = _random.NextAngle(-reflect.Spread / 2, reflect.Spread / 2).Opposite();
+ var existingVelocity = _physics.GetMapLinearVelocity(projectile, component: physics);
+ var relativeVelocity = existingVelocity - _physics.GetMapLinearVelocity(user);
+ var newVelocity = rotation.RotateVec(relativeVelocity);
+
+ var difference = newVelocity - existingVelocity;
+
+ _physics.SetLinearVelocity(projectile, physics.LinearVelocity + difference, body: physics);
+
+ var locRot = Transform(projectile).LocalRotation;
+ var newRot = rotation.RotateVec(locRot.ToVec());
+ _transform.SetLocalRotation(projectile, newRot.ToAngle());
+ }
if (_netManager.IsServer)
{
@@ -176,9 +192,17 @@ public sealed class ReflectSystem : EntitySystem
_popup.PopupEntity(Loc.GetString("reflect-shot"), user);
_audio.PlayPvs(reflect.SoundOnReflect, user, AudioHelpers.WithVariation(0.05f, _random));
}
-
- var spread = _random.NextAngle(-reflect.Spread / 2, reflect.Spread / 2);
- newDirection = -spread.RotateVec(direction);
+ if (reflect.OverrideAngle is not null)
+ {
+ var overrideAngle = _transform.GetWorldRotation(reflector) + reflect.OverrideAngle.Value;
+ newDirection = new Vector2((float)Math.Cos(overrideAngle), (float)Math.Sin(overrideAngle));
+ newDirection = newDirection.Value.Normalized();
+ }
+ else
+ {
+ var spread = _random.NextAngle(-reflect.Spread / 2, reflect.Spread / 2);
+ newDirection = -spread.RotateVec(direction);
+ }
if (shooter != null)
_adminLogger.Add(LogType.HitScanHit, LogImpact.Medium, $"{ToPrettyString(user)} reflected hitscan from {ToPrettyString(shotSource)} shot by {ToPrettyString(shooter.Value)}");
@@ -216,7 +240,7 @@ public sealed class ReflectSystem : EntitySystem
private void OnToggleReflect(EntityUid uid, ReflectComponent comp, ref ItemToggledEvent args)
{
- if (args.User is {} user)
+ if (args.User is { } user)
RefreshReflectUser(user);
}
diff --git a/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs b/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs
index 33ec1e2c51..8a3317b62f 100644
--- a/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs
+++ b/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs
@@ -4,6 +4,8 @@ using Content.Shared.Inventory;
using Content.Shared.Actions;
using Content.Shared.Inventory.Events;
using Content.Shared.Toggleable;
+using Content.Shared.PowerCell;
+using Content.Shared.PowerCell.Components;
using Content.Shared.Popups;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Network;
@@ -20,6 +22,7 @@ public sealed class NightVisionDeviceSystem : EntitySystem
[Dependency] private readonly SharedPointLightSystem _light = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedPopupSystem _popup = default!;
+ [Dependency] private readonly SharedPowerCellSystem _cell = default!;
public override void Initialize()
{
@@ -27,6 +30,9 @@ public sealed class NightVisionDeviceSystem : EntitySystem
SubscribeLocalEvent>(OnNVDTrySee);
SubscribeLocalEvent(OnNightVisionDeviceUpdateVisuals);
+
+ SubscribeLocalEvent(OnPowerCellChanged);
+ SubscribeLocalEvent(OnPowerCellSlotEmpty);
SubscribeLocalEvent(OnGetActions);
SubscribeLocalEvent(OnToggleAction);
@@ -56,7 +62,20 @@ public sealed class NightVisionDeviceSystem : EntitySystem
{
_actionsSystem.RemoveAction(uid, component.ToggleActionEntity);
}
+
+ private void OnPowerCellSlotEmpty(Entity ent, ref PowerCellSlotEmptyEvent args)
+ {
+ if (ent.Comp.isPowered)
+ Toggle(ent);
+ }
+ private void OnPowerCellChanged(Entity ent, ref PowerCellChangedEvent args)
+ {
+ if (args.Ejected || !_powerCell.HasDrawCharge(ent))
+ if (ent.Comp.isPowered)
+ Toggle(ent);
+ }
+
private void OnToggleAction(Entity ent, ref ToggleActionEvent args)
{
if (args.Handled)
@@ -68,6 +87,13 @@ public sealed class NightVisionDeviceSystem : EntitySystem
return;
}
+ Toggle(ent);
+
+ args.Handled = true;
+ }
+
+ public void Toggle(Entity ent)
+ {
var updVisEv = new NightVisionDeviceUpdateVisualsEvent();
RaiseLocalEvent(ent, ref updVisEv);
@@ -81,15 +107,22 @@ public sealed class NightVisionDeviceSystem : EntitySystem
if (!_light.TryGetLight(ent.Owner, out var light))
return;
+
+ var draw = Comp(ent.Owner);
+ _cell.QueueUpdate((ent.Owner, draw));
+ _cell.SetDrawEnabled((ent.Owner, draw), ent.Comp.Activated);
_appearance.SetData(ent, ToggleableLightVisuals.Enabled, ent.Comp.Activated);
_light.SetEnabled(ent.Owner, ent.Comp.Activated, comp: light);
- var changeEv = new NightVisionDeviceToggledEvent(args.Performer);
- RaiseLocalEvent(ent.Owner, ref changeEv);
- Dirty(ent);
+ if (TryComp(ent.Owner, out var transform))
+ {
+ var equipped = transform.ParentUid;
- args.Handled = true;
+ var changeEv = new NightVisionDeviceToggledEvent(equipped);
+ RaiseLocalEvent(ent.Owner, ref changeEv);
+ }
+ Dirty(ent);
}
}
diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
index b754f1b032..27d77b19b7 100644
--- a/Resources/Changelog/ChangelogSunrise.yml
+++ b/Resources/Changelog/ChangelogSunrise.yml
@@ -4839,3 +4839,65 @@
id: 346
time: '2024-10-30T07:08:48.0000000+00:00'
url: https://github.com/space-sunrise/space-station-14/pull/509
+- author: J C Denton
+ changes:
+ - message: "\u041D\u0435\u0431\u043E\u043B\u044C\u0448\u0438\u0435 \u043F\u0440\u0430\
+ \u0432\u043A\u0438 \u043D\u0430 SunriseMeta."
+ type: Tweak
+ id: 347
+ time: '2024-10-30T07:18:35.0000000+00:00'
+ url: https://github.com/space-sunrise/space-station-14/pull/513
+- author: Rinary, Darkrell
+ changes:
+ - message: "\u0412\u0440\u0435\u043C\u0435\u043D\u043D\u043E \u0443\u0434\u0430\u043B\
+ \u0435\u043D\u044B \u043F\u043D\u0432 \u0443 \u0441\u043A\u0430\u0444\u0430\u043D\
+ \u0434\u0440\u043E\u0432, \u0438\u0437-\u0437\u0430 \u0432\u0435\u0447\u043D\
+ \u044B\u0445 \u0436\u0430\u043B\u043E\u0431. \u0418\u0437\u0443\u0447\u0430\u0439\
+ \u0442\u0435 \u043A\u0443\u0441\u0442\u0430\u0440\u043D\u044B\u0435 \u043F\u043D\
+ \u0432."
+ type: Remove
+ - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043D\u0430\u0441\u043F\
+ \u0438\u043D\u043D\u044B\u0439 \u044D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\
+ \u0447\u0435\u0441\u043A\u0438\u0439 \u0449\u0438\u0442 \u041D\u0422."
+ type: Add
+ - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0447\u0430\u0441\
+ \u0442\u0438 \u043A\u043B\u043E\u0443\u043D\u0430 \u043A\u0438\u0431\u043E\u0440\
+ \u0433\u0430, \u043C\u0438\u0440\u043E\u0442\u0432\u043E\u0440\u0446\u0430."
+ type: Add
+ - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0441\u0443\
+ \u043F\u0435\u0440 \u043C\u0430\u0442\u0435\u0440\u0438\u044F, \u0442\u0435\u043F\
+ \u0435\u0440\u044C \u043E\u043D\u0430 \u0440\u0435\u0430\u0433\u0438\u0440\u0443\
+ \u0435\u0442 \u043D\u0430 \u044D\u043C\u0438\u0442\u0442\u0435\u0440\u044B,\
+ \ \u0438\u0437\u043B\u0443\u0447\u0430\u0435\u0442 \u0440\u0430\u0434\u0438\u0430\
+ \u0446\u0438\u044E \u0438 \u043F\u043E\u043B\u0443\u0447\u0430\u0435\u0442 \u0443\
+ \u0440\u043E\u043D \u043F\u0440\u0438 \u0438\u0441\u043F\u0430\u0440\u0435\u043D\
+ \u0438\u0438 \u043F\u0440\u0435\u0434\u043C\u0435\u0442\u043E\u0432."
+ type: Fix
+ - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0442\
+ \u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0434\u043E\u043B\u0436\
+ \u043D\u043E\u0441\u0442\u0435\u0439 \u0432 \u0440\u0430\u0446\u0438\u0438."
+ type: Fix
+ - message: "\u041F\u043E\u043B\u043D\u043E\u0441\u0442\u044C\u044E \u043F\u0435\u0440\
+ \u0435\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u0430 \u0441\u0443\u043F\u0435\
+ \u0440 \u043C\u0430\u0442\u0435\u0440\u0438\u044F(by Darkrell)"
+ type: Tweak
+ - message: "\u041F\u0440\u0430\u0432\u043A\u0438 \u0432 \u043F\u0440\u0430\u0432\
+ \u0430\u0445 \u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\
+ \u043E\u0440\u043E\u0432, loadmap|loadgrid|rmmap|rmgrid|tpgrid|mapinit, \u0431\
+ \u044B\u043B\u0438 \u0432\u044B\u043D\u0435\u0441\u0435\u043D\u044B \u0432 \u0433\
+ \u0440\u0443\u043F\u043F\u0443 \"SPAWN\"."
+ type: Tweak
+ - message: "\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u0447\u0435\u0441\u043A\
+ \u0438\u0435 \u0449\u0438\u0442\u044B \u0441\u0438\u043D\u0434\u0438\u043A\u0430\
+ \u0442\u0430 \u0430 \u0442\u0430\u043A-\u0436\u0435 \u044D\u043D\u0435\u0440\
+ \u0433\u0435\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u0449\u0438\u0442\
+ \u044B \u043E\u0431\u0440 \u0442\u0435\u043F\u0435\u0440\u044C \u044F\u0432\u043B\
+ \u044F\u044E\u0442\u044C\u0441\u044F \u043A\u043E\u043D\u0442\u0440\u0430\u0431\
+ \u0430\u043D\u0434\u043E\u0439."
+ type: Tweak
+ - message: "\u0426\u0435\u043D\u0430 AKMS \u0432 \u043A\u0430\u0440\u0433\u043E\
+ \ \u043F\u043E\u0434\u043D\u044F\u0442\u0430 \u0434\u043E 35000."
+ type: Tweak
+ id: 348
+ time: '2024-10-30T07:19:37.0000000+00:00'
+ url: https://github.com/space-sunrise/space-station-14/pull/515
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/tools/energydome.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/tools/energydome.ftl
index 831800399e..69a8ef37e9 100644
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/tools/energydome.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/tools/energydome.ftl
@@ -1,4 +1,6 @@
ent-EnergyDomeGeneratorBackpackSyndie = кроваво-красный наспинный генератор щита
.desc = Наспинный генератор щита, защищающий владельца от лазеров и пуль, но не позволяющий самому использовать оружие дальнего боя. Использует батареи.
+ent-EnergyDomeGeneratorBackpackNT = BR-50c "Бастион"
+ .desc = Наспинный генератор щита, защищающий владельца от лазеров и пуль, но не позволяющий самому использовать оружие дальнего боя. Использует батареи.
ent-EnergyDomeGeneratorPersonalNT = BT-21b "Барьер"
- .desc = Генератор щита, защищающий владельца от лазеров и пуль, но не позволяющий самому использовать оружие дальнего боя. Использует батареи.
+ .desc = Генератор щита, защищающий владельца от лазеров и пуль, но не позволяющий самому использовать оружие дальнего боя. Использует батареи.
\ No newline at end of file
diff --git a/Resources/Maps/_Sunrise/Station/meta.yml b/Resources/Maps/_Sunrise/Station/meta.yml
index 410adb0a35..6704d90c47 100644
--- a/Resources/Maps/_Sunrise/Station/meta.yml
+++ b/Resources/Maps/_Sunrise/Station/meta.yml
@@ -13,6 +13,7 @@ tilemap:
22: FloorCave
25: FloorClown
29: FloorDark
+ 5: FloorDarkPlastic
40: FloorDirt
41: FloorEighties
44: FloorFreezer
@@ -221,7 +222,7 @@ entities:
version: 6
-2,3:
ind: -2,3
- tiles: AAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ tiles: AAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
version: 6
-3,3:
ind: -3,3
@@ -289,11 +290,11 @@ entities:
version: 6
4,-2:
ind: 4,-2
- tiles: eAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAA
+ tiles: eQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAA
version: 6
3,-3:
ind: 3,-3
- tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAATQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAA
+ tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAATQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAA
version: 6
5,0:
ind: 5,0
@@ -301,7 +302,7 @@ entities:
version: 6
4,-3:
ind: 4,-3
- tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAA
+ tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAABQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAABQAAAAAAeQAAAAAAeQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAeQAAAAAAeQAAAAAABQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAABQAAAAAAeQAAAAAAeQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAeQAAAAAAeQAAAAAABQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAABQAAAAAAeQAAAAAAeQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAeQAAAAAAeQAAAAAABQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAATQAAAAAATQAAAAAABQAAAAAABQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAABQAAAAAABQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAABQAAAAAABQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAABQAAAAAABQAAAAAATQAAAAAATQAAAAAAeQAAAAAAAAAAAAAA
version: 6
2,-3:
ind: 2,-3
@@ -449,7 +450,23 @@ entities:
version: 6
5,-2:
ind: 5,-2
- tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAA
+ tiles: eQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAA
+ version: 6
+ 5,-3:
+ ind: 5,-3
+ tiles: eAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ version: 6
+ 5,-4:
+ ind: 5,-4
+ tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ version: 6
+ 4,-4:
+ ind: 4,-4
+ tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA
+ version: 6
+ 3,-4:
+ ind: 3,-4
+ tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
version: 6
- type: Broadphase
- type: Physics
@@ -644,6 +661,10 @@ entities:
3522: -37,3
3523: -37,2
3524: -38,2
+ 3569: 67,-34
+ 3570: 68,-34
+ 3571: 74,-34
+ 3572: 75,-34
- node:
color: '#FFFFFFFF'
id: BotGreyscale
@@ -1798,6 +1819,10 @@ entities:
3453: 53,-4
3525: -38,6
3526: -37,6
+ 3564: 67,-33
+ 3565: 68,-33
+ 3566: 74,-33
+ 3567: 75,-33
- node:
color: '#52B4E996'
id: DeliveryGreyscale
@@ -4954,11 +4979,27 @@ entities:
id: WarnBox
decals:
2504: -64,-14
+ - node:
+ color: '#FFFFFFFF'
+ id: WarnCornerNE
+ decals:
+ 3576: 77,-31
+ - node:
+ color: '#FFFFFFFF'
+ id: WarnCornerNW
+ decals:
+ 3573: 65,-31
- node:
color: '#FFFFFFFF'
id: WarnCornerSE
decals:
2747: -27,-26
+ 3575: 77,-41
+ - node:
+ color: '#FFFFFFFF'
+ id: WarnCornerSW
+ decals:
+ 3574: 65,-41
- node:
color: '#FFFFFFFF'
id: WarnCornerSmallGreyscaleNE
@@ -5068,6 +5109,15 @@ entities:
3269: 42,16
3270: 42,17
3271: 42,18
+ 3597: 77,-32
+ 3598: 77,-33
+ 3599: 77,-34
+ 3600: 77,-35
+ 3601: 77,-36
+ 3602: 77,-37
+ 3603: 77,-38
+ 3604: 77,-39
+ 3605: 77,-40
- node:
color: '#52B4E996'
id: WarnLineGreyscaleE
@@ -5292,6 +5342,17 @@ entities:
3536: -43,20
3537: -43,17
3543: -43,20
+ 3606: 76,-41
+ 3607: 75,-41
+ 3608: 74,-41
+ 3609: 73,-41
+ 3610: 72,-41
+ 3611: 71,-41
+ 3612: 70,-41
+ 3613: 69,-41
+ 3614: 68,-41
+ 3615: 67,-41
+ 3616: 66,-41
- node:
color: '#FFFFFFFF'
id: WarnLineS
@@ -5355,6 +5416,15 @@ entities:
3546: -42,16
3549: -42,19
3550: -42,18
+ 3577: 65,-32
+ 3578: 65,-33
+ 3579: 65,-34
+ 3580: 65,-35
+ 3581: 65,-36
+ 3582: 65,-37
+ 3583: 65,-38
+ 3584: 65,-39
+ 3585: 65,-40
- node:
color: '#DE3A3A96'
id: WarnLineW
@@ -5425,6 +5495,17 @@ entities:
3528: -44,17
3544: -43,14
3552: -43,17
+ 3586: 66,-31
+ 3587: 67,-31
+ 3588: 68,-31
+ 3589: 69,-31
+ 3590: 70,-31
+ 3591: 71,-31
+ 3592: 72,-31
+ 3593: 73,-31
+ 3594: 74,-31
+ 3595: 75,-31
+ 3596: 76,-31
- node:
angle: -3.141592653589793 rad
color: '#FFFFFFFF'
@@ -6551,8 +6632,8 @@ entities:
15,-4:
0: 65535
16,-8:
- 1: 58115
- 0: 236
+ 1: 57600
+ 0: 238
16,-7:
1: 242
0: 61440
@@ -7423,52 +7504,80 @@ entities:
1: 8928
6: 32768
16,-9:
- 0: 61166
- 1: 1
+ 0: 61038
17,-8:
- 0: 31487
- 1: 32768
+ 0: 51455
+ 1: 8192
17,-7:
- 1: 3536
- 0: 61991
+ 1: 1363
+ 0: 63628
17,-6:
1: 35037
6: 12288
0: 34
17,-9:
- 0: 65535
+ 0: 40335
18,-8:
- 0: 153
- 1: 12898
+ 0: 4351
+ 1: 8192
18,-7:
- 1: 47858
+ 0: 61441
+ 1: 4082
18,-6:
- 1: 43770
+ 1: 43775
18,-9:
- 0: 48027
- 1: 96
+ 0: 52495
19,-8:
0: 51
19,-7:
- 1: 8448
- 0: 512
+ 1: 1472
+ 0: 64000
19,-6:
- 1: 8754
+ 1: 8887
+ 0: 8
19,-9:
- 0: 13107
+ 0: 13307
+ 1: 2048
+ 20,-7:
+ 1: 16
+ 0: 64973
+ 20,-6:
+ 0: 61133
+ 1: 16
20,-5:
0: 36608
1: 128
12,-10:
- 1: 61696
+ 1: 61704
11,-10:
1: 7936
+ 12,-11:
+ 1: 32768
+ 13,-11:
+ 1: 55304
13,-10:
- 1: 62737
+ 0: 13
+ 1: 62738
+ 13,-12:
+ 1: 34944
+ 14,-12:
+ 0: 4368
+ 1: 1
+ 14,-11:
+ 0: 4353
+ 1: 16
14,-10:
+ 0: 1
1: 64000
+ 14,-13:
+ 1: 4231
+ 0: 368
15,-10:
- 1: 61952
+ 1: 62148
+ 15,-12:
+ 1: 53079
+ 15,-11:
+ 1: 53087
20,4:
1: 5377
0: 244
@@ -7533,12 +7642,38 @@ entities:
24,3:
1: 609
0: 63760
+ 16,-12:
+ 0: 60928
+ 16,-11:
+ 0: 58606
16,-10:
- 0: 61152
+ 0: 61038
+ 17,-12:
+ 0: 63232
+ 17,-11:
+ 0: 61695
17,-10:
- 0: 65520
+ 0: 65295
+ 18,-12:
+ 0: 65280
+ 18,-11:
+ 0: 61695
18,-10:
- 0: 13072
+ 0: 65295
+ 19,-12:
+ 0: 13056
+ 19,-11:
+ 0: 12595
+ 1: 32768
+ 19,-10:
+ 0: 48115
+ 1: 8
+ 20,-10:
+ 1: 34959
+ 0: 30576
+ 20,-9:
+ 0: 631
+ 1: 11656
8,-13:
0: 6004
9,-12:
@@ -8379,8 +8514,58 @@ entities:
26,-6:
1: 34800
0: 28672
+ 20,-8:
+ 0: 56585
+ 1: 150
+ 21,-8:
+ 0: 65283
+ 1: 16
+ 21,-7:
+ 0: 65535
+ 21,-6:
+ 0: 65535
+ 21,-9:
+ 0: 8736
+ 1: 17474
+ 22,-8:
+ 0: 29440
+ 22,-7:
+ 0: 30583
+ 22,-6:
+ 0: 30583
22,-5:
0: 3840
+ 20,-12:
+ 1: 8737
+ 0: 4368
+ 20,-13:
+ 1: 4096
+ 20,-11:
+ 1: 45
+ 0: 208
+ 21,-11:
+ 1: 8790
+ 0: 32
+ 21,-10:
+ 0: 546
+ 1: 9284
+ 19,-13:
+ 0: 61440
+ 1: 3840
+ 16,-13:
+ 1: 33859
+ 0: 16432
+ 15,-13:
+ 1: 30
+ 0: 224
+ 17,-13:
+ 0: 61440
+ 1: 3840
+ 18,-13:
+ 1: 30720
+ 0: 32768
+ 13,-13:
+ 1: 2184
uniqueMixes:
- volume: 2500
temperature: 293.15
@@ -8508,6 +8693,15 @@ entities:
- type: Transform
pos: -42.475952,-54.406525
parent: 5350
+- proto: ActionToggleInternals
+ entities:
+ - uid: 27246
+ components:
+ - type: Transform
+ parent: 27245
+ - type: InstantAction
+ originalIconColor: '#FFFFFFFF'
+ container: 27245
- proto: AirAlarm
entities:
- uid: 9242
@@ -9974,6 +10168,32 @@ entities:
- 19501
- 19500
- 19499
+ - uid: 27257
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 69.5,-32.5
+ parent: 5350
+ - type: DeviceList
+ devices:
+ - 27171
+ - 27172
+ - 27170
+ - 27167
+ - 27168
+ - 27169
+ - 27355
+ - uid: 27488
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 64.5,-30.5
+ parent: 5350
+ - type: DeviceList
+ devices:
+ - 27273
+ - 27486
+ - 27272
- proto: AirCanister
entities:
- uid: 2431
@@ -10206,10 +10426,53 @@ entities:
- type: Transform
pos: 54.5,-9.5
parent: 5350
- - uid: 11498
+ - uid: 27057
components:
- type: Transform
- pos: 69.5,-29.5
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-34.5
+ parent: 5350
+ - uid: 27061
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 78.5,-38.5
+ parent: 5350
+ - uid: 27084
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 66.5,-41.5
+ parent: 5350
+ - uid: 27085
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 76.5,-41.5
+ parent: 5350
+ - uid: 27159
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 71.5,-32.5
+ parent: 5350
+ - uid: 27160
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 71.5,-34.5
+ parent: 5350
+ - uid: 27554
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 81.5,-33.5
+ parent: 5350
+ - uid: 27571
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 81.5,-24.5
parent: 5350
- proto: AirlockAtmosphericsLocked
entities:
@@ -10887,14 +11150,16 @@ entities:
parent: 5350
- proto: AirlockExternalGlassAtmosphericsLocked
entities:
+ - uid: 3508
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-24.5
+ parent: 5350
- uid: 11284
components:
- type: Transform
- pos: 64.5,-24.5
- parent: 5350
- - uid: 11285
- components:
- - type: Transform
+ rot: -1.5707963267948966 rad
pos: 67.5,-24.5
parent: 5350
- uid: 27555
@@ -10903,6 +11168,12 @@ entities:
rot: 3.141592653589793 rad
pos: 71.5,-29.5
parent: 5350
+ - uid: 27584
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 81.5,-21.5
+ parent: 5350
- proto: AirlockExternalGlassCargoLocked
entities:
- uid: 3442
@@ -11743,11 +12014,6 @@ entities:
- type: Transform
pos: -25.5,9.5
parent: 5350
- - uid: 3508
- components:
- - type: Transform
- pos: -23.5,10.5
- parent: 5350
- uid: 3891
components:
- type: Transform
@@ -11819,6 +12085,12 @@ entities:
- type: Transform
pos: -21.5,24.5
parent: 5350
+ - uid: 11285
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: -23.5,10.5
+ parent: 5350
- uid: 11809
components:
- type: Transform
@@ -13265,6 +13537,24 @@ entities:
- type: DeviceNetwork
deviceLists:
- 9242
+ - uid: 27355
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 71.5,-35.5
+ parent: 5350
+ - type: DeviceNetwork
+ deviceLists:
+ - 27257
+ - uid: 27486
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 71.5,-30.5
+ parent: 5350
+ - type: DeviceNetwork
+ deviceLists:
+ - 27488
- proto: AltarConvertMaint
entities:
- uid: 22866
@@ -13884,6 +14174,17 @@ entities:
rot: -1.5707963267948966 rad
pos: 30.5,24.5
parent: 5350
+ - uid: 27394
+ components:
+ - type: Transform
+ pos: 73.5,-29.5
+ parent: 5350
+ - uid: 27483
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 74.5,-46.5
+ parent: 5350
- proto: APCHyperCapacity
entities:
- uid: 6623
@@ -14019,10 +14320,9 @@ entities:
- uid: 27228
components:
- type: Transform
- anchored: False
rot: 3.141592653589793 rad
- pos: 83.77101,-35.91482
- parent: 951
+ pos: 81.5,-33.5
+ parent: 5350
- proto: AtmosFixBlockerMarker
entities:
- uid: 11609
@@ -22528,6 +22828,11 @@ entities:
- type: Transform
pos: -29.5,30.5
parent: 5350
+ - uid: 11269
+ components:
+ - type: Transform
+ pos: -19.5,28.5
+ parent: 5350
- uid: 11360
components:
- type: Transform
@@ -34478,11 +34783,301 @@ entities:
- type: Transform
pos: -9.5,-14.5
parent: 5350
- - uid: 27035
+ - uid: 27032
+ components:
+ - type: Transform
+ pos: -18.5,26.5
+ parent: 5350
+ - uid: 27033
+ components:
+ - type: Transform
+ pos: -16.5,26.5
+ parent: 5350
+ - uid: 27414
+ components:
+ - type: Transform
+ pos: 73.5,-29.5
+ parent: 5350
+ - uid: 27415
+ components:
+ - type: Transform
+ pos: 73.5,-30.5
+ parent: 5350
+ - uid: 27416
+ components:
+ - type: Transform
+ pos: 73.5,-31.5
+ parent: 5350
+ - uid: 27417
+ components:
+ - type: Transform
+ pos: 72.5,-31.5
+ parent: 5350
+ - uid: 27418
+ components:
+ - type: Transform
+ pos: 71.5,-31.5
+ parent: 5350
+ - uid: 27419
+ components:
+ - type: Transform
+ pos: 71.5,-32.5
+ parent: 5350
+ - uid: 27420
+ components:
+ - type: Transform
+ pos: 71.5,-33.5
+ parent: 5350
+ - uid: 27421
+ components:
+ - type: Transform
+ pos: 71.5,-34.5
+ parent: 5350
+ - uid: 27422
+ components:
+ - type: Transform
+ pos: 73.5,-31.5
+ parent: 5350
+ - uid: 27423
+ components:
+ - type: Transform
+ pos: 74.5,-31.5
+ parent: 5350
+ - uid: 27424
+ components:
+ - type: Transform
+ pos: 75.5,-31.5
+ parent: 5350
+ - uid: 27425
+ components:
+ - type: Transform
+ pos: 76.5,-31.5
+ parent: 5350
+ - uid: 27426
+ components:
+ - type: Transform
+ pos: 77.5,-31.5
+ parent: 5350
+ - uid: 27427
+ components:
+ - type: Transform
+ pos: 77.5,-31.5
+ parent: 5350
+ - uid: 27428
+ components:
+ - type: Transform
+ pos: 77.5,-32.5
+ parent: 5350
+ - uid: 27429
+ components:
+ - type: Transform
+ pos: 77.5,-34.5
+ parent: 5350
+ - uid: 27430
+ components:
+ - type: Transform
+ pos: 77.5,-33.5
+ parent: 5350
+ - uid: 27431
+ components:
+ - type: Transform
+ pos: 78.5,-34.5
+ parent: 5350
+ - uid: 27432
+ components:
+ - type: Transform
+ pos: 79.5,-34.5
+ parent: 5350
+ - uid: 27433
+ components:
+ - type: Transform
+ pos: 80.5,-34.5
+ parent: 5350
+ - uid: 27434
+ components:
+ - type: Transform
+ pos: 81.5,-34.5
+ parent: 5350
+ - uid: 27435
+ components:
+ - type: Transform
+ pos: 77.5,-35.5
+ parent: 5350
+ - uid: 27436
+ components:
+ - type: Transform
+ pos: 77.5,-36.5
+ parent: 5350
+ - uid: 27437
+ components:
+ - type: Transform
+ pos: 77.5,-37.5
+ parent: 5350
+ - uid: 27438
+ components:
+ - type: Transform
+ pos: 77.5,-38.5
+ parent: 5350
+ - uid: 27439
+ components:
+ - type: Transform
+ pos: 78.5,-38.5
+ parent: 5350
+ - uid: 27440
+ components:
+ - type: Transform
+ pos: 77.5,-39.5
+ parent: 5350
+ - uid: 27441
+ components:
+ - type: Transform
+ pos: 77.5,-40.5
+ parent: 5350
+ - uid: 27442
+ components:
+ - type: Transform
+ pos: 76.5,-40.5
+ parent: 5350
+ - uid: 27443
+ components:
+ - type: Transform
+ pos: 76.5,-41.5
+ parent: 5350
+ - uid: 27444
+ components:
+ - type: Transform
+ pos: 76.5,-41.5
+ parent: 5350
+ - uid: 27445
+ components:
+ - type: Transform
+ pos: 76.5,-42.5
+ parent: 5350
+ - uid: 27446
+ components:
+ - type: Transform
+ pos: 76.5,-43.5
+ parent: 5350
+ - uid: 27447
+ components:
+ - type: Transform
+ pos: 75.5,-43.5
+ parent: 5350
+ - uid: 27448
+ components:
+ - type: Transform
+ pos: 74.5,-43.5
+ parent: 5350
+ - uid: 27449
+ components:
+ - type: Transform
+ pos: 73.5,-43.5
+ parent: 5350
+ - uid: 27450
+ components:
+ - type: Transform
+ pos: 72.5,-43.5
+ parent: 5350
+ - uid: 27451
+ components:
+ - type: Transform
+ pos: 71.5,-43.5
+ parent: 5350
+ - uid: 27452
+ components:
+ - type: Transform
+ pos: 70.5,-43.5
+ parent: 5350
+ - uid: 27453
+ components:
+ - type: Transform
+ pos: 69.5,-43.5
+ parent: 5350
+ - uid: 27454
+ components:
+ - type: Transform
+ pos: 68.5,-43.5
+ parent: 5350
+ - uid: 27455
+ components:
+ - type: Transform
+ pos: 67.5,-43.5
+ parent: 5350
+ - uid: 27456
+ components:
+ - type: Transform
+ pos: 67.5,-44.5
+ parent: 5350
+ - uid: 27457
+ components:
+ - type: Transform
+ pos: 67.5,-45.5
+ parent: 5350
+ - uid: 27459
+ components:
+ - type: Transform
+ pos: 68.5,-30.5
+ parent: 5350
+ - uid: 27460
+ components:
+ - type: Transform
+ pos: 69.5,-30.5
+ parent: 5350
+ - uid: 27461
+ components:
+ - type: Transform
+ pos: 70.5,-30.5
+ parent: 5350
+ - uid: 27462
+ components:
+ - type: Transform
+ pos: 71.5,-30.5
+ parent: 5350
+ - uid: 27464
+ components:
+ - type: Transform
+ pos: 65.5,-31.5
+ parent: 5350
+ - uid: 27465
+ components:
+ - type: Transform
+ pos: 65.5,-30.5
+ parent: 5350
+ - uid: 27466
+ components:
+ - type: Transform
+ pos: 67.5,-30.5
+ parent: 5350
+ - uid: 27467
+ components:
+ - type: Transform
+ pos: 66.5,-30.5
+ parent: 5350
+ - uid: 27471
+ components:
+ - type: Transform
+ pos: 79.5,-38.5
+ parent: 5350
+ - uid: 27553
+ components:
+ - type: Transform
+ pos: 81.5,-33.5
+ parent: 5350
+ - uid: 27563
components:
- type: Transform
pos: 106.5,1.5
parent: 5350
+ - uid: 27623
+ components:
+ - type: Transform
+ pos: 71.5,-28.5
+ parent: 5350
+ - uid: 27624
+ components:
+ - type: Transform
+ pos: 71.5,-29.5
+ parent: 5350
- proto: CableApcStack
entities:
- uid: 1550
@@ -37502,30 +38097,10 @@ entities:
- type: Transform
pos: -32.5,49.5
parent: 5350
- - uid: 11245
+ - uid: 11248
components:
- type: Transform
- pos: 67.5,-31.5
- parent: 5350
- - uid: 11272
- components:
- - type: Transform
- pos: 69.5,-34.5
- parent: 5350
- - uid: 11274
- components:
- - type: Transform
- pos: 69.5,-32.5
- parent: 5350
- - uid: 11278
- components:
- - type: Transform
- pos: 69.5,-33.5
- parent: 5350
- - uid: 11279
- components:
- - type: Transform
- pos: 69.5,-31.5
+ pos: 66.5,-31.5
parent: 5350
- uid: 11877
components:
@@ -43142,16 +43717,6 @@ entities:
- type: Transform
pos: 63.5,0.5
parent: 5350
- - uid: 24239
- components:
- - type: Transform
- pos: 68.5,-31.5
- parent: 5350
- - uid: 24240
- components:
- - type: Transform
- pos: 66.5,-31.5
- parent: 5350
- uid: 24241
components:
- type: Transform
@@ -43502,6 +44067,181 @@ entities:
- type: Transform
pos: 103.5,13.5
parent: 5350
+ - uid: 27585
+ components:
+ - type: Transform
+ pos: 86.5,-26.5
+ parent: 5350
+ - uid: 27589
+ components:
+ - type: Transform
+ pos: 86.5,-24.5
+ parent: 5350
+ - uid: 27590
+ components:
+ - type: Transform
+ pos: 86.5,-25.5
+ parent: 5350
+ - uid: 27591
+ components:
+ - type: Transform
+ pos: 85.5,-26.5
+ parent: 5350
+ - uid: 27592
+ components:
+ - type: Transform
+ pos: 84.5,-26.5
+ parent: 5350
+ - uid: 27593
+ components:
+ - type: Transform
+ pos: 82.5,-26.5
+ parent: 5350
+ - uid: 27594
+ components:
+ - type: Transform
+ pos: 83.5,-26.5
+ parent: 5350
+ - uid: 27595
+ components:
+ - type: Transform
+ pos: 81.5,-26.5
+ parent: 5350
+ - uid: 27596
+ components:
+ - type: Transform
+ pos: 80.5,-26.5
+ parent: 5350
+ - uid: 27597
+ components:
+ - type: Transform
+ pos: 79.5,-26.5
+ parent: 5350
+ - uid: 27598
+ components:
+ - type: Transform
+ pos: 78.5,-26.5
+ parent: 5350
+ - uid: 27599
+ components:
+ - type: Transform
+ pos: 78.5,-25.5
+ parent: 5350
+ - uid: 27600
+ components:
+ - type: Transform
+ pos: 77.5,-25.5
+ parent: 5350
+ - uid: 27601
+ components:
+ - type: Transform
+ pos: 75.5,-25.5
+ parent: 5350
+ - uid: 27602
+ components:
+ - type: Transform
+ pos: 76.5,-25.5
+ parent: 5350
+ - uid: 27603
+ components:
+ - type: Transform
+ pos: 74.5,-25.5
+ parent: 5350
+ - uid: 27604
+ components:
+ - type: Transform
+ pos: 73.5,-25.5
+ parent: 5350
+ - uid: 27605
+ components:
+ - type: Transform
+ pos: 73.5,-26.5
+ parent: 5350
+ - uid: 27606
+ components:
+ - type: Transform
+ pos: 73.5,-27.5
+ parent: 5350
+ - uid: 27607
+ components:
+ - type: Transform
+ pos: 69.5,-27.5
+ parent: 5350
+ - uid: 27608
+ components:
+ - type: Transform
+ pos: 70.5,-27.5
+ parent: 5350
+ - uid: 27609
+ components:
+ - type: Transform
+ pos: 71.5,-27.5
+ parent: 5350
+ - uid: 27610
+ components:
+ - type: Transform
+ pos: 72.5,-27.5
+ parent: 5350
+ - uid: 27611
+ components:
+ - type: Transform
+ pos: 68.5,-27.5
+ parent: 5350
+ - uid: 27612
+ components:
+ - type: Transform
+ pos: 68.5,-26.5
+ parent: 5350
+ - uid: 27613
+ components:
+ - type: Transform
+ pos: 67.5,-26.5
+ parent: 5350
+ - uid: 27614
+ components:
+ - type: Transform
+ pos: 66.5,-26.5
+ parent: 5350
+ - uid: 27615
+ components:
+ - type: Transform
+ pos: 65.5,-26.5
+ parent: 5350
+ - uid: 27616
+ components:
+ - type: Transform
+ pos: 64.5,-26.5
+ parent: 5350
+ - uid: 27617
+ components:
+ - type: Transform
+ pos: 63.5,-26.5
+ parent: 5350
+ - uid: 27618
+ components:
+ - type: Transform
+ pos: 63.5,-27.5
+ parent: 5350
+ - uid: 27619
+ components:
+ - type: Transform
+ pos: 63.5,-28.5
+ parent: 5350
+ - uid: 27620
+ components:
+ - type: Transform
+ pos: 63.5,-29.5
+ parent: 5350
+ - uid: 27621
+ components:
+ - type: Transform
+ pos: 63.5,-30.5
+ parent: 5350
+ - uid: 27622
+ components:
+ - type: Transform
+ pos: 63.5,-31.5
+ parent: 5350
- proto: CableHVStack
entities:
- uid: 1551
@@ -50676,6 +51416,341 @@ entities:
- type: Transform
pos: 29.5,20.5
parent: 5350
+ - uid: 27278
+ components:
+ - type: Transform
+ pos: 53.5,-24.5
+ parent: 5350
+ - uid: 27295
+ components:
+ - type: Transform
+ pos: 52.5,-21.5
+ parent: 5350
+ - uid: 27296
+ components:
+ - type: Transform
+ pos: 52.5,-22.5
+ parent: 5350
+ - uid: 27297
+ components:
+ - type: Transform
+ pos: 52.5,-23.5
+ parent: 5350
+ - uid: 27298
+ components:
+ - type: Transform
+ pos: 52.5,-24.5
+ parent: 5350
+ - uid: 27299
+ components:
+ - type: Transform
+ pos: 54.5,-24.5
+ parent: 5350
+ - uid: 27300
+ components:
+ - type: Transform
+ pos: 55.5,-24.5
+ parent: 5350
+ - uid: 27301
+ components:
+ - type: Transform
+ pos: 57.5,-24.5
+ parent: 5350
+ - uid: 27302
+ components:
+ - type: Transform
+ pos: 56.5,-24.5
+ parent: 5350
+ - uid: 27303
+ components:
+ - type: Transform
+ pos: 58.5,-24.5
+ parent: 5350
+ - uid: 27304
+ components:
+ - type: Transform
+ pos: 59.5,-24.5
+ parent: 5350
+ - uid: 27305
+ components:
+ - type: Transform
+ pos: 60.5,-24.5
+ parent: 5350
+ - uid: 27306
+ components:
+ - type: Transform
+ pos: 61.5,-24.5
+ parent: 5350
+ - uid: 27307
+ components:
+ - type: Transform
+ pos: 62.5,-24.5
+ parent: 5350
+ - uid: 27308
+ components:
+ - type: Transform
+ pos: 63.5,-24.5
+ parent: 5350
+ - uid: 27309
+ components:
+ - type: Transform
+ pos: 64.5,-24.5
+ parent: 5350
+ - uid: 27310
+ components:
+ - type: Transform
+ pos: 65.5,-24.5
+ parent: 5350
+ - uid: 27311
+ components:
+ - type: Transform
+ pos: 66.5,-24.5
+ parent: 5350
+ - uid: 27312
+ components:
+ - type: Transform
+ pos: 67.5,-24.5
+ parent: 5350
+ - uid: 27313
+ components:
+ - type: Transform
+ pos: 68.5,-24.5
+ parent: 5350
+ - uid: 27314
+ components:
+ - type: Transform
+ pos: 69.5,-24.5
+ parent: 5350
+ - uid: 27315
+ components:
+ - type: Transform
+ pos: 70.5,-24.5
+ parent: 5350
+ - uid: 27316
+ components:
+ - type: Transform
+ pos: 71.5,-24.5
+ parent: 5350
+ - uid: 27318
+ components:
+ - type: Transform
+ pos: 71.5,-25.5
+ parent: 5350
+ - uid: 27319
+ components:
+ - type: Transform
+ pos: 71.5,-27.5
+ parent: 5350
+ - uid: 27320
+ components:
+ - type: Transform
+ pos: 71.5,-28.5
+ parent: 5350
+ - uid: 27321
+ components:
+ - type: Transform
+ pos: 71.5,-29.5
+ parent: 5350
+ - uid: 27322
+ components:
+ - type: Transform
+ pos: 71.5,-30.5
+ parent: 5350
+ - uid: 27323
+ components:
+ - type: Transform
+ pos: 71.5,-26.5
+ parent: 5350
+ - uid: 27324
+ components:
+ - type: Transform
+ pos: 67.5,-45.5
+ parent: 5350
+ - uid: 27325
+ components:
+ - type: Transform
+ pos: 67.5,-44.5
+ parent: 5350
+ - uid: 27326
+ components:
+ - type: Transform
+ pos: 67.5,-43.5
+ parent: 5350
+ - uid: 27327
+ components:
+ - type: Transform
+ pos: 66.5,-43.5
+ parent: 5350
+ - uid: 27328
+ components:
+ - type: Transform
+ pos: 66.5,-42.5
+ parent: 5350
+ - uid: 27329
+ components:
+ - type: Transform
+ pos: 75.5,-45.5
+ parent: 5350
+ - uid: 27330
+ components:
+ - type: Transform
+ pos: 75.5,-44.5
+ parent: 5350
+ - uid: 27331
+ components:
+ - type: Transform
+ pos: 75.5,-43.5
+ parent: 5350
+ - uid: 27332
+ components:
+ - type: Transform
+ pos: 76.5,-43.5
+ parent: 5350
+ - uid: 27333
+ components:
+ - type: Transform
+ pos: 76.5,-42.5
+ parent: 5350
+ - uid: 27334
+ components:
+ - type: Transform
+ pos: 68.5,-43.5
+ parent: 5350
+ - uid: 27335
+ components:
+ - type: Transform
+ pos: 69.5,-43.5
+ parent: 5350
+ - uid: 27336
+ components:
+ - type: Transform
+ pos: 71.5,-43.5
+ parent: 5350
+ - uid: 27337
+ components:
+ - type: Transform
+ pos: 72.5,-43.5
+ parent: 5350
+ - uid: 27338
+ components:
+ - type: Transform
+ pos: 74.5,-43.5
+ parent: 5350
+ - uid: 27339
+ components:
+ - type: Transform
+ pos: 70.5,-43.5
+ parent: 5350
+ - uid: 27340
+ components:
+ - type: Transform
+ pos: 73.5,-43.5
+ parent: 5350
+ - uid: 27395
+ components:
+ - type: Transform
+ pos: 72.5,-30.5
+ parent: 5350
+ - uid: 27396
+ components:
+ - type: Transform
+ pos: 73.5,-30.5
+ parent: 5350
+ - uid: 27397
+ components:
+ - type: Transform
+ pos: 73.5,-29.5
+ parent: 5350
+ - uid: 27398
+ components:
+ - type: Transform
+ pos: 74.5,-30.5
+ parent: 5350
+ - uid: 27399
+ components:
+ - type: Transform
+ pos: 75.5,-30.5
+ parent: 5350
+ - uid: 27400
+ components:
+ - type: Transform
+ pos: 76.5,-30.5
+ parent: 5350
+ - uid: 27401
+ components:
+ - type: Transform
+ pos: 77.5,-30.5
+ parent: 5350
+ - uid: 27402
+ components:
+ - type: Transform
+ pos: 77.5,-31.5
+ parent: 5350
+ - uid: 27403
+ components:
+ - type: Transform
+ pos: 77.5,-32.5
+ parent: 5350
+ - uid: 27404
+ components:
+ - type: Transform
+ pos: 77.5,-33.5
+ parent: 5350
+ - uid: 27405
+ components:
+ - type: Transform
+ pos: 77.5,-34.5
+ parent: 5350
+ - uid: 27406
+ components:
+ - type: Transform
+ pos: 77.5,-36.5
+ parent: 5350
+ - uid: 27407
+ components:
+ - type: Transform
+ pos: 77.5,-35.5
+ parent: 5350
+ - uid: 27408
+ components:
+ - type: Transform
+ pos: 77.5,-37.5
+ parent: 5350
+ - uid: 27409
+ components:
+ - type: Transform
+ pos: 77.5,-39.5
+ parent: 5350
+ - uid: 27410
+ components:
+ - type: Transform
+ pos: 77.5,-38.5
+ parent: 5350
+ - uid: 27411
+ components:
+ - type: Transform
+ pos: 77.5,-40.5
+ parent: 5350
+ - uid: 27412
+ components:
+ - type: Transform
+ pos: 76.5,-40.5
+ parent: 5350
+ - uid: 27413
+ components:
+ - type: Transform
+ pos: 76.5,-41.5
+ parent: 5350
+ - uid: 27484
+ components:
+ - type: Transform
+ pos: 74.5,-45.5
+ parent: 5350
+ - uid: 27485
+ components:
+ - type: Transform
+ pos: 74.5,-46.5
+ parent: 5350
- proto: CableMVStack
entities:
- uid: 1548
@@ -56048,6 +57123,66 @@ entities:
- type: Transform
pos: 58.5,11.5
parent: 5350
+ - uid: 27538
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 85.5,-42.5
+ parent: 5350
+ - uid: 27542
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 80.5,-31.5
+ parent: 5350
+ - uid: 27543
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 85.5,-31.5
+ parent: 5350
+ - uid: 27544
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 80.5,-48.5
+ parent: 5350
+ - uid: 27545
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 80.5,-42.5
+ parent: 5350
+ - uid: 27546
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 56.5,-39.5
+ parent: 5350
+ - uid: 27547
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 66.5,-48.5
+ parent: 5350
+ - uid: 27548
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 56.5,-50.5
+ parent: 5350
+ - uid: 27549
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 66.5,-50.5
+ parent: 5350
+ - uid: 27550
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 52.5,-39.5
+ parent: 5350
- proto: Chair
entities:
- uid: 347
@@ -56244,11 +57379,6 @@ entities:
rot: -1.5707963267948966 rad
pos: -73.5,7.5
parent: 5350
- - uid: 6164
- components:
- - type: Transform
- pos: -71.5,-8.5
- parent: 5350
- uid: 6165
components:
- type: Transform
@@ -59427,6 +60557,11 @@ entities:
- type: Transform
pos: 51.5,9.5
parent: 5350
+ - uid: 27233
+ components:
+ - type: Transform
+ pos: 82.5,-34.5
+ parent: 5350
- proto: ClosetJanitorFilled
entities:
- uid: 26527
@@ -61119,6 +62254,11 @@ entities:
- type: Transform
pos: 61.47438,1.4628983
parent: 5350
+ - uid: 27247
+ components:
+ - type: Transform
+ pos: 82.63406,-38.64446
+ parent: 5350
- proto: ClothingMaskBreathMedical
entities:
- uid: 15675
@@ -63446,6 +64586,11 @@ entities:
- type: Transform
pos: 59.646255,1.4628983
parent: 5350
+ - uid: 27265
+ components:
+ - type: Transform
+ pos: 67.5,-36.5
+ parent: 5350
- proto: CrowbarOrange
entities:
- uid: 26883
@@ -71373,6 +72518,30 @@ entities:
- type: Transform
pos: 66.5,28.5
parent: 5350
+ - uid: 27267
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 67.5,-45.5
+ parent: 5350
+ - uid: 27268
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 67.5,-44.5
+ parent: 5350
+ - uid: 27269
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 75.5,-44.5
+ parent: 5350
+ - uid: 27271
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 71.5,-43.5
+ parent: 5350
- proto: EncryptionKeyCargo
entities:
- uid: 26443
@@ -71498,6 +72667,19 @@ entities:
- type: Transform
pos: -27.487486,38.58992
parent: 5350
+ - uid: 27245
+ components:
+ - type: Transform
+ pos: 82.429535,-38.294117
+ parent: 5350
+ - type: GasTank
+ toggleActionEntity: 27246
+ - type: ActionsContainer
+ - type: ContainerContainer
+ containers:
+ actions: !type:Container
+ ents:
+ - 27246
- proto: ExtinguisherCabinetFilled
entities:
- uid: 1093
@@ -72802,6 +73984,18 @@ entities:
- 14208
- 14209
- 14210
+ - uid: 27341
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 64.5,-33.5
+ parent: 5350
+ - uid: 27343
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-43.5
+ parent: 5350
- proto: FireAxeCabinetFilled
entities:
- uid: 1096
@@ -74851,6 +76045,46 @@ entities:
parent: 5350
- type: AtmosPipeColor
color: '#FF1212FF'
+ - uid: 27093
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 68.5,-31.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#32CD32FF'
+ - uid: 27106
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-40.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27109
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-40.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27112
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 68.5,-40.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#947507FF'
+ - uid: 27190
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 75.5,-40.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
- proto: GasMinerCarbonDioxide
entities:
- uid: 11596
@@ -75091,6 +76325,12 @@ entities:
rot: 3.141592653589793 rad
pos: 104.5,-16.5
parent: 5350
+ - uid: 27210
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 79.5,-40.5
+ parent: 5350
- proto: GasPipeBend
entities:
- uid: 510
@@ -76993,6 +78233,207 @@ entities:
rot: 3.141592653589793 rad
pos: 108.5,-4.5
parent: 5350
+ - uid: 27102
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 66.5,-31.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#32CD32FF'
+ - uid: 27114
+ components:
+ - type: Transform
+ pos: 76.5,-31.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27117
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 76.5,-39.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27189
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 67.5,-32.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27195
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 69.5,-37.5
+ parent: 5350
+ - uid: 27196
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-37.5
+ parent: 5350
+ - uid: 27199
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 72.5,-34.5
+ parent: 5350
+ - uid: 27200
+ components:
+ - type: Transform
+ pos: 73.5,-34.5
+ parent: 5350
+ - uid: 27201
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-34.5
+ parent: 5350
+ - uid: 27202
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 69.5,-34.5
+ parent: 5350
+ - uid: 27241
+ components:
+ - type: Transform
+ pos: 80.5,-34.5
+ parent: 5350
+ - uid: 27242
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 80.5,-38.5
+ parent: 5350
+ - uid: 27281
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 70.5,-27.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27282
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 71.5,-27.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27283
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-29.5
+ parent: 5350
+ - uid: 27284
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 66.5,-29.5
+ parent: 5350
+ - uid: 27291
+ components:
+ - type: Transform
+ pos: 76.5,-29.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27292
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 72.5,-29.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27356
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 62.5,-38.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27372
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 60.5,-41.5
+ parent: 5350
+ - uid: 27373
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 63.5,-41.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27374
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 63.5,-40.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27375
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 60.5,-43.5
+ parent: 5350
+ - uid: 27376
+ components:
+ - type: Transform
+ pos: 63.5,-43.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27377
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 63.5,-45.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27378
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 60.5,-45.5
+ parent: 5350
+ - uid: 27379
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 60.5,-47.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27380
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 62.5,-47.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27386
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 68.5,-39.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- proto: GasPipeFourway
entities:
- uid: 260
@@ -88983,11 +90424,6 @@ entities:
parent: 5350
- type: AtmosPipeColor
color: '#0055CCFF'
- - uid: 9069
- components:
- - type: Transform
- pos: 68.5,-30.5
- parent: 5350
- uid: 9166
components:
- type: Transform
@@ -90667,23 +92103,14 @@ entities:
parent: 5350
- type: AtmosPipeColor
color: '#03FCD3FF'
- - uid: 11246
+ - uid: 11263
components:
- type: Transform
- pos: 70.5,-30.5
- parent: 5350
- - uid: 11247
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: 68.5,-29.5
- parent: 5350
- - uid: 11248
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: 70.5,-29.5
+ rot: -1.5707963267948966 rad
+ pos: 69.5,-24.5
parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- uid: 11362
components:
- type: Transform
@@ -101191,6 +102618,325 @@ entities:
parent: 5350
- type: AtmosPipeColor
color: '#0055CCFF'
+ - uid: 27070
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 78.5,-40.5
+ parent: 5350
+ - uid: 27086
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 67.5,-40.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#947507FF'
+ - uid: 27087
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 67.5,-31.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#32CD32FF'
+ - uid: 27089
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 72.5,-31.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27091
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-31.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27094
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-31.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#32CD32FF'
+ - uid: 27096
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 69.5,-31.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#32CD32FF'
+ - uid: 27097
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 66.5,-35.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#32CD32FF'
+ - uid: 27098
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 66.5,-33.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#32CD32FF'
+ - uid: 27099
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 66.5,-34.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#32CD32FF'
+ - uid: 27101
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 66.5,-32.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#32CD32FF'
+ - uid: 27104
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 66.5,-37.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#32CD32FF'
+ - uid: 27105
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 76.5,-40.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27107
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 71.5,-40.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27108
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 69.5,-40.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27110
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 72.5,-40.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27111
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 74.5,-40.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27119
+ components:
+ - type: Transform
+ pos: 76.5,-35.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27120
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 76.5,-32.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27121
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 76.5,-33.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27191
+ components:
+ - type: Transform
+ pos: 76.5,-36.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27236
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 78.5,-38.5
+ parent: 5350
+ - uid: 27237
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 78.5,-34.5
+ parent: 5350
+ - uid: 27238
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 79.5,-38.5
+ parent: 5350
+ - uid: 27239
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 79.5,-34.5
+ parent: 5350
+ - uid: 27240
+ components:
+ - type: Transform
+ pos: 80.5,-35.5
+ parent: 5350
+ - uid: 27275
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-24.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27276
+ components:
+ - type: Transform
+ pos: 71.5,-25.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27277
+ components:
+ - type: Transform
+ pos: 71.5,-26.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27285
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 67.5,-29.5
+ parent: 5350
+ - uid: 27286
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 68.5,-29.5
+ parent: 5350
+ - uid: 27287
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 69.5,-29.5
+ parent: 5350
+ - uid: 27288
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 73.5,-29.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27289
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 74.5,-29.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27290
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 75.5,-29.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27381
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 62.5,-45.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27382
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 62.5,-41.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27383
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 62.5,-43.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27385
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-38.5
+ parent: 5350
+ - uid: 27387
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 69.5,-39.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27388
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 71.5,-39.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27389
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 72.5,-39.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27390
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 74.5,-39.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- proto: GasPipeTJunction
entities:
- uid: 265
@@ -104740,6 +106486,132 @@ entities:
parent: 5350
- type: AtmosPipeColor
color: '#0055CCFF'
+ - uid: 27035
+ components:
+ - type: Transform
+ pos: 71.5,-24.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27090
+ components:
+ - type: Transform
+ pos: 74.5,-31.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27095
+ components:
+ - type: Transform
+ pos: 75.5,-31.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27100
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 66.5,-36.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#32CD32FF'
+ - uid: 27103
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 66.5,-40.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#947507FF'
+ - uid: 27113
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 66.5,-38.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#32CD32FF'
+ - uid: 27115
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 76.5,-34.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27118
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 76.5,-38.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27188
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 68.5,-32.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27193
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 69.5,-35.5
+ parent: 5350
+ - uid: 27194
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 69.5,-36.5
+ parent: 5350
+ - uid: 27197
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-36.5
+ parent: 5350
+ - uid: 27198
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-35.5
+ parent: 5350
+ - uid: 27243
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 80.5,-36.5
+ parent: 5350
+ - uid: 27244
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 80.5,-37.5
+ parent: 5350
+ - uid: 27391
+ components:
+ - type: Transform
+ pos: 70.5,-39.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27392
+ components:
+ - type: Transform
+ pos: 73.5,-39.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27393
+ components:
+ - type: Transform
+ pos: 75.5,-39.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- proto: GasPort
entities:
- uid: 8245
@@ -104777,6 +106649,8 @@ entities:
- type: Transform
pos: 63.5,-4.5
parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- uid: 10163
components:
- type: Transform
@@ -104839,16 +106713,6 @@ entities:
parent: 5350
- type: AtmosPipeColor
color: '#03FCD3FF'
- - uid: 11243
- components:
- - type: Transform
- pos: 68.5,-27.5
- parent: 5350
- - uid: 11244
- components:
- - type: Transform
- pos: 70.5,-27.5
- parent: 5350
- uid: 11438
components:
- type: Transform
@@ -104986,6 +106850,69 @@ entities:
- type: Transform
pos: 110.5,2.5
parent: 5350
+ - uid: 27182
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 67.5,-33.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27183
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 68.5,-33.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27184
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 74.5,-33.5
+ parent: 5350
+ - uid: 27185
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 75.5,-33.5
+ parent: 5350
+ - uid: 27229
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 82.5,-35.5
+ parent: 5350
+ - uid: 27230
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 82.5,-36.5
+ parent: 5350
+ - uid: 27231
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 82.5,-37.5
+ parent: 5350
+ - uid: 27293
+ components:
+ - type: Transform
+ pos: 72.5,-27.5
+ parent: 5350
+ - uid: 27566
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 79.5,-25.5
+ parent: 5350
+ - uid: 27573
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 79.5,-23.5
+ parent: 5350
- proto: GasPressurePump
entities:
- uid: 2653
@@ -105105,18 +107032,7 @@ entities:
pos: 61.5,-4.5
parent: 5350
- type: AtmosPipeColor
- color: '#0055CCFF'
- - uid: 11249
- components:
- - type: Transform
- pos: 68.5,-28.5
- parent: 5350
- - uid: 11250
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: 70.5,-28.5
- parent: 5350
+ color: '#03FCD3FF'
- uid: 11428
components:
- type: Transform
@@ -105196,6 +107112,107 @@ entities:
parent: 5350
- type: AtmosPipeColor
color: '#0055CCFF'
+ - uid: 27088
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 71.5,-31.5
+ parent: 5350
+ - uid: 27092
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 65.5,-36.5
+ parent: 5350
+ - uid: 27116
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 76.5,-37.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27180
+ components:
+ - type: Transform
+ pos: 72.5,-33.5
+ parent: 5350
+ - uid: 27181
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 70.5,-33.5
+ parent: 5350
+ - uid: 27186
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 74.5,-32.5
+ parent: 5350
+ - uid: 27187
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 75.5,-32.5
+ parent: 5350
+ - uid: 27192
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 77.5,-38.5
+ parent: 5350
+ - uid: 27205
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 65.5,-38.5
+ parent: 5350
+ - uid: 27206
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 77.5,-34.5
+ parent: 5350
+ - uid: 27207
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 65.5,-40.5
+ parent: 5350
+ - uid: 27208
+ components:
+ - type: Transform
+ pos: 66.5,-39.5
+ parent: 5350
+ - uid: 27279
+ components:
+ - type: Transform
+ pos: 70.5,-28.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 27280
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 72.5,-28.5
+ parent: 5350
+ - type: GasPressurePump
+ targetPressure: 4500
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
+ - uid: 27576
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 80.5,-25.5
+ parent: 5350
+ - uid: 27580
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 80.5,-23.5
+ parent: 5350
- proto: GasThermoMachineFreezer
entities:
- uid: 2630
@@ -105238,6 +107255,18 @@ entities:
- type: Transform
pos: 29.5,-38.5
parent: 5350
+ - uid: 27234
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 79.5,-37.5
+ parent: 5350
+ - uid: 27235
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 79.5,-36.5
+ parent: 5350
- proto: GasThermoMachineHeater
entities:
- uid: 11366
@@ -105290,6 +107319,16 @@ entities:
parent: 5350
- type: GasValve
open: False
+ - uid: 27209
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 77.5,-40.5
+ parent: 5350
+ - type: GasValve
+ open: False
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
- proto: GasVentPump
entities:
- uid: 747
@@ -105973,14 +108012,6 @@ entities:
parent: 5350
- type: AtmosPipeColor
color: '#0055CCFF'
- - uid: 11242
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: 69.5,-24.5
- parent: 5350
- - type: AtmosPipeColor
- color: '#03FCD3FF'
- uid: 11867
components:
- type: Transform
@@ -106908,6 +108939,50 @@ entities:
parent: 5350
- type: AtmosPipeColor
color: '#0055CCFF'
+ - uid: 27167
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 72.5,-37.5
+ parent: 5350
+ - type: DeviceNetwork
+ deviceLists:
+ - 27257
+ - uid: 27168
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 72.5,-36.5
+ parent: 5350
+ - type: DeviceNetwork
+ deviceLists:
+ - 27257
+ - uid: 27169
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 72.5,-35.5
+ parent: 5350
+ - type: DeviceNetwork
+ deviceLists:
+ - 27257
+ - uid: 27272
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 66.5,-30.5
+ parent: 5350
+ - type: DeviceNetwork
+ deviceLists:
+ - 27488
+ - uid: 27274
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 72.5,-24.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- proto: GasVentScrubber
entities:
- uid: 755
@@ -108299,6 +110374,44 @@ entities:
parent: 5350
- type: AtmosPipeColor
color: '#FF1212FF'
+ - uid: 27170
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-37.5
+ parent: 5350
+ - type: DeviceNetwork
+ deviceLists:
+ - 27257
+ - uid: 27171
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-36.5
+ parent: 5350
+ - type: DeviceNetwork
+ deviceLists:
+ - 27257
+ - uid: 27172
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-35.5
+ parent: 5350
+ - type: DeviceNetwork
+ deviceLists:
+ - 27257
+ - uid: 27273
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 76.5,-30.5
+ parent: 5350
+ - type: DeviceNetwork
+ deviceLists:
+ - 27488
+ - type: AtmosPipeColor
+ color: '#FF1212FF'
- proto: GasVolumePump
entities:
- uid: 10948
@@ -110558,12 +112671,6 @@ entities:
- type: Transform
pos: 28.5,20.5
parent: 5350
- - uid: 8405
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: -24.5,50.5
- parent: 5350
- uid: 8407
components:
- type: Transform
@@ -110659,6 +112766,12 @@ entities:
- type: Transform
pos: 42.5,12.5
parent: 5350
+ - uid: 9069
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 65.5,-29.5
+ parent: 5350
- uid: 9422
components:
- type: Transform
@@ -110799,6 +112912,78 @@ entities:
- type: Transform
pos: 63.5,1.5
parent: 5350
+ - uid: 11242
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 67.5,-41.5
+ parent: 5350
+ - uid: 11243
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-41.5
+ parent: 5350
+ - uid: 11244
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 72.5,-41.5
+ parent: 5350
+ - uid: 11245
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 71.5,-41.5
+ parent: 5350
+ - uid: 11250
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 77.5,-29.5
+ parent: 5350
+ - uid: 11261
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 67.5,-29.5
+ parent: 5350
+ - uid: 11265
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 77.5,-41.5
+ parent: 5350
+ - uid: 11268
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 75.5,-41.5
+ parent: 5350
+ - uid: 11273
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 65.5,-41.5
+ parent: 5350
+ - uid: 11276
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 76.5,-29.5
+ parent: 5350
+ - uid: 11277
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 66.5,-29.5
+ parent: 5350
+ - uid: 11278
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 75.5,-29.5
+ parent: 5350
- uid: 11309
components:
- type: Transform
@@ -114949,11 +117134,6 @@ entities:
- type: Transform
pos: 83.5,10.5
parent: 5350
- - uid: 26285
- components:
- - type: Transform
- pos: 77.5,-23.5
- parent: 5350
- uid: 26286
components:
- type: Transform
@@ -115059,11 +117239,6 @@ entities:
- type: Transform
pos: 75.5,-22.5
parent: 5350
- - uid: 26312
- components:
- - type: Transform
- pos: 75.5,-24.5
- parent: 5350
- uid: 26313
components:
- type: Transform
@@ -115305,6 +117480,341 @@ entities:
- type: Transform
pos: -1.5,64.5
parent: 5350
+ - uid: 27044
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-38.5
+ parent: 5350
+ - uid: 27045
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-39.5
+ parent: 5350
+ - uid: 27046
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-40.5
+ parent: 5350
+ - uid: 27124
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 71.5,-38.5
+ parent: 5350
+ - uid: 27211
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-40.5
+ parent: 5350
+ - uid: 27225
+ components:
+ - type: Transform
+ pos: 79.5,-33.5
+ parent: 5350
+ - uid: 27261
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 70.5,-29.5
+ parent: 5350
+ - uid: 27262
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 72.5,-29.5
+ parent: 5350
+ - uid: 27351
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-32.5
+ parent: 5350
+ - uid: 27352
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-31.5
+ parent: 5350
+ - uid: 27384
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 51.5,-39.5
+ parent: 5350
+ - uid: 27493
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 51.5,-40.5
+ parent: 5350
+ - uid: 27494
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 52.5,-40.5
+ parent: 5350
+ - uid: 27495
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 54.5,-40.5
+ parent: 5350
+ - uid: 27496
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 55.5,-40.5
+ parent: 5350
+ - uid: 27497
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 55.5,-41.5
+ parent: 5350
+ - uid: 27498
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 55.5,-43.5
+ parent: 5350
+ - uid: 27499
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 55.5,-44.5
+ parent: 5350
+ - uid: 27500
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 55.5,-45.5
+ parent: 5350
+ - uid: 27501
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 55.5,-46.5
+ parent: 5350
+ - uid: 27502
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 55.5,-49.5
+ parent: 5350
+ - uid: 27503
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 55.5,-50.5
+ parent: 5350
+ - uid: 27504
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 55.5,-51.5
+ parent: 5350
+ - uid: 27505
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 56.5,-51.5
+ parent: 5350
+ - uid: 27506
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 58.5,-51.5
+ parent: 5350
+ - uid: 27507
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 57.5,-51.5
+ parent: 5350
+ - uid: 27508
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 75.5,-49.5
+ parent: 5350
+ - uid: 27509
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 61.5,-51.5
+ parent: 5350
+ - uid: 27510
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 63.5,-51.5
+ parent: 5350
+ - uid: 27511
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 64.5,-51.5
+ parent: 5350
+ - uid: 27512
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 65.5,-51.5
+ parent: 5350
+ - uid: 27513
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 62.5,-51.5
+ parent: 5350
+ - uid: 27514
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 68.5,-49.5
+ parent: 5350
+ - uid: 27515
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 69.5,-49.5
+ parent: 5350
+ - uid: 27516
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 70.5,-49.5
+ parent: 5350
+ - uid: 27517
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 71.5,-49.5
+ parent: 5350
+ - uid: 27518
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 76.5,-49.5
+ parent: 5350
+ - uid: 27519
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 77.5,-49.5
+ parent: 5350
+ - uid: 27520
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 78.5,-49.5
+ parent: 5350
+ - uid: 27521
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 79.5,-49.5
+ parent: 5350
+ - uid: 27522
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 86.5,-39.5
+ parent: 5350
+ - uid: 27523
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 82.5,-43.5
+ parent: 5350
+ - uid: 27524
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 83.5,-43.5
+ parent: 5350
+ - uid: 27525
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 85.5,-43.5
+ parent: 5350
+ - uid: 27526
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 86.5,-43.5
+ parent: 5350
+ - uid: 27527
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 86.5,-42.5
+ parent: 5350
+ - uid: 27528
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 81.5,-44.5
+ parent: 5350
+ - uid: 27529
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 81.5,-45.5
+ parent: 5350
+ - uid: 27530
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 81.5,-46.5
+ parent: 5350
+ - uid: 27531
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 86.5,-37.5
+ parent: 5350
+ - uid: 27532
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 86.5,-38.5
+ parent: 5350
+ - uid: 27533
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 86.5,-34.5
+ parent: 5350
+ - uid: 27534
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 86.5,-32.5
+ parent: 5350
+ - uid: 27535
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 86.5,-33.5
+ parent: 5350
+ - uid: 27536
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 84.5,-30.5
+ parent: 5350
+ - uid: 27537
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 83.5,-30.5
+ parent: 5350
- proto: GrilleBroken
entities:
- uid: 3458
@@ -115558,35 +118068,18 @@ entities:
rot: 3.141592653589793 rad
pos: 77.5,-13.5
parent: 5350
- - uid: 26337
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: 77.5,-24.5
- parent: 5350
- uid: 26338
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 75.5,-23.5
parent: 5350
- - uid: 26339
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: 75.5,-25.5
- parent: 5350
- uid: 26340
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 73.5,-23.5
parent: 5350
- - uid: 26341
- components:
- - type: Transform
- pos: 73.5,-24.5
- parent: 5350
- uid: 26521
components:
- type: Transform
@@ -115803,6 +118296,113 @@ entities:
- type: Transform
pos: 29.518621,-60.391666
parent: 5350
+- proto: HeatExchanger
+ entities:
+ - uid: 27317
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 63.5,-38.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27357
+ components:
+ - type: Transform
+ pos: 62.5,-44.5
+ parent: 5350
+ - uid: 27358
+ components:
+ - type: Transform
+ pos: 62.5,-39.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27359
+ components:
+ - type: Transform
+ pos: 62.5,-40.5
+ parent: 5350
+ - uid: 27360
+ components:
+ - type: Transform
+ pos: 62.5,-41.5
+ parent: 5350
+ - uid: 27361
+ components:
+ - type: Transform
+ pos: 62.5,-42.5
+ parent: 5350
+ - uid: 27362
+ components:
+ - type: Transform
+ pos: 62.5,-43.5
+ parent: 5350
+ - uid: 27363
+ components:
+ - type: Transform
+ pos: 62.5,-45.5
+ parent: 5350
+ - uid: 27364
+ components:
+ - type: Transform
+ pos: 62.5,-46.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27365
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 61.5,-47.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27366
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 60.5,-46.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27367
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 61.5,-45.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27368
+ components:
+ - type: Transform
+ pos: 63.5,-44.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27369
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 61.5,-43.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
+ - uid: 27370
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 60.5,-42.5
+ parent: 5350
+ - uid: 27371
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 61.5,-41.5
+ parent: 5350
+ - type: AtmosPipeColor
+ color: '#DCDCDCFF'
- proto: HighSecCommandLocked
entities:
- uid: 1668
@@ -116201,18 +118801,6 @@ entities:
- type: Transform
pos: 10.558252,-14.387053
parent: 5350
-- proto: Intellicard
- entities:
- - uid: 26880
- components:
- - type: Transform
- pos: -7.5668554,15.683428
- parent: 5350
- - uid: 26881
- components:
- - type: Transform
- pos: -7.4262304,15.605303
- parent: 5350
- proto: IntercomAll
entities:
- uid: 3128
@@ -120269,6 +122857,51 @@ entities:
- type: Transform
pos: -26.28364,-10.470074
parent: 5350
+ - uid: 26881
+ components:
+ - type: Transform
+ pos: -7.323101,15.538839
+ parent: 5350
+ - type: Paper
+ stampState: paper_stamp-centcom
+ stampedBy:
+ - stampedColor: '#006600FF'
+ stampedName: stamp-component-stamped-name-centcom
+ content: >
+ [color=#006400]███░███░░░░██░░░░[/color]
+
+ [color=#006400]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+
+ [color=#006400]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+
+ [color=#006400]░░░░██░░██░██░██░[/color] [bold]Meta Station ЦК - ИИ[/bold]
+
+ [color=#006400]░░░░██░░░████░███[/color]
+
+ =============================================
+ [head=3]ПРИКАЗ ЦК[/head]
+ =============================================
+
+ [bold]Дата и время от начала смены:[/bold]
+ 28.08.3024, 00:00
+ [bold]Составитель документа:[/bold]
+
+ [color=Red] Джеймс Малкович[/color]
+
+ [bold]Должность составителя:[/bold]
+
+ [color=Red] Оператор ЦК[/color]
+
+
+ Уважаемый текущий установленый Искуственный Интеллект станции, в соответствии с действующим регламентом уведомляем вас об отправке вам следующего приказа:
+ Вы обязаны соблюдать свои законы.
+ Сообщаем вам, что вы должны выполнять действующий приказ беспрекословно.
+ В случае нарушения, к вам будут применены Административные Санкции Корпорации, вплоть до удаления из НаноТрейзен.
+ За вами остаётся право запросить уточнение по действующему приказу.
+
+
+ =============================================
+ [italic]Место для печатей[/italic]
- proto: PaperBin10
entities:
- uid: 23164
@@ -120380,11 +123013,6 @@ entities:
- type: Transform
pos: -42.7706,23.635101
parent: 5350
- - uid: 11275
- components:
- - type: Transform
- pos: 67.42234,-30.577332
- parent: 5350
- uid: 11812
components:
- type: Transform
@@ -120715,6 +123343,42 @@ entities:
rot: -1.5707963267948966 rad
pos: 23.5,-28.5
parent: 5350
+ - uid: 27144
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 69.5,-35.5
+ parent: 5350
+ - uid: 27145
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 69.5,-37.5
+ parent: 5350
+ - uid: 27146
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 69.5,-36.5
+ parent: 5350
+ - uid: 27147
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-35.5
+ parent: 5350
+ - uid: 27148
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-36.5
+ parent: 5350
+ - uid: 27149
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-37.5
+ parent: 5350
- proto: PlasmaTank
entities:
- uid: 23586
@@ -120727,9 +123391,8 @@ entities:
- uid: 27552
components:
- type: Transform
- anchored: False
- pos: 83.77101,-34.91482
- parent: 951
+ pos: 81.5,-32.5
+ parent: 5350
- proto: PlasticFlapsAirtightClear
entities:
- uid: 1102
@@ -121744,18 +124407,6 @@ entities:
- type: Transform
pos: 13.5,17.5
parent: 5350
-- proto: PottedPlantBioluminscent
- entities:
- - uid: 27037
- components:
- - type: Transform
- pos: 102.5,-0.5
- parent: 5350
- - uid: 27038
- components:
- - type: Transform
- pos: 106.5,-0.5
- parent: 5350
- proto: PottedPlantRandom
entities:
- uid: 1021
@@ -123151,6 +125802,18 @@ entities:
- type: Transform
pos: 35.5,-18.5
parent: 5350
+ - uid: 11266
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: -15.5,27.5
+ parent: 5350
+ - uid: 11270
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: -19.5,27.5
+ parent: 5350
- uid: 11506
components:
- type: Transform
@@ -124780,17 +127443,33 @@ entities:
rot: -1.5707963267948966 rad
pos: -25.5,-23.5
parent: 5350
- - uid: 26828
+ - uid: 27031
components:
- type: Transform
- rot: 3.141592653589793 rad
- pos: -15.5,27.5
+ pos: -16.5,25.5
parent: 5350
- - uid: 26829
+ - uid: 27270
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: -19.5,27.5
+ pos: 67.5,-45.5
+ parent: 5350
+ - uid: 27342
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 77.5,-33.5
+ parent: 5350
+ - uid: 27458
+ components:
+ - type: Transform
+ pos: 68.5,-30.5
+ parent: 5350
+ - uid: 27474
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 75.5,-45.5
parent: 5350
- proto: PoweredlightExterior
entities:
@@ -125345,6 +128024,11 @@ entities:
parent: 5350
- type: ApcPowerReceiver
powerLoad: 0
+ - uid: 11267
+ components:
+ - type: Transform
+ pos: -16.5,32.5
+ parent: 5350
- uid: 11286
components:
- type: Transform
@@ -126519,6 +129203,71 @@ entities:
- type: Transform
pos: -9.5,-13.5
parent: 5350
+ - uid: 27463
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 65.5,-31.5
+ parent: 5350
+ - uid: 27468
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 72.5,-33.5
+ parent: 5350
+ - uid: 27469
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 80.5,-38.5
+ parent: 5350
+ - uid: 27470
+ components:
+ - type: Transform
+ pos: 80.5,-34.5
+ parent: 5350
+ - uid: 27475
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 65.5,-39.5
+ parent: 5350
+ - uid: 27476
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 77.5,-39.5
+ parent: 5350
+ - uid: 27477
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 69.5,-40.5
+ parent: 5350
+ - uid: 27478
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 73.5,-40.5
+ parent: 5350
+ - uid: 27480
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 72.5,-28.5
+ parent: 5350
+ - uid: 27481
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 68.5,-25.5
+ parent: 5350
+ - uid: 27487
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 77.5,-31.5
+ parent: 5350
- proto: PrinterDoc
entities:
- uid: 15066
@@ -127161,6 +129910,28 @@ entities:
- type: Transform
pos: 111.5,-0.5
parent: 5350
+- proto: RadiationCollector
+ entities:
+ - uid: 27489
+ components:
+ - type: Transform
+ pos: 77.5,-44.5
+ parent: 5350
+ - uid: 27490
+ components:
+ - type: Transform
+ pos: 77.5,-45.5
+ parent: 5350
+ - uid: 27491
+ components:
+ - type: Transform
+ pos: 65.5,-44.5
+ parent: 5350
+ - uid: 27492
+ components:
+ - type: Transform
+ pos: 65.5,-45.5
+ parent: 5350
- proto: RadiationCollectorFullTank
entities:
- uid: 2472
@@ -128481,6 +131252,143 @@ entities:
- type: Transform
pos: 66.5,-6.5
parent: 5350
+ - uid: 27055
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-39.5
+ parent: 5350
+ - uid: 27059
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-38.5
+ parent: 5350
+ - uid: 27153
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 71.5,-38.5
+ parent: 5350
+ - uid: 27173
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-41.5
+ parent: 5350
+ - uid: 27174
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 71.5,-41.5
+ parent: 5350
+ - uid: 27175
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 72.5,-41.5
+ parent: 5350
+ - uid: 27176
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 75.5,-41.5
+ parent: 5350
+ - uid: 27177
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 77.5,-41.5
+ parent: 5350
+ - uid: 27178
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 67.5,-41.5
+ parent: 5350
+ - uid: 27179
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 65.5,-41.5
+ parent: 5350
+ - uid: 27212
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-40.5
+ parent: 5350
+ - uid: 27226
+ components:
+ - type: Transform
+ pos: 79.5,-33.5
+ parent: 5350
+ - uid: 27263
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 70.5,-29.5
+ parent: 5350
+ - uid: 27264
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 72.5,-29.5
+ parent: 5350
+ - uid: 27344
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 65.5,-29.5
+ parent: 5350
+ - uid: 27345
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 66.5,-29.5
+ parent: 5350
+ - uid: 27346
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 67.5,-29.5
+ parent: 5350
+ - uid: 27347
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 75.5,-29.5
+ parent: 5350
+ - uid: 27348
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 76.5,-29.5
+ parent: 5350
+ - uid: 27349
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 77.5,-29.5
+ parent: 5350
+ - uid: 27350
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-40.5
+ parent: 5350
+ - uid: 27353
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-31.5
+ parent: 5350
+ - uid: 27354
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-32.5
+ parent: 5350
- proto: ReinforcedWindow
entities:
- uid: 691
@@ -132370,6 +135278,26 @@ entities:
- type: Transform
pos: 102.5,-1.5
parent: 5350
+ - uid: 27253
+ components:
+ - type: Transform
+ pos: 67.5,-34.5
+ parent: 5350
+ - uid: 27254
+ components:
+ - type: Transform
+ pos: 75.5,-34.5
+ parent: 5350
+ - uid: 27255
+ components:
+ - type: Transform
+ pos: 75.5,-38.5
+ parent: 5350
+ - uid: 27256
+ components:
+ - type: Transform
+ pos: 67.5,-38.5
+ parent: 5350
- proto: Screwdriver
entities:
- uid: 1553
@@ -132695,11 +135623,6 @@ entities:
- type: Transform
pos: 42.547264,-3.4866009
parent: 5350
- - uid: 11273
- components:
- - type: Transform
- pos: 71.51609,-32.499207
- parent: 5350
- uid: 12277
components:
- type: Transform
@@ -133380,6 +136303,36 @@ entities:
- type: Transform
pos: 56.5,17.5
parent: 5350
+ - uid: 27131
+ components:
+ - type: Transform
+ pos: 67.5,-37.5
+ parent: 5350
+ - uid: 27132
+ components:
+ - type: Transform
+ pos: 67.5,-36.5
+ parent: 5350
+ - uid: 27133
+ components:
+ - type: Transform
+ pos: 67.5,-35.5
+ parent: 5350
+ - uid: 27134
+ components:
+ - type: Transform
+ pos: 75.5,-37.5
+ parent: 5350
+ - uid: 27135
+ components:
+ - type: Transform
+ pos: 75.5,-36.5
+ parent: 5350
+ - uid: 27136
+ components:
+ - type: Transform
+ pos: 75.5,-35.5
+ parent: 5350
- proto: ShuttersWindowOpen
entities:
- uid: 15185
@@ -133817,7 +136770,7 @@ entities:
- uid: 4372
components:
- type: MetaData
- name: кнопка сигнала (турели загрузки (летал))
+ name: кнопка сигнала (турели загрузки ИИ (летал))
- type: Transform
pos: -10.5,20.5
parent: 5350
@@ -133848,7 +136801,7 @@ entities:
- Pressed: Toggle
- Pressed: AutoClose
- type: Label
- currentLabel: турели загрузки (летал)
+ currentLabel: турели загрузки ИИ (летал)
- type: NameModifier
baseName: кнопка сигнала
- uid: 4667
@@ -134022,29 +136975,29 @@ entities:
- Pressed: Toggle
23578:
- Pressed: Toggle
- - uid: 27036
+ - uid: 27564
components:
- type: MetaData
- name: кнопка сигнала (турели холла спутника (нелетал))
+ name: кнопка сигнала (турели холла ИИ (нелетал))
- type: Transform
pos: 103.5,3.5
parent: 5350
- type: DeviceLinkSource
linkedPorts:
- 27031:
+ 27559:
- Pressed: Toggle
- Pressed: AutoClose
- 27030:
+ 27562:
- Pressed: Toggle
- Pressed: AutoClose
- 27033:
+ 27561:
- Pressed: Toggle
- Pressed: AutoClose
- 27032:
+ 27560:
- Pressed: Toggle
- Pressed: AutoClose
- type: Label
- currentLabel: турели холла спутника (нелетал)
+ currentLabel: турели холла ИИ (нелетал)
- type: NameModifier
baseName: кнопка сигнала
- proto: SignalButtonExt1
@@ -134173,6 +137126,14 @@ entities:
- type: Transform
pos: -29.5,-28.5
parent: 5350
+- proto: SignDangerMed
+ entities:
+ - uid: 27204
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 70.5,-38.5
+ parent: 5350
- proto: SignDirectionalBridge
entities:
- uid: 1116
@@ -134737,6 +137698,12 @@ entities:
- type: Transform
pos: 45.5,-35.5
parent: 5350
+ - uid: 27203
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 72.5,-38.5
+ parent: 5350
- proto: SignGravity
entities:
- uid: 14539
@@ -135098,6 +138065,18 @@ entities:
rot: 1.5707963267948966 rad
pos: 56.5,-3.5
parent: 5350
+ - uid: 27259
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 68.5,-29.5
+ parent: 5350
+ - uid: 27260
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 74.5,-29.5
+ parent: 5350
- proto: SignSecureMedRed
entities:
- uid: 10471
@@ -135200,6 +138179,12 @@ entities:
- type: Transform
pos: -0.5,-48.5
parent: 5350
+ - uid: 27258
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 69.5,-29.5
+ parent: 5350
- proto: SignSpace
entities:
- uid: 5419
@@ -138676,6 +141661,11 @@ entities:
- type: Transform
pos: 26.5,-52.5
parent: 5350
+ - uid: 27294
+ components:
+ - type: Transform
+ pos: 72.5,-27.5
+ parent: 5350
- proto: SubstationExtended
entities:
- uid: 9091
@@ -139092,6 +142082,13 @@ entities:
- type: Transform
pos: -4.5,29.5
parent: 5350
+- proto: SupermatterCrystal
+ entities:
+ - uid: 27143
+ components:
+ - type: Transform
+ pos: 71.5,-36.5
+ parent: 5350
- proto: SurveillanceCameraCommand
entities:
- uid: 1076
@@ -139883,6 +142880,54 @@ entities:
- SurveillanceCameraEngineering
nameSet: True
id: Solars SW
+ - uid: 27248
+ components:
+ - type: Transform
+ pos: 68.5,-37.5
+ parent: 5350
+ - uid: 27249
+ components:
+ - type: Transform
+ pos: 74.5,-37.5
+ parent: 5350
+ - uid: 27250
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 68.5,-35.5
+ parent: 5350
+ - uid: 27251
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-33.5
+ parent: 5350
+ - uid: 27252
+ components:
+ - type: Transform
+ pos: 70.5,-31.5
+ parent: 5350
+ - uid: 27472
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 80.5,-34.5
+ parent: 5350
+ - uid: 27473
+ components:
+ - type: Transform
+ pos: 81.5,-38.5
+ parent: 5350
+ - uid: 27479
+ components:
+ - type: Transform
+ pos: 70.5,-28.5
+ parent: 5350
+ - uid: 27482
+ components:
+ - type: Transform
+ pos: 71.5,-44.5
+ parent: 5350
- proto: SurveillanceCameraGeneral
entities:
- uid: 23189
@@ -143889,6 +146934,12 @@ entities:
- type: Transform
pos: 107.5,5.5
parent: 5350
+ - uid: 27232
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 82.5,-38.5
+ parent: 5350
- proto: TableWood
entities:
- uid: 263
@@ -144816,26 +147867,26 @@ entities:
parent: 5350
- proto: TegCenter
entities:
- - uid: 11276
+ - uid: 27586
components:
- type: Transform
rot: -1.5707963267948966 rad
- pos: 69.5,-34.5
+ pos: 86.5,-24.5
parent: 5350
- proto: TegCirculator
entities:
- - uid: 11277
+ - uid: 27587
components:
- type: Transform
- pos: 70.5,-34.5
+ pos: 87.5,-24.5
parent: 5350
- type: PointLight
color: '#FF3300FF'
- - uid: 11280
+ - uid: 27588
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 68.5,-34.5
+ pos: 85.5,-24.5
parent: 5350
- type: PointLight
color: '#FF3300FF'
@@ -145054,6 +148105,26 @@ entities:
- type: Transform
pos: 69.5,12.5
parent: 5350
+ - uid: 27137
+ components:
+ - type: Transform
+ pos: 69.5,-37.5
+ parent: 5350
+ - uid: 27138
+ components:
+ - type: Transform
+ pos: 69.5,-35.5
+ parent: 5350
+ - uid: 27139
+ components:
+ - type: Transform
+ pos: 73.5,-35.5
+ parent: 5350
+ - uid: 27140
+ components:
+ - type: Transform
+ pos: 73.5,-37.5
+ parent: 5350
- proto: TeslaGenerator
entities:
- uid: 9185
@@ -145083,6 +148154,16 @@ entities:
- type: Transform
pos: 61.5,15.5
parent: 5350
+ - uid: 27141
+ components:
+ - type: Transform
+ pos: 69.5,-36.5
+ parent: 5350
+ - uid: 27142
+ components:
+ - type: Transform
+ pos: 73.5,-36.5
+ parent: 5350
- proto: TintedWindow
entities:
- uid: 3812
@@ -145383,6 +148464,13 @@ entities:
- type: Transform
pos: 21.475891,-16.453907
parent: 5350
+- proto: ToolboxElectrical
+ entities:
+ - uid: 8405
+ components:
+ - type: Transform
+ pos: -13.545377,15.703165
+ parent: 5350
- proto: ToolboxElectricalFilled
entities:
- uid: 1520
@@ -145520,6 +148608,11 @@ entities:
- type: Transform
pos: 1.5618443,-16.342892
parent: 5350
+ - uid: 26880
+ components:
+ - type: Transform
+ pos: -7.615568,15.778646
+ parent: 5350
- proto: ToyAmongPequeno
entities:
- uid: 14514
@@ -151322,20 +154415,59 @@ entities:
- type: Transform
pos: 66.5,-17.5
parent: 5350
- - uid: 11268
+ - uid: 11246
components:
- type: Transform
- pos: 70.5,-29.5
+ rot: -1.5707963267948966 rad
+ pos: 69.5,-41.5
parent: 5350
- - uid: 11269
+ - uid: 11247
components:
- type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 68.5,-41.5
+ parent: 5350
+ - uid: 11249
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 74.5,-29.5
+ parent: 5350
+ - uid: 11255
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-29.5
+ parent: 5350
+ - uid: 11258
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
pos: 68.5,-29.5
parent: 5350
- - uid: 11270
+ - uid: 11262
components:
- type: Transform
- pos: 67.5,-29.5
+ rot: -1.5707963267948966 rad
+ pos: 69.5,-29.5
+ parent: 5350
+ - uid: 11272
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-29.5
+ parent: 5350
+ - uid: 11274
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-41.5
+ parent: 5350
+ - uid: 11275
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 74.5,-41.5
parent: 5350
- uid: 11370
components:
@@ -155856,6 +158988,18 @@ entities:
- type: Transform
pos: 79.5,-15.5
parent: 5350
+ - uid: 26337
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 81.5,-28.5
+ parent: 5350
+ - uid: 26339
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 81.5,-26.5
+ parent: 5350
- uid: 26580
components:
- type: Transform
@@ -155986,6 +159130,472 @@ entities:
- type: Transform
pos: -15.5,61.5
parent: 5350
+ - uid: 27036
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-30.5
+ parent: 5350
+ - uid: 27037
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-31.5
+ parent: 5350
+ - uid: 27038
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-32.5
+ parent: 5350
+ - uid: 27039
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-33.5
+ parent: 5350
+ - uid: 27040
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-34.5
+ parent: 5350
+ - uid: 27041
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-35.5
+ parent: 5350
+ - uid: 27042
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-36.5
+ parent: 5350
+ - uid: 27043
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-37.5
+ parent: 5350
+ - uid: 27047
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-41.5
+ parent: 5350
+ - uid: 27048
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-42.5
+ parent: 5350
+ - uid: 27049
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-44.5
+ parent: 5350
+ - uid: 27050
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-45.5
+ parent: 5350
+ - uid: 27051
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-46.5
+ parent: 5350
+ - uid: 27052
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 64.5,-43.5
+ parent: 5350
+ - uid: 27053
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-29.5
+ parent: 5350
+ - uid: 27054
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-30.5
+ parent: 5350
+ - uid: 27056
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-33.5
+ parent: 5350
+ - uid: 27058
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-35.5
+ parent: 5350
+ - uid: 27060
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-36.5
+ parent: 5350
+ - uid: 27062
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-39.5
+ parent: 5350
+ - uid: 27063
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-37.5
+ parent: 5350
+ - uid: 27064
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-41.5
+ parent: 5350
+ - uid: 27065
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-42.5
+ parent: 5350
+ - uid: 27066
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-43.5
+ parent: 5350
+ - uid: 27067
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-44.5
+ parent: 5350
+ - uid: 27068
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-45.5
+ parent: 5350
+ - uid: 27069
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 78.5,-46.5
+ parent: 5350
+ - uid: 27071
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 65.5,-46.5
+ parent: 5350
+ - uid: 27072
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 66.5,-46.5
+ parent: 5350
+ - uid: 27073
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 67.5,-46.5
+ parent: 5350
+ - uid: 27074
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 68.5,-46.5
+ parent: 5350
+ - uid: 27075
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 69.5,-46.5
+ parent: 5350
+ - uid: 27076
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-46.5
+ parent: 5350
+ - uid: 27077
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 71.5,-46.5
+ parent: 5350
+ - uid: 27078
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 72.5,-46.5
+ parent: 5350
+ - uid: 27079
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-46.5
+ parent: 5350
+ - uid: 27080
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 74.5,-46.5
+ parent: 5350
+ - uid: 27081
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 75.5,-46.5
+ parent: 5350
+ - uid: 27082
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 76.5,-46.5
+ parent: 5350
+ - uid: 27083
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 77.5,-46.5
+ parent: 5350
+ - uid: 27122
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 67.5,-38.5
+ parent: 5350
+ - uid: 27123
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-38.5
+ parent: 5350
+ - uid: 27125
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 72.5,-38.5
+ parent: 5350
+ - uid: 27126
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 69.5,-38.5
+ parent: 5350
+ - uid: 27127
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-38.5
+ parent: 5350
+ - uid: 27128
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 68.5,-38.5
+ parent: 5350
+ - uid: 27129
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 75.5,-38.5
+ parent: 5350
+ - uid: 27130
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 74.5,-38.5
+ parent: 5350
+ - uid: 27150
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 67.5,-34.5
+ parent: 5350
+ - uid: 27151
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 69.5,-34.5
+ parent: 5350
+ - uid: 27152
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-34.5
+ parent: 5350
+ - uid: 27154
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 68.5,-34.5
+ parent: 5350
+ - uid: 27155
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 72.5,-34.5
+ parent: 5350
+ - uid: 27156
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-34.5
+ parent: 5350
+ - uid: 27157
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 75.5,-34.5
+ parent: 5350
+ - uid: 27158
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 74.5,-34.5
+ parent: 5350
+ - uid: 27161
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 72.5,-32.5
+ parent: 5350
+ - uid: 27162
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 70.5,-32.5
+ parent: 5350
+ - uid: 27163
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 69.5,-33.5
+ parent: 5350
+ - uid: 27164
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 69.5,-32.5
+ parent: 5350
+ - uid: 27165
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-33.5
+ parent: 5350
+ - uid: 27166
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-32.5
+ parent: 5350
+ - uid: 27213
+ components:
+ - type: Transform
+ pos: 79.5,-39.5
+ parent: 5350
+ - uid: 27214
+ components:
+ - type: Transform
+ pos: 80.5,-39.5
+ parent: 5350
+ - uid: 27215
+ components:
+ - type: Transform
+ pos: 81.5,-39.5
+ parent: 5350
+ - uid: 27216
+ components:
+ - type: Transform
+ pos: 82.5,-39.5
+ parent: 5350
+ - uid: 27217
+ components:
+ - type: Transform
+ pos: 83.5,-39.5
+ parent: 5350
+ - uid: 27218
+ components:
+ - type: Transform
+ pos: 83.5,-33.5
+ parent: 5350
+ - uid: 27219
+ components:
+ - type: Transform
+ pos: 83.5,-35.5
+ parent: 5350
+ - uid: 27220
+ components:
+ - type: Transform
+ pos: 83.5,-36.5
+ parent: 5350
+ - uid: 27221
+ components:
+ - type: Transform
+ pos: 83.5,-34.5
+ parent: 5350
+ - uid: 27222
+ components:
+ - type: Transform
+ pos: 83.5,-37.5
+ parent: 5350
+ - uid: 27223
+ components:
+ - type: Transform
+ pos: 83.5,-38.5
+ parent: 5350
+ - uid: 27224
+ components:
+ - type: Transform
+ pos: 80.5,-33.5
+ parent: 5350
+ - uid: 27227
+ components:
+ - type: Transform
+ pos: 82.5,-33.5
+ parent: 5350
+ - uid: 27266
+ components:
+ - type: Transform
+ pos: 71.5,-45.5
+ parent: 5350
+ - uid: 27539
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 81.5,-27.5
+ parent: 5350
+ - uid: 27581
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 81.5,-25.5
+ parent: 5350
+ - uid: 27582
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 81.5,-23.5
+ parent: 5350
+ - uid: 27583
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 81.5,-22.5
+ parent: 5350
- proto: WallSolid
entities:
- uid: 57
@@ -164252,24 +167862,16 @@ entities:
rot: 1.5707963267948966 rad
pos: -13.5,16.5
parent: 5350
- - uid: 27028
- components:
- - type: Transform
- pos: 106.5,2.5
- parent: 5350
- - type: Gun
- fireRate: 3
- - type: BallisticAmmoProvider
- proto: BulletDisabler
- - uid: 27029
+ - uid: 27557
components:
- type: Transform
pos: 102.5,2.5
parent: 5350
- - type: Gun
- fireRate: 3
- - type: BallisticAmmoProvider
- proto: BulletDisabler
+ - uid: 27558
+ components:
+ - type: Transform
+ pos: 106.5,2.5
+ parent: 5350
- proto: WeaponTurretSyndicateBroken
entities:
- uid: 13978
@@ -164503,18 +168105,9 @@ entities:
- type: Transform
pos: -19.5,30.5
parent: 5350
- - uid: 11282
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: 71.5,-24.5
- parent: 5350
- - uid: 11283
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: 71.5,-24.5
- parent: 5350
+ - type: AccessReader
+ access:
+ - - Ntrep
- uid: 13571
components:
- type: Transform
@@ -164581,6 +168174,12 @@ entities:
- type: Transform
pos: -28.5,38.5
parent: 5350
+ - uid: 24240
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 73.5,-24.5
+ parent: 5350
- uid: 25054
components:
- type: Transform
@@ -164624,6 +168223,12 @@ entities:
- type: Transform
pos: 112.5,-11.5
parent: 5350
+ - uid: 27030
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-24.5
+ parent: 5350
- proto: WindoorBarLocked
entities:
- uid: 24795
@@ -164760,6 +168365,8 @@ entities:
- type: Transform
pos: 101.5,6.5
parent: 5350
+ - type: Door
+ bumpOpen: False
- uid: 3576
components:
- type: Transform
@@ -164880,29 +168487,21 @@ entities:
rot: 3.141592653589793 rad
pos: -5.5,35.5
parent: 5350
- - uid: 27030
+ - uid: 27559
components:
- type: Transform
pos: 102.5,2.5
parent: 5350
- type: Door
bumpOpen: False
- - uid: 27031
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: 102.5,2.5
- parent: 5350
- - type: Door
- bumpOpen: False
- - uid: 27032
+ - uid: 27560
components:
- type: Transform
pos: 106.5,2.5
parent: 5350
- type: Door
bumpOpen: False
- - uid: 27033
+ - uid: 27561
components:
- type: Transform
rot: -1.5707963267948966 rad
@@ -164910,6 +168509,14 @@ entities:
parent: 5350
- type: Door
bumpOpen: False
+ - uid: 27562
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 102.5,2.5
+ parent: 5350
+ - type: Door
+ bumpOpen: False
- proto: WindoorSecureAtmosphericsLocked
entities:
- uid: 5236
@@ -166317,12 +169924,6 @@ entities:
- type: Transform
pos: 71.5,-23.5
parent: 5350
- - uid: 11255
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: 71.5,-25.5
- parent: 5350
- uid: 11256
components:
- type: Transform
@@ -166335,65 +169936,52 @@ entities:
rot: 3.141592653589793 rad
pos: 68.5,-25.5
parent: 5350
- - uid: 11258
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: 68.5,-25.5
- parent: 5350
- uid: 11259
components:
- type: Transform
+ anchored: False
rot: 1.5707963267948966 rad
- pos: 68.5,-26.5
+ pos: 69.5,-27.5
parent: 5350
- uid: 11260
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: 70.5,-26.5
- parent: 5350
- - uid: 11261
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: 70.5,-25.5
- parent: 5350
- - uid: 11262
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: 68.5,-27.5
- parent: 5350
- - uid: 11263
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: 68.5,-27.5
+ anchored: False
+ rot: 1.5707963267948966 rad
+ pos: 69.5,-28.5
parent: 5350
- uid: 11264
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: 68.5,-28.5
+ rot: 3.141592653589793 rad
+ pos: 72.5,-25.5
parent: 5350
- - uid: 11265
+ - uid: 11279
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 70.5,-27.5
+ pos: 73.5,-25.5
parent: 5350
- - uid: 11266
+ - uid: 11280
components:
- type: Transform
- rot: 1.5707963267948966 rad
- pos: 70.5,-27.5
+ pos: 73.5,-23.5
parent: 5350
- - uid: 11267
+ - uid: 11282
components:
- type: Transform
- rot: 1.5707963267948966 rad
- pos: 70.5,-28.5
+ pos: 72.5,-23.5
+ parent: 5350
+ - uid: 11283
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-27.5
+ parent: 5350
+ - uid: 11498
+ components:
+ - type: Transform
+ pos: 72.5,-26.5
parent: 5350
- uid: 11512
components:
@@ -166695,6 +170283,12 @@ entities:
rot: 1.5707963267948966 rad
pos: 41.5,31.5
parent: 5350
+ - uid: 24239
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 70.5,-26.5
+ parent: 5350
- uid: 25042
components:
- type: Transform
@@ -169594,6 +173188,34 @@ entities:
rot: -1.5707963267948966 rad
pos: 94.5,-1.5
parent: 5350
+ - uid: 26285
+ components:
+ - type: Transform
+ pos: 77.5,-23.5
+ parent: 5350
+ - uid: 26312
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 77.5,-25.5
+ parent: 5350
+ - uid: 26341
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 73.5,-28.5
+ parent: 5350
+ - uid: 26828
+ components:
+ - type: Transform
+ pos: 70.5,-26.5
+ parent: 5350
+ - uid: 26829
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 72.5,-26.5
+ parent: 5350
- uid: 26874
components:
- type: Transform
@@ -169606,6 +173228,105 @@ entities:
rot: 1.5707963267948966 rad
pos: -10.5,19.5
parent: 5350
+ - uid: 27028
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 72.5,-25.5
+ parent: 5350
+ - uid: 27029
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 70.5,-25.5
+ parent: 5350
+ - uid: 27540
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 75.5,-25.5
+ parent: 5350
+ - uid: 27541
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 74.5,-25.5
+ parent: 5350
+ - uid: 27551
+ components:
+ - type: Transform
+ anchored: False
+ rot: 3.141592653589793 rad
+ pos: 71.77101,-27.914822
+ parent: 951
+ - type: Physics
+ bodyType: Dynamic
+ - uid: 27556
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 76.5,-25.5
+ parent: 5350
+ - uid: 27565
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 78.5,-25.5
+ parent: 5350
+ - uid: 27567
+ components:
+ - type: Transform
+ pos: 74.5,-23.5
+ parent: 5350
+ - uid: 27568
+ components:
+ - type: Transform
+ pos: 76.5,-23.5
+ parent: 5350
+ - uid: 27569
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 78.5,-25.5
+ parent: 5350
+ - uid: 27570
+ components:
+ - type: Transform
+ pos: 78.5,-23.5
+ parent: 5350
+ - uid: 27572
+ components:
+ - type: Transform
+ pos: 75.5,-23.5
+ parent: 5350
+ - uid: 27574
+ components:
+ - type: Transform
+ pos: 79.5,-22.5
+ parent: 5350
+ - uid: 27575
+ components:
+ - type: Transform
+ pos: 80.5,-22.5
+ parent: 5350
+ - uid: 27577
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 79.5,-26.5
+ parent: 5350
+ - uid: 27578
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 80.5,-26.5
+ parent: 5350
+ - uid: 27579
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 78.5,-23.5
+ parent: 5350
- proto: Wirecutter
entities:
- uid: 3801
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 1126c9b73d..3034e91289 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -86,9 +86,9 @@
# Sunrise-Start
- type: EyeProtection
- type: FlashImmunity
- - type: NightVisionDevice
- displayColor: "#ebeb00"
- displayShader: NVDDisplay
+# - type: NightVisionDevice
+# displayColor: "#ebeb00"
+# displayShader: NVDDisplay
# Sunrise-End
#Spationaut Hardsuit
@@ -405,9 +405,9 @@
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- - type: NightVisionDevice #Sunrise - night vision
- displayColor: "#44b855"
- displayShader: NVDDisplay
+# - type: NightVisionDevice Sunrise - night vision
+# displayColor: "#44b855"
+# displayShader: NVDDisplay
#Syndicate Elite Hardsuit
- type: entity
@@ -437,9 +437,9 @@
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- - type: NightVisionDevice #Sunrise - night vision
- displayColor: "#44b855"
- displayShader: NVDDisplay
+# - type: NightVisionDevice Sunrise - night vision
+# displayColor: "#44b855"
+# displayShader: NVDDisplay
#Syndicate Commander Hardsuit
- type: entity
@@ -464,9 +464,9 @@
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- - type: NightVisionDevice #Sunrise - night vision
- displayColor: "#44b855"
- displayShader: NVDDisplay
+# - type: NightVisionDevice Sunrise - night vision
+# displayColor: "#44b855"
+# displayShader: NVDDisplay
#Cybersun Juggernaut Hardsuit
- type: entity
@@ -491,9 +491,9 @@
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- - type: NightVisionDevice #Sunrise - night vision
- displayColor: "#44b855"
- displayShader: NVDDisplay
+# - type: NightVisionDevice Sunrise - night vision
+# displayColor: "#44b855"
+# displayShader: NVDDisplay
#Wizard Hardsuit
- type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml
index 6df0488e28..39ec468f8d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml
@@ -501,3 +501,183 @@
tags:
- Trash
- BorgServiceTorso
+
+# peace parts
+- type: entity
+ id: LeftArmBorgPeace
+ parent: BaseBorgArmLeft
+ name: peace cyborg left arm
+ components:
+ - type: Sprite
+ state: peace_l_arm
+ - type: Icon
+ state: peace_l_arm
+ - type: Tag
+ tags:
+ - Trash
+ - BorgArm
+ - BorgPeaceLArm
+
+- type: entity
+ id: RightArmBorgPeace
+ parent: BaseBorgArmRight
+ name: peace cyborg right arm
+ components:
+ - type: Sprite
+ state: peace_r_arm
+ - type: Icon
+ state: peace_r_arm
+ - type: Tag
+ tags:
+ - Trash
+ - BorgArm
+ - BorgPeaceRArm
+
+- type: entity
+ id: LeftLegBorgPeace
+ parent: BaseBorgLegLeft
+ name: peace cyborg left leg
+ components:
+ - type: Sprite
+ state: peace_l_leg
+ - type: Icon
+ state: peace_l_leg
+ - type: Tag
+ tags:
+ - Trash
+ - BorgLeg
+ - BorgPeaceLLeg
+
+- type: entity
+ id: RightLegBorgPeace
+ parent: BaseBorgLegRight
+ name: peace cyborg right leg
+ components:
+ - type: Sprite
+ state: peace_r_leg
+ - type: Icon
+ state: peace_r_leg
+ - type: Tag
+ tags:
+ - Trash
+ - BorgLeg
+ - BorgPeaceRLeg
+
+- type: entity
+ id: HeadBorgPeace
+ parent: BaseBorgHead
+ name: peace cyborg head
+ components:
+ - type: Sprite
+ state: peace_head
+ - type: Icon
+ state: peace_head
+ - type: Tag
+ tags:
+ - Trash
+ - BorgHead
+ - BorgPeaceHead
+
+- type: entity
+ id: TorsoBorgPeace
+ parent: BaseBorgTorso
+ name: peace cyborg torso
+ components:
+ - type: Sprite
+ state: peace_chest
+ - type: Icon
+ state: peace_chest
+ - type: Tag
+ tags:
+ - Trash
+ - BorgPeaceTorso
+
+# clown parts
+- type: entity
+ id: LeftArmBorgClown
+ parent: BaseBorgArmLeft
+ name: clown cyborg left arm
+ components:
+ - type: Sprite
+ state: peace_l_arm
+ - type: Icon
+ state: peace_l_arm
+ - type: Tag
+ tags:
+ - Trash
+ - BorgArm
+ - BorgClownLArm
+
+- type: entity
+ id: RightArmBorgClown
+ parent: BaseBorgArmRight
+ name: clown cyborg right arm
+ components:
+ - type: Sprite
+ state: peace_r_arm
+ - type: Icon
+ state: peace_r_arm
+ - type: Tag
+ tags:
+ - Trash
+ - BorgArm
+ - BorgClownRArm
+
+- type: entity
+ id: LeftLegBorgClown
+ parent: BaseBorgLegLeft
+ name: clown cyborg left leg
+ components:
+ - type: Sprite
+ state: peace_l_leg
+ - type: Icon
+ state: peace_l_leg
+ - type: Tag
+ tags:
+ - Trash
+ - BorgLeg
+ - BorgClownLLeg
+
+- type: entity
+ id: RightLegBorgClown
+ parent: BaseBorgLegRight
+ name: clown cyborg right leg
+ components:
+ - type: Sprite
+ state: peace_r_leg
+ - type: Icon
+ state: peace_r_leg
+ - type: Tag
+ tags:
+ - Trash
+ - BorgLeg
+ - BorgClownRLeg
+
+- type: entity
+ id: HeadBorgClown
+ parent: BaseBorgHead
+ name: clown cyborg head
+ components:
+ - type: Sprite
+ state: peace_head
+ - type: Icon
+ state: peace_head
+ - type: Tag
+ tags:
+ - Trash
+ - BorgHead
+ - BorgClownHead
+
+- type: entity
+ id: TorsoBorgClown
+ parent: BaseBorgTorso
+ name: clown cyborg torso
+ components:
+ - type: Sprite
+ state: peace_chest
+ - type: Icon
+ state: peace_chest
+ - type: Tag
+ tags:
+ - Trash
+ - BorgClownTorso
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
index 9261e06ea2..018883d236 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
@@ -166,6 +166,54 @@
whitelist:
tags:
- BorgJanitorTorso
+ peace_l_arm+o:
+ whitelist:
+ tags:
+ - BorgPeaceLArm
+ peace_r_arm+o:
+ whitelist:
+ tags:
+ - BorgPeaceRArm
+ peace_l_leg+o:
+ whitelist:
+ tags:
+ - BorgPeaceLLeg
+ peace_r_leg+o:
+ whitelist:
+ tags:
+ - BorgPeaceRLeg
+ peace_head+o:
+ whitelist:
+ tags:
+ - BorgPeaceHead
+ peace_chest+o:
+ whitelist:
+ tags:
+ - BorgPeaceTorso
+ clown_l_arm+o:
+ whitelist:
+ tags:
+ - BorgClownLArm
+ clown_r_arm+o:
+ whitelist:
+ tags:
+ - BorgClownRArm
+ clown_l_leg+o:
+ whitelist:
+ tags:
+ - BorgClownLLeg
+ clown_r_leg+o:
+ whitelist:
+ tags:
+ - BorgClownRLeg
+ clown_head+o:
+ whitelist:
+ tags:
+ - BorgClownHead
+ clown_chest+o:
+ whitelist:
+ tags:
+ - BorgClownTorso
- type: ContainerContainer
containers:
part-container: !type:Container
@@ -212,6 +260,20 @@
- BorgMiningRLeg
- BorgMiningHead
- BorgMiningTorso
+ peace:
+ - BorgPeaceLArm
+ - BorgPeaceRArm
+ - BorgPeaceLLeg
+ - BorgPeaceRLeg
+ - BorgPeaceHead
+ - BorgPeaceTorso
+ clown:
+ - BorgClownLArm
+ - BorgClownRArm
+ - BorgClownLLeg
+ - BorgClownRLeg
+ - BorgClownHead
+ - BorgClownTorso
- type: Construction
graph: Cyborg
node: start
diff --git a/Resources/Prototypes/Entities/Objects/Tools/energydome.yml b/Resources/Prototypes/Entities/Objects/Tools/energydome.yml
index 05a2f53a5f..acd1e3b9aa 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/energydome.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/energydome.yml
@@ -2,7 +2,7 @@
name: blood red personal shield generator
description: A personal shield generator that protects the wearer from lasers and bullets but prevents from using ranged weapons himself. Uses a power cell.
id: EnergyDomeGeneratorPersonalSyndie
- parent: BaseItem
+ parent: [ BaseItem, BaseSyndicateContraband ]
components:
- type: Item
size: Ginormous
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
index 98508b21bc..933014a1b6 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -145,7 +145,7 @@
suffix: Hydroponics
components:
- type: Sprite
- sprite: Structures/Doors/Airlocks/Standard/hydroponics.rsi
+ sprite: _Sunrise/Structures/Doors/Airlocks/Standard/hydroponics.rsi #Sunrise-Resprite
state: "assembly"
- type: entity
@@ -154,7 +154,7 @@
suffix: Hydroponics, Glass
components:
- type: Sprite
- sprite: Structures/Doors/Airlocks/Glass/hydroponics.rsi
+ sprite: _Sunrise/Structures/Doors/Airlocks/Glass/hydroponics.rsi #Sunrise-Resprite
state: "assembly"
#Maintenance
diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
index 9beedb5e49..a33477ea5a 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
@@ -5,11 +5,11 @@
atmospherics: Structures/Doors/Airlocks/Standard/atmospherics.rsi
basic: Structures/Doors/Airlocks/Standard/basic.rsi
cargo: Structures/Doors/Airlocks/Standard/cargo.rsi
- chemistry: Structures/Doors/Airlocks/Standard/chemistry.rsi
+ chemistry: _Sunrise/Structures/Doors/Airlocks/Standard/chemistry.rsi #Sunrise-Resprite
command: Structures/Doors/Airlocks/Standard/command.rsi
engineering: Structures/Doors/Airlocks/Standard/engineering.rsi
freezer: Structures/Doors/Airlocks/Standard/freezer.rsi
- hydroponics: Structures/Doors/Airlocks/Standard/hydroponics.rsi
+ hydroponics: _Sunrise/Structures/Doors/Airlocks/Standard/hydroponics.rsi #Sunrise-Resprite
maintenance: Structures/Doors/Airlocks/Standard/maint.rsi
medical: Structures/Doors/Airlocks/Standard/medical.rsi
science: Structures/Doors/Airlocks/Standard/science.rsi
@@ -24,11 +24,11 @@
basic: Structures/Doors/Airlocks/Glass/basic.rsi
cargo: Structures/Doors/Airlocks/Glass/cargo.rsi
command: Structures/Doors/Airlocks/Glass/command.rsi
- chemistry: Structures/Doors/Airlocks/Glass/chemistry.rsi
+ chemistry: _Sunrise/Structures/Doors/Airlocks/Glass/chemistry.rsi #Sunrise-Resprite
science: Structures/Doors/Airlocks/Glass/science.rsi
engineering: Structures/Doors/Airlocks/Glass/engineering.rsi
glass: Structures/Doors/Airlocks/Glass/glass.rsi
- hydroponics: Structures/Doors/Airlocks/Glass/hydroponics.rsi
+ hydroponics: _Sunrise/Structures/Doors/Airlocks/Glass/hydroponics.rsi #Sunrise-Resprite
maintenance: Structures/Doors/Airlocks/Glass/maint.rsi
medical: Structures/Doors/Airlocks/Glass/medical.rsi
security: Structures/Doors/Airlocks/Glass/security.rsi
diff --git a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_armory.yml
index 28a26597f9..0f7fa15638 100644
--- a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_armory.yml
@@ -14,7 +14,7 @@
sprite: _Sunrise/Objects/Weapons/Guns/Rifles/akms/big.rsi
state: icon
product: CrateArmoryAKMS
- cost: 11000
+ cost: 35000
category: cargoproduct-category-name-armory
group: market
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/night_vision_device.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/night_vision_device.yml
index 4d0e582ce6..10f16f24a6 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/night_vision_device.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/night_vision_device.yml
@@ -38,7 +38,6 @@
- type: PowerCellDraw
drawRate: 0
useRate: 20
- - type: ToggleCellDraw
- type: entity
parent: [ClothingEyesNVD,ShowSecurityIcons]
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml
index 4cae859ac8..0b57535583 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml
@@ -2,7 +2,7 @@
name: blood red backpack shield generator
description: A backpack shield generator that protects the wearer from lasers and bullets but prevents from using ranged weapons himself. Uses a power cell.
id: EnergyDomeGeneratorBackpackSyndie
- parent: BaseItem
+ parent: [ BaseItem, BaseSyndicateContraband ]
components:
- type: Item
size: Ginormous
@@ -38,11 +38,51 @@
- type: UseDelay
delay: 10.0
+- type: entity
+ name: BR-50c "Bastion"
+ description: A backpack shield generator that protects the wearer from lasers and bullets but prevents from using ranged weapons himself. Uses a power cell.
+ id: EnergyDomeGeneratorBackpackNT
+ parent: [ BaseItem, BaseCentcommContraband ]
+ components:
+ - type: Item
+ size: Ginormous
+ - type: MultiHandedItem
+ - type: Clothing
+ quickEquip: false
+ slots:
+ - Back
+ - type: Sprite
+ sprite: _Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi
+ layers:
+ - state: icon
+ - type: ContainerContainer
+ containers:
+ cell_slot: !type:ContainerSlot
+ - type: PowerCellSlot
+ cellSlotId: cell_slot
+ - type: ItemSlots
+ slots:
+ cell_slot:
+ name: power-cell-slot-component-slot-name-default
+ startingItem: PowerCellSmall
+ whitelist:
+ tags:
+ - PowerCell
+ - PowerCellSmall
+ - type: EnergyDomeGenerator
+ damageEnergyDraw: 3
+ domePrototype: EnergyDomeMediumBlue
+ - type: PowerCellDraw
+ drawRate: 2
+ useRate: 0
+ - type: UseDelay
+ delay: 10.0
+
- type: entity
name: BT-21b "Barrier"
description: A personal shield generator that protects the wearer from lasers and bullets but prevents from using ranged weapons himself. Uses a power cell.
id: EnergyDomeGeneratorPersonalNT
- parent: BaseItem
+ parent: [ BaseItem, BaseCentcommContraband ]
components:
- type: Item
size: Ginormous
diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Reflector/reflector.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Reflector/reflector.yml
new file mode 100644
index 0000000000..583a6c56e9
--- /dev/null
+++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Reflector/reflector.yml
@@ -0,0 +1,90 @@
+- type: entity
+ id: Reflector
+ name: reflector
+ placement:
+ mode: SnapgridCenter
+ components:
+ - type: MeleeSound
+ soundGroups:
+ Brute:
+ collection: GlassSmack
+ - type: Anchorable
+ - type: Pullable
+ - type: Rotatable
+ - type: Machine
+ - type: Physics
+ bodyType: Static
+ - type: Fixtures
+ fixtures:
+ fix1:
+ shape:
+ !type:PhysShapeAabb
+ bounds: "-0.25,-0.25,0.25,0.25"
+ density: 400
+ mask:
+ - MachineMask
+ layer:
+ - MachineLayer
+ - type: Reflect
+ reflectProb: 1.0
+ overrideAngle: 270
+ reflects:
+ - Energy
+ - type: RCDDeconstructable
+ deconstructable: false
+ - type: Sprite
+ sprite: _Sunrise/Structures/Reflector/reflector.rsi
+ layers:
+ - state: reflector_box
+ shader: unshaded
+ - type: Repairable
+ fuelCost: 15
+ doAfterDelay: 3
+ - type: Damageable
+ damageContainer: StructuralInorganic
+ damageModifierSet: RGlass
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 1000
+ behaviors:
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+ - trigger:
+ !type:DamageTrigger
+ damage: 500
+ behaviors:
+ - !type:PlaySoundBehavior
+ sound:
+ collection: WindowShatter
+ - !type:SpawnEntitiesBehavior
+ spawn:
+ ShardGlassReinforced:
+ min: 1
+ max: 2
+ PartRodMetal:
+ min: 1
+ max: 2
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+ - type: Construction
+ graph: Window
+ node: shuttleWindow
+ - type: Appearance
+ - type: DamageVisuals
+ thresholds: [5, 10, 20]
+ damageDivisor: 28
+ trackAllDamage: true
+ damageOverlay:
+ sprite: Structures/Windows/cracks.rsi
+ - type: StaticPrice
+ price: 150
+ - type: ExaminableDamage
+ messages: WindowMessages
+ - type: InteractionPopup
+ interactSuccessString: comp-window-knock
+ messagePerceivedByOthers: comp-window-knock
+ interactSuccessSound:
+ path: /Audio/Effects/glass_knock.ogg
+ - type: BlockWeather
\ No newline at end of file
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index a0490fa15a..d61acb713e 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -146,6 +146,42 @@
- type: Tag
id: BorgMedicalTorso
+
+- type: Tag
+ id: BorgPeaceHead
+
+- type: Tag
+ id: BorgPeaceLArm
+
+- type: Tag
+ id: BorgPeaceLLeg
+
+- type: Tag
+ id: BorgPeaceRArm
+
+- type: Tag
+ id: BorgPeaceRLeg
+
+- type: Tag
+ id: BorgPeaceTorso
+
+- type: Tag
+ id: BorgClownHead
+
+- type: Tag
+ id: BorgClownLArm
+
+- type: Tag
+ id: BorgClownLLeg
+
+- type: Tag
+ id: BorgClownRArm
+
+- type: Tag
+ id: BorgClownRLeg
+
+- type: Tag
+ id: BorgClownTorso
- type: Tag
id: BorgMiningHead
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_chest+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_chest+o.png
new file mode 100644
index 0000000000..7dca9a23cb
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_chest+o.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_chest.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_chest.png
new file mode 100644
index 0000000000..9d67223241
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_chest.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_head+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_head+o.png
new file mode 100644
index 0000000000..bd4fc5d792
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_head+o.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_head.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_head.png
new file mode 100644
index 0000000000..e8a4dd4d5f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_head.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_l_arm+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_l_arm+o.png
new file mode 100644
index 0000000000..b7e7c4e57b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_l_arm+o.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_l_arm.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_l_arm.png
new file mode 100644
index 0000000000..7e63942f1a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_l_arm.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_l_leg+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_l_leg+o.png
new file mode 100644
index 0000000000..76ca93d07d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_l_leg+o.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_l_leg.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_l_leg.png
new file mode 100644
index 0000000000..33309421fb
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_l_leg.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_r_arm+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_r_arm+o.png
new file mode 100644
index 0000000000..632582fc9d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_r_arm+o.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_r_arm.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_r_arm.png
new file mode 100644
index 0000000000..19087ffeb3
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_r_arm.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_r_leg+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_r_leg+o.png
new file mode 100644
index 0000000000..b58073a781
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_r_leg+o.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_r_leg.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_r_leg.png
new file mode 100644
index 0000000000..323c31b0d0
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/clown_r_leg.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json
index 8cab41943f..0d737f37e0 100644
--- a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json
@@ -213,6 +213,78 @@
},
{
"name": "service_r_leg+o"
+ },
+ {
+ "name": "peace_l_arm"
+ },
+ {
+ "name": "peace_r_arm"
+ },
+ {
+ "name": "peace_l_leg"
+ },
+ {
+ "name": "peace_r_leg"
+ },
+ {
+ "name": "peace_chest"
+ },
+ {
+ "name": "peace_head"
+ },
+ {
+ "name": "peace_head+o"
+ },
+ {
+ "name": "peace_chest+o"
+ },
+ {
+ "name": "peace_l_arm+o"
+ },
+ {
+ "name": "peace_r_arm+o"
+ },
+ {
+ "name": "peace_l_leg+o"
+ },
+ {
+ "name": "peace_r_leg+o"
+ },
+ {
+ "name": "clown_l_arm"
+ },
+ {
+ "name": "clown_r_arm"
+ },
+ {
+ "name": "clown_l_leg"
+ },
+ {
+ "name": "clown_r_leg"
+ },
+ {
+ "name": "clown_chest"
+ },
+ {
+ "name": "clown_head"
+ },
+ {
+ "name": "clown_head+o"
+ },
+ {
+ "name": "clown_chest+o"
+ },
+ {
+ "name": "clown_l_arm+o"
+ },
+ {
+ "name": "clown_r_arm+o"
+ },
+ {
+ "name": "clown_l_leg+o"
+ },
+ {
+ "name": "clown_r_leg+o"
}
]
}
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_chest+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_chest+o.png
new file mode 100644
index 0000000000..a123e98895
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_chest+o.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_chest.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_chest.png
new file mode 100644
index 0000000000..65a91a8e19
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_chest.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_head+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_head+o.png
new file mode 100644
index 0000000000..2ccf28c4e8
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_head+o.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_head.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_head.png
new file mode 100644
index 0000000000..bf38656ca4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_head.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_l_arm+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_l_arm+o.png
new file mode 100644
index 0000000000..b7e7c4e57b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_l_arm+o.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_l_arm.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_l_arm.png
new file mode 100644
index 0000000000..7e63942f1a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_l_arm.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_l_leg+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_l_leg+o.png
new file mode 100644
index 0000000000..76ca93d07d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_l_leg+o.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_l_leg.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_l_leg.png
new file mode 100644
index 0000000000..33309421fb
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_l_leg.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_r_arm+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_r_arm+o.png
new file mode 100644
index 0000000000..632582fc9d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_r_arm+o.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_r_arm.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_r_arm.png
new file mode 100644
index 0000000000..19087ffeb3
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_r_arm.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_r_leg+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_r_leg+o.png
new file mode 100644
index 0000000000..b58073a781
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_r_leg+o.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_r_leg.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_r_leg.png
new file mode 100644
index 0000000000..323c31b0d0
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/peace_r_leg.png differ
diff --git a/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000..3989fbf8d3
Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/icon.png b/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/icon.png
new file mode 100644
index 0000000000..26402a5830
Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/icon.png differ
diff --git a/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/inhand-left.png
new file mode 100644
index 0000000000..8cf64054d1
Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/inhand-right.png
new file mode 100644
index 0000000000..73f546d7a4
Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/meta.json
new file mode 100644
index 0000000000..fc0abb8b46
--- /dev/null
+++ b/Resources/Textures/_Sunrise/Objects/Tools/EnergyDome/nanotrasen_back.rsi/meta.json
@@ -0,0 +1,34 @@
+{
+ "version": 1,
+ "license": "CLA",
+ "copyright": "SUNRISE",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "delays": [
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ]
+ ]
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Sunrise/Structures/Reflector/reflector.rsi/meta.json b/Resources/Textures/_Sunrise/Structures/Reflector/reflector.rsi/meta.json
new file mode 100644
index 0000000000..12e4145b27
--- /dev/null
+++ b/Resources/Textures/_Sunrise/Structures/Reflector/reflector.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "copyright": "Taked From Paradise Station",
+ "license": "CC-BY-SA-3.0",
+ "states": [
+ {
+ "name": "reflector_box",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Sunrise/Structures/Reflector/reflector.rsi/reflector_box.png b/Resources/Textures/_Sunrise/Structures/Reflector/reflector.rsi/reflector_box.png
new file mode 100644
index 0000000000..d06830e586
Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Reflector/reflector.rsi/reflector_box.png differ
diff --git a/Resources/engineCommandPerms.yml b/Resources/engineCommandPerms.yml
index 94d7920228..2047bcd5bd 100644
--- a/Resources/engineCommandPerms.yml
+++ b/Resources/engineCommandPerms.yml
@@ -73,19 +73,21 @@
- Flags: MAPPING
Commands:
- addmap
- - loadgrid
- - loadmap
+#Sunrise-start: loadmap|mapinit|loadgrid|tpgrid|rmmap|rmgrid for moderators
+# - loadgrid
+# - loadmap
- pausemap
- querymappaused
- - rmgrid
- - rmmap
- - mapinit
+# - rmgrid
+# - rmmap
+# - mapinit
- savegrid
- savemap
- setambientlight
- - tpgrid
+# - tpgrid
- gridtc
- togglespritenetsync
+#Sunrise-end
- Flags: ADMIN
Commands:
@@ -111,6 +113,14 @@
- spawn
- cspawn
- delete
+#Sunrise-start: loadmap|mapinit|loadgrid for moderators
+ - loadgrid
+ - loadmap
+ - mapinit
+ - tpgrid
+ - rmgrid
+ - rmmap
+#Sunrise-end
- Flags: MODERATOR
Commands: