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

Ports stripping menu from TG #5914

Merged
merged 42 commits into from
Apr 15, 2024

Conversation

ihatethisengine
Copy link
Contributor

@ihatethisengine ihatethisengine commented Mar 10, 2024

About the pull request

(This is a commissioned PR)
Ports tgstation/tgstation#57889 and adapts for our gameplay.

Explain why it's good for the game

Fancy and more convenient?

Testing Photographs and Procedure

str.mp4

Changelog

🆑 ihatethisengine2
add: ported stripping menu from TG
/:cl:

@github-actions github-actions bot added UI deletes nanoui/html Feature Feature coder badge labels Mar 10, 2024
@zzzmike
Copy link
Contributor

zzzmike commented Mar 10, 2024

I'm guessing this might fix that longstanding bug where the strip menu doesn't update sometimes? Thank you for this.

@ihatethisengine ihatethisengine marked this pull request as draft March 10, 2024 15:50
@ihatethisengine ihatethisengine marked this pull request as ready for review March 10, 2024 16:26
@ihatethisengine ihatethisengine marked this pull request as draft March 10, 2024 16:31
@ihatethisengine ihatethisengine marked this pull request as ready for review March 10, 2024 18:03
@mullenpaul
Copy link
Contributor

This is nice - I think it looks like an improvement, I will review this tonight

Copy link
Contributor

@mullenpaul mullenpaul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks ok in its current state. As it's quite a core change I need to spend some time looking at it. Can you have a look at the comments raised and address them / query them so this can be done in parallel?

tgui/packages/tgui/interfaces/StripMenu.tsx Outdated Show resolved Hide resolved
tgui/packages/tgui/interfaces/StripMenu.tsx Outdated Show resolved Hide resolved
tgui/packages/tgui/interfaces/StripMenu.tsx Show resolved Hide resolved
tgui/packages/tgui/interfaces/StripMenu.tsx Outdated Show resolved Hide resolved
tgui/packages/tgui/interfaces/StripMenu.tsx Outdated Show resolved Hide resolved
code/datums/elements/strippable.dm Show resolved Hide resolved
code/datums/elements/strippable.dm Outdated Show resolved Hide resolved
@mullenpaul
Copy link
Contributor

I'm away for a few days and then I have a few days leave in which I can burn time testing this.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Mar 18, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Mar 19, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

code/datums/elements/strippable.dm Outdated Show resolved Hide resolved
code/datums/elements/strippable.dm Show resolved Hide resolved
code/datums/elements/strippable.dm Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft March 25, 2024 20:41
@Drulikar Drulikar added the Sprites Remove the soul from the game. label Apr 13, 2024
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I can tell the code is working and acceptable.

@Drulikar
Copy link
Contributor

Sprites are existing sprites

@Drulikar
Copy link
Contributor

Two of paul's reviews are still outstanding.

@Drulikar Drulikar marked this pull request as draft April 13, 2024 12:43
@ihatethisengine ihatethisengine marked this pull request as ready for review April 13, 2024 14:47
cm13-github added a commit that referenced this pull request Apr 13, 2024
@Steelpoint Steelpoint mentioned this pull request Apr 14, 2024
3 tasks
cm13-github added a commit that referenced this pull request Apr 15, 2024
@Drulikar Drulikar dismissed mullenpaul’s stale review April 15, 2024 19:57

Mostly resolved, though TGUI code likely needs refactoring in the future

@Drulikar Drulikar added this pull request to the merge queue Apr 15, 2024
Merged via the queue into cmss13-devs:master with commit ce3716d Apr 15, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Apr 15, 2024
github-merge-queue bot pushed a commit that referenced this pull request Aug 22, 2024
…lds (#6881)

# About the pull request

This PR is a followup to #6150
and #5914 that added new
flags_item flags but not to the bitfields

# Explain why it's good for the game

Allows the VV to allow editing and displaying these flags correctly.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/user-attachments/assets/3b292717-c48a-4d22-89ef-c4a549db9a1c)

</details>


# Changelog
:cl: Drathek
code: Added missing bitfields for flags_item to VV
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Remove the soul from the game. Testmerge Candidate we'll test this while you're asleep and the server has 10 players UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants