Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Commit

Permalink
Merge0711 (space-wizards#262)
Browse files Browse the repository at this point in the history
* Detective (space-wizards#9301)

* Automatic changelog update

* Add tag to let entity not fire guns (space-wizards#9293)

* Prevent round end test from leaking (space-wizards#9342)

* Add Different Styles for Instruments (space-wizards#9250)

* Automatic changelog update

* Feet update (space-wizards#9344)

* Footstep sounds update

* adjustments I thought of

* Automatic changelog update

* Detective minor bug fixes 2 lines (space-wizards#9347)

* Update identification_cards.yml

* Update detective.yml

* ic ic ic

* yurgh

* Some footstep tweaks (space-wizards#9355)

* Lower footstep volume slightly

* more tweaks

* Saltern Update 3.8 (space-wizards#9351)

* Atlas Update 1.5 (space-wizards#9346)

* Marathon Update 2.2 (space-wizards#9349)

* fix variantize (space-wizards#9348)

* Bagel Update 14 (space-wizards#9345)

* Adds detective spawner to Delta (space-wizards#9356)

* See-Through Shuttle Wall (space-wizards#9306)

* Automatic changelog update

* Fix vomit mopping (space-wizards#9358)

* Freezer fixatmos entity (space-wizards#9314)

* Automatic changelog update

* Miasma outbreaks give every mob the same disease (space-wizards#9232)

* Added missing drawdepth "WallTops" to directional windows. (space-wizards#9308)

* Disarms now deselect after a usage. (space-wizards#9290)

* Automatic changelog update

* Make Dragons Pettable (space-wizards#9367)

* Automatic changelog update

* Lighthouse Update (space-wizards#9368)

* Add files via upload

* Add files via upload

* Automatic changelog update

* Extends cutting delay for cables from .25 to .50 (space-wizards#9366)

* Automatic changelog update

* Rotting fixes (space-wizards#9338)

* Automatic changelog update

* Makes Xenos Insulated and Immune to diseases (space-wizards#9369)

* Automatic changelog update

* Ammends changelog of space-wizards#9366 (space-wizards#9370)

* Remove xeno accent (space-wizards#9311)

* Automatic changelog update

* Add and replace alert sounds (space-wizards#9360)

* Automatic changelog update

* Update submodule to 0.28.2.1 (space-wizards#9371)

* Syndie Radio for Ghosts (space-wizards#9375)

* ERT cleanup (space-wizards#9376)

* Intrinsic radio fixes (space-wizards#9378)

* Inherent radio fixes

* rename

* Automatic changelog update

* barratry update (space-wizards#9389)

* Allow adminnotes to use username (space-wizards#9388)

No I'm not going to the ban panel to find someone's GUID.

* Reduce shuttle transit time (space-wizards#9397)

* Automatic changelog update

* Adds new disease! Tongue Twister. Also new scrambled accent. (space-wizards#9393)

* Automatic changelog update

* Fix station announcements (space-wizards#9380)

* Fix station announcements

Doesn't just get what's on the grid. Also made it generic so other systems can use a station filter.

* bumped

* a

* Broadcast salvage over supply instead (space-wizards#9381)

* Broadcast salvage over supply instead

* prototypes

* a

* Automatic changelog update

* Event Music & Nuke Countdown Song (space-wizards#8597)

Co-authored-by: ike709 <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Blocking and Shields (space-wizards#8584)

* Blocking

* Fixes Bodytype bug

* Blocking Damage Modifier

* Storing bodytype

* Consolidates Stop Blocking code

* Consolidates more methods

* Some cleanup, hitbox fix

* Shield Textures

* Passive blocking modifier check

* Localization, popups, and more cleanup

* Small cleanup

* Relay event

* Fixes a shutdown bug, adds specific containers and sets

* Popups and sounds

* Fixes typo

* Removes whitespace, adds comment

* Some requested changes

* Remove Shared

* Audio fix

* More changes

* More requested changes

* Properly remove on shutdown

* Adds riot shields to seclathes

* SecTech Riot shield

* Constant variable

* Relay transfer to user blocking system

* More destruction behavior

* Adds a shape field

* Riot shield cleanup

* More requested changes.

* Prevents blocking attempt where a user cannot be anchored

* Listen for anchor change

* Unused using cleanup

* More shields.

* Buckler

* Construction

* Linter fix

* Automatic changelog update

* Add BreakOnDistance to DoAfterEventArgs (space-wizards#8902)

Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Telescreens and big flat screen TV (space-wizards#8842)

* first pass wall tv

* telescreen first pass

* adds flat screen television

* removed duplicate assets

* code changes and construction graph start

* Update lv stack to apc

* completed graphs and fixed bb sizes

* Proto update

Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* removes metal walls, adds rusted walls (space-wizards#8416)

* removes metal walls, adds rusted walls

* removes 2 metal walls in bagel

* remove metal walls from pillar

* Remove icon from rust wall

* Made welding work

* removes old prototype

* Automatic changelog update

* Fixes tongue twister disease message, also adds it to the outbreak event (space-wizards#9400)

* Make shuttle launch use ID card entity name (space-wizards#9405)

* Automatic changelog update

* window (space-wizards#9399)

* Cargo Shuttle Shuttle Windows (space-wizards#9401)

* Refactors the AtmosphereSystem public-facing API to allow for multiple atmos backends. (space-wizards#8134)

* Refactors the entirety of the AtmosphereSystem public-facing API to allow for multiple atmos backends.

* actually compiles

* Remove commented out code

* funny bracket

* Move archived moles, temperature from GasMixture to TileAtmosphere.

* WIP customizable map default mixture
still VERY buggy

* broken mess
aaaaaaaaaaaaa

* Fix lattice, etc not being considered space

* visualization for "IsSpace"

* help

* Update Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs

Co-authored-by: Moony <[email protected]>

* Holy SHIT it compiles AGAIN

* Fix AtmosDeviceSystem crash at shutdown

* Fix immutable tiles on map blueprints not being fixed by fixgridatmos/revalidate.

* Use space instead of gasmixture immutable for heat capacity calculations

* Remove all LINDA-specific code from GasMixture, move it to TileAtmosphere/AtmosphereSystem instead.

* Fix roundstart tiles not processing

* Update Content.Server/Atmos/Commands/SetTemperatureCommand.cs

Co-authored-by: metalgearsloth <[email protected]>

* Update Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs

Changed Files tab is so large I can't commit both suggestions at once mfw

Co-authored-by: metalgearsloth <[email protected]>

Co-authored-by: Moony <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>

* reeee (space-wizards#9385)

* Humans can now have their ID cards examined (space-wizards#9415)

Co-authored-by: ike709 <[email protected]>

* Automatic changelog update

* Bloodstreams now have their own drawing behavior (space-wizards#8920)

* Automatic changelog update

* Fix collisions passing firestacks between mobs (space-wizards#9324)

* Automatic changelog update

* Experimental nukie changes (space-wizards#9428)

* Automatic changelog update

* Makes the nuke keypad play a nonatonic scale (space-wizards#9431)

* Add files via upload (space-wizards#9413)

* Automatic changelog update

* Bandaid NSS Pillar (space-wizards#9436)

* Fix remote piloting rotation (space-wizards#9439)

* Automatic changelog update

* Fixes Waystation's cargo dock. (space-wizards#9420)

* add tongue twister to the miasma pool (space-wizards#9423)

* Sec external access (space-wizards#9412)

* Security officer external access

* Update warden.yml

* Update head_of_security.yml

* Fixes entity spawner icons (space-wizards#9411)

* fixes asteroid icon / parent and adds suffix

* fixes asteroid icon / parent and adds suffix

* fix rust wall icon

* fix table icon

* fix counter icons

* makes base grenade abstract

* fixes rat stomach sprite error

* really fixed rat stomachs

* Automatic changelog update

* Make destructible test more reliable (space-wizards#9425)

* Fix salvage gibbing (space-wizards#9426)

* Fix salvage gib attempt 2 (space-wizards#9444)

* Fix invisible held sprites for capgun (space-wizards#9390)

* Fix capgun YAML for held sprites and touch up in-hand sprites

* Remove capgun size to inherit BaseItem size 5

* Automatic changelog update

* Make the extra bright lantern actually flash you. (space-wizards#9387)

* lantern goes STUN STUN

* fix an awkward extra spacebar

* fixing the lantern as emogarbage suggested

* buffs the usage amount

ngl, 15 might be a bit over the top, but it is several times larger than a normal flash so it somewhat makes sense.

* fixed encoding

* Automatic changelog update

* ass (space-wizards#9446)

* ass (space-wizards#9445)

* Tiny fans for freezers/shuttles (space-wizards#9451)

* department tech 1984 (space-wizards#9449)

* Automatic changelog update

* Fix intrinsic UI keys (space-wizards#9437)

struct moment

* Fix hunger/thirst 'Dead' thresholds (space-wizards#9453)

* Automatic changelog update

* Zombie Mode [New Game Mode] (space-wizards#8501)

Co-authored-by: Kara <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>

* Convert rat king to use a ghost role spawner (space-wizards#9459)

* Convert rat king to use a ghost role spawner

* fix literally unplayable spelling mistake

* Automatic changelog update

* Adds sell prices to fuel & water tanks (space-wizards#9466)

Co-authored-by: ike709 <[email protected]>

* Automatic changelog update

* Add UI window for loadbp (space-wizards#9441)

* Add UI window for loadbp

* Perms disabled

* Also teleport button

* wraparound fix

* Review

* Update game_presets.yml (space-wizards#9471)

* "Fix" aghost mass scanner (space-wizards#9438)

* Damage masks (space-wizards#9402)

* Automatic changelog update

* Stamina damage (space-wizards#9230)

* Automatic changelog update

* Fix delay roundend (space-wizards#9481)

* Allow aghosts to pilot (space-wizards#9482)

* Make nukie arm sounds entity based (space-wizards#9484)

* Fix loadbp window maps (space-wizards#9485)

* Reduce disabler stam damage (space-wizards#9483)

* Update submodule (space-wizards#9486)

* highlights (space-wizards#9332)

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>

* Magboots ECS and Cleanup (space-wizards#9245)

Co-authored-by: metalgearsloth <[email protected]>

* Marathon Update 2.3 (space-wizards#9490)

* Bagel Shells and Disabler (space-wizards#9491)

* Saltern Disablers (space-wizards#9492)

* Atlas Disablers (space-wizards#9493)

* Update hardsuits.yml (space-wizards#9494)

* Makes storage insertion failure more explicit (space-wizards#9465)

* Automatic changelog update

* Disablers on Delta (space-wizards#9509)

* Disablers on Waystation (space-wizards#9510)

* Convert piped atmos entity visualizers (space-wizards#9200)

* Make explosive armor multiplicative and not additive (space-wizards#9498)

* Automatic changelog update

* Fix stunbaton stun sounds (space-wizards#9511)

* Add deletion checks to verb execution (space-wizards#9507)

* Fix pipe net null error (space-wizards#9508)

* Make ghost role names default to entity name (space-wizards#9478)

* Play tap.ogg when no damage is being done (space-wizards#9489)

* Automatic changelog update

* Splitstation Update 06 July 2022 (space-wizards#9495)

* Pillar Update (space-wizards#9504)

* Light Lighthouse Update (space-wizards#9503)

* Automatic changelog update

* Prevent erroneous materials from being placed in lathes. (space-wizards#9454)

Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Disable ambience default again (space-wizards#9442)

* Emergency light goodies (space-wizards#9352)

Co-authored-by: Jacob Tong <[email protected]>

* Automatic changelog update

* Fix Practice Shotgun Shells (space-wizards#9516)

* Automatic changelog update

* Satiety tweaks (space-wizards#9519)

* Satiety tweaks

* actually lets do this

* Automatic changelog update

* Separate jetpack movement speed modifier (space-wizards#9363)

* Content changes required for recursive deletion changes (space-wizards#9316)

* Automatic changelog update

* Textures to make lamps mappable to East/West. (space-wizards#9414)

Co-authored-by: Jeff <[email protected]>

* Pizza box 1984 (space-wizards#9521)

* Pizza box 1984

* todo

* Automatic changelog update

* Probably fix ghost overlays (space-wizards#9529)

* Fix & speed up explosion lookup (space-wizards#9526)

* Speed up explosion lookup

* Ah. Fuck.

* Disease Stages But Epic (space-wizards#9043)

Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Adds station filter for alert level change sound (space-wizards#9533)

* FixVacuum does not replace tile air if there are no adjacent tiles. (space-wizards#9535)

* Fix adjacent tile atmosphere creation using the wrong coordinates. (space-wizards#9539)

* Automatic changelog update

* Make wieldable use entity position (space-wizards#9538)

* sprite fix (space-wizards#9542)

* Automatic changelog update

* Add SoftMaxPlayers to status response for launcher use (space-wizards#9365)

* Automatic changelog update

* Fix T-ray scanner flickering (space-wizards#9544)

* Automatic changelog update

* Fix a bunch of warnings (space-wizards#9528)

* BEHOLD! The MagiVend! (space-wizards#9440)

* Magivend Sprites, and Entity stuffs

* Oopsie!

* Automatic changelog update

* Dispense hot tea into teacup instead of glass (space-wizards#9541)

* Automatic changelog update

* Fireaxe resprite (space-wizards#9302)

* fieraxe

* traitor-fireaxe

* Automatic changelog update

* Marathon Update 2.4 (space-wizards#9553)

* Fix space-wizards#9549

* Automatic changelog update

* Bullet impact effects (space-wizards#9530)

* Automatic changelog update

* Fix force-feeding pills (space-wizards#9554)

* Automatic changelog update

* China Lake Buff (space-wizards#9543)

* Automatic changelog update

* Shuttle announces its docking direction (space-wizards#9564)

* Shuttle announces its docking direction

* Consider COM juusssttt in case

* Fix nearby warping (space-wizards#9565)

* Automatic changelog update

* Jetpack QOL tweaks (space-wizards#9563)

* Automatic changelog update

* Fix drink system double-refunding solutions on failure (space-wizards#9569)

* Automatic changelog update

* Visual popup types (space-wizards#9523)

* Visual popup types

* Pass over `PopupCoordinates` and `PopupCursor`

* `PopupEntity` pass

* Disease and reagent popup pass

* COLOUR

* Automatic changelog update

* Specifiable dock colours + stripeback displays (space-wizards#9566)

* Visual popup addendum (space-wizards#9570)

* Add egg laying + chicken/duck improvements (space-wizards#9518)

* Disable emergency light ambience by default (space-wizards#9571)

* splitstation minor update (emergency lights) (space-wizards#9572)

* Making smites funnier (space-wizards#9524)

* Automatic changelog update

* Bagel E Lights (space-wizards#9573)

* Update submodule (space-wizards#9574)

* Injector sprite fix (space-wizards#9011)

* Automatic changelog update

* marathon e lights (space-wizards#9575)

* Change yellow alert elight color to goldenrod (space-wizards#9577)

* Evac Shuttle Fans (space-wizards#9578)

* Order manifests for shuttle orders. Now with item names and approver info. (space-wizards#9464)

Co-authored-by: Kara <[email protected]>

* Automatic changelog update

* Marathon Ore Processor and misc (space-wizards#9580)

* Kudzu nerf (space-wizards#9576)

* Automatic changelog update

* Convert Remaining Atmos Appearance Visualizers (space-wizards#9582)

* Convert atmos plaque to generic visualizer

Use generic visualizer for atmos plaque. Also enables zumos plaque to
appear.

* Convert gas canister connecters

* Remove manual layer creation

* Remove gas canister visualizer

* Convert gas analyzers to generic visualizers

* Convert fire visualizer

* Fix layers on plasma and air canisters

* Remove commented out fire visualizer in barricades

* Add documentation for fire visuals component

* Remove redundant visualizer for milkalyzer

* Remove rogue item group

* Knock on shutters (space-wizards#9586)

* Automatic changelog update

* Update battery_guns.yml (space-wizards#9581)

* Automatic changelog update

* Shards damage barefoot users + steptrigger-related general cleanup (space-wizards#9585)

* Automatic changelog update

* Client command perms cleanup. (space-wizards#9599)

* Update identification_cards.yml (space-wizards#9603)

* public method to add/subtract from cargo bank account (space-wizards#9614)

* Forensics QOL (Autolabeling of pads and reports) (space-wizards#9610)

* Automatic changelog update

* Allow non-humanoid roles (space-wizards#9604)

* Fix medical techfab and add unused bodybag recipe to it (space-wizards#9607)

* bodybags printable in medical techfab

* fix medical techfab

* Automatic changelog update

* Lamp Plushie (space-wizards#9118)

* Update meta.json

* Add files via upload

* Update toys.yml

* Update toy.yml

* Update toys.yml

* Id[entity] 2.0 (real) (space-wizards#9612)

* starter API

* network ID cards

* Port more stuff from old identity

* Re-implement identity representation + name updating

* move

* proper name returning for `IdentityName`

* move everything important to server, give in to  temptation

* shared / server / client split sadly. move ensure to shared and spawn to server

* identity update queueing + identityblocker

* fixes

* and just like that it's usable for admins

* huge identity pass

* pass dos

* jesus christ

* figs :D

* fuck u

* fix bad merge.

Co-authored-by: Moony <[email protected]>

* Automatic changelog update

* Event refactor (space-wizards#9589)

* Station event refactor

* Remove clientside `IStationEventManager`

we can just use prototypes

* Basic API idea

* Cruft

* first attempt at epicness

* okay yeah this shit is really clean

* sort out minor stuff

* Convert `BreakerFlip`

* `BureaucraticError` + general cleanup

* `DiseaseOutbreak`

* `FalseAlarm`

* `GasLeak`

* `KudzuGrowth`

* `MeteorSwarm`

* `MouseMigration`

* misc errors

* `PowerGridCheck`

* `RandomSentience`

* `VentClog`

* `VentCritters`

* `ZombieOutbreak`

* Rewrite basic event scheduler

* Minor fixes and logging

* ooooops

* errors + fix

* linter

* completions, `RuleStarted` property, update loop fixes

* Tweaks

* Fix space-wizards#9462

* Basic scheduler update fix, and fixes space-wizards#8174

* Add test

* UI cleanup

* really this was just for testing

* Fixes Blocking bugs (space-wizards#9424)

* Fixes Riot shield bugs

* Removes redundant check and extra parenthesis

* Requested changes

* Prevent block with another shield if already blocking.

* Automatic changelog update

* Fix space mob burning (space-wizards#9615)

* Small identity fixes (space-wizards#9617)

* More nukie tweaks (space-wizards#9618)

* Automatic changelog update

* Fixed typo in lobby (space-wizards#9630)

* Automatic changelog update

* Fix salv magnet

Co-authored-by: Emisse <[email protected]>
Co-authored-by: PJBot <[email protected]>
Co-authored-by: wrexbe <[email protected]>
Co-authored-by: EmoGarbage404 <[email protected]>
Co-authored-by: Kara <[email protected]>
Co-authored-by: Moony <[email protected]>
Co-authored-by: TimrodDX <[email protected]>
Co-authored-by: Ablankmann <[email protected]>
Co-authored-by: themias <[email protected]>
Co-authored-by: BismarckShuffle <[email protected]>
Co-authored-by: AJCM-git <[email protected]>
Co-authored-by: Aerocrux <[email protected]>
Co-authored-by: OldDanceJacket <[email protected]>
Co-authored-by: Júlio César Ueti <[email protected]>
Co-authored-by: T-Stalker <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: Pancake <[email protected]>
Co-authored-by: Jessica M <[email protected]>
Co-authored-by: ike709 <[email protected]>
Co-authored-by: ike709 <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: keronshb <[email protected]>
Co-authored-by: Peptide90 <[email protected]>
Co-authored-by: Vera Aguilera Puerto <[email protected]>
Co-authored-by: Delete69 <[email protected]>
Co-authored-by: ninruB <[email protected]>
Co-authored-by: TaralGit <[email protected]>
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: TekuNut <[email protected]>
Co-authored-by: Leon Friedrich <[email protected]>
Co-authored-by: Jacob Tong <[email protected]>
Co-authored-by: ChilbroBaggins <[email protected]>
Co-authored-by: Jeff <[email protected]>
Co-authored-by: Flipp Syder <[email protected]>
Co-authored-by: Deahaka <[email protected]>
Co-authored-by: Myctai <[email protected]>
Co-authored-by: Marat Gadzhiev <[email protected]>
Co-authored-by: Pieter-Jan Briers <[email protected]>
Co-authored-by: Duddino <[email protected]>
  • Loading branch information
Show file tree
Hide file tree
Showing 158 changed files with 2,116 additions and 1,894 deletions.
7 changes: 7 additions & 0 deletions Content.Client/Access/IdCardSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
using Content.Shared.Access.Systems;

namespace Content.Client.Access;

public sealed class IdCardSystem : SharedIdCardSystem
{
}
9 changes: 6 additions & 3 deletions Content.Client/Administration/UI/BwoinkWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,12 @@ private string FormatTabTitle(ItemList.Item li, PlayerInfo? pl = default)
if (pl.Antag)
sb.Append(new Rune(0x1F5E1)); // 🗡

sb.AppendFormat("\"{0}\"", pl.CharacterName)
.Append(' ')
.Append(pl.Username);
sb.AppendFormat("\"{0}\"", pl.CharacterName);

if (pl.IdentityName != pl.CharacterName && pl.IdentityName != string.Empty)
sb.Append(' ').AppendFormat("[{0}]", pl.IdentityName);

sb.Append(' ').Append(pl.Username);

return sb.ToString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ private void PopulateList(IReadOnlyList<PlayerInfo> _ = null!)
foreach (var info in _adminSystem.PlayerList)
{
var displayName = $"{info.CharacterName} ({info.Username})";
if (info.IdentityName != info.CharacterName)
displayName += $" [{info.IdentityName}]";
if (!string.IsNullOrEmpty(FilterLineEdit.Text) &&
!displayName.ToLowerInvariant().Contains(FilterLineEdit.Text.Trim().ToLowerInvariant()))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@
<Button Name="LoadGamePrototypeButton" Text="{Loc 'load-game-prototype'}"/>
<cc:UICommandButton Name="LoadBlueprintsButton" Command="loadbp" Text="{Loc 'load-blueprints'}" WindowType="{x:Type abt:LoadBlueprintsWindow}"/>
<cc:CommandButton Command="deleteewc Singularity" Name="DeleteSingulos" Text="{Loc 'delete-singularities'}"/>
<cc:UICommandButton Command="events" Text="{Loc 'open-station-events'}" WindowType="{x:Type abt:StationEventsWindow}" />
</GridContainer>
</Control>

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ private void RefreshPlayerList(IReadOnlyList<PlayerInfo> players)
{
var entry = new PlayerTabEntry(player.Username,
player.CharacterName,
player.IdentityName,
player.StartingJob,
player.Antag ? "YES" : "NO",
new StyleBoxFlat(useAltColor ? _altColor : _defaultColor),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public sealed partial class PlayerTabEntry : ContainerButton
{
public EntityUid? PlayerUid;

public PlayerTabEntry(string username, string character, string job, string antagonist, StyleBox styleBox, bool connected)
public PlayerTabEntry(string username, string character, string identity, string job, string antagonist, StyleBox styleBox, bool connected)
{
RobustXamlLoader.Load(this);

Expand All @@ -19,6 +19,8 @@ public PlayerTabEntry(string username, string character, string job, string anta
UsernameLabel.StyleClasses.Add("Disabled");
JobLabel.Text = job;
CharacterLabel.Text = character;
if (identity != character)
CharacterLabel.Text += $" [{identity}]";
AntagonistLabel.Text = antagonist;
BackgroundColorPanel.PanelOverride = styleBox;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Content.Shared.Cargo.BUI;
using Content.Shared.Cargo.Events;
using Content.Shared.Cargo.Prototypes;
using Content.Shared.IdentityManagement;
using Robust.Client.GameObjects;
using Robust.Client.Player;
using Robust.Shared.Prototypes;
Expand Down Expand Up @@ -55,7 +56,7 @@ protected override void Open()
string orderRequester;

if (entityManager.TryGetComponent<MetaDataComponent>(localPlayer, out var metadata))
orderRequester = metadata.EntityName;
orderRequester = Identity.Name(localPlayer.Value, entityManager);
else
orderRequester = string.Empty;

Expand Down
11 changes: 9 additions & 2 deletions Content.Client/ContextMenu/UI/EntityMenuElement.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
using Content.Client.Administration.Managers;
using Content.Shared.Administration;
using Content.Shared.IdentityManagement;
using Robust.Client.GameObjects;
using Robust.Client.Player;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
Expand All @@ -11,6 +15,7 @@ public sealed partial class EntityMenuElement : ContextMenuElement
public const string StyleClassEntityMenuCountText = "contextMenuCount";

[Dependency] private IEntityManager _entityManager = default!;
[Dependency] private IPlayerManager _playerManager = default!;

/// <summary>
/// The entity that can be accessed by interacting with this element.
Expand Down Expand Up @@ -74,10 +79,12 @@ public void UpdateEntity(EntityUid? entity = null)

EntityIcon.Sprite = _entityManager.GetComponentOrNull<ISpriteComponent>(entity);

if (UserInterfaceManager.DebugMonitors.Visible)
var admin = IoCManager.Resolve<IClientAdminManager>();

if (admin.HasFlag(AdminFlags.Admin | AdminFlags.Debug))
Text = _entityManager.ToPrettyString(entity.Value);
else
Text = _entityManager.GetComponent<MetaDataComponent>(entity.Value).EntityName;
Text = Identity.Name(entity.Value, _entityManager, _playerManager.LocalPlayer!.ControlledEntity!);
}
}
}
3 changes: 2 additions & 1 deletion Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Shared.IdentityManagement;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
Expand All @@ -21,7 +22,7 @@ private List<List<EntityUid>> GroupEntities(IEnumerable<EntityUid> entities, int
{
if (GroupingContextMenuType == 0)
{
var newEntities = entities.GroupBy(e => _entityManager.GetComponent<MetaDataComponent>(e).EntityName + (_entityManager.GetComponent<MetaDataComponent>(e).EntityPrototype?.ID ?? string.Empty)).ToList();
var newEntities = entities.GroupBy(e => Identity.Name(e, _entityManager) + (_entityManager.GetComponent<MetaDataComponent>(e).EntityPrototype?.ID ?? string.Empty)).ToList();
return newEntities.Select(grp => grp.ToList()).ToList();
}
else
Expand Down
4 changes: 1 addition & 3 deletions Content.Client/Entry/EntryPoint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@
using Content.Client.Parallax;
using Content.Client.Parallax.Managers;
using Content.Client.Preferences;
using Content.Client.Radiation;
using Content.Client.Sandbox;
using Content.Client.Screenshot;
using Content.Client.Singularity;
using Content.Client.StationEvents;
using Content.Client.StationEvents.Managers;
using Content.Client.Stylesheets;
using Content.Client.Viewport;
using Content.Client.Voting;
Expand Down Expand Up @@ -194,7 +193,6 @@ public override void PostInit()

IoCManager.Resolve<IChatManager>().Initialize();
IoCManager.Resolve<IClientPreferencesManager>().Initialize();
IoCManager.Resolve<IStationEventManager>().Initialize();
IoCManager.Resolve<EuiManager>().Initialize();
IoCManager.Resolve<IVoteManager>().Initialize();
IoCManager.Resolve<IGamePrototypeLoadManager>().Initialize();
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/Examine/ExamineSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Threading;
using Content.Client.Verbs;
using Content.Shared.Examine;
using Content.Shared.IdentityManagement;
using Content.Shared.Input;
using Content.Shared.Verbs;
using JetBrains.Annotations;
Expand Down Expand Up @@ -192,7 +193,7 @@ public void OpenTooltip(EntityUid player, EntityUid target, bool centeredOnCurso

hBox.AddChild(new Label
{
Text = EntityManager.GetComponent<MetaDataComponent>(target).EntityName,
Text = Identity.Name(target, EntityManager, player),
HorizontalExpand = true,
});

Expand Down
7 changes: 4 additions & 3 deletions Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Content.Shared.FixedPoint;
using Robust.Shared.Prototypes;
using Content.Shared.Damage;

using Content.Shared.IdentityManagement;
using static Content.Shared.MedicalScanner.SharedHealthAnalyzerComponent;

namespace Content.Client.HealthAnalyzer.UI
Expand All @@ -28,8 +28,9 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
if (msg.TargetEntity != null && entities.TryGetComponent<DamageableComponent>(msg.TargetEntity, out var damageable))
{
string entityName = "Unknown";
if (msg.TargetEntity != null && entities.TryGetComponent<MetaDataComponent>(msg.TargetEntity.Value, out var metaData))
entityName = metaData.EntityName;
if (msg.TargetEntity != null &&
entities.TryGetComponent<MetaDataComponent>(msg.TargetEntity.Value, out var metaData))
entityName = Identity.Name(msg.TargetEntity.Value, entities);

IReadOnlyDictionary<string, FixedPoint2> DamagePerGroup = damageable.DamagePerGroup;
IReadOnlyDictionary<string, FixedPoint2> DamagePerType = damageable.Damage.DamageDict;
Expand Down
7 changes: 7 additions & 0 deletions Content.Client/IdentityManagement/IdentitySystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
using Content.Shared.IdentityManagement;

namespace Content.Client.IdentityManagement;

public class IdentitySystem : SharedIdentitySystem
{
}
4 changes: 3 additions & 1 deletion Content.Client/Inventory/StrippableBoundUserInterface.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using Content.Client.Strip;
using Content.Shared.IdentityManagement;
using Content.Shared.Strip.Components;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
Expand Down Expand Up @@ -28,7 +29,8 @@ protected override void Open()
{
base.Open();

_strippingMenu = new StrippingMenu($"{Loc.GetString("strippable-bound-user-interface-stripping-menu-title",("ownerName", IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Owner).EntityName))}");
var entMan = IoCManager.Resolve<IEntityManager>();
_strippingMenu = new StrippingMenu($"{Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner.Owner, entMan)))}");

_strippingMenu.OnClose += Close;
_strippingMenu.OpenCentered();
Expand Down
2 changes: 0 additions & 2 deletions Content.Client/IoC/ClientContentIoC.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
using Content.Client.Parallax.Managers;
using Content.Client.Preferences;
using Content.Client.Screenshot;
using Content.Client.StationEvents.Managers;
using Content.Client.Stylesheets;
using Content.Client.Viewport;
using Content.Client.Voting;
Expand All @@ -37,7 +36,6 @@ public static void Register()
IoCManager.Register<IStylesheetManager, StylesheetManager>();
IoCManager.Register<IScreenshotHook, ScreenshotHook>();
IoCManager.Register<IClickMapManager, ClickMapManager>();
IoCManager.Register<IStationEventManager, StationEventManager>();
IoCManager.Register<IClientAdminManager, ClientAdminManager>();
IoCManager.Register<EuiManager, EuiManager>();
IoCManager.Register<IVoteManager, VoteManager>();
Expand Down
6 changes: 4 additions & 2 deletions Content.Client/Items/UI/ItemStatusPanel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Content.Client.Resources;
using Content.Client.Stylesheets;
using Content.Shared.Hands.Components;
using Content.Shared.IdentityManagement;
using Robust.Client.Graphics;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
Expand Down Expand Up @@ -159,11 +160,12 @@ private void UpdateItemName()
if (_entityManager.TryGetComponent(_entity, out HandVirtualItemComponent? virtualItem)
&& _entityManager.EntityExists(virtualItem.BlockingEntity))
{
_itemNameLabel.Text = _entityManager.GetComponent<MetaDataComponent>(virtualItem.BlockingEntity).EntityName;
// Uses identity because we can be blocked by pulling someone
_itemNameLabel.Text = Identity.Name(virtualItem.BlockingEntity, _entityManager);
}
else
{
_itemNameLabel.Text = _entityManager.GetComponent<MetaDataComponent>(_entity.Value).EntityName;
_itemNameLabel.Text = Identity.Name(_entity.Value, _entityManager);
}
}

Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Nuke/NukeMenu.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public void UpdateState(NukeUiState state)
SecondStatusLabel.Text = secondMsg;

EjectButton.Disabled = !state.DiskInserted || state.Status == NukeStatus.ARMED;
AnchorButton.Disabled = !state.DiskInserted;
AnchorButton.Disabled = state.Status == NukeStatus.ARMED;
AnchorButton.Pressed = state.IsAnchored;
ArmButton.Disabled = !state.AllowArm;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System;
using Content.Shared.Radiation;
using Robust.Shared.GameObjects;

namespace Content.Client.StationEvents
namespace Content.Client.Radiation
{
[RegisterComponent]
[ComponentReference(typeof(SharedRadiationPulseComponent))]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Robust.Client.Graphics;
using Robust.Shared.Enums;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;

namespace Content.Client.StationEvents
namespace Content.Client.Radiation
{
public sealed class RadiationPulseOverlay : Overlay
{
Expand Down
Loading

0 comments on commit bc97dec

Please sign in to comment.