Merge branch 'master' into port/impstation/supermatter

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);
     }
 

Resources/Changelog/DeltaVChangelog.yml

@@ -1,19 +1,4 @@
 Entries:
-- 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
@@ -3855,3 +3840,19 @@
   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/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/Migrations/deltaMigrations.yml

@@ -131,3 +131,6 @@ AlwaysPoweredSmallLightMaintenanceRed: PoweredDimSmallLight
 
 # 2024-12-22
 VendingMachineRestockSalvageEquipment: null
+
+# 2025-01-11
+SpawnMobSmile: SentientSmileCore

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -231,7 +231,7 @@
     - id: RubberStampCMO
     - id: MedTekCartridge
     # Shitmed
-    - id: MedicalBiofabMachineBoard
+    #- id: MedicalBiofabMachineBoard #DeltaV - Replaced with a flatpack at Prototypes/_DV/Catalog/Fills/Lockers/heads.yml
 
 # Hardsuit table, used for suit storage as well
 - type: entityTable

Resources/Prototypes/Entities/Mobs/NPCs/pets.yml

@@ -776,6 +776,9 @@
         BaseUnshaded: aslime-_3
       Dead:
         Base: rainbow_baby_slime_dead
+  - type: Body  # DeltaV - Changes to add brain
+    prototype: Smiles
+    requiredLegs: 1
   - type: Butcherable
     spawned:
     - id: FoodMeatSlime

Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml

@@ -0,0 +1,17 @@
+- type: entity
+  id: SentientSmileCore
+  parent: SentientSlimesCore
+  name: sentient smile core
+  components:
+  - type: Sprite
+    sprite: _DV/Mobs/Pets/Smile/organs.rsi
+    state: brain-smile
+  - type: Extractable
+    grindableSolutionName: organ
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        maxVol: 5
+        reagents:
+        - ReagentId: SentientGreyMatter
+          Quantity: 5

Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml

@@ -0,0 +1,19 @@
+- type: body
+  id: Smiles
+  name: "Smiles"
+  parent: Slimes
+  root: torso
+  slots:
+    torso:
+      part: TorsoSlime
+      connections:
+      - legs
+      organs:
+        core: SentientSmileCore
+        lungs: OrganSlimesLungs
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal

Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml

@@ -67,6 +67,7 @@
     - id: LunchboxCommandFilledRandom
       prob: 0.3
     - id: ChemMasterFlatpack # So the chemist can make pills
+    - id: MedBioFabricatorFlatpack # Replaced the shitmed board
 
 - type: entityTable
   id: LockerFillResearchDirectorDeltaV

Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml

@@ -6,3 +6,12 @@
   components:
   - type: Flatpack
     entity: ChemMaster
+
+- type: entity
+  parent: BaseFlatpack
+  id: MedBioFabricatorFlatpack
+  name: medical biofabricator flatpack
+  description: A flatpack used for constructing a medical biofabricator.
+  components:
+  - type: Flatpack
+    entity: MedicalBiofabricator

Resources/Prototypes/_DV/Reagents/biological.yml

@@ -0,0 +1,5 @@
+- type: reagent
+  id: SentientGreyMatter
+  parent: GreyMatter
+  name: reagent-name-sentient-grey-matter
+  desc: reagent-desc-sentient-grey-matter

Resources/Prototypes/_DV/Recipes/Reactions/fun.yml

@@ -9,3 +9,21 @@
   effects:
     - !type:CreateEntityReactionEffect
       entity: SheetGlass1
+
+- type: reaction
+  id: SmileTheSlime
+  impact: Low
+  quantized: true
+  conserveEnergy: false
+  reactants:
+    Happiness:
+      amount: 4
+    SentientGreyMatter:
+      amount: 5
+    JuiceThatMakesYouWeh:
+      amount: 10
+    Slime:
+      amount: 20
+  effects:
+  - !type:CreateEntityReactionEffect
+    entity: MobSlimesPet

Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/meta.json

@@ -0,0 +1,42 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by Nimfar11 (Github) for Space Station 14, inhands by mubururu_ (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "brain-smile",
+            "delays": [
+                [
+                    10.0,
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.2,
+                    0.4,
+                    0.6,
+                    0.4,
+                    5.0,
+                    0.02,
+                    0.02,
+                    0.02
+                ]
+            ]
+        },
+        {
+            "name": "brain-inhand-left",
+            "directions": 4
+        },
+        {
+                "name": "brain-inhand-right",
+                "directions": 4
+        }
+    ]
+}