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

Character Information UI #48

Closed
wants to merge 5 commits into from
Closed

Character Information UI #48

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ddd2da3
port character info UI and use identity instead of ID for name
DEATHB4DEFEAT Jan 28, 2024
cb6f67c
update the commented detailExaminableSystem
DEATHB4DEFEAT Jan 28, 2024
813a341
review changes
DEATHB4DEFEAT Feb 5, 2024
ea72d82
review changes
DEATHB4DEFEAT Feb 12, 2024
9543da7
move characterinformationcomp to base species
DEATHB4DEFEAT May 3, 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
2 changes: 2 additions & 0 deletions ...Client/SimpleStation14/Examine/CharacterInformation/Systems/CharacterInformationSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ private void ShowInfoWindow(EntityUid uid)
/// </summary>
/// <param name="idUid">Entity to check</param>
/// <returns>ID card component if they have one on the entity</returns>
/// <remarks>This function should not exist</remarks>
DEATHB4DEFEAT marked this conversation as resolved.
Show resolved Hide resolved
private IdCardComponent? GetId(EntityUid? idUid)
{
// PDA
Expand All @@ -121,6 +122,7 @@ private void ShowInfoWindow(EntityUid uid)
/// </summary>
/// <param name="uid">The entity to attempt information retrieval from</param>
/// <returns>Name, Job Title</returns>
/// <remarks>This function should not exist</remarks>
private (string, string) GetNameAndJob(EntityUid uid)
{
string? name = null;
Expand Down
3 changes: 1 addition & 2 deletions Content.Server/DetailExaminable/DetailExaminableComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Parkstation-CharacterInformation-Start
// Parkstation-CharacterInformation-Start - This was moved to the Shared namespace
// namespace Content.Server.DetailExaminable
// {
// [RegisterComponent]
Expand All @@ -9,4 +9,3 @@
// }
// }
// Parkstation-CharacterInformation-End
// (This was moved to shared)
3 changes: 1 addition & 2 deletions Content.Server/DetailExaminable/DetailExaminableystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Parkstation-CharacterInformation-Start
// Parkstation-CharacterInformation-Start - This was moved to the Shared namespace
// using Content.Shared.Examine;
// using Content.Shared.IdentityManagement;
// using Content.Shared.Verbs;
Expand Down Expand Up @@ -44,4 +44,3 @@
// }
// }
// Parkstation-CharacterInformation-End
// (This was moved to shared)
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Species/base.yml
View file
Open in desktop
DEATHB4DEFEAT marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
- Pacified
- StaminaModifier
- PsionicsDisabled #Nyano - Summary: PCs can have psionics disabled.
- PsionicallyInsulated #Nyano - Summary: PCs can be made insulated from psionic powers.
- PsionicallyInsulated #Nyano - Summary: PCs can be made insulated from psionic powers.
- type: Reflect
enabled: false
reflectProb: 0
Expand Down Expand Up @@ -218,7 +218,7 @@
- type: MobPrice
price: 1500 # Kidnapping a living person and selling them for cred is a good move.
deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less.
- type: CanEscapeInventory # Carrying system from nyanotrasen.
- type: CanEscapeInventory # Carrying system from nyanotrasen.
- type: Tag
tags:
- CanPilot
Expand Down
Loading