Merge branch 'DeltaV-Station:master' into map-testing

Content.Shared/Lock/LockSystem.cs

@@ -1,10 +1,10 @@
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Construction.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Examine;
-using Content.Shared.Hands.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
@@ -26,6 +26,7 @@ namespace Content.Shared.Lock;
 public sealed class LockSystem : EntitySystem
 {
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
     [Dependency] private readonly ActivatableUISystem _activatableUI = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -246,7 +247,7 @@ public bool IsLocked(Entity<LockComponent?> ent)
     /// </summary>
     public bool CanToggleLock(EntityUid uid, EntityUid user, bool quiet = true)
     {
-        if (!HasComp<HandsComponent>(user))
+        if (!_actionBlocker.CanComplexInteract(user))
             return false;
 
         var ev = new LockToggleAttemptEvent(user, quiet);

Resources/Changelog/DeltaVChangelog.yml

@@ -1,11 +1,4 @@
 Entries:
-- author: rosieposieeee
-  changes:
-  - message: Submarine Station has been removed from rotation.
-    type: Remove
-  id: 385
-  time: '2024-06-07T14:37:29.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1307
 - author: Lyndomen
   changes:
   - message: Burning bodies no longer ash
@@ -3845,3 +3838,11 @@
   id: 884
   time: '2025-01-09T12:39:39.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2667
+- author: deltanedas
+  changes:
+  - message: AI cores will soon have defense turrets that the AI can deploy to shoot
+      intruders.
+    type: Add
+  id: 885
+  time: '2025-01-09T17:06:00.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2665

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/turrets.yml

@@ -0,0 +1,17 @@
+# Shoots anything and lets doors close over it, letting it be used in AI cores "under" blast doors.
+- type: entity
+  parent: WeaponTurretAllHostile
+  id: WeaponTurretAI
+  name: AI defense turret
+  description: A ballistic turret that retracts into the floor. Deployable by the station AI to defend its core against urgent threats.
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.45
+        density: 60
+        mask:
+        - SmallMobMask # same as mouse, lets it go under doors but not phase through walls
+        layer:
+        - SmallMobLayer