Skip to content

Commit

Permalink
More error fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
GreaseMonk committed Apr 9, 2024
1 parent cd8ce5d commit 0e5f424
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private void UpdateUI(EntityUid owner, SyrinxVoiceMaskComponent? component = nul
return;

if (_uiSystem.TryGetUi(owner, VoiceMaskUIKey.Key, out var bui))
_uiSystem.SetUiState(bui, new VoiceMaskBuiState(component.VoiceName));
_uiSystem.SetUiState(bui, new VoiceMaskBuiState(component.VoiceName, null));
}

/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,6 @@ public void QueueExplosion(MapCoordinates epicenter,
if (HasComp<ProtectedGridComponent>(gridUid) || ev.Cancelled)
return null;

var visualEnt = CreateExplosionVisualEntity(epicenter, type.ID, spaceMatrix, spaceData, gridData.Values, iterationIntensity);

return new Explosion(this,
queued.Proto,
spaceData,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public sealed partial class DeepFryerSystem : SharedDeepfryerSystem
private static readonly string MobFlavorMeat = "meaty";

private static readonly AudioParams
AudioParamsInsertRemove = new(0.5f, 1f, "Master", 5f, 1.5f, 1f, false, 0f, 0.2f);
AudioParamsInsertRemove = new(0.5f, 1f, 5f, 1.5f, 1f, false, 0f, 0.2f);

private ISawmill _sawmill = default!;

Expand Down Expand Up @@ -634,8 +634,7 @@ private void OnClearSlagStart(EntityUid uid, DeepFryerComponent component, DeepF
var doAfterArgs = new DoAfterArgs(EntityManager, user.Value, delay, ev, uid, uid, heldItem)
{
BreakOnDamage = true,
BreakOnTargetMove = true,
BreakOnUserMove = true,
BreakOnMove = true,
MovementThreshold = 0.25f,
NeedHand = true
};
Expand Down
4 changes: 2 additions & 2 deletions Content.Server/Nyanotrasen/Mail/MailCommands.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
}

foreach (var entity in targetContainer.ContainedEntities.ToArray())
mailContents.Insert(entity);
_containerSystem.Insert(entity, mailContents);

mailComponent.IsFragile = isFragile;
mailComponent.IsPriority = isPriority;

_mailSystem.SetupMail(mailUid, teleporterComponent, recipient.Value);

var teleporterQueue = _containerSystem.EnsureContainer<Container>(teleporterComponent.Owner, "queued");
teleporterQueue.Insert(mailUid);
_containerSystem.Insert(mailUid, teleporterQueue);
shell.WriteLine(Loc.GetString("command-mailto-success", ("timeToTeleport", teleporterComponent.TeleportInterval.TotalSeconds - teleporterComponent.Accumulator)));
}
}
Expand Down
2 changes: 1 addition & 1 deletion Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private void OnSalvageClaimMessage(EntityUid uid, SalvageExpeditionConsoleCompon
_labelSystem.Label(cdUid, GetFTLName(_prototypeManager.Index<DatasetPrototype>("names_borer"), missionparams.Seed));
_audio.PlayPvs(component.PrintSound, uid);

UpdateConsoles((station.Value, data));
UpdateConsoles(data);
}

private void OnSalvageConsoleInit(Entity<SalvageExpeditionConsoleComponent> console, ref ComponentInit args)
Expand Down
3 changes: 2 additions & 1 deletion Content.Server/Salvage/SalvageSystem.Runner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Content.Server.Shuttles.Systems;
using Content.Server.Station.Components;
using Content.Shared.Chat;
using Content.Shared.Coordinates;
using Content.Shared.Humanoid;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
Expand Down Expand Up @@ -208,7 +209,7 @@ private void UpdateRunner()
var location = Spawn(null, coords);
var despawn = EnsureComp<TimedDespawnComponent>(location);
despawn.Lifetime = 600;
_shuttle.FTLTravel(shuttleUid, shuttle, location, ftlTime);
_shuttle.FTLToCoordinates(shuttleUid, shuttle, location.ToCoordinates(), ftlTime);
}

break;
Expand Down
3 changes: 2 additions & 1 deletion Content.Server/Shipyard/Systems/ShipyardSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Numerics;
using Content.Shared.Coordinates;
using Content.Shared.Shipyard.Events;
using Content.Shared.Mobs.Components;
using Robust.Shared.Containers;
Expand Down Expand Up @@ -114,7 +115,7 @@ public bool TryPurchaseShuttle(EntityUid stationUid, string shuttlePath, [NotNul

_sawmill.Info($"Shuttle {shuttlePath} was purchased at {ToPrettyString((EntityUid) stationUid)} for {price:f2}");
//can do TryFTLDock later instead if we need to keep the shipyard map paused
_shuttle.FTLTravel(shuttleGrid.Value, shuttle, targetGrid.Value, 0f, 15f, true);
_shuttle.FTLToCoordinates(shuttleGrid.Value, shuttle, targetGrid.Value.ToCoordinates(), 0f, 15f);

return true;
}
Expand Down
10 changes: 0 additions & 10 deletions Content.Server/VendingMachines/VendingMachineSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,6 @@ private void OnBoundUIOpened(EntityUid uid, VendingMachineComponent component, B
UpdateVendingMachineInterfaceState(uid, component, balance);
}

private void OnBoundUIClosed(EntityUid uid, VendingMachineComponent component, BoundUIClosedEvent args)
{
// Only vendors that advertise will send message after dispensing
if (component.ShouldSayThankYou && TryComp<AdvertiseComponent>(uid, out var advertise))
{
_advertise.SayThankYou(uid, advertise);
component.ShouldSayThankYou = false;
}
}

private void UpdateVendingMachineInterfaceState(EntityUid uid, VendingMachineComponent component, int balance)
{
var state = new VendingMachineInterfaceState(GetAllInventory(uid, component), balance);
Expand Down

0 comments on commit 0e5f424

Please sign in to comment.