From b389e99dbdbdefbf6f66fde1ed12198999a1feee Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sun, 24 Nov 2024 11:57:37 +0000 Subject: [PATCH 1/7] fix secborg sprite (#2278) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Prototypes/DeltaV/borg_types.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/DeltaV/borg_types.yml b/Resources/Prototypes/DeltaV/borg_types.yml index 16f8b6c8cf1..fd5be28db70 100644 --- a/Resources/Prototypes/DeltaV/borg_types.yml +++ b/Resources/Prototypes/DeltaV/borg_types.yml @@ -37,6 +37,8 @@ # Visual clientComponents: - type: Sprite + noRot: true + drawdepth: Mobs sprite: DeltaV/Mobs/Silicon/chassis.rsi layers: - state: security From 3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 24 Nov 2024 12:57:55 +0100 Subject: [PATCH 2/7] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index d0d2a83147c..9db929b4640 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Gregg - changes: - - message: Adjusted the rules in regards to PDA confiscation and borg memory. - type: Tweak - id: 206 - time: '2024-01-19T10:30:34.0000000+00:00' - author: DebugOk changes: - message: Zombies can no longer be psionic @@ -3764,3 +3758,10 @@ id: 705 time: '2024-11-24T10:15:12.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2277 +- author: Big Orthagonal + changes: + - message: Diagonal secborgs are not real and were never real. + type: Fix + id: 706 + time: '2024-11-24T11:57:37.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2278 From 3a27784542b455f581ae1839983751c3361b1b45 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sun, 24 Nov 2024 20:25:25 +0000 Subject: [PATCH 3/7] fix debris having nothing (#2280) Revert "improve BiomeDunGen (#33113)" This reverts commit b94731c4f8d7183a7a1e624dd337839e911f3e1d. Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../DungeonJob/DungeonJob.PostGenBiome.cs | 25 +++++++------------ .../Parallax/Biomes/SharedBiomeSystem.cs | 2 +- .../Procedural/PostGeneration/BiomeDunGen.cs | 7 ------ 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs index fdadcb7849d..65f6d2d14f9 100644 --- a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs +++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs @@ -1,6 +1,5 @@ using System.Threading.Tasks; using Content.Server.Parallax; -using Content.Shared.Maps; using Content.Shared.Parallax.Biomes; using Content.Shared.Procedural; using Content.Shared.Procedural.PostGeneration; @@ -16,35 +15,27 @@ public sealed partial class DungeonJob /// private async Task PostGen(BiomeDunGen dunGen, DungeonData data, Dungeon dungeon, HashSet reservedTiles, Random random) { - if (!_prototype.TryIndex(dunGen.BiomeTemplate, out var indexedBiome)) + if (_entManager.TryGetComponent(_gridUid, out BiomeComponent? biomeComp)) return; + biomeComp = _entManager.AddComponent(_gridUid); var biomeSystem = _entManager.System(); - + biomeSystem.SetTemplate(_gridUid, biomeComp, _prototype.Index(dunGen.BiomeTemplate)); var seed = random.Next(); var xformQuery = _entManager.GetEntityQuery(); - var tiles = _maps.GetAllTilesEnumerator(_gridUid, _grid); - while (tiles.MoveNext(out var tileRef)) + foreach (var node in dungeon.RoomTiles) { - var node = tileRef.Value.GridIndices; - if (reservedTiles.Contains(node)) continue; - - if (dunGen.TileMask is not null) - { - if (!dunGen.TileMask.Contains(((ContentTileDefinition) _tileDefManager[tileRef.Value.Tile.TypeId]).ID)) - continue; - } // Need to set per-tile to override data. - if (biomeSystem.TryGetTile(node, indexedBiome.Layers, seed, _grid, out var tile)) + if (biomeSystem.TryGetTile(node, biomeComp.Layers, seed, _grid, out var tile)) { _maps.SetTile(_gridUid, _grid, node, tile.Value); } - if (biomeSystem.TryGetDecals(node, indexedBiome.Layers, seed, _grid, out var decals)) + if (biomeSystem.TryGetDecals(node, biomeComp.Layers, seed, _grid, out var decals)) { foreach (var decal in decals) { @@ -52,7 +43,7 @@ private async Task PostGen(BiomeDunGen dunGen, DungeonData data, Dungeon dungeon } } - if (tile is not null && biomeSystem.TryGetEntity(node, indexedBiome.Layers, tile.Value, seed, _grid, out var entityProto)) + if (biomeSystem.TryGetEntity(node, biomeComp, _grid, out var entityProto)) { var ent = _entManager.SpawnEntity(entityProto, new EntityCoordinates(_gridUid, node + _grid.TileSizeHalfVector)); var xform = xformQuery.Get(ent); @@ -70,5 +61,7 @@ private async Task PostGen(BiomeDunGen dunGen, DungeonData data, Dungeon dungeon if (!ValidateResume()) return; } + + biomeComp.Enabled = false; } } diff --git a/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs b/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs index 250b0f70a54..b14baba9817 100644 --- a/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs +++ b/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs @@ -183,7 +183,7 @@ public bool TryGetEntity(Vector2i indices, BiomeComponent component, MapGridComp } - public bool TryGetEntity(Vector2i indices, List layers, Tile tileRef, int seed, MapGridComponent grid, + private bool TryGetEntity(Vector2i indices, List layers, Tile tileRef, int seed, MapGridComponent grid, [NotNullWhen(true)] out string? entity) { var tileId = TileDefManager[tileRef.TypeId].ID; diff --git a/Content.Shared/Procedural/PostGeneration/BiomeDunGen.cs b/Content.Shared/Procedural/PostGeneration/BiomeDunGen.cs index e21e582211b..833cf2dec76 100644 --- a/Content.Shared/Procedural/PostGeneration/BiomeDunGen.cs +++ b/Content.Shared/Procedural/PostGeneration/BiomeDunGen.cs @@ -1,4 +1,3 @@ -using Content.Shared.Maps; using Content.Shared.Parallax.Biomes; using Robust.Shared.Prototypes; @@ -12,10 +11,4 @@ public sealed partial class BiomeDunGen : IDunGenLayer { [DataField(required: true)] public ProtoId BiomeTemplate; - - /// - /// creates a biome only on the specified tiles - /// - [DataField] - public HashSet>? TileMask; } From 90707f19e55bcc31f11bc596946d5540c3259e02 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 24 Nov 2024 21:25:44 +0100 Subject: [PATCH 4/7] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 9db929b4640..3bf6c702cb1 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: DebugOk - changes: - - message: Zombies can no longer be psionic - type: Remove - id: 207 - time: '2024-01-19T20:53:05.0000000+00:00' - author: Adrian16199 changes: - message: Fixes mantis and them not be able to spawn with duffelbags and satchels. @@ -3765,3 +3759,10 @@ id: 706 time: '2024-11-24T11:57:37.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2278 +- author: deltanedas + changes: + - message: Fixed salvage debris not having anything. + type: Fix + id: 707 + time: '2024-11-24T20:25:25.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2280 From a09a2e0d4713bae644e07e80efd17e98a3c8232e Mon Sep 17 00:00:00 2001 From: DisposableCrewmember42 Date: Mon, 25 Nov 2024 05:30:25 +0000 Subject: [PATCH 5/7] feat: Add emergency pie delivery (#2211) * feat: Add emergency pie delivery * refactor: add missing newline * refactor: Move name and description to prototype * tweak: Increase price to 3200 to make the integration test happy... * tweak: Change price again and adjust amount * refactor: unindent a level --- .../Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml | 10 ++++++++++ .../Prototypes/DeltaV/Catalog/Fills/Crates/food.yml | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml index 42b4d57e910..abd64d33efe 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml @@ -27,3 +27,13 @@ cost: 6000 # Thanks bounties category: Food group: market + +- type: cargoProduct + id: FoodEmergencyPie + icon: + sprite: Objects/Consumable/Food/Baked/pie.rsi + state: tin + product: CrateFoodEmergencyPie + cost: 3333 + category: Food + group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml index 6e273a72c48..067a9ed9777 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml @@ -29,3 +29,14 @@ amount: 1 - id: FoodBoxDonkpocketDink prob: 0.1 + +- type: entity + id: CrateFoodEmergencyPie + parent: CratePlastic + name: emergency pie delivery + description: '"Then let them eat pie."' + components: + - type: StorageFill + contents: + - id: FoodPieBananaCream + amount: 13 From e8e2b6327d32694bfa5c082462eb78a5466eabae Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 25 Nov 2024 06:30:44 +0100 Subject: [PATCH 6/7] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 3bf6c702cb1..3e323712e81 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Adrian16199 - changes: - - message: Fixes mantis and them not be able to spawn with duffelbags and satchels. - type: Fix - id: 208 - time: '2024-01-19T20:54:29.0000000+00:00' - author: Adrian16199 changes: - message: Laika no longer takes 200 damage before dying from critical. @@ -3766,3 +3760,11 @@ id: 707 time: '2024-11-24T20:25:25.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2280 +- author: DisposableCrewmember42 + changes: + - message: Hungry? Stuff your face with cream from an emergency pie delivery for + a change! + type: Add + id: 708 + time: '2024-11-25T05:30:25.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2211 From 02f40078f460d6e937c9635c8c6b1457984e98e9 Mon Sep 17 00:00:00 2001 From: SolStar <44028047+ewokswagger@users.noreply.github.com> Date: Mon, 25 Nov 2024 00:43:15 -0500 Subject: [PATCH 7/7] Clarify wording on borgs NLR rules (#2161) * Clarify wording on borgs NLR rules * Update wording Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com> --------- Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com> Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- .../ServerInfo/Guidebook/DeltaV/Rules/GameRules/1_Behave.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/1_Behave.xml b/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/1_Behave.xml index 66c51439daa..80cc7b96181 100644 --- a/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/1_Behave.xml +++ b/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/1_Behave.xml @@ -21,7 +21,7 @@ You must roleplay. Your character's actions, feelings, and knowledge in-game sho - Do not engage in meta-communications (i.e. using external channels to communicate with other players in the same game). ## Rule B1.3: If you die and return to life, follow the new life rules. -If a player dies, they forget the specific details of their death. [color=#ff0000]Please report players who break this rule.[/color] A borg being removed from its chassis is not a death, and there is no memory loss. +If a player dies, they forget the specific details of their death. [color=#ff0000]Please report players who break this rule.[/color] A borg being removed from its chassis is not a death, and may decide for itself whether or not it experiences memory loss. - If they are revived by using a defibrillator, they can only recall vague information such as “Someone shot me” or “I was set ablaze”. - If they are revived by any other method, they forget the last five minutes leading up to their death, and cannot describe their death in any capacity.