juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Genpop Closets & IDs (#36392)

Browse Source 
* Genpop IDs and Lockers

* placeholder generation, no ui yet.

* UI

* Fix time offset

* fix meta.jsons

* big speller

* Scarkyo review

* Add turnstile prototypes

* make IDs recyclable

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
This commit is contained in:
Nemanja
2025-04-24 10:32:11 -04:00
committed by GitHub
parent 896f73c59d
commit dc9844edd1
37 changed files with 1403 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/Lock/LockSystem.cs
View File

@@ -118,7 +118,7 @@ public sealed class LockSystem : EntitySystem
if (!CanToggleLock(uid, user, quiet: false))
return false;
if (!HasUserAccess(uid, user, quiet: false))
if (lockComp.UseAccess && !HasUserAccess(uid, user, quiet: false))
return false;
if (!skipDoAfter && lockComp.LockTime != TimeSpan.Zero)
@@ -145,6 +145,9 @@ public sealed class LockSystem : EntitySystem
if (!Resolve(uid, ref lockComp))
return;
if (lockComp.Locked)
return;
if (user is { Valid: true })
{
_sharedPopupSystem.PopupClient(Loc.GetString("lock-comp-do-lock-success",
@@ -175,6 +178,9 @@ public sealed class LockSystem : EntitySystem
if (!Resolve(uid, ref lockComp))
return;
if (!lockComp.Locked)
return;
if (user is { Valid: true })
{
_sharedPopupSystem.PopupClient(Loc.GetString("lock-comp-do-unlock-success",
@@ -211,7 +217,7 @@ public sealed class LockSystem : EntitySystem
if (!CanToggleLock(uid, user, quiet: false))
return false;
if (!HasUserAccess(uid, user, quiet: false))
if (lockComp.UseAccess && !HasUserAccess(uid, user, quiet: false))
return false;
if (!skipDoAfter && lockComp.UnlockTime != TimeSpan.Zero)