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.

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

Fixes #297

Merged
merged 2 commits into from
Nov 5, 2023
Merged

Fixes #297

Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<BoxContainer HorizontalAlignment="Center" VerticalAlignment="Center">
<SpriteView Name="GhostView" Scale="5 5"/>
</BoxContainer>
<Label Text="Только просмотр! В данный момент без применения в игре! в работаботке!" FontColorOverride="{x:Static style:StyleNano.DangerousRedFore}" />
<Label Text="Только просмотр! В данный момент без применения в игре! В разработке!" FontColorOverride="{x:Static style:StyleNano.DangerousRedFore}" />
<Label Text="View only! Currently not used in the game! under development!" FontColorOverride="{x:Static style:StyleNano.DangerousRedFore}" />
</BoxContainer>
</DefaultWindow>
17 changes: 16 additions & 1 deletion Content.Server/Backmen/Flesh/FleshCultistSystem.Abilities.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@
using Content.Server.Construction.Components;
using Content.Server.Coordinates.Helpers;
using Content.Server.Cuffs;
using Content.Server.Salvage.Expeditions;
using Content.Server.Station.Components;
using Content.Server.Station.Systems;
using Content.Shared.Chemistry.Components;
using Content.Shared.Cuffs.Components;
using Content.Shared.Backmen.Flesh;
using Content.Shared.Cargo.Components;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems;
Expand All @@ -31,6 +35,7 @@ public sealed partial class FleshCultistSystem
[Dependency] private readonly IMapManager _map = default!;
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
[Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
[Dependency] private readonly StationSystem _stationSystem = default!;

private void InitializeAbilities()
{
Expand Down Expand Up @@ -559,7 +564,17 @@ private void OnCreateFleshHeartActionEvent(EntityUid uid, FleshCultistComponent
var radius = 1.5f;
if (!_map.TryGetGrid(xform.GridUid, out var grid))
{
_popup.PopupEntity(Loc.GetString("flesh-cultist-cant-spawn-flesh-heart-in-space",
_popup.PopupEntity(Loc.GetString("flesh-cultist-cant-spawn-flesh-heart",
("Entity", uid)), uid, PopupType.Large);
return;
}

var station = _stationSystem.GetOwningStation(xform.GridUid.Value);
var isCargo = HasComp<CargoShuttleComponent>(xform.GridUid.Value) ||
HasComp<SalvageShuttleComponent>(xform.GridUid.Value);
if (station == null || !HasComp<StationEventEligibleComponent>(station) || isCargo || !HasComp<BecomesStationComponent>(xform.GridUid.Value))
{
_popup.PopupEntity(Loc.GetString("flesh-cultist-cant-spawn-flesh-heart",
("Entity", uid)), uid, PopupType.Large);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/actions/actions/fleshcultist.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ flesh-cultist-devout-target-invalid = You cannot consume this.
flesh-cultist-devout-not-hungry = The parasite is not hungry enough to consume this.
flesh-cultist-hungry = The parasite is hungry.
flesh-cultist-equipped-outer-clothing-blocked = You cannot wear this while having spider legs.
flesh-cultist-cant-spawn-flesh-heart-in-space = It is impossible to create a flesh heart in space.
flesh-cultist-cant-spawn-flesh-heart = It is impossible to create a flesh heart here.
flesh-cultist-cant-spawn-flesh-heart-here = There is not enough space to spawn a flesh heart.
flesh-cultist-cant-absorb-puddle = There are no clean blood puddles nearby.
flesh-cultist-absorb-puddle = { $Entity } absorbs a blood puddle.
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/backmen/actions/fleshcultist.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ flesh-cultist-devout-target-invalid = Вы не можете это употре
flesh-cultist-devout-not-hungry = Паразит недостаточно голоден, чтобы съесть это.
flesh-cultist-hungry = Паразит голоден.
flesh-cultist-equipped-outer-clothing-blocked = Вы не можете носить это, имея паучьи ножки.
flesh-cultist-cant-spawn-flesh-heart-in-space = Невозможно создать сердце из плоти и крови в космосе.
flesh-cultist-cant-spawn-flesh-heart = Невозможно создать сердце из плоти и крови здесь.
flesh-cultist-cant-spawn-flesh-heart-here = Здесь недостаточно места, чтобы создать сердце из плоти.
flesh-cultist-cant-absorb-puddle = Поблизости нет чистых луж крови.
flesh-cultist-absorb-puddle = { $Entity } впитывает лужу крови.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ bank-program-no-account = [color=red]Нет подключенного акка
bank-program-change-balance-notification = Баланс карты { $change }{ $currencySymbol }. Теперь { $balance }{ $currencySymbol }!

glimmer-monitor-program-name = Монитор сияния
glimmer-monitor-current-glimmer = Текущие сияние: {$glimmer}Ψ
glimmer-monitor-current-glimmer = Текущий уровень сияния: {$glimmer}Ψ
glimmer-monitor-interval = Интервал
glimmer-monitor-sync = Синхронизация
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ sophia-response-lamiae = Итак, ты помнишь? Вы, должно бы
sophia-response-cyno = Были ли это... нет... Такой слабый. Невежество! Вы не можете их запомнить! Это невозможно!
sophia-response-grue = Вы о них не знаете. Ты не можешь. Я так надеялся прожить несколько циклов в условиях нормальной причинно-следственной связи.
sophia-response-abraxas = Это имя силы, и я избегаю говорить о нем. Он меньше всего любит отдыхать и больше всего увлечен созданием вещей из невежества.
sophia-response-glimmer = Текущее значение glimmer равно { $glimmer }. { $tier }
sophia-response-glimmer = Текущее значение уровня сияния равно { $glimmer }. { $tier }
sophia-or = { " или " }
sophia-topic-nature = природа
sophia-topic-epi = волхвы
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@
- id: BoxEncryptionKeyMedical
- id: AntiPsychicKnife # backmen
- id: ClothingHeadCage # backmen
- id: PresentMetempsychoticMachine # backmen

- type: entity
id: LockerChiefMedicalOfficerFilled
Expand Down Expand Up @@ -248,6 +249,7 @@
- id: BoxEncryptionKeyMedical
- id: AntiPsychicKnife # backmen
- id: ClothingHeadCage # backmen
- id: PresentMetempsychoticMachine # backmen

- type: entity
id: LockerResearchDirectorFilledHardsuit
Expand Down Expand Up @@ -275,7 +277,6 @@
- id: PresentOracle # backmen
- id: PresentSophie # backmen
- id: PonderingOrbTelepathic # backmen
- id: PresentMetempsychoticMachine # backmen

- type: entity
id: LockerResearchDirectorFilled
Expand Down Expand Up @@ -304,7 +305,6 @@
- id: PresentOracle # backmen
- id: PresentSophie # backmen
- id: PonderingOrbTelepathic # backmen
- id: PresentMetempsychoticMachine # backmen

- type: entity
id: LockerHeadOfSecurityFilledHardsuit
Expand Down
Loading