From d5453f3c3c5078f0f2a969429ff0c8f2433437a2 Mon Sep 17 00:00:00 2001 From: UrPrice Date: Tue, 15 Oct 2024 03:31:50 +0300 Subject: [PATCH 1/3] SS220 RnD Balance revert --- .../Teleportation/Systems/SharedPortalSystem.cs | 11 ++++++++--- Resources/Locale/en-US/portal/portal.ftl | 3 +++ Resources/Locale/ru-RU/portal/portal.ftl | 3 +++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs index cda6eacb279a13..89d36e592f3292 100644 --- a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs +++ b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs @@ -209,13 +209,18 @@ private void TeleportEntity(EntityUid portal, EntityUid subject, EntityCoordinat projectile.IgnoreShooter = false; } + // SS220 RnD Balance revert, AnomalyComp cannot teleport via portal begin + { + _popup.PopupCoordinates(Loc.GetString("portal-component-anomaly-reaction"), + ourCoords, Filter.Pvs(ourCoords, entityMan: EntityManager), true); + return; + } + // SS220 RnD Balance revert, AnomalyComp cannot teleport via portal end + LogTeleport(portal, subject, Transform(subject).Coordinates, target); _transform.SetCoordinates(subject, target); - //SS220-rnd-reb - if (HasComp(subject)) - _anomalySystem.DoAnomalySupercriticalEvent(subject); if (!playSound) return; diff --git a/Resources/Locale/en-US/portal/portal.ftl b/Resources/Locale/en-US/portal/portal.ftl index 8134871380fc1a..f493b34c777756 100644 --- a/Resources/Locale/en-US/portal/portal.ftl +++ b/Resources/Locale/en-US/portal/portal.ftl @@ -6,3 +6,6 @@ portal-component-no-linked-entities = Can't ghost traverse a portal that doesn't portal-component-can-ghost-traverse = Teleport to the linked portal portal-component-invalid-configuration-fizzle = The portal fizzles out! + +# SS220 RnD Balance revert, AnomalyComp cannot teleport via portal +portal-component-anomaly-reaction = anomaly object can not transform via portal. diff --git a/Resources/Locale/ru-RU/portal/portal.ftl b/Resources/Locale/ru-RU/portal/portal.ftl index f399ce9cbc6fe7..e759b40f7c744e 100644 --- a/Resources/Locale/ru-RU/portal/portal.ftl +++ b/Resources/Locale/ru-RU/portal/portal.ftl @@ -4,3 +4,6 @@ portal-component-ghost-traverse = Переместиться portal-component-no-linked-entities = Невозможно переместиться призраком через портал, не имеющий ровно одного связанного портала. portal-component-can-ghost-traverse = Телепортироваться к связанному порталу portal-component-invalid-configuration-fizzle = Портал исчезает! + +# SS220 RnD Balance revert, AnomalyComp cannot teleport via portal +portal-component-anomaly-reaction = Аномальный объект искажается сквозь портал. From 484cef58c499cbf21e6f831864a1c169ef8ece6f Mon Sep 17 00:00:00 2001 From: UrPrice Date: Wed, 16 Oct 2024 09:28:59 +0300 Subject: [PATCH 2/3] Condition added --- Content.Shared/Teleportation/Systems/SharedPortalSystem.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs index 89d36e592f3292..8b91b8585bf6c5 100644 --- a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs +++ b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs @@ -210,6 +210,7 @@ private void TeleportEntity(EntityUid portal, EntityUid subject, EntityCoordinat } // SS220 RnD Balance revert, AnomalyComp cannot teleport via portal begin + if (HasComp(subject)) { _popup.PopupCoordinates(Loc.GetString("portal-component-anomaly-reaction"), ourCoords, Filter.Pvs(ourCoords, entityMan: EntityManager), true); From 300fb4ae97ea90f5f6fb206a1709408eea408b56 Mon Sep 17 00:00:00 2001 From: UrPrice Date: Wed, 16 Oct 2024 09:43:00 +0300 Subject: [PATCH 3/3] Localization Fix --- Resources/Locale/en-US/portal/portal.ftl | 3 --- Resources/Locale/en-US/ss220/portal/portal.ftl | 1 + Resources/Locale/ru-RU/portal/portal.ftl | 3 --- Resources/Locale/ru-RU/ss220/portal/portal.ftl | 1 + 4 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 Resources/Locale/en-US/ss220/portal/portal.ftl create mode 100644 Resources/Locale/ru-RU/ss220/portal/portal.ftl diff --git a/Resources/Locale/en-US/portal/portal.ftl b/Resources/Locale/en-US/portal/portal.ftl index f493b34c777756..8134871380fc1a 100644 --- a/Resources/Locale/en-US/portal/portal.ftl +++ b/Resources/Locale/en-US/portal/portal.ftl @@ -6,6 +6,3 @@ portal-component-no-linked-entities = Can't ghost traverse a portal that doesn't portal-component-can-ghost-traverse = Teleport to the linked portal portal-component-invalid-configuration-fizzle = The portal fizzles out! - -# SS220 RnD Balance revert, AnomalyComp cannot teleport via portal -portal-component-anomaly-reaction = anomaly object can not transform via portal. diff --git a/Resources/Locale/en-US/ss220/portal/portal.ftl b/Resources/Locale/en-US/ss220/portal/portal.ftl new file mode 100644 index 00000000000000..5c2337c4b11ced --- /dev/null +++ b/Resources/Locale/en-US/ss220/portal/portal.ftl @@ -0,0 +1 @@ +portal-component-anomaly-reaction = anomaly object can not transform via portal diff --git a/Resources/Locale/ru-RU/portal/portal.ftl b/Resources/Locale/ru-RU/portal/portal.ftl index e759b40f7c744e..f399ce9cbc6fe7 100644 --- a/Resources/Locale/ru-RU/portal/portal.ftl +++ b/Resources/Locale/ru-RU/portal/portal.ftl @@ -4,6 +4,3 @@ portal-component-ghost-traverse = Переместиться portal-component-no-linked-entities = Невозможно переместиться призраком через портал, не имеющий ровно одного связанного портала. portal-component-can-ghost-traverse = Телепортироваться к связанному порталу portal-component-invalid-configuration-fizzle = Портал исчезает! - -# SS220 RnD Balance revert, AnomalyComp cannot teleport via portal -portal-component-anomaly-reaction = Аномальный объект искажается сквозь портал. diff --git a/Resources/Locale/ru-RU/ss220/portal/portal.ftl b/Resources/Locale/ru-RU/ss220/portal/portal.ftl new file mode 100644 index 00000000000000..42b6ead7b73da7 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/portal/portal.ftl @@ -0,0 +1 @@ +portal-component-anomaly-reaction = Аномальный объект искажается сквозь портал