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

upstream merge 2/11 #2090

Merged
merged 94 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
89aa64f
Fix multiplying colors of differing nullabilities (#32991)
chromiumboy Oct 25, 2024
761ecbc
revert the temporary hack
Nov 2, 2024
6bd07cd
Make atmos alert computer colors private variables (#32992)
chromiumboy Oct 25, 2024
2ebdc07
Add flash reaction effect (#32377)
slarticodefast Oct 25, 2024
afdaa00
Automatic changelog update
PJBot Oct 25, 2024
a9913fc
Fix loneop spawnrate by reverting it to not use the shuttle event sys…
BramvanZijp Oct 26, 2024
c31000a
Automatic changelog update
PJBot Oct 26, 2024
426df37
add atmosia to devmap (#32460)
Ilya246 Oct 26, 2024
e849ce8
bowls now make drinking sounds (#32819)
Moomoobeef Oct 26, 2024
d49b71a
Automatic changelog update
PJBot Oct 26, 2024
9048bc6
Add health analyzer unrevivability warning (#32636)
SaphireLattice Oct 26, 2024
0b0e221
Automatic changelog update
PJBot Oct 26, 2024
c16df96
Removed the name "Hujsak" (#32998)
Moomoobeef Oct 26, 2024
6b5711c
fix pie throwing sound not playing (#33017)
slarticodefast Oct 27, 2024
6f421f6
Automatic changelog update
PJBot Oct 27, 2024
738ce8b
Fix TestSuicideByHeldItem and TestSuicideByHeldItemSpreadDamage (#33030)
FluffMe Oct 28, 2024
42a55c1
make ai speak robotically (#33025)
pheenty Oct 28, 2024
a56e9ad
Automatic changelog update
PJBot Oct 28, 2024
5640ec1
Extends the minimum round time for meteor swarm events (#32876)
august-sun Oct 28, 2024
75df992
Automatic changelog update
PJBot Oct 28, 2024
39f5ea9
add StartDelay bool to actions (#33026)
lzk228 Oct 28, 2024
cd3ed90
Updated an incorrect sprite in the smite menu (#33043)
Moomoobeef Oct 28, 2024
03bf602
fix lava expeds (#33042)
deltanedas Oct 29, 2024
d775554
Automatic changelog update
PJBot Oct 29, 2024
a47e73d
Fix separated game screen bumping (#33046)
metalgearsloth Oct 29, 2024
30a24d5
Automatic changelog update
PJBot Oct 29, 2024
f5bcaa3
Fix: Make Plushie Damage Unexaminable (#33061)
thetolbean Oct 30, 2024
455c099
fix chameleon projector bot whitelist (#33055)
MilonPL Oct 30, 2024
0018646
Various Vaugely Connected Sprite Updates™: Encryption Keys, Station M…
Flareguy Oct 30, 2024
c14b5ab
Give proto-kinetic crushers, glaives, and daggers better inhands. Upd…
Blackern5000 Oct 30, 2024
f7e6758
Automatic changelog update
PJBot Oct 30, 2024
fe5b3ca
Make the security belt contain more useful items by default (#32291)
Blackern5000 Oct 30, 2024
df9ade0
revert changes of 32291
Nov 2, 2024
12b1c1c
Automatic changelog update
PJBot Oct 30, 2024
5717730
Add 3 bottle boxes to nanomed plus (#33018)
Blackern5000 Oct 30, 2024
3073062
Automatic changelog update
PJBot Oct 30, 2024
639da99
Nukie med bundle now costs 24 tc and contains a unique defibrillator …
Blackern5000 Oct 30, 2024
36fa307
Automatic changelog update
PJBot Oct 30, 2024
19da298
Pill Bottles can only store pills now (#33074)
Boaz1111 Oct 31, 2024
efdab53
Automatic changelog update
PJBot Oct 31, 2024
a6fb1ba
Add a spare bible to PietyVend (#32363)
Jarmer123 Oct 31, 2024
96d2660
Automatic changelog update
PJBot Oct 31, 2024
d00e435
[#28722 fix] Add notification for dependent wearables being dropped (…
SlamBamActionman Oct 31, 2024
b83a452
Automatic changelog update
PJBot Oct 31, 2024
678eb0c
More pda space (#32601)
BramvanZijp Oct 31, 2024
c7a8863
Automatic changelog update
PJBot Oct 31, 2024
5512ab9
Fixed spelling mistake in water blaster description. (#33087)
SpaceLizard24 Oct 31, 2024
2b79bd2
[#20285 fix] Carp Plush and Rehydratables can now be put into mop buc…
SlamBamActionman Oct 31, 2024
edde81b
Automatic changelog update
PJBot Oct 31, 2024
896dd3c
remove now duplicated nyano PlushieCarp tag
Nov 2, 2024
93d9216
Fixes tailthump breaking positional audio by making it mono (#33092)
deathride58 Oct 31, 2024
8c10f38
Automatic changelog update
PJBot Oct 31, 2024
2eb4f61
ExaminableDamage now puts its message at the bottom and in color (#32…
Moomoobeef Nov 1, 2024
22d4410
Automatic changelog update
PJBot Nov 1, 2024
05f8726
Lower in-round votekick requirements (#32953)
SlamBamActionman Nov 1, 2024
d29f875
Allow votekicks to be initiated in the lobby (#32528)
SlamBamActionman Nov 1, 2024
f40723b
Automatic changelog update
PJBot Nov 1, 2024
9f61960
Fixes bolt lights of previously unpowered bolted doors (#33063)
PopGamer45 Nov 1, 2024
77d571c
Automatic changelog update
PJBot Nov 1, 2024
15b0097
Muffins (#29318)
RumiTiger Nov 1, 2024
889cc60
Automatic changelog update
PJBot Nov 1, 2024
b7a8012
Borgs can no longer see mindshield + AI can no longer toggle off seei…
ScarKy0 Nov 1, 2024
057575e
Automatic changelog update
PJBot Nov 1, 2024
3acbc0d
Add CanLoad for biomes (#33050)
metalgearsloth Nov 1, 2024
193b53b
Remove CargoPallet component from the cargo pallet (#33022)
Minemoder5000 Nov 1, 2024
c74eb05
Automatic changelog update
PJBot Nov 1, 2024
b7b8d39
Minor antagonist guidebook changes (#32824)
UBlueberry Nov 2, 2024
d4e20aa
Give Nukies a Hand Labeler (#33053)
thetolbean Nov 2, 2024
d7a2539
Fix `ItemSlotSystem` popup Logic (#28856)
aspiringLich Nov 2, 2024
a1cb499
Add cvars to votekick to customize requirements for the initiator. (#…
VasilisThePikachu Nov 2, 2024
e1814c9
Automatic changelog update
PJBot Nov 2, 2024
cec8f76
Add on-call functionality for adminning (#30443)
metalgearsloth Nov 2, 2024
fdd00fd
Automatic changelog update
PJBot Nov 2, 2024
3468c30
Pills are explosion resistant (partially reverts #15851) (#32458)
K-Dynamic Nov 2, 2024
792fbb1
Automatic changelog update
PJBot Nov 2, 2024
94db7bf
Hasten handcraft gauze recipe & decrease techfab gauze cost (#32744)
K-Dynamic Nov 2, 2024
f6fa233
Automatic changelog update
PJBot Nov 2, 2024
6bc9ee3
Service workers antagonist fix. (#31359)
UbaserB Nov 2, 2024
9d2386f
Automatic changelog update
PJBot Nov 2, 2024
6ce4181
Adds a new AME sound effect! (#33097)
AftrLite Nov 2, 2024
825da5c
Automatic changelog update
PJBot Nov 2, 2024
b41023f
Allow for the ai's laws to be changed from its core and eye (#32461)
nikthechampiongr Nov 2, 2024
b8760f2
Automatic changelog update
PJBot Nov 2, 2024
6d3cad3
clean up tools lathe recipes (#31521)
deltanedas Nov 2, 2024
f24cee2
Automatic changelog update
PJBot Nov 2, 2024
8328378
Intercoms and Radios both pick up proximate speech (#32737)
Centronias Nov 2, 2024
25d41d9
Automatic changelog update
PJBot Nov 2, 2024
846e159
Adds headphones to loadouts (#33067)
joshepvodka Nov 2, 2024
e2d9caf
Automatic changelog update
PJBot Nov 2, 2024
f0dd678
Cardboard Box Capacity 4 -> 5 (#32743)
Scribbles0 Nov 2, 2024
466fe19
remove our duplicate pill whitelist
Nov 2, 2024
fce4b76
fix
Nov 3, 2024
edc495b
remove broken crew monitor from dev map, how did it even get there
Nov 3, 2024
94b7cbb
a
Nov 6, 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
43 changes: 26 additions & 17 deletions Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,18 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow

private const float SilencingDuration = 2.5f;

// Colors
private Color _wallColor = new Color(64, 64, 64);
private Color _tileColor = new Color(28, 28, 28);
private Color _monitorBlipColor = Color.Cyan;
private Color _untrackedEntColor = Color.DimGray;
private Color _regionBaseColor = new Color(154, 154, 154);
private Color _inactiveColor = StyleNano.DisabledFore;
private Color _statusTextColor = StyleNano.GoodGreenFore;
private Color _goodColor = Color.LimeGreen;
private Color _warningColor = new Color(255, 182, 72);
private Color _dangerColor = new Color(255, 67, 67);

public AtmosAlertsComputerWindow(AtmosAlertsComputerBoundUserInterface userInterface, EntityUid? owner)
{
RobustXamlLoader.Load(this);
Expand All @@ -55,8 +67,8 @@ public AtmosAlertsComputerWindow(AtmosAlertsComputerBoundUserInterface userInter
NavMap.Owner = _owner;

// Set nav map colors
NavMap.WallColor = new Color(64, 64, 64);
NavMap.TileColor = Color.DimGray * NavMap.WallColor;
NavMap.WallColor = _wallColor;
NavMap.TileColor = _tileColor;

// Set nav map grid uid
var stationName = Loc.GetString("atmos-alerts-window-unknown-location");
Expand Down Expand Up @@ -214,7 +226,7 @@ public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[
if (consoleCoords != null && consoleUid != null)
{
var texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")));
var blip = new NavMapBlip(consoleCoords.Value, texture, Color.Cyan, true, false);
var blip = new NavMapBlip(consoleCoords.Value, texture, _monitorBlipColor, true, false);
NavMap.TrackedEntities[consoleUid.Value] = blip;
}

Expand Down Expand Up @@ -263,7 +275,7 @@ public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[
VerticalAlignment = VAlignment.Center,
};

label.SetMarkup(Loc.GetString("atmos-alerts-window-no-active-alerts", ("color", StyleNano.GoodGreenFore.ToHexNoAlpha())));
label.SetMarkup(Loc.GetString("atmos-alerts-window-no-active-alerts", ("color", _statusTextColor.ToHexNoAlpha())));

AlertsTable.AddChild(label);
}
Expand Down Expand Up @@ -292,7 +304,7 @@ public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[
if (!TryGetSensorRegionColor(regionOwner, alarmState, out var regionColor))
continue;

regionOverlay.Color = regionColor.Value;
regionOverlay.Color = regionColor;

var priority = (_trackedEntity == regionOwner) ? 999 : (int)alarmState;
prioritizedRegionOverlays.Add(regionOverlay, priority);
Expand Down Expand Up @@ -323,31 +335,28 @@ private void AddTrackedEntityToNavMap(AtmosAlertsDeviceNavMapData metaData, Atmo
var coords = _entManager.GetCoordinates(metaData.NetCoordinates);

if (_trackedEntity != null && _trackedEntity != metaData.NetEntity)
color *= Color.DimGray;
color *= _untrackedEntColor;

var selectable = true;
var blip = new NavMapBlip(coords, _spriteSystem.Frame0(texture), color, _trackedEntity == metaData.NetEntity, selectable);

NavMap.TrackedEntities[metaData.NetEntity] = blip;
}

private bool TryGetSensorRegionColor(NetEntity regionOwner, AtmosAlarmType alarmState, [NotNullWhen(true)] out Color? color)
private bool TryGetSensorRegionColor(NetEntity regionOwner, AtmosAlarmType alarmState, out Color color)
{
color = null;
color = Color.White;

var blip = GetBlipTexture(alarmState);

if (blip == null)
return false;

// DeltaV: fix client until upstream does
// Color the region based on alarm state and entity tracking
var output = blip.Value.Item2 * new Color(154, 154, 154);
color = blip.Value.Item2 * _regionBaseColor;

if (_trackedEntity != null && _trackedEntity != regionOwner)
output *= Color.DimGray;

color = output;
color *= _untrackedEntColor;

return true;
}
Expand Down Expand Up @@ -588,13 +597,13 @@ private AtmosAlarmType GetAlarmState(NetEntity netEntity)
switch (alarmState)
{
case AtmosAlarmType.Invalid:
output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), StyleNano.DisabledFore); break;
output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), _inactiveColor); break;
case AtmosAlarmType.Normal:
output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), Color.LimeGreen); break;
output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), _goodColor); break;
case AtmosAlarmType.Warning:
output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_triangle.png")), new Color(255, 182, 72)); break;
output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_triangle.png")), _warningColor); break;
case AtmosAlarmType.Danger:
output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_square.png")), new Color(255, 67, 67)); break;
output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_square.png")), _dangerColor); break;
}

return output;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@

<PanelContainer Name="AlertsDivider" Visible="False" StyleClasses="LowDivider" />

<BoxContainer Name="AlertsContainer" Visible="False" Margin="0 5" Orientation="Horizontal"
HorizontalExpand="True" HorizontalAlignment="Center">
<BoxContainer Name="AlertsContainer" Visible="False" Margin="0 5" Orientation="Vertical" HorizontalAlignment="Center">

</BoxContainer>

Expand Down
25 changes: 18 additions & 7 deletions Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,29 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)

// Alerts

AlertsDivider.Visible = msg.Bleeding == true;
AlertsContainer.Visible = msg.Bleeding == true;
var showAlerts = msg.Unrevivable == true || msg.Bleeding == true;

if (msg.Bleeding == true)
{
AlertsDivider.Visible = showAlerts;
AlertsContainer.Visible = showAlerts;

if (showAlerts)
AlertsContainer.DisposeAllChildren();
AlertsContainer.AddChild(new Label

if (msg.Unrevivable == true)
AlertsContainer.AddChild(new RichTextLabel
{
Text = Loc.GetString("health-analyzer-window-entity-unrevivable-text"),
Margin = new Thickness(0, 4),
MaxWidth = 300
});

if (msg.Bleeding == true)
AlertsContainer.AddChild(new RichTextLabel
{
Text = Loc.GetString("health-analyzer-window-entity-bleeding-text"),
FontColorOverride = Color.Red,
Margin = new Thickness(0, 4),
MaxWidth = 300
});
}

// Damage Groups

Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Mapping/MappingScreen.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
VerticalExpand="False"
VerticalAlignment="Bottom"
HorizontalAlignment="Center">
<controls:RecordedSplitContainer Name="ScreenContainer" HorizontalExpand="True"
<SplitContainer Name="ScreenContainer" HorizontalExpand="True"
VerticalExpand="True" SplitWidth="0"
StretchDirection="TopLeft">
<BoxContainer Orientation="Vertical" VerticalExpand="True" Name="SpawnContainer" MinWidth="200" SetWidth="600">
Expand Down Expand Up @@ -82,5 +82,5 @@
</BoxContainer>
</PanelContainer>
</LayoutContainer>
</controls:RecordedSplitContainer>
</SplitContainer>
</mapping:MappingScreen>
1 change: 0 additions & 1 deletion Content.Client/Mapping/MappingScreen.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ private void RefreshList()

public override void SetChatSize(Vector2 size)
{
ScreenContainer.DesiredSplitCenter = size.X;
ScreenContainer.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize;
}

Expand Down
29 changes: 0 additions & 29 deletions Content.Client/UserInterface/Controls/RecordedSplitContainer.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
VerticalExpand="False"
VerticalAlignment="Bottom"
HorizontalAlignment="Center">
<controls:RecordedSplitContainer Name="ScreenContainer" HorizontalExpand="True" VerticalExpand="True" SplitWidth="0" StretchDirection="TopLeft">
<SplitContainer Name="ScreenContainer" HorizontalExpand="True" VerticalExpand="True" SplitWidth="0" StretchDirection="TopLeft">
<LayoutContainer Name="ViewportContainer" HorizontalExpand="True" VerticalExpand="True">
<controls:MainViewport Name="MainViewport"/>
<widgets:GhostGui Name="Ghost" Access="Protected" />
Expand All @@ -26,7 +26,7 @@
</BoxContainer>
<alerts:AlertsUI Name="Alerts" Access="Protected" />
</LayoutContainer>
<PanelContainer HorizontalExpand="True" MinWidth="300">
<PanelContainer Name="SeparatedChatPanel" MinWidth="300">
<PanelContainer.PanelOverride>
<graphics:StyleBoxFlat BackgroundColor="#2B2C3B" />
</PanelContainer.PanelOverride>
Expand All @@ -36,5 +36,5 @@
<chat:ChatBox VerticalExpand="True" HorizontalExpand="True" Name="Chat" Access="Protected" MinSize="0 0"/>
</BoxContainer>
</PanelContainer>
</controls:RecordedSplitContainer>
</SplitContainer>
</screens:SeparatedChatGameScreen>
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ private void ResizeActionContainer()

public override void SetChatSize(Vector2 size)
{
ScreenContainer.DesiredSplitCenter = size.X;
ScreenContainer.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize;
}
}
14 changes: 13 additions & 1 deletion Content.Client/Voting/UI/VoteCallMenu.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Linq;
using System.Numerics;
using Content.Client.Gameplay;
using Content.Client.Stylesheets;
using Content.Shared.Administration;
using Content.Shared.CCVar;
Expand All @@ -8,6 +9,7 @@
using JetBrains.Annotations;
using Robust.Client.AutoGenerated;
using Robust.Client.Console;
using Robust.Client.State;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
Expand All @@ -28,6 +30,7 @@ public sealed partial class VoteCallMenu : BaseWindow
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IEntityNetworkManager _entNetManager = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly IStateManager _state = default!;

private VotingSystem _votingSystem;

Expand Down Expand Up @@ -62,14 +65,15 @@ public VoteCallMenu()

Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
CloseButton.OnPressed += _ => Close();
VoteNotTrustedLabel.Text = Loc.GetString("ui-vote-trusted-users-notice", ("timeReq", _cfg.GetCVar(CCVars.VotekickEligibleVoterDeathtime) / 60));
VoteNotTrustedLabel.Text = Loc.GetString("ui-vote-trusted-users-notice", ("timeReq", _cfg.GetCVar(CCVars.VotekickEligibleVoterDeathtime)));

foreach (StandardVoteType voteType in Enum.GetValues<StandardVoteType>())
{
var option = AvailableVoteOptions[voteType];
VoteTypeButton.AddItem(Loc.GetString(option.Name), (int)voteType);
}

_state.OnStateChanged += OnStateChanged;
VoteTypeButton.OnItemSelected += VoteTypeSelected;
CreateButton.OnPressed += CreatePressed;
FollowButton.OnPressed += FollowSelected;
Expand Down Expand Up @@ -101,6 +105,14 @@ protected override void FrameUpdate(FrameEventArgs args)
UpdateVoteTimeout();
}

private void OnStateChanged(StateChangedEventArgs obj)
{
if (obj.NewState is not GameplayState)
return;

Close();
}

private void CanCallVoteChanged(bool obj)
{
if (!obj)
Expand Down
5 changes: 0 additions & 5 deletions Content.Client/Voting/VotingSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ public override void Initialize()

private void OnVotePlayerListResponseEvent(VotePlayerListResponseEvent msg)
{
if (!_ghostSystem.IsGhost)
{
return;
}

VotePlayerListResponse?.Invoke(msg);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ await server.WaitAssertion(() =>
await pair.CleanReturnAsync();
}

/// <summary>
/// <summary>
/// Run the suicide command in the console
/// Should only ghost the player but not kill them
/// </summary>
Expand Down Expand Up @@ -241,6 +241,7 @@ public async Task TestSuicideByHeldItem()
var mindSystem = entManager.System<SharedMindSystem>();
var mobStateSystem = entManager.System<MobStateSystem>();
var transformSystem = entManager.System<TransformSystem>();
var damageableSystem = entManager.System<DamageableSystem>();

// We need to know the player and whether they can be hurt, killed, and whether they have a mind
var player = playerMan.Sessions.First().AttachedEntity!.Value;
Expand Down Expand Up @@ -276,6 +277,8 @@ await server.WaitPost(() =>
// and that all the damage is concentrated in the Slash category
await server.WaitAssertion(() =>
{
// Heal all damage first (possible low pressure damage taken)
damageableSystem.SetAllDamage(player, damageableComp, 0);
consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last();

Expand Down Expand Up @@ -313,6 +316,7 @@ public async Task TestSuicideByHeldItemSpreadDamage()
var mindSystem = entManager.System<SharedMindSystem>();
var mobStateSystem = entManager.System<MobStateSystem>();
var transformSystem = entManager.System<TransformSystem>();
var damageableSystem = entManager.System<DamageableSystem>();

// We need to know the player and whether they can be hurt, killed, and whether they have a mind
var player = playerMan.Sessions.First().AttachedEntity!.Value;
Expand Down Expand Up @@ -348,6 +352,8 @@ await server.WaitPost(() =>
// and that slash damage is split in half
await server.WaitAssertion(() =>
{
// Heal all damage first (possible low pressure damage taken)
damageableSystem.SetAllDamage(player, damageableComp, 0);
consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
{
Text = "admin-smite-become-mouse-name",
Category = VerbCategory.Smite,
Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Instruments/h_synthesizer.rsi"), "icon"),
Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Instruments/h_synthesizer.rsi"), "supersynth"),
Act = () =>
{
_polymorphSystem.PolymorphEntity(args.Target, "AdminInstrumentSmite");
Expand Down
Loading
Loading