diff --git a/Content.IntegrationTests/Tests/DoAfter/DoAfterCancellationTests.cs b/Content.IntegrationTests/Tests/DoAfter/DoAfterCancellationTests.cs index 8ced77cf281..a70a267b3a2 100644 --- a/Content.IntegrationTests/Tests/DoAfter/DoAfterCancellationTests.cs +++ b/Content.IntegrationTests/Tests/DoAfter/DoAfterCancellationTests.cs @@ -67,13 +67,13 @@ public async Task CancelTilePry() await SetTile(Floor); await InteractUsing(Pry, awaitDoAfters: false); - // WD EDIT START + // CORVAX-NEXT START if (!ActiveDoAfters.Any()) { await AssertTile(Plating); return; } - // WD EDIT END + // CORVAX-NEXT END await CancelDoAfters(); await AssertTile(Floor); @@ -89,7 +89,7 @@ public async Task CancelRepeatedTilePry() await InteractUsing(Pry, awaitDoAfters: false); await RunTicks(1); - if (!ActiveDoAfters.Any()) // WD EDIT + if (!ActiveDoAfters.Any()) // CORVAX-NEXT return; Assert.That(ActiveDoAfters.Count(), Is.EqualTo(1)); diff --git a/Content.Shared/Prying/Components/PryingComponent.cs b/Content.Shared/Prying/Components/PryingComponent.cs index 021b5ebeb90..9bb52b63e42 100644 --- a/Content.Shared/Prying/Components/PryingComponent.cs +++ b/Content.Shared/Prying/Components/PryingComponent.cs @@ -87,7 +87,7 @@ public record struct GetPryTimeModifierEvent public readonly EntityUid User; public float PryTimeModifier = 1.0f; public float BaseTime = 5.0f; - public float Neglect = 5f; // WD EDIT + public float Neglect = 5f; // CORVAX-NEXT public GetPryTimeModifierEvent(EntityUid user) { diff --git a/Content.Shared/Prying/Systems/PryingSystem.cs b/Content.Shared/Prying/Systems/PryingSystem.cs index 9b99ec0ed69..cd8fd551cf9 100644 --- a/Content.Shared/Prying/Systems/PryingSystem.cs +++ b/Content.Shared/Prying/Systems/PryingSystem.cs @@ -135,13 +135,13 @@ private bool StartPry(EntityUid target, EntityUid user, EntityUid? tool, float t RaiseLocalEvent(target, ref modEv); - // WD EDIT START + // CORVAX-NEXT START var time = modEv.BaseTime * modEv.PryTimeModifier / toolModifier; if (time <= modEv.Neglect) time = 0; - var doAfterArgs = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(time), new DoorPryDoAfterEvent(), target, target, tool) // WD EDIT END + var doAfterArgs = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(time), new DoorPryDoAfterEvent(), target, target, tool) // CORVAX-NEXT END { BreakOnDamage = true, BreakOnMove = true, @@ -175,7 +175,7 @@ private void OnDoAfter(EntityUid uid, DoorComponent door, DoorPryDoAfterEvent ar return; } - if (args.Used != null && comp != null && door.State is not DoorState.Closing and not DoorState.Opening) // WD EDIT + if (args.Used != null && comp != null && door.State is not DoorState.Closing and not DoorState.Opening) // CORVAX-NEXT-EDIT { _audioSystem.PlayPredicted(comp.UseSound, args.Used.Value, args.User); } diff --git a/Content.Shared/Tools/Components/ToolTileCompatibleComponent.cs b/Content.Shared/Tools/Components/ToolTileCompatibleComponent.cs index d325c9dd159..8b308dab348 100644 --- a/Content.Shared/Tools/Components/ToolTileCompatibleComponent.cs +++ b/Content.Shared/Tools/Components/ToolTileCompatibleComponent.cs @@ -18,7 +18,7 @@ public sealed partial class ToolTileCompatibleComponent : Component /// The time it takes to modify the tile. /// [DataField, ViewVariables(VVAccess.ReadWrite)] - public TimeSpan Delay = TimeSpan.FromSeconds(0); // WD EDIT + public TimeSpan Delay = TimeSpan.FromSeconds(0); // CORVAX-NEXT-EDIT /// /// Whether or not the tile being modified must be unobstructed diff --git a/Resources/Locale/en-US/_corvaxnext/tools/tool-qualities.ftl b/Resources/Locale/en-US/_corvaxnext/tools/tool-qualities.ftl new file mode 100644 index 00000000000..3336a793bb6 --- /dev/null +++ b/Resources/Locale/en-US/_corvaxnext/tools/tool-qualities.ftl @@ -0,0 +1,2 @@ +tool-quality-advanced-prying-name = Advanced Prying +tool-quality-advanced-prying-tool-name = Axe diff --git a/Resources/Locale/en-US/tools/tool-qualities.ftl b/Resources/Locale/en-US/tools/tool-qualities.ftl index f18e97c61dc..7b0e0102a74 100644 --- a/Resources/Locale/en-US/tools/tool-qualities.ftl +++ b/Resources/Locale/en-US/tools/tool-qualities.ftl @@ -33,8 +33,3 @@ tool-quality-rolling-tool-name = Rolling Pin tool-quality-digging-name = Digging tool-quality-digging-tool-name = Shovel - -# White Dream -tool-quality-advanced-prying-name = Advanced Prying -tool-quality-advanced-prying-tool-name = Axe -# White Dream diff --git a/Resources/Locale/ru-RU/_corvaxnext/tools/tool-qualities.ftl b/Resources/Locale/ru-RU/_corvaxnext/tools/tool-qualities.ftl new file mode 100644 index 00000000000..f0925d44992 --- /dev/null +++ b/Resources/Locale/ru-RU/_corvaxnext/tools/tool-qualities.ftl @@ -0,0 +1,2 @@ +tool-quality-advanced-prying-name = Продвинутое монтирование +tool-quality-advanced-prying-tool-name = Топор diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index 96e6e687da9..60640d281ac 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -41,7 +41,7 @@ - type: Tool qualities: - Prying - - AdvancedPrying # White Dream + - AdvancedPrying # Corvax-Next-AdvancedPrying - type: ToolTileCompatible - type: Prying - type: UseDelay diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml index d5997515ffc..28dea56b704 100644 --- a/Resources/Prototypes/Tiles/plating.yml +++ b/Resources/Prototypes/Tiles/plating.yml @@ -4,7 +4,7 @@ sprite: /Textures/Tiles/plating.png baseTurf: Lattice isSubfloor: true - deconstructTools: [ AdvancedPrying ] # White Dream + deconstructTools: [ AdvancedPrying ] # Corvax-Next-AdvancedPrying footstepSounds: collection: FootstepPlating friction: 0.3 @@ -21,7 +21,7 @@ - 1.0 baseTurf: Lattice isSubfloor: true - deconstructTools: [ AdvancedPrying ] # White Dream + deconstructTools: [ AdvancedPrying ] # Corvax-Next-AdvancedPrying footstepSounds: collection: FootstepPlating friction: 0.3 @@ -33,7 +33,7 @@ sprite: /Textures/Tiles/plating_burnt.png baseTurf: Lattice isSubfloor: true - deconstructTools: [ AdvancedPrying ] # White Dream + deconstructTools: [ AdvancedPrying ] # Corvax-Next-AdvancedPrying footstepSounds: collection: FootstepPlating friction: 0.3 diff --git a/Resources/Prototypes/_White/tool_qualities.yml b/Resources/Prototypes/_CorvaxNext/tool_qualities.yml similarity index 100% rename from Resources/Prototypes/_White/tool_qualities.yml rename to Resources/Prototypes/_CorvaxNext/tool_qualities.yml