Merge remote-tracking branch 'upstream/master' into ThreeMapEdits

Content.Server/DeltaV/StationEvents/Events/FugitiveRule.cs

@@ -11,6 +11,7 @@
 using Content.Shared.Paper;
 using Content.Shared.Popups;
 using Content.Shared.Random.Helpers;
+using Content.Shared.Silicons.StationAi;
 using Content.Shared.Storage.EntitySystems;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Utility;
@@ -46,7 +47,7 @@ protected override void ActiveTick(EntityUid uid, FugitiveRuleComponent comp, Ga
         var consoles = new List<TransformComponent>();
         while (query.MoveNext(out var console, out var xform, out _))
         {
-            if (StationSystem.GetOwningStation(console, xform) != comp.Station || HasComp<GhostComponent>(console))
+            if (StationSystem.GetOwningStation(console, xform) != comp.Station || HasComp<GhostComponent>(console) || HasComp<StationAiHeldComponent>(console))
                 continue;
 
             consoles.Add(xform);

Resources/Changelog/DeltaVChangelog.yml

@@ -1,56 +1,4 @@
 Entries:
-- author: Adrian16199
-  changes:
-  - message: Added a speech bubble to felinids. Mraow!
-    type: Add
-  id: 237
-  time: '2024-02-12T20:51:35.0000000+00:00'
-- author: DebugOk
-  changes:
-  - message: Felinids now fit in bags again!
-    type: Add
-  id: 238
-  time: '2024-02-12T20:52:49.0000000+00:00'
-- author: Guess-My-Name
-  changes:
-  - message: Some budget cuts were made in HR department, expect more bureaucratic
-      errors in near future.
-    type: Add
-  id: 239
-  time: '2024-02-12T21:01:44.0000000+00:00'
-- author: Adrian16199
-  changes:
-  - message: Felinid's thieving gloves have been removed for Soft paws mechanic.
-    type: Tweak
-  id: 240
-  time: '2024-02-12T21:10:44.0000000+00:00'
-- author: Adrian16199
-  changes:
-  - message: Felinids now scream in agony from water.
-    type: Add
-  id: 241
-  time: '2024-02-12T21:11:44.0000000+00:00'
-- author: VMSolidus
-  changes:
-  - message: 'Harpies have received a full visual rework. Featuring clothing sprites,
-      new markings, a complete overhaul of their layering, as well as visual systems. '
-    type: Add
-  - message: Harpies now have bird related speech verbs
-    type: Add
-  - message: 'Two new traits have been added related to birds. Harpies now start by
-      default with the new Ultraviolet Vision trait, letting them see a whole new
-      spectrum of colors. This trait can be taken by other curious people. Harpies
-      that wish to see in RGB colors can instead take the new Normal Vision trait. '
-    type: Add
-  id: 242
-  time: '2024-02-12T22:25:02.0000000+00:00'
-- author: DebugOk
-  changes:
-  - message: Glimmer probers now react violently to being hit by gorilla gauntlets
-      if glimmer is above 500
-    type: Tweak
-  id: 243
-  time: '2024-02-13T00:59:01.0000000+00:00'
 - author: VMSolidus
   changes:
   - message: Removed the ability of Harpies to destroy people's ears.
@@ -3803,3 +3751,57 @@
   id: 736
   time: '2024-12-03T06:36:02.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2352
+- author: BlitzTheSquishy
+  changes:
+  - message: You now have to hold a rifle with TWO hands to operate it.
+    type: Tweak
+  id: 737
+  time: '2024-12-04T12:51:08.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2353
+- author: deltanedas
+  changes:
+  - message: Fixed the AI getting a copy of fugitive reports on its face.
+    type: Fix
+  id: 738
+  time: '2024-12-04T23:20:55.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2363
+- author: deltanedas
+  changes:
+  - message: Fixed traitors never getting the notary stamp steal objective.
+    type: Fix
+  id: 739
+  time: '2024-12-05T04:17:26.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2358
+- author: JustAnOrange
+  changes:
+  - message: Fixed Logi and Epi departmental sign sprites.
+    type: Fix
+  id: 740
+  time: '2024-12-05T10:29:37.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2366
+- author: Emily9031
+  changes:
+  - message: Cyborgs are now able to slowly fly through space.
+    type: Add
+  id: 741
+  time: '2024-12-06T01:22:26.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2339
+- author: Avalon-Proto
+  changes:
+  - message: Syndicate Observation Kits have been adjusted, granting it a Camera bug
+      and a better cell for the monitor!
+    type: Tweak
+  id: 742
+  time: '2024-12-06T18:15:22.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2288
+- author: Radezolid
+  changes:
+  - message: Added foam sabres! They may appear in maintenance lockers and mimes can
+      select to spawn with it in the loadout selection.
+    type: Add
+  - message: Added a sharp version of the foam sabre toy, purchasable from the syndicate
+      uplink at 6 TC with a possible discount to 4 TC.
+    type: Add
+  id: 743
+  time: '2024-12-06T19:33:56.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2310

Resources/Locale/en-US/deltav/store/uplink-catalog.ftl

@@ -20,3 +20,6 @@ uplink-doorjack-desc = A specialized cryptographic sequencer, designed solely to
 
 uplink-home-run-bat-name = Home Run Bat
 uplink-home-run-bat-desc = Rigged bat pre-coated in blood for Syndicate tee-ball practice. Launch your foes!
+
+uplink-foam-sabre-name = Sharp Foam Sabre
+uplink-foam-sabre-desc = A blade disguised as a toy foam sabre. Perfect for assassins that pretend playing around.

Resources/Maps/Shuttles/DeltaV/barge.yml

@@ -457,7 +457,6 @@ entities:
     - type: GasTileOverlay
     - type: SpreaderGrid
     - type: GravityShake
-      nextShake: 0
       shakeTimes: 10
 - proto: AirCanister
   entities:
@@ -598,44 +597,26 @@ entities:
     - type: Transform
       pos: 5.5,-0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 437
   - uid: 23
     components:
     - type: Transform
       pos: 5.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 437
   - uid: 24
     components:
     - type: Transform
       pos: -4.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 434
-      - 435
   - uid: 25
     components:
     - type: Transform
       pos: -4.5,2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 434
-      - 435
   - uid: 26
     components:
     - type: Transform
       pos: -4.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 434
-      - 435
 - proto: BoozeDispenser
   entities:
   - uid: 249
@@ -1693,139 +1674,90 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 507
-      - 508
   - uid: 232
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 507
-      - 508
   - uid: 233
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 507
-      - 508
   - uid: 234
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 507
-      - 508
   - uid: 235
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 510
   - uid: 236
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 510
   - uid: 237
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 510
   - uid: 238
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,-0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 509
   - uid: 239
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,-0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 509
   - uid: 240
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 509
   - uid: 241
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 509
   - uid: 242
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 509
   - uid: 243
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,-0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 509
   - uid: 244
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 510
   - uid: 245
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-5.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 510
 - proto: DrinkGinBottleFull
   entities:
   - uid: 246
@@ -3291,43 +3223,26 @@ entities:
     - type: Transform
       pos: 0.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 439
   - uid: 399
     components:
     - type: Transform
       pos: 0.5,2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 439
   - uid: 400
     components:
     - type: Transform
       pos: 0.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 439
   - uid: 401
     components:
     - type: Transform
       pos: 1.5,-2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 436
-      - 438
   - uid: 402
     components:
     - type: Transform
       pos: 2.5,-2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 436
-      - 438
 - proto: ShuttleWindow
   entities:
   - uid: 403
@@ -4364,6 +4279,15 @@ entities:
     - type: Transform
       pos: 1.5,-13.5
       parent: 1
+- proto: WarpPoint
+  entities:
+  - uid: 643
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+    - type: WarpPoint
+      location: The Barge
 - proto: WaterCooler
   entities:
   - uid: 576