Merge branch 'master' into Armor-HoS-Headgear

2025-09-22 15:18:07 +02:00 · 2025-09-22 15:18:07 +02:00 · 3d1cc54df0
parent 7cc9c76790 dd49738e4c
commit 3d1cc54df0
17 changed files with 103 additions and 60 deletions
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
@ -92,16 +92,8 @@ namespace Content.Client.Access.UI
            }
        }

-        private void ClearAllAccess()
-        {
-            foreach (var button in _accessButtons.ButtonsList.Values)
-            {
-                if (button.Pressed)
-                {
-                    button.Pressed = false;
-                }
-            }
-        }
+        // DeltaV - removed as part of job preset access fix
+        // private void ClearAllAccess()

        private void SelectJobPreset(OptionButton.ItemSelectedEventArgs args)
        {
@ -113,34 +105,28 @@ namespace Content.Client.Access.UI
            JobTitleLineEdit.Text = Loc.GetString(job.Name);
            args.Button.SelectId(args.Id);

-            ClearAllAccess();
-
-            // this is a sussy way to do this
-            foreach (var access in job.Access)
-            {
-                if (_accessButtons.ButtonsList.TryGetValue(access, out var button) && !button.Disabled)
-                {
-                    button.Pressed = true;
-                }
-            }
+            // DeltaV - start of job preset access fix
+            SubmitData();

+            var targetAccesses = job.Access.ToHashSet();
            foreach (var group in job.AccessGroups)
            {
                if (!_prototypeManager.TryIndex(group, out AccessGroupPrototype? groupPrototype))
                {
                    continue;
                }
-
-                foreach (var access in groupPrototype.Tags)
-                {
-                    if (_accessButtons.ButtonsList.TryGetValue(access, out var button) && !button.Disabled)
-                    {
-                        button.Pressed = true;
-                    }
-                }
+                targetAccesses.UnionWith(groupPrototype.Tags);
            }

-            SubmitData();
+            // this is a sussy way to do this
+            foreach (var (id, button) in _accessButtons.ButtonsList)
+            {
+                if (!button.Disabled && button.Pressed != targetAccesses.Contains(id))
+                {
+                    OnToggleAccess?.Invoke(id);
+                }
+            }
+            // DeltaV - end of job preset access fix
        }

        public void UpdateState(IdCardConsoleBoundUserInterfaceState state)
--- a/Content.Server/Flash/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@ -236,7 +236,7 @@ namespace Content.Server.Flash
        public readonly EntityUid Target;
        public readonly EntityUid? User;
        public readonly EntityUid? Used;
-        public readonly bool IgnoreProtection; //DeltaV: allow flashing to ignore flash protection
+        public bool IgnoreProtection; //DeltaV: allow flashing to ignore flash protection

        public FlashAttemptEvent(EntityUid target, EntityUid? user, EntityUid? used, bool ignoreProtection) //DeltaV: allow flashing to ignore flash protection
        {
--- a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs
+++ b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs
@ -404,10 +404,12 @@ public sealed class StationRecordsSystem : SharedStationRecordsSystem
                !someRecord.JobTitle.ToLower().Contains(filterLowerCaseValue),
            StationRecordFilterType.Species =>
                !someRecord.Species.ToLower().Contains(filterLowerCaseValue),
-            StationRecordFilterType.Prints => someRecord.Fingerprint != null
-                && IsFilterWithSomeCodeValue(someRecord.Fingerprint, filterLowerCaseValue),
-            StationRecordFilterType.DNA => someRecord.DNA != null
-                && IsFilterWithSomeCodeValue(someRecord.DNA, filterLowerCaseValue),
+            // DeltaV - start of silicon bio filters fix
+            StationRecordFilterType.Prints => someRecord.Fingerprint == null
+                || IsFilterWithSomeCodeValue(someRecord.Fingerprint, filterLowerCaseValue),
+            StationRecordFilterType.DNA => someRecord.DNA == null
+                || IsFilterWithSomeCodeValue(someRecord.DNA, filterLowerCaseValue),
+            // DeltaV - end of silicon bio filters fix
            _ => throw new IndexOutOfRangeException(nameof(filter.Type)),
        };
    }
--- a/Content.Server/_CD/Records/Consoles/CharacterRecordConsoleSystem.cs
+++ b/Content.Server/_CD/Records/Consoles/CharacterRecordConsoleSystem.cs
@ -167,10 +167,12 @@ public sealed class CharacterRecordConsoleSystem : EntitySystem
        {
            StationRecordFilterType.Name =>
                !nameJob.Contains(filterLowerCaseValue, StringComparison.CurrentCultureIgnoreCase),
-            StationRecordFilterType.Prints => record.Fingerprint != null
-                && IsFilterWithSomeCodeValue(record.Fingerprint, filterLowerCaseValue),
-            StationRecordFilterType.DNA => record.DNA != null
-                                                && IsFilterWithSomeCodeValue(record.DNA, filterLowerCaseValue),
+            // DeltaV - start of silicon bio filters fix
+            StationRecordFilterType.Prints => record.Fingerprint == null
+                || IsFilterWithSomeCodeValue(record.Fingerprint, filterLowerCaseValue),
+            StationRecordFilterType.DNA => record.DNA == null
+                || IsFilterWithSomeCodeValue(record.DNA, filterLowerCaseValue),
+            // DeltaV - start of silicon bio filters fix
            _ => throw new ArgumentOutOfRangeException(nameof(filter), "Invalid Character Record filter type"),
        };
    }
--- a/Content.Server/_DV/Access/Systems/IdCardConsoleSystem.Toggle.cs
+++ b/Content.Server/_DV/Access/Systems/IdCardConsoleSystem.Toggle.cs
@ -55,5 +55,7 @@ public sealed partial class IdCardConsoleSystem
        // TODO: only log changes when ejecting the id
        _adminLogger.Add(LogType.Action, LogImpact.Medium,
            $"{ToPrettyString(user):user} has {verb} access level '{args.Id}' {prefix} {ToPrettyString(targetId):entity}");
+
+        UpdateUserInterface(ent.Owner, ent.Comp, args);
    }
 }
--- a/Content.Server/_DV/Overlays/NightVisionSystem.cs
+++ b/Content.Server/_DV/Overlays/NightVisionSystem.cs
@ -0,0 +1,25 @@
+using Content.Server.Flash;
+using Content.Server.Flash.Components;
+using Content.Shared._Goobstation.Overlays;
+using Content.Shared.Inventory;
+
+namespace Content.Server._DV.Overlays;
+
+public sealed partial class NightVisionSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<NightVisionComponent, FlashAttemptEvent>(OnFlashAttempt);
+    }
+
+    private void OnFlashAttempt(Entity<NightVisionComponent> ent, ref FlashAttemptEvent args)
+    {
+        if (!ent.Comp.IsActive)
+            return;
+
+        args.Uncancel();
+        args.IgnoreProtection = true;
+    }
+}
--- a/Resources/Changelog/DeltaVChangelog.yml
+++ b/Resources/Changelog/DeltaVChangelog.yml
@ -1,18 +1,4 @@
 Entries:
- author: Lyndomen
-  changes:
-  - message: Champagne and Cryptobiolin are less likely to obliterate your liver
-    type: Tweak
-  id: 1182
-  time: '2025-03-19T02:33:37.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/3268
- author: nkokic
-  changes:
-  - message: Added TEG parts in cargo computer.
-    type: Add
-  id: 1183
-  time: '2025-03-19T12:01:42.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/3245
 - author: TGRCdev, formlessnameless, Lyndomen
  changes:
  - message: Revenants can now Haunt, which reveals them and gives them a small amount
@ -4182,3 +4168,22 @@
  id: 1681
  time: '2025-09-19T06:00:27.0000000+00:00'
  url: https://github.com/DeltaV-Station/Delta-v/pull/4423
+- author: SirWarock
+  changes:
+  - message: Added black scarfs to Security - No longer must they wear red scarfs
+      after the paint change!
+    type: Add
+  - message: Added formal suits for Senior Security Officers - Now more than one person
+      can dress in style!
+    type: Add
+  id: 1682
+  time: '2025-09-21T09:08:49.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4036
+- author: TehFlaminTaco
+  changes:
+  - message: Having Night Vision Goggles on now lets you be flashed even when wearing
+      other flash protection.
+    type: Tweak
+  id: 1683
+  time: '2025-09-22T05:46:45.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4378
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@ -501,7 +501,7 @@

 - type: entity
  id: MedicalTechFab
-  parent: BaseTechFabDepartamental # DeltaV - make sure it inherits the emag recipes
+  parent: BaseTechFabDepartmental # DeltaV - make sure it inherits the emag recipes
  name: medical techfab
  description: Prints equipment for use by the medbay.
  components:
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@ -1227,6 +1227,7 @@
  - HeadofSecurityCloak
  - HeadofSecurityMantle
  - ScarfRed # DeltaV
+  - ScarfBlack # DeltaV
  - SecurityPoncho # DeltaV

 - type: loadoutGroup
@ -1304,6 +1305,8 @@
  - SeniorSecOfficerTurtleskirt
  - SeniorSecOfficerJumpsuit
  - SeniorSecOfficerJumpskirt
+  - SeniorSecOfficerFormalSuit
+  - SeniorSecOfficerFormalSkirt
  # End DeltaV changes

 - type: loadoutGroup
--- a/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml
@ -19,7 +19,7 @@

 - type: entity
  parent: BaseLatheLube
-  id: BaseTechFabDepartamental
+  id: BaseTechFabDepartmental
  abstract: true
  components:
  - type: Sprite
@ -52,7 +52,7 @@
    - blueprint

 - type: entity
-  parent: BaseTechFabDepartamental
+  parent: BaseTechFabDepartmental
  id: EngineeringTechFab
  name: engineering techfab
  description: Prints equipment for engineers.
@ -100,7 +100,7 @@
    channels: [Engineering]

 - type: entity
-  parent: BaseTechFabDepartamental
+  parent: BaseTechFabDepartmental
  id: LogisticsTechFab
  name: logistics techfab
  description: Prints equipment for the logistics department.
@ -143,7 +143,7 @@
    channels: [Supply]

 - type: entity
-  parent: BaseTechFabDepartamental
+  parent: BaseTechFabDepartmental
  id: ServiceTechFab
  name: service techfab
  description: Prints equipment for the service department.
@ -183,7 +183,7 @@
    channels: [Service]

 - type: entity
-  parent: BaseTechFabDepartamental
+  parent: BaseTechFabDepartmental
  id: EpistemicsTechFab
  name: epistemics techfab
  description: Prints equipment for the epistemics department.
--- a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml
@ -78,6 +78,22 @@
  equipment:
    jumpsuit: ClothingUniformJumpskirtSecTurtle

+- type: loadout
+  id: SeniorSecOfficerFormalSuit
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorOfficer
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSecFormal
+
+- type: loadout
+  id: SeniorSecOfficerFormalSkirt
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorOfficer
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtSecFormal
+
 # OuterClothing

 - type: loadout
--- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml
@ -257,6 +257,7 @@
  minLimit: 0
  loadouts:
  - ScarfRed
+  - ScarfBlack
  - ScarfBlue
  - SecurityPoncho

@ -390,6 +391,7 @@
  minLimit: 0
  loadouts:
  - ScarfRed
+  - ScarfBlack
  - SecurityPoncho

 - type: loadoutGroup
--- a/Resources/Textures/_DV/Structures/Furniture/Tables/advanced_optable.rsi/meta.json
+++ b/Resources/Textures/_DV/Structures/Furniture/Tables/advanced_optable.rsi/meta.json
@ -1,7 +1,7 @@
 {
    "version": 1,
    "license": "CC-BY-SA-3.0",
-    "copyright": "Sprited by Sir_Warock on Discord",
+    "copyright": "Sprited by Sir_Warock on Discord, modified by TehFlaminTaco (Github)",
    "size": {
        "x": 32,
        "y": 32
--- a/Resources/Textures/_DV/Structures/Furniture/Tables/advanced_optable.rsi/state_speed.png
+++ b/Resources/Textures/_DV/Structures/Furniture/Tables/advanced_optable.rsi/state_speed.png
--- a/Resources/Textures/_DV/Structures/Furniture/Tables/advanced_optable.rsi/state_stasis.png
+++ b/Resources/Textures/_DV/Structures/Furniture/Tables/advanced_optable.rsi/state_stasis.png
--- a/Resources/Textures/_DV/Structures/Furniture/Tables/advanced_optable.rsi/state_unpowered.png
+++ b/Resources/Textures/_DV/Structures/Furniture/Tables/advanced_optable.rsi/state_unpowered.png