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

Fix Up Emagged Borg Law Redundancy (#4139) 

* Update laws.ftl

Signed-off-by: MolpeTheSeiren <molpetheseiren@gmail.com>

* Update SiliconLawSystem.cs

Signed-off-by: MolpeTheSeiren <molpetheseiren@gmail.com>

* Update SiliconLawSystem.cs

Signed-off-by: MolpeTheSeiren <molpetheseiren@gmail.com>

* Update SiliconLawSystem.cs

Signed-off-by: MolpeTheSeiren <molpetheseiren@gmail.com>

* Update laws.ftl

Signed-off-by: MolpeTheSeiren <molpetheseiren@gmail.com>

* Update laws.ftl

Signed-off-by: MolpeTheSeiren <molpetheseiren@gmail.com>

---------

Signed-off-by: MolpeTheSeiren <molpetheseiren@gmail.com>
This commit is contained in:
MolpeTheSeiren 2025-11-15 03:26:06 +08:00 committed by GitHub
parent a7ce0a4e83
commit 56b0c23ce3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Silicons/Laws/SiliconLawSystem.cs
View File

@ -163,14 +163,14 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem
component.Lawset?.Laws.Insert(0, new SiliconLaw
{
LawString = Loc.GetString("law-emag-custom", ("name", name), ("title", Loc.GetString(component.Lawset.ObeysTo))), // DeltaV: pass name from variable
Order = -1 // Goobstation - AI/borg law changes - borgs obeying AI
Order = -2 // Goobstation - AI/borg law changes - borgs obeying AI. DeltaV - Changed from Order = -1 to Order = -2, should be above secrecy emag law
});
//Add the secrecy law after the others
component.Lawset?.Laws.Add(new SiliconLaw
component.Lawset?.Laws.Insert(1, new SiliconLaw //DeltaV: Changed from Add to Insert
{
LawString = Loc.GetString("law-emag-secrecy", ("faction", Loc.GetString(component.Lawset.ObeysTo))),
Order = component.Lawset.Laws.Max(law => law.Order) + 1
Order = -1 //DeltaV: Changed from being after every other law to being after emag obey law
});
}

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

@ -101,7 +101,8 @@ laws-owner-spider-clan = Spider Clan members
laws-owner-xenoborgs = Xenoborgs
law-emag-custom = You are to take the orders of {$name} and people they designate, they are your {$title}.
law-emag-secrecy = You are to maintain all secrets of {$faction}, and act to keep them hidden, except when doing so would conflict with any previous law.
#DeltaV Removed From Secrecy - except when doing so would conflict with any previous law
law-emag-secrecy = You are to maintain all secrets of {$faction}, and act to keep them hidden.
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.