Move contraband text to a separate examine tab by murphyneko · Pull Request #32250 · space-wizards/space-station-14

murphyneko · 2024-09-17T16:08:20Z

i forgor i had this pr open and deleted it whoops

About the PR

Contraband text is now in a separate examination tab, like armor resistances and item damage.

Why / Balance

That info is related to a single department (security), I don't need to see it every time I examine something.
You can see that tab in the strip menu, meaning it's only a visual difference.

Technical details

ContrabandSystem was refactored a bit for that

Media

Requirements

I have read and am following the Pull Request and Changelog Guidelines.
I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog
note that i added changelog after the merge to see if this works; if it does, it can be abused and should be fixed
🆑

tweak: Contraband examine is separated into a different section of examine.

Sadopeer · 2024-09-17T16:24:52Z

this is a brilliant addition

Everturning · 2024-09-17T17:21:16Z

is the knife a placeholder? might be better to make it something like handcuffs

murphyneko · 2024-09-17T17:50:53Z

is the knife a placeholder? might be better to make it something like handcuffs

i am not the author of the icon

BramvanZijp

Code looks great, works in-game.

github-actions · 2024-09-23T20:36:12Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

# Conflicts: # Content.Shared/Contraband/ContrabandSystem.cs

murphyneko · 2024-09-29T18:51:56Z

@Errant-4 any news on maintainer discussion? AFAIK it's 3 days

Errant-4 · 2024-09-29T19:58:29Z

@Errant-4 any news on maintainer discussion? AFAIK it's 3 days

Discussion ran into a design vacuum, vote has not started yet

murphyneko · 2024-10-25T10:22:26Z

g

murphyneko · 2024-10-27T19:13:58Z

But for this I feel like you're just slowing down the player getting info for very little value.

It's a matter of milliseconds to click a button, plus you're most likely viewing it from the strip menu/from the item on the ground, making speed a non-issue

SlamBamActionman · 2025-01-04T16:25:13Z

Hello, sorry for the late reply; internal discussion resulted in feedback but it was never finalized.

The consensus seems to be that the preferable way to implement this kind of examine status would be via a tooltip-on-hover icon, rather than its own clickable button + window. That way you don't have to do a separate click nor move away from the item description. Were we to do this, any such hover-only icon should probably be left-aligned in the window, just to separate it from the clickable buttons.

Speaking of the icon, there was some disagreements about its depiction. A knife is serviceable but maybe doesn't perfectly convey that it's for contraband info. Ubaser suggested a lock, for example. With the hover-only suggestion above it would be great if the icon changed visuals depending on if you're permitted to have the item or not, though I'm not entirely sure we have code supporting that functionality.

All that being said, if you're not interested in creating a hover-only tooltip icon we could merge this as an interim solution since it is an improvement over the current state, though it would require a change from the knife icon first.

github-actions · 2025-01-21T10:03:46Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

murphyneko · 2025-01-21T22:32:40Z

back to fixing

# Conflicts: # Content.Shared/Contraband/ContrabandSystem.cs

…valuate the pull request. This pull request has conflicts, please resolve those before we can evaluate the pull request. This pull request has conflicts, please resolve those before we can evaluate the pull request.

murphyneko · 2025-01-22T14:19:45Z

if anyone spots this, this is not my fault, it works the same on master (see #34581)

github-actions · 2025-01-23T10:27:35Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

# Conflicts: # Content.Shared/Contraband/ContrabandSystem.cs # Resources/Locale/en-US/contraband/contraband-severity.ftl

github-actions · 2025-01-24T05:09:47Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

# Conflicts: # Content.Shared/Contraband/ContrabandSystem.cs

…valuate the pull request.

## About the PR This PR adds the system that's going to allow us to mark items as contraband. Adding the respective contraband parent to items is going to be for another pr. ported: - space-wizards/space-station-14#28688 - space-wizards/space-station-14#30986 - space-wizards/space-station-14#30930 - space-wizards/space-station-14#30942 - space-wizards/space-station-14#31606 - space-wizards/space-station-14#30970 - space-wizards/space-station-14#33385 - space-wizards/space-station-14#32250 - space-wizards/space-station-14#35206 - space-wizards/space-station-14#35228 - space-wizards/space-station-14#36032 ## Why / Balance It'll allow people to definitely discern whether an item is contraband or not and what severity. ## Technical details Look at PR's mentioned. ## Media (this pr does not actually change these items) <img width="628" height="165" alt="image" src="https://github.com/user-attachments/assets/92c7bb4c-0f8f-46cf-9d7f-c9de29a1a473" /> <img width="644" height="268" alt="image" src="https://github.com/user-attachments/assets/053a211c-8f4c-435c-beff-62e3b84a01fe" /> <img width="886" height="170" alt="image" src="https://github.com/user-attachments/assets/09c661aa-b7f8-4e51-bd3d-9110fe22657b" /> ## Requirements - [x] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [x] I have added media to this PR or it does not require an ingame showcase. - [x] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. ## Breaking changes None as far as I know. ## Changelog Not needed. --------- Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: EmoGarbage404 <retron404@gmail.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Co-authored-by: John <35928781+sporkyz@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>

(cherry picked from commit a62ffdc)

weh

b35de57

BramvanZijp approved these changes Sep 22, 2024

View reviewed changes

github-actions Bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Sep 23, 2024

UbaserB mentioned this pull request Sep 25, 2024

Contraband should be a detailed examine #32439

Closed

Errant-4 added the S: Undergoing Discussion Status: Currently going through an extended discussion, as per procedure. label Sep 25, 2024

Merge branch 'master' into move-contra-text

1671f8c

# Conflicts: # Content.Shared/Contraband/ContrabandSystem.cs

github-actions Bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Sep 25, 2024

Errant-4 self-assigned this Oct 26, 2024

This comment was marked as abuse.

Sign in to view

SlamBamActionman added the S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. label Nov 14, 2024

SlamBamActionman added S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. labels Jan 4, 2025

Merge branch 'master' into move-contra-text

eaeee40

github-actions Bot added S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. and removed S: Awaiting Changes Status: Changes are required before another review can happen labels Jan 11, 2025

github-actions Bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Jan 21, 2025

murphyneko added 2 commits January 22, 2025 14:55

Merge branch 'master' into move-contra-text

b2f694b

# Conflicts: # Content.Shared/Contraband/ContrabandSystem.cs

github-actions Bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Jan 22, 2025

github-actions Bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Jan 23, 2025

murphyneko added 2 commits January 23, 2025 12:13

Merge branch 'master' into move-contra-text

663498b

# Conflicts: # Content.Shared/Contraband/ContrabandSystem.cs # Resources/Locale/en-US/contraband/contraband-severity.ftl

MERGE CONFLICT YIPPEE

0dfa161

github-actions Bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Jan 23, 2025

Errant-4 approved these changes Jan 23, 2025

View reviewed changes

Errant-4 added the S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. label Jan 23, 2025

github-actions Bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Jan 24, 2025

murphyneko added 2 commits January 24, 2025 11:09

Merge branch 'master' into move-contra-text

4778d16

# Conflicts: # Content.Shared/Contraband/ContrabandSystem.cs

This pull request has conflicts, please resolve those before we can e…

38748fe

…valuate the pull request.

github-actions Bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Jan 24, 2025

metalgearsloth approved these changes Feb 11, 2025

View reviewed changes

metalgearsloth merged commit a62ffdc into space-wizards:master Feb 11, 2025

murphyneko deleted the move-contra-text branch February 11, 2025 20:33

murphyneko mentioned this pull request Feb 16, 2025

Hover examine buttons #35206

Merged

2 tasks

murphyneko mentioned this pull request Mar 23, 2025

Contraband examine changes (again) #36032

Merged

2 tasks

PicklOH mentioned this pull request Apr 10, 2025

Only sec glasses can show contraband: second attempt #36412

Merged

2 tasks

MajorMoth mentioned this pull request Aug 7, 2025

Contraband Examine Port TheDenSS14/TheDen#1350

Merged

3 tasks

eris-webserv pushed a commit to The-Arcadis-Team/arc-station-14 that referenced this pull request Oct 16, 2025

Move contraband text to a separate examine tab (space-wizards#32250)

891c70d

(cherry picked from commit a62ffdc)

Conversation

murphyneko commented Sep 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

About the PR

Why / Balance

Technical details

Media

Requirements

Breaking changes

Uh oh!

Sadopeer commented Sep 17, 2024

Uh oh!

Everturning commented Sep 17, 2024

Uh oh!

murphyneko commented Sep 17, 2024

Uh oh!

BramvanZijp left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Sep 23, 2024

Uh oh!

murphyneko commented Sep 29, 2024

Uh oh!

Errant-4 commented Sep 29, 2024

Uh oh!

murphyneko commented Oct 25, 2024

Uh oh!

This comment was marked as abuse.

murphyneko commented Oct 27, 2024

Uh oh!

SlamBamActionman commented Jan 4, 2025

Uh oh!

github-actions Bot commented Jan 21, 2025

Uh oh!

murphyneko commented Jan 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

murphyneko commented Jan 22, 2025

Uh oh!

github-actions Bot commented Jan 23, 2025

Uh oh!

github-actions Bot commented Jan 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

murphyneko commented Sep 17, 2024 •

edited

Loading

murphyneko commented Jan 21, 2025 •

edited

Loading