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

WY actual hud #8088

Merged
merged 7 commits into from
Jan 17, 2025
Merged

WY actual hud #8088

merged 7 commits into from
Jan 17, 2025

Conversation

Blundir
Copy link
Contributor

@Blundir Blundir commented Jan 13, 2025

About the pull request

Gives all WY jobs actual hud + minimap icons, adds missing ones where possible

dreamseeker_HH2DwBdwMC

mzoPGaPsvs

dreamseeker_ZNwGzeDpKj

4Ed21TGVti

Makes CL have a WY faction by default (it shouldn't mess with anything, i really hope, USCM IFF is still there)

Makes all WY survs have correct starting faction

Changes WY headset sprite to white corporate one

Explain why it's good for the game

Icons good, fixes good

Changelog

🆑
add: now all WY jobs have a hud icon and a minimap icon
fix: fixed corporate survs having incorrect faction
imageadd: WY headset is now white
/:cl:

@cmss13-ci cmss13-ci bot added Sprites Remove the soul from the game. Feature Feature coder badge Fix Fix one bug, make ten more labels Jan 13, 2025
Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

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

pictures

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Jan 13, 2025
@efzapa
Copy link
Contributor

efzapa commented Jan 13, 2025

not really required but Comms Exec icon would be cool, they sometimes wind up on the ERT Station post-round

EDIT: Trainee icon should also be using the bronze palette imo

@fighterslam
Copy link

question. how does this affect CLs? I'm assuming the first 6 sprites are the first 6 ranks, so Trainee, Jr Exec, Exec, Sr Exec, Exec Spec, Exec Supervisor. Will this affect their look at all, or will it only apply to admin-spawned Corporate personnel?

@Blundir
Copy link
Contributor Author

Blundir commented Jan 13, 2025

question. how does this affect CLs? I'm assuming the first 6 sprites are the first 6 ranks, so Trainee, Jr Exec, Exec, Sr Exec, Exec Spec, Exec Supervisor. Will this affect their look at all, or will it only apply to admin-spawned Corporate personnel?

I didn't test it, but most likely it only changes survivors and admin spawned ones, due to how the code works for this

@fighterslam
Copy link

I didn't test it, but most likely it only changes survivors and admin spawned ones, due to how the code works for this

Damn, that's a shame. It'd be cool to see these used for the CL, since it's quite rare for the Corporate presets to be used. Still an awesome PR regardless.

code/game/objects/items/devices/radio/headset.dm Outdated Show resolved Hide resolved
code/datums/factions/wy.dm Outdated Show resolved Hide resolved
code/datums/factions/wy.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft January 16, 2025 01:16
@Blundir Blundir marked this pull request as ready for review January 16, 2025 13:11
@Blundir Blundir requested a review from Drulikar January 16, 2025 13:11
@Drulikar Drulikar added this pull request to the merge queue Jan 17, 2025
Merged via the queue into cmss13-devs:master with commit 730f5e4 Jan 17, 2025
29 checks passed
cmss13-ci bot added a commit that referenced this pull request Jan 17, 2025
github-merge-queue bot pushed a commit that referenced this pull request Jan 21, 2025
# About the pull request

Adds support for a headset to have additional faction huds, currently
list as follows:

CL can see Marine, PMC, WY

XO, CO can see Marine, WY, CMB

All CMB can see Marine, CMB

All NSPA can see TWE, NSPA

All PMCs can see WY, PMC

PMC command can see Marine, PMC, WY (they can't see Marine in hvh
preset)

All MP and HG can see CMB, CMP can also see WY

This pr is a nice additon to
#8088 , especially to CL,
since CL has a hud icon themselves now

All credit for code to bibby01 aka Thomas Neumann, big thank to him

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


![dreamseeker_SZeuLzwct7](https://github.com/user-attachments/assets/375bdb8a-3047-4962-b3e1-6debc1a1e2dd)


</details>


# Changelog
:cl:
add: adds support for a headset to have multiple faction huds, instead
of being harcoded to one main one
add: some headsets can now see multiple huds: CL can see USCM, WY, PMC;
CO, XO can see USCM, WY, CMB, etc
add: mp and hg headsets can now track cmp
fix: cl having incorrect minimap/orbit icon
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Fix Fix one bug, make ten more Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
Status: Merged
Development

Successfully merging this pull request may close these issues.

5 participants