From 45ea7451ca383ac5b6adfedf00ad4024fc29e610 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Tue, 14 Jan 2025 06:14:01 -0800 Subject: [PATCH 1/5] Fixed various issues with kill objectives (#2723) The fix is in doc! --- .../Objectives/Systems/KillPersonConditionSystem.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs index bd062e74560..9d9c6aa7f31 100644 --- a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs +++ b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs @@ -41,18 +41,18 @@ private void OnGetProgress(EntityUid uid, KillPersonConditionComponent comp, ref private void OnPersonAssigned(Entity ent, ref ObjectiveAssignedEvent args) { - AssignRandomTarget(ent, args, _ => true); + AssignRandomTarget(ent, ref args, _ => true); } private void OnHeadAssigned(Entity ent, ref ObjectiveAssignedEvent args) { - AssignRandomTarget(ent, args, mindId => + AssignRandomTarget(ent, ref args, mindId => TryComp(mindId, out var mind) && mind.OwnedEntity is { } ownedEnt && HasComp(ownedEnt)); } - private void AssignRandomTarget(EntityUid uid, ObjectiveAssignedEvent args, Predicate filter, bool fallbackToAny = true) + private void AssignRandomTarget(EntityUid uid, ref ObjectiveAssignedEvent args, Predicate filter, bool fallbackToAny = true) { // invalid prototype if (!TryComp(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); } From 32af76dd2b6898ca2d9e2eecde14dc1776a7380f Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Tue, 14 Jan 2025 08:17:01 -0600 Subject: [PATCH 2/5] Adds Smile the slime recipe (#2632) * Adds Smile the slime recipe * unindent * 4 space Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> * switch to migration * It's the future, bro --------- Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Velcroboy Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- .../en-US/_DV/reagents/meta/biological.ftl | 2 + Resources/Migrations/deltaMigrations.yml | 3 ++ .../Prototypes/Entities/Mobs/NPCs/pets.yml | 3 ++ .../_DV/Body/Organs/Animal/slimes.yml | 17 +++++++ .../_DV/Body/Prototypes/Animal/slimes.yml | 19 ++++++++ .../Prototypes/_DV/Reagents/biological.yml | 5 +++ .../Prototypes/_DV/Recipes/Reactions/fun.yml | 18 ++++++++ .../Smile/organs.rsi/brain-inhand-left.png | Bin 0 -> 428 bytes .../Smile/organs.rsi/brain-inhand-right.png | Bin 0 -> 414 bytes .../Pets/Smile/organs.rsi/brain-smile.png | Bin 0 -> 2177 bytes .../_DV/Mobs/Pets/Smile/organs.rsi/meta.json | 42 ++++++++++++++++++ 11 files changed, 109 insertions(+) create mode 100644 Resources/Locale/en-US/_DV/reagents/meta/biological.ftl create mode 100644 Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml create mode 100644 Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml create mode 100644 Resources/Prototypes/_DV/Reagents/biological.yml create mode 100644 Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-left.png create mode 100644 Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-right.png create mode 100644 Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-smile.png create mode 100644 Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/meta.json diff --git a/Resources/Locale/en-US/_DV/reagents/meta/biological.ftl b/Resources/Locale/en-US/_DV/reagents/meta/biological.ftl new file mode 100644 index 00000000000..d3fcceb245f --- /dev/null +++ b/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... diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml index d0c682215f9..8113abba178 100644 --- a/Resources/Migrations/deltaMigrations.yml +++ b/Resources/Migrations/deltaMigrations.yml @@ -131,3 +131,6 @@ AlwaysPoweredSmallLightMaintenanceRed: PoweredDimSmallLight # 2024-12-22 VendingMachineRestockSalvageEquipment: null + +# 2025-01-11 +SpawnMobSmile: SentientSmileCore diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 3570e8fd5e2..41b1aca0ed5 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/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 diff --git a/Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml b/Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml new file mode 100644 index 00000000000..b16f5735475 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml b/Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml new file mode 100644 index 00000000000..80a27f8c3a9 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_DV/Reagents/biological.yml b/Resources/Prototypes/_DV/Reagents/biological.yml new file mode 100644 index 00000000000..b45bf8a4350 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml b/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml index 2c026637ce7..722c6a2a4f9 100644 --- a/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml +++ b/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 diff --git a/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-left.png b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c07475fc631713557358605a8f675eca390d6391 GIT binary patch literal 428 zcmV;d0aN~oP)vk%=f0T0^ruaF7#hqBa;HL0NMS7@)a361Bkq3CfytzyQtN zk*Ey@NKn?C0|sdBjzn!RK!UR7956t0cfQreacJ6D1MEGu?#SHT8Cc!&pO4KO3!uI@ zk(qta?U6wm6?@cZr*;a9eenX^jf{Lmbwyh{{E(2b9X!pJiDq+QRMCyy-gp4ch2?S zx?-8tg0StUer+lJw&iO&TZ_}e534I>*KS#`a^CSLA-o=?OS+X zPaUmoS^xkYFP!_yjR<`+r22;Mz=U@LfW&#Zy9SU#=S$Kf2d|rU(Rz4;JtJyyEo0(n z$LJHqnSBK7XTNx7{^EQqGD_>5N5)nhK0|rJRP334^X8USKT?$PiLqA(woJFNZXMtG zxr{fRoLBZq`ZS^CGRp}gIDG2!Oaki|hjmHv8GHN?c5x<|5yoNZd`YeWQ}@`qTc)l{ z296>@vTg=IgQ;dj@?`sG0C#zGB!6bUTj#%0W*kt(AzQs@9T&Yz{F>mcG)dd0YRVi} zyw7>Rz6_W`pVOgdbWzlfH+j8F+Y@vUd>cOB@k*{vWbJcu;wes)(N>M^-=b^p!PRkw~m z?8O1>tiSu2-wFu$DOt8Q6D-gu+?V;Oiz=VQ-ctpER%w6A`+p4>L?TbQ{YKa8&5rKy zK~V|9H&umJ{Y>Q~%b}#LHc9SV-QXbIgO?fQi^Vy#AcLCbLBluPLo3P!+R3oJyHeqC z0Xc7dtX^61c@p#>`>%V-QMP^7LC>Uk?QM-)?iPX(P4~|ha%3(C$P`k6LH0_ zVto>~cpqya@FPRG3nQ0=BbzPpUy?#+vr}Ff61m;Ha6x?SgYKd4F$-K}< zC3)T*K52)QmC<}uouEP>`!i{Hw?5_0v=LFz=Xzi0kNxh~bp?C)xMU%uoo6?>4BIXj zpXZ2u_ud0+yYh;n11}gKHI9=I;9)tYAL(8eixSi zK2Er7F5ivFWb(|7I{rQ3IijYJWrUTW;1X^k3O>Kpl$4 zOf-h{myh~A)`72{)^ z@Tr9yMm)Mb39}rhqSjMOqoSh9-{rF8$+%I|M7=vgm=q*qA*`!C?$@M7Z zO;y1Kh4JEl)S+4Ph zcxddJC6T1pes9c=ZNEgcC@Z*y%Y10hfqp zRb5C>W9=F6>i-K&5gQX96iLgtcqv^6iWNymd%Fbc_M Date: Tue, 14 Jan 2025 15:17:21 +0100 Subject: [PATCH 3/5] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index bedb8809c70..a9ae764283a 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +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 @@ -3855,3 +3848,11 @@ 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 From 6dd01ee5ed1b82d405441bf7c267f371186f6f84 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Tue, 14 Jan 2025 12:04:13 -0300 Subject: [PATCH 4/5] Replace the medical biofabricator board with a flatpack (#2722) * Added flatpack * Given to CMO's locker * webedit ops Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --------- Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- Resources/Prototypes/Catalog/Fills/Lockers/heads.yml | 2 +- Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml | 1 + .../_DV/Entities/Objects/Devices/Devices/flatpack.yml | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 20dcc4e3cec..88871624621 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/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 diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml index ce8ff57b1d1..40b7d5dd6ed 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml +++ b/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 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml index eedeb96a871..d19d3307db0 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml +++ b/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 From 450c7785412c41265b584e5dc0351f0418d6738b Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 14 Jan 2025 16:04:33 +0100 Subject: [PATCH 5/5] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index a9ae764283a..ed243a30ff8 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,12 +1,4 @@ Entries: -- 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 @@ -3856,3 +3848,11 @@ 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