Skip to content

Revert "Delta v cherry picks" #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sage-Jones merged 1 commit into from
Oct 11, 2025
Merged

Revert "Delta v cherry picks" #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ private void OnCompShutdown(Entity<InnerBodyAnomalyComponent> ent, ref Component
if (!TryComp<SpriteComponent>(ent, out var sprite))
return;

if (sprite.LayerMapTryGet(ent.Comp.LayerMap, out var index)) // imp. added this check to prevent errors on anomalites - not having it was bad code on upstream's part
sprite.LayerSetVisible(index, false);
var index = _sprite.LayerMapGet((ent.Owner, sprite), ent.Comp.LayerMap);
_sprite.LayerSetVisible((ent.Owner, sprite), index, false);
}
}
31 changes: 0 additions & 31 deletions Content.Client/Atmos/EntitySystems/GasPressureRegulatorSystem.cs
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions Content.Client/Atmos/UI/GasPressureRegulatorBoundUserInterface.cs
View file
Open in desktop

This file was deleted.

96 changes: 0 additions & 96 deletions Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml
View file
Open in desktop

This file was deleted.

129 changes: 0 additions & 129 deletions Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ protected override void Open()
// Begin DeltaV Additions - Find a station's grid instead of the current one for evil monitors
if (EntMan.HasComponent<LongRangeCrewMonitorComponent>(Owner))
{
gridUid = EntMan.System<LongRangeCrewMonitorSystem>().FindLargestStationGridInMap(xform.MapID);
gridUid = EntMan.System<LongRangeCrewMonitorSystem>().FindStationGridInMap(xform.MapID);
gridUid ??= xform.GridUid; // fall back to whatever grid this is on if it failed
}
// End DeltaV Additions
Expand Down
5 changes: 0 additions & 5 deletions Content.Client/PDA/PdaMenu.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@
<ContainerButton Name="StationTimeButton">
<RichTextLabel Name="StationTimeLabel" Access="Public"/>
</ContainerButton>
<!-- Begin DeltaV changes -->
<ContainerButton Name="CurrentDateButton">
<RichTextLabel Name="CurrentDateLabel" Access="Public"/>
</ContainerButton>
<!-- End DeltaV changes -->
<ContainerButton Name="StationAlertLevelInstructionsButton">
<RichTextLabel Name="StationAlertLevelInstructions" Access="Public"/>
</ContainerButton>
Expand Down
16 changes: 0 additions & 16 deletions Content.Client/PDA/PdaMenu.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ public sealed partial class PdaMenu : PdaWindow
private string _stationName = Loc.GetString("comp-pda-ui-unknown");
private string _alertLevel = Loc.GetString("comp-pda-ui-unknown");
private string _instructions = Loc.GetString("comp-pda-ui-unknown");
private string _currentDate = Loc.GetString("comp-pda-ui-unknown"); // DeltaV - PDA date


private int _currentView;
Expand Down Expand Up @@ -126,13 +125,6 @@ public PdaMenu()
_clipboard.SetText(_instructions);
};

// Begin DeltaV additions
CurrentDateButton.OnPressed += _ =>
{
_clipboard.SetText(_currentDate);
};
// End DeltaV additions




Expand Down Expand Up @@ -195,14 +187,6 @@ public void UpdateState(PdaUpdateState state)
"comp-pda-ui-station-alert-level-instructions",
("instructions", _instructions))
);
// Begin DeltaV additions
if (state.PdaOwnerInfo.CurrentDate is { } curDate)
_currentDate = curDate.ToString("dd MMMM yyyy");
CurrentDateLabel.SetMarkup(Loc.GetString(
"comp-pda-ui-current-date",
("date", _currentDate)
));
// End DeltaV additions

AddressLabel.Text = state.Address?.ToUpper() ?? " - ";

Expand Down
2 changes: 1 addition & 1 deletion Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ private void OnUnpressed(GUIBoundKeyEventArgs args)
if (_entities.TryGetComponent(Action, out AutoRechargeComponent? autoRecharge))
{
var chargeTimeRemaining = _sharedChargesSys.GetNextRechargeTime((Action.Value, actionCharges, autoRecharge));
chargesText.AddText(Loc.GetString($"{Environment.NewLine}Time Til Recharge: {chargeTimeRemaining.TotalSeconds:F1} seconds")); // DeltaV - Better formatted, easier to read.
chargesText.AddText(Loc.GetString($"{Environment.NewLine}Time Til Recharge: {chargeTimeRemaining}"));
}
}

Expand Down
Loading
Loading