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

New revert revert #712

Merged
Merged
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion ADT_STATION
2 changes: 1 addition & 1 deletion Content.Client/Overlays/ShowHealthIconsSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ protected override void DeactivateInternal()

private void OnGetStatusIconsEvent(Entity<DamageableComponent> entity, ref GetStatusIconsEvent args)
{
if (!IsActive || args.InContainer)
if (!IsActive || args.InContainer || args.HasStealthComponent)
return;

var healthIcons = DecideHealthIcons(entity);
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Overlays/ShowHungerIconsSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public override void Initialize()

private void OnGetStatusIconsEvent(EntityUid uid, HungerComponent hungerComponent, ref GetStatusIconsEvent args)
{
if (!IsActive || args.InContainer)
if (!IsActive || args.InContainer || args.HasStealthComponent)
return;

var hungerIcons = DecideHungerIcon(uid, hungerComponent);
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Overlays/ShowSecurityIconsSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public override void Initialize()

private void OnGetStatusIconsEvent(EntityUid uid, StatusIconComponent _, ref GetStatusIconsEvent @event)
{
if (!IsActive || @event.InContainer)
if (!IsActive || @event.InContainer || @event.HasStealthComponent)
{
return;
}
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Overlays/ShowThirstIconsSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public override void Initialize()

private void OnGetStatusIconsEvent(EntityUid uid, ThirstComponent thirstComponent, ref GetStatusIconsEvent args)
{
if (!IsActive || args.InContainer)
if (!IsActive || args.InContainer || args.HasStealthComponent)
return;

var thirstIcons = DecideThirstIcon(uid, thirstComponent);
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/SSDIndicator/SSDIndicatorSystem.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Content.Shared.CCVar;
using Content.Shared.CCVar;
using Content.Shared.Mind.Components;
using Content.Shared.Mobs.Systems;
using Content.Shared.NPC;
Expand Down Expand Up @@ -31,6 +31,7 @@ private void OnGetStatusIcon(EntityUid uid, SSDIndicatorComponent component, ref
if (component.IsSSD &&
_cfg.GetCVar(CCVars.ICShowSSDIndicator) &&
!args.InContainer &&
!args.HasStealthComponent &&
!_mobState.IsDead(uid) &&
!HasComp<ActiveNPCComponent>(uid) &&
TryComp<MindContainerComponent>(uid, out var mindContainer) &&
Expand Down
5 changes: 4 additions & 1 deletion Content.Client/StatusIcon/StatusIconSystem.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Content.Shared.CCVar;
using Content.Shared.StatusIcon;
using Content.Shared.StatusIcon.Components;
using Content.Shared.Stealth.Components;
using Robust.Client.Graphics;
using Robust.Shared.Configuration;

Expand All @@ -13,6 +14,7 @@ public sealed class StatusIconSystem : SharedStatusIconSystem
{
[Dependency] private readonly IConfigurationManager _configuration = default!;
[Dependency] private readonly IOverlayManager _overlay = default!;
[Dependency] private readonly IEntityManager _entManager = default!;

private bool _globalEnabled;
private bool _localEnabled;
Expand Down Expand Up @@ -55,7 +57,8 @@ public List<StatusIconData> GetStatusIcons(EntityUid uid, MetaDataComponent? met
return list;

var inContainer = (meta.Flags & MetaDataFlags.InContainer) != 0;
var ev = new GetStatusIconsEvent(list, inContainer);
var hasStealthComponent = _entManager.HasComponent<StealthComponent>(uid);
var ev = new GetStatusIconsEvent(list, inContainer, hasStealthComponent);
RaiseLocalEvent(uid, ref ev);
return ev.StatusIcons;
}
Expand Down
5 changes: 3 additions & 2 deletions Content.IntegrationTests/Tests/PostMapInitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,11 @@ public sealed class PostMapInitTest
"ADTCore",
"ADTMarathon",
"ADTAtlas",

"ADTDelta",
"ADTTrain",
"ADTAvrite",
// Corvax-Start
"CorvaxAvrite",
"CorvaxDelta",
// Corvax-End

"Dev",
Expand Down
3 changes: 0 additions & 3 deletions Content.Server/ADT/SecretTrans/SecretTransComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@

namespace Content.Server.ADT.SecretTrans;

/// <summary>
/// Lizard specific properties
/// </summary>
[RegisterComponent]
public sealed partial class SecretTransComponent : Component
{
Expand Down
1 change: 1 addition & 0 deletions Content.Server/ADT/SecretTrans/blank.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Гооол
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ private bool CheckRevsLose()
{
if (HasComp<HeadRevolutionaryComponent>(uid))
continue;
if (TryComp<MobStateComponent>(uid, out var mobstate) && mobstate.CurrentState == MobState.Alive)
if (TryComp<MobStateComponent>(uid, out var mobstate) && mobstate.CurrentState != MobState.Dead)
{
AddComp<HeadRevolutionaryComponent>(uid);
return false;
Expand Down
1 change: 0 additions & 1 deletion Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace Content.Server.Sandbox.Commands
[AnyCommand]
public sealed class ColorNetworkCommand : IConsoleCommand
{
[Dependency] private readonly IAdminManager _adminManager = default!;
[Dependency] private readonly IEntityManager _entManager = default!;

public string Command => "colornetwork";
Expand Down
6 changes: 6 additions & 0 deletions Content.Server/Store/Components/StoreComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ public sealed partial class StoreComponent : Component
[DataField]
public EntityUid? StartingMap;

/// <summary>
/// The map the store was originally from, used to block refunds if the map is changed
/// </summary>
[ViewVariables, DataField]
public bool StoreCordsSpawn = false;

#region audio
/// <summary>
/// The sound played to the buyer when a purchase is succesfully made.
Expand Down
2 changes: 1 addition & 1 deletion Content.Server/Store/Systems/StoreSystem.Ui.cs
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
//spawn entity
if (listing.ProductEntity != null)
{
var product = Spawn(listing.ProductEntity, Transform(buyer).Coordinates);
var product = component.StoreCordsSpawn ? Spawn(listing.ProductEntity, Transform(uid).Coordinates) : Spawn(listing.ProductEntity, Transform(buyer).Coordinates);
_hands.PickupOrDrop(buyer, product);

HandleRefundComp(uid, component, product);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public sealed partial class StatusIconComponent : Component
/// </summary>
/// <param name="StatusIcons"></param>
[ByRefEvent]
public record struct GetStatusIconsEvent(List<StatusIconData> StatusIcons, bool InContainer);
public record struct GetStatusIconsEvent(List<StatusIconData> StatusIcons, bool InContainer, bool HasStealthComponent);

/// <summary>
/// Event raised on the Client-side to determine whether to display a status icon on an entity.
Expand Down
Binary file modified Resources/Audio/Announcements/welcome.ogg
Binary file not shown.
16 changes: 12 additions & 4 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1751,29 +1751,37 @@ Entries:
- {message: "Синдикат сменил стандартную структуру своих аванпостов.", type: Add}
id: 55745
time: '2024-05-07T08:20:00.0000000+00:00'

- author: Крыса
changes:
- {message: "Для экипажа станции провели брифинг по использованию фазона. Теперь, вы можете использовать фазу.", type: Add}
- {message: "СБ получили партию мехов пабби.", type: Add}
- {message: "Дельту маштабно перестроили.", type: Tweak}
id: 55746
time: '2024-05-12T08:20:00.0000000+00:00'

- author: Мудрый дуб
changes:
- {message: "НТ решили не выдавать бесплатные деньги в вещмешках парамедика, а оставить себе.", type: Fix}
id: 55746 #костыль отображения в Обновлениях
id: 55747
time: '2024-05-07T23:25:00.0000000+00:00'

- author: username228
changes:
- {message: "Лучшие ксенобиологи NanoTrasen смогли вернуть к жизни один из вымерших инопланетных видов - Слизнекошек с Дождливой планеты! Теперь у работников корпорации появляется уникальнейшая возможность лицезреть этих очаровательных созданий в живую, а так же завести себе как питомца!", type: Add}
id: 55747 #костыль отображения в Обновлениях
id: 55748 #костыль отображения в Обновлениях
time: '2024-05-10T20:25:00.0000000+00:00'

- author: JustKekc
changes:
- {message: "Добавлена замена '??' в тексте сообщения на 'вопросительно смотрит' эмоцией.", type: Add}
id: 55748
id: 55749
time: '2024-05-10T20:25:00.0000000+00:00'

- author: Петр Игнатьевич
changes:
- {message: "Куличи в Гетмор Шоколаде - закончились.", type: Remove}
- {message: "Добавлена наши модификации карт Аврит, Ориджин и Трейн.", type: Add}
- {message: "Частично пофикшена видимость невидимок визорами.", type: Fix}
id: 55749 #костыль отображения в Обновлениях
id: 55750 #костыль отображения в Обновлениях
time: '2024-05-13T08:20:00.0000000+00:00'
Loading
Loading