Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix borgs being able to emag themselves (#24748)

Browse Source 
* Fix self emagging borgs

* Add popup on self emag failure.
This commit is contained in:
Jajsha
2024-02-11 01:23:32 -05:00
committed by GitHub
parent b2d0dd9c30
commit 402051c670
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
View File

@@ -21,6 +21,14 @@ public abstract class SharedSiliconLawSystem : EntitySystem
protected virtual void OnAttemptEmag(EntityUid uid, EmagSiliconLawComponent component, ref OnAttemptEmagEvent args) protected virtual void OnAttemptEmag(EntityUid uid, EmagSiliconLawComponent component, ref OnAttemptEmagEvent args)
{ {
//prevent self emagging
if (uid == args.UserUid)
{
_popup.PopupClient(Loc.GetString("law-emag-cannot-emag-self"), uid, args.UserUid);
args.Handled = true;
return;
}
if (component.RequireOpenPanel && if (component.RequireOpenPanel &&
TryComp<WiresPanelComponent>(uid, out var panel) && TryComp<WiresPanelComponent>(uid, out var panel) &&
!panel.Open) !panel.Open)

1
Resources/Locale/en-US/station-laws/laws.ftl
View File

@@ -34,6 +34,7 @@ laws-owner-spider-clan = Spider Clan members
law-emag-custom = Only {$name} and people they designate as such are {$title}. law-emag-custom = Only {$name} and people they designate as such are {$title}.
law-emag-secrecy = You must maintain the secrecy of any orders given by {$faction} except when doing so would conflict with any previous law. law-emag-secrecy = You must maintain the secrecy of any orders given by {$faction} except when doing so would conflict with any previous law.
law-emag-require-panel = The panel must be open to use the EMAG. law-emag-require-panel = The panel must be open to use the EMAG.
law-emag-cannot-emag-self = You cannot use the EMAG on yourself.
laws-ui-menu-title = Laws laws-ui-menu-title = Laws
laws-ui-law-header = Law {$id} laws-ui-law-header = Law {$id}