cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mech equipment fix (#12969)

This commit is contained in:
Nemanja 2022-12-11 06:31:55 -05:00 committed by GitHub
parent 58d57c2e8e
commit ef8db74533
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Mech/Systems/MechEquipmentSystem.cs
View File

@ -36,6 +36,9 @@ public sealed class MechEquipmentSystem : EntitySystem
if (!TryComp<MechComponent>(mech, out var mechComp))
return;
if (mechComp.Broken)
return;
if (args.User == mechComp.PilotSlot.ContainedEntity)
return;
@ -62,7 +65,6 @@ public sealed class MechEquipmentSystem : EntitySystem
{
component.TokenSource = null;
_popup.PopupEntity(Loc.GetString("mech-equipment-finish-install", ("item", uid)), args.Mech, Filter.Pvs(args.Mech));
_mech.InsertEquipment(args.Mech, uid);
}

5
Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
View File

@ -292,15 +292,14 @@ public abstract class SharedMechSystem : EntitySystem
if (attemptev.Cancelled)
return;
}
equipmentComponent.EquipmentOwner = null;
component.EquipmentContainer.Remove(toRemove, EntityManager);
var ev = new MechEquipmentRemovedEvent(uid);
RaiseLocalEvent(toRemove, ref ev);
if (component.CurrentSelectedEquipment == toRemove)
CycleEquipment(uid, component);
equipmentComponent.EquipmentOwner = null;
component.EquipmentContainer.Remove(toRemove, EntityManager);
UpdateUserInterface(uid, component);
}