Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RnD Balance revert #2092

Merged
merged 3 commits into from
Oct 17, 2024
Merged

RnD Balance revert #2092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5453f3
SS220 RnD Balance revert
UrPrice Oct 15, 2024
484cef5
Condition added
UrPrice Oct 16, 2024
300fb4a
Localization Fix
UrPrice Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,19 @@ private void TeleportEntity(EntityUid portal, EntityUid subject, EntityCoordinat
projectile.IgnoreShooter = false;
}

// SS220 RnD Balance revert, AnomalyComp cannot teleport via portal begin
if (HasComp<AnomalyComponent>(subject))
{
_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<AnomalyComponent>(subject))
_anomalySystem.DoAnomalySupercriticalEvent(subject);

if (!playSound)
return;
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/ss220/portal/portal.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
portal-component-anomaly-reaction = anomaly object can not transform via portal
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ss220/portal/portal.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
portal-component-anomaly-reaction = Аномальный объект искажается сквозь портал
Loading