diff --git a/Content.Client/_Starlight/Antags/Abductor/AbductorCameraConsoleWindow.xaml b/Content.Client/_Starlight/Antags/Abductor/AbductorCameraConsoleWindow.xaml
index 0edc58e331ab..a85cb14e63a6 100644
--- a/Content.Client/_Starlight/Antags/Abductor/AbductorCameraConsoleWindow.xaml
+++ b/Content.Client/_Starlight/Antags/Abductor/AbductorCameraConsoleWindow.xaml
@@ -7,7 +7,7 @@
-
diff --git a/Content.Server/_Starlight/Antags/Abductor/AbductorSystem.cs b/Content.Server/_Starlight/Antags/Abductor/AbductorSystem.cs
index 839d5315f496..960524fc3413 100644
--- a/Content.Server/_Starlight/Antags/Abductor/AbductorSystem.cs
+++ b/Content.Server/_Starlight/Antags/Abductor/AbductorSystem.cs
@@ -95,7 +95,7 @@ private void OnAbductorBeaconChosenBuiMsg(Entity(args.Actor))
- AddComp(args.Actor, new StationAiOverlayComponent { AllowCrossGrid = true });
+ AddComp(args.Actor, new StationAiOverlayComponent { AllowCrossGrid = true , Cosmetic = true });
if (!TryComp(eye, out RemoteEyeSourceContainerComponent? remoteEyeSourceContainerComponent))
{
remoteEyeSourceContainerComponent = new RemoteEyeSourceContainerComponent { Actor = args.Actor };
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
index 86c1c190e7b9..13cf793a8bec 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
@@ -132,6 +132,10 @@ private void OnCoreVerbs(Entity ent, ref GetVerbsEvent ent, ref AccessibleOverrideEvent args)
{
+ // Begin DeltaV Additions
+ if (ent.Comp.Cosmetic)
+ return;
+ // End DeltaV Additions
args.Handled = true;
// Hopefully AI never needs storage
@@ -150,6 +154,10 @@ private void OnAiAccessible(Entity ent, ref Accessibl
private void OnAiMenu(Entity ent, ref MenuVisibilityEvent args)
{
+ // Begin DeltaV Additions
+ if (ent.Comp.Cosmetic)
+ return;
+ // End DeltaV Additions
args.Visibility &= ~MenuVisibility.NoFov;
}
@@ -187,6 +195,10 @@ private void OnAiBuiCheck(Entity ent, ref BoundUser
private void OnAiInRange(Entity ent, ref InRangeOverrideEvent args)
{
+ // Begin DeltaV Additions
+ if (ent.Comp.Cosmetic)
+ return;
+ // End DeltaV Additions
args.Handled = true;
var target = args.Target;
if (ent.Comp.AllowCrossGrid && TryComp(ent, out RelayInputMoverComponent? relay))
diff --git a/Content.Shared/Silicons/StationAi/StationAiOverlayComponent.cs b/Content.Shared/Silicons/StationAi/StationAiOverlayComponent.cs
index d5a156d45257..fb3e22a71eaa 100644
--- a/Content.Shared/Silicons/StationAi/StationAiOverlayComponent.cs
+++ b/Content.Shared/Silicons/StationAi/StationAiOverlayComponent.cs
@@ -12,4 +12,11 @@ public sealed partial class StationAiOverlayComponent : Component
{
[DataField, AutoNetworkedField]
public bool AllowCrossGrid;
+
+ ///
+ /// DeltaV: Makes this purely an overlay and not functional.
+ /// Exists because this component also controls interaction ranges for some reason.
+ ///
+ [DataField, AutoNetworkedField]
+ public bool Cosmetic;
}
diff --git a/README.md b/README.md
index 3166b950b44f..82fc87bcbf2a 100644
--- a/README.md
+++ b/README.md
@@ -61,4 +61,5 @@ Content under these subdirectories either originate from their respective fork,
| `_Goobstation` | Goob Station | https://github.com/Goob-Station/Goob-Station/ | AGPL 3.0 |
| `_Harmony` | Harmony | https://github.com/ss14-harmony/ss14-harmony | AGPL 3.0 |
| `_NF` | Frontier Station | https://github.com/new-frontiers-14/frontier-station-14 | AGPL 3.0 |
+| `_Starlight` | Starlight | https://github.com/ss14Starlight/space-station-14 | Starlight |
| `_White` | White Dream | https://github.com/WWhiteDreamProject/wwdpublic/ | AGPL 3.0 |
diff --git a/Resources/Maps/_Impstation/Shuttles/listening_post.yml b/Resources/Maps/_Impstation/Shuttles/listening_post.yml
index 52e27667fe52..10003fead8d8 100644
--- a/Resources/Maps/_Impstation/Shuttles/listening_post.yml
+++ b/Resources/Maps/_Impstation/Shuttles/listening_post.yml
@@ -31,7 +31,7 @@ entities:
name: Unknown
- type: Transform
pos: 22.326925,-7.8882475
- parent: 966
+ parent: invalid
- type: MapGrid
chunks:
0,0:
@@ -530,19 +530,6 @@ entities:
- type: RadiationGridResistance
- type: Shuttle
- type: NavMap
- - uid: 966
- components:
- - type: MetaData
- name: Map Entity
- - type: Transform
- - type: Map
- mapPaused: True
- - type: PhysicsMap
- - type: GridTree
- - type: MovedGrids
- - type: Broadphase
- - type: OccluderTree
- - type: LoadedMap
- proto: AcousticGuitarInstrument
entities:
- uid: 17
@@ -781,7 +768,7 @@ entities:
pos: 6.5,-1.5
parent: 1
- type: Door
- secondsUntilStateChange: -4560.7007
+ secondsUntilStateChange: -4636.898
state: Opening
- type: DeviceLinkSource
lastSignals:
@@ -799,7 +786,7 @@ entities:
pos: 7.5,-0.5
parent: 1
- type: Door
- secondsUntilStateChange: -5040.1
+ secondsUntilStateChange: -5116.2974
state: Opening
- type: DeviceLinkSource
lastSignals:
@@ -812,7 +799,7 @@ entities:
pos: -1.5,-1.5
parent: 1
- type: Door
- secondsUntilStateChange: -5396.2666
+ secondsUntilStateChange: -5472.464
state: Opening
- type: DeviceLinkSource
lastSignals:
@@ -4178,7 +4165,7 @@ entities:
- uid: 838
components:
- type: Transform
- pos: 8.377745,0.81428385
+ pos: 8.2848,2.032989
parent: 1
- proto: PowerCellRecharger
entities:
@@ -4326,7 +4313,7 @@ entities:
- uid: 839
components:
- type: Transform
- pos: 8.54962,1.1267838
+ pos: 8.675425,1.9704452
parent: 1
- proto: RandomPosterContraband
entities:
@@ -4805,6 +4792,14 @@ entities:
available: False
- type: Pullable
prevFixedRotation: True
+- proto: SyndicateObservationConsole
+ entities:
+ - uid: 948
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 8.5,0.5
+ parent: 1
- proto: SyndicatePersonalAI
entities:
- uid: 819
@@ -4917,12 +4912,6 @@ entities:
rot: 3.141592653589793 rad
pos: 8.5,2.5
parent: 1
- - uid: 948
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: 8.5,0.5
- parent: 1
- uid: 952
components:
- type: Transform