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

Adds holocards to health scans, adds a new purple holocard #5968

Merged
merged 10 commits into from
Mar 26, 2024

Conversation

Vicacrov
Copy link
Contributor

@Vicacrov Vicacrov commented Mar 17, 2024

About the pull request

Video TLDR:

Video
dreamseeker_qW4M3VU4z1.mp4

In detail:

  1. Displays the active holocard of the patient on health scans (health analyzer, body scanner) and allows the user to change it there as well. Each colour shows up with their own explanatory text.
  2. Adds a new purple holocard, indicating xenomorph infection.
  3. Removes the ability to remove your own holocard when you click yourself with an empty hand.

Explain why it's good for the game

The goal is to improve communication between medics, doctors, and synths. Currently, toggling holocards is a bit cumbersome since you need to examine the person and that can quickly get lost in the chat spam. This PR aims to make this easier.

With this change, if you analyze someone and you see they have IB, you can immediately assign a red card to them while looking at the rest of the data.

Assigning purple card to freshly hugged marines ensures that when these marines return to the FOB/Almayer/get picked up by CAS (medevac can see the holocard's colour by default), the receiving end will know that their patient needs urgent care.

I think it also adds some extra tacticoolness to frontline medical personnel.

Testing Photographs and Procedure

  1. Spawn in as a medic
  2. Spawn in a health analyzer
  3. Scan yourself
  4. Change holocard

Screenshots

Screenshots

image
image
image
image
image

Changelog

🆑
add: Added holocards to health scans to improve communication between medical players. You can now assign holocards via the health analyzer and the body scanner as well. The health scan also tells you what the current holocard's colour means.
add: Added a new purple holocard to tag infected marines.
del: Clicking yourself no longer removes your own holocard.
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. UI deletes nanoui/html Feature Feature coder badge labels Mar 17, 2024
@Vicacrov
Copy link
Contributor Author

Vicacrov commented Mar 17, 2024

Currently, it has an error when clicking on "Change":

734.626 store FatalError: ReferenceError: 'act' is undefined
  at onClick (http://127.0.0.1:62252/tmp5228/tgui.bundle.js:53805)
  at rest.onClick (http://127.0.0.1:62252/tmp5228/tgui.bundle.js:35583)
  at callCallback (http://127.0.0.1:62252/tmp5228/tgui.bundle.js:968)

I cannot figure out how it is undefined, so it stays in draft until someone better at tgui than me can help me with it.

edit: sabre spotted the issue, I'll fix it soon

@Vicacrov Vicacrov marked this pull request as ready for review March 17, 2024 16:01
@Vicacrov Vicacrov changed the title Adds holocards to health scans Adds holocards to health scans, adds a new purple holocard Mar 17, 2024
code/modules/mob/living/carbon/human/human.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/human/human.dm Outdated Show resolved Hide resolved
code/modules/mob/living/living_healthscan.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

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

sprite fine

@sleepynecrons sleepynecrons added the Sprites Approved confirmed no stray pixels label Mar 18, 2024
@Vicacrov Vicacrov requested a review from Birdtalon March 20, 2024 15:05
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.

Just a couple minor things; otherwise this is great.

code/modules/mob/living/carbon/human/human.dm Show resolved Hide resolved
code/modules/mob/living/living_healthscan.dm Outdated Show resolved Hide resolved
code/modules/mob/living/living_healthscan.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft March 25, 2024 21:04
@Vicacrov Vicacrov marked this pull request as ready for review March 26, 2024 16:41
@Vicacrov Vicacrov requested a review from Drulikar March 26, 2024 17:07
@Drulikar Drulikar added this pull request to the merge queue Mar 26, 2024
Merged via the queue into cmss13-devs:master with commit 351e7c8 Mar 26, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Mar 26, 2024
github-merge-queue bot pushed a commit that referenced this pull request Mar 31, 2024
# About the pull request

This PR is a followup to #5968 which made holocards more prominent. Now
the holocards are tied to the squad hud.

Changes to sprites are just to move the holocards into the dmi with the
rest of the squad hud icons.

# Explain why it's good for the game

It is not super important that this overlay *always* be displayed, and
especially not to xenos. Now it is as if your squad visor is identifying
the person you are looking at.

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


https://github.com/cmss13-devs/cmss13/assets/76988376/b4f0e369-a269-4678-9f17-69dafffe0848

</details>


# Changelog
:cl: Drathek
add: Moved holocards to the squad hud
/: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 Approved confirmed no stray pixels Sprites Remove the soul from the game. UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants