Merge branch 'master' into Chitinid

Content.Server/Objectives/Systems/KillPersonConditionSystem.cs

@@ -41,18 +41,18 @@ private void OnGetProgress(EntityUid uid, KillPersonConditionComponent comp, ref
 
     private void OnPersonAssigned(Entity<PickRandomPersonComponent> ent, ref ObjectiveAssignedEvent args)
     {
-        AssignRandomTarget(ent, args, _ => true);
+        AssignRandomTarget(ent, ref args, _ => true);
     }
 
     private void OnHeadAssigned(Entity<PickRandomHeadComponent> ent, ref ObjectiveAssignedEvent args)
     {
-        AssignRandomTarget(ent, args, mindId =>
+        AssignRandomTarget(ent, ref args, mindId =>
             TryComp<MindComponent>(mindId, out var mind) &&
             mind.OwnedEntity is { } ownedEnt &&
             HasComp<CommandStaffComponent>(ownedEnt));
     }
 
-    private void AssignRandomTarget(EntityUid uid, ObjectiveAssignedEvent args, Predicate<EntityUid> filter, bool fallbackToAny = true)
+    private void AssignRandomTarget(EntityUid uid, ref ObjectiveAssignedEvent args, Predicate<EntityUid> filter, bool fallbackToAny = true)
     {
         // invalid prototype
         if (!TryComp<TargetObjectiveComponent>(uid, out var target))
@@ -97,6 +97,13 @@ private void AssignRandomTarget(EntityUid uid, ObjectiveAssignedEvent args, Pred
         // Pick between humans matching our filter or fall back to all humans alive
         var selectedHumans = filteredHumans.Count > 0 ? filteredHumans : allHumans;
 
+        // Still no valid targets even after the fallback
+        if (selectedHumans.Count == 0)
+        {
+            args.Cancelled = true;
+            return;
+        }
+
         _target.SetTarget(uid, _random.Pick(selectedHumans), target);
     }
 

Content.Shared/Humanoid/HumanoidVisualLayers.cs

@@ -11,6 +11,8 @@ public enum HumanoidVisualLayers : byte
         Hair,
         FacialHair,
         Chest,
+        Underwear, // DeltaV
+        Undershirt, // DeltaV
         Head,
         Snout,
         HeadSide, // side parts (i.e., frills)

Content.Shared/Humanoid/Markings/MarkingCategories.cs

@@ -13,6 +13,8 @@ public enum MarkingCategories : byte
         HeadSide,
         Snout,
         Chest,
+        Underwear, // DeltaV
+        Undershirt, // DeltaV
         Arms,
         Legs,
         Tail,
@@ -32,6 +34,8 @@ public static MarkingCategories FromHumanoidVisualLayers(HumanoidVisualLayers la
                 HumanoidVisualLayers.HeadTop => MarkingCategories.HeadTop,
                 HumanoidVisualLayers.HeadSide => MarkingCategories.HeadSide,
                 HumanoidVisualLayers.Snout => MarkingCategories.Snout,
+                HumanoidVisualLayers.Undershirt => MarkingCategories.Undershirt, // DeltaV
+                HumanoidVisualLayers.Underwear => MarkingCategories.Underwear, // DeltaV
                 HumanoidVisualLayers.Chest => MarkingCategories.Chest,
                 HumanoidVisualLayers.RArm => MarkingCategories.Arms,
                 HumanoidVisualLayers.LArm => MarkingCategories.Arms,

Resources/Changelog/DeltaVChangelog.yml

@@ -1,34 +1,4 @@
 Entries:
-- author: deltanedas
-  changes:
-  - message: CentComm now has a justice department if you want to use it for admemes.
-    type: Tweak
-  id: 408
-  time: '2024-06-19T14:48:59.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1352
-- author: Velcroboy
-  changes:
-  - message: Added the NTES-Fishbowl, a stylish new ride to Centcomm from The Hive
-      Station
-    type: Add
-  id: 409
-  time: '2024-06-20T17:32:27.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1417
-- author: Lyndomen
-  changes:
-  - message: Sleeper Agents are waking up!
-    type: Add
-  id: 410
-  time: '2024-06-20T20:36:51.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1389
-- author: deltanedas
-  changes:
-  - message: Fugitives can now be wanted by GALPOL, they might even be hiding in your
-      very station!
-    type: Add
-  id: 411
-  time: '2024-06-30T19:40:33.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1413
 - author: Lyndomen
   changes:
   - message: Death Acidifiers are now in Syndicate Uplinks once more
@@ -3854,3 +3824,35 @@
   id: 907
   time: '2025-01-14T01:39:32.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2720
+- author: beck-thompson
+  changes:
+  - message: Lone ops can now no longer be targeted by kill objectives
+    type: Fix
+  id: 908
+  time: '2025-01-14T05:31:53.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2724
+- author: alterae
+  changes:
+  - message: Ported undergarments from Impstation
+    type: Add
+  - message: Slimefolk can now wear chest tattoos
+    type: Tweak
+  id: 909
+  time: '2025-01-14T05:56:24.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2719
+- author: Velcroboy
+  changes:
+  - message: Added science! Smile the Slime can be created in the science lab through
+      a mixture of reagents and a special brain.
+    type: Add
+  id: 910
+  time: '2025-01-14T14:17:02.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2632
+- author: Radezolid
+  changes:
+  - message: CMO's locker now starts with a medical biofabricator flatpack instead
+      of it's machine board.
+    type: Tweak
+  id: 911
+  time: '2025-01-14T15:04:14.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2722

Resources/Locale/en-US/_DV/markings/tattoos.ftl

@@ -6,3 +6,6 @@ marking-TattooNightlingChestMale = Chest Tattoo (Nightling)
 
 marking-TattooNightlingChestFemale-tattoo_nightling_female = Chest Tattoo (Nightling)
 marking-TattooNightlingChestFemale = Chest Tattoo (Nightling)
+
+marking-TattooNanotrasenChest-tattoo_nanotrasen_chest = Chest Tattoo (Nanotrasen)
+marking-TattooNanotrasenChest = Chest Tattoo (Nanotrasen)

Resources/Locale/en-US/_DV/preferences/ui/markings-picker.ftl

@@ -0,0 +1,2 @@
+markings-category-Undershirt = Undershirt
+markings-category-Underwear = Underwear

Resources/Locale/en-US/_DV/reagents/meta/biological.ftl

@@ -0,0 +1,2 @@
+reagent-name-sentient-grey-matter = sentient grey matter
+reagent-desc-sentient-grey-matter = Thought juice, the stuff that leaks out of your ears. It seems to be sparkling when you look at it in the right light. That's odd...

Resources/Locale/en-US/_Impstation/markings/undershirt.ftl

@@ -0,0 +1,29 @@
+marking-UndershirtDefault-undershirt = Undershirt
+marking-UndershirtDefault = Undershirt (Default)
+
+marking-UndershirtRolled-rolled_undershirt = Undershirt
+marking-UndershirtRolled = Undershirt (Rolled)
+
+marking-UndershirtSleeveless-sleeveless = Tanktop
+marking-UndershirtSleeveless = Tanktop
+
+marking-UndershirtGrossSleeveless-gross_sleeveless = Tanktop
+marking-UndershirtGrossSleeveless = Tanktop (Gross)
+
+marking-UndershirtRolledSleeveless-rolled_undershirt_sleeveless = Tanktop
+marking-UndershirtRolledSleeveless = Tanktop (Rolled)
+
+marking-UndershirtNanotrasen-nanotrasen = Undershirt
+marking-UndershirtNanotrasen = Undershirt (Nanotrasen)
+
+marking-UndershirtBinder-binder = Binder
+marking-UndershirtBinder = Binder
+
+marking-UndershirtBraClassic-classic = Bra
+marking-UndershirtBraClassic = Bra (Classic)
+
+marking-UndershirtBraSports-sports = Bra
+marking-UndershirtBraSports = Bra (Sports)
+
+marking-UndershirtBraStrapless-strapless = Bra
+marking-UndershirtBraStrapless = Bra (Strapless)

Resources/Locale/en-US/_Impstation/markings/underwear.ftl

@@ -0,0 +1,10 @@
+marking-UnderwearDefault-boxers = Underwear
+marking-UnderwearDefault = Underwear (Default)
+marking-UnderwearBriefs-briefs = Underwear
+marking-UnderwearBriefs = Underwear (Briefs)
+marking-UnderwearLowriders-lowriders = Underwear
+marking-UnderwearLowriders = Underwear (Lowriders)
+marking-UnderwearSatin-satin = Underwear
+marking-UnderwearSatin = Underwear (Satin)
+marking-UnderwearTanga-tanga = Underwear
+marking-UnderwearTanga = Underwear (Tanga)