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

Stethoscopes and penlights - An attempt on usefulness (Also, flashlight flashing fixed) #6691

Merged
merged 34 commits into from
Aug 6, 2024

Conversation

LC4492
Copy link
Contributor

@LC4492 LC4492 commented Jul 12, 2024

About the pull request

The main purpose of this PR is to add functionality to both the stethoscope and the penlight, with the fixing of the "flash eyes with flashlight" mechanism being only a conterminous addon.

Special thanks to Drathek for assisting with coding this, without his help I wouldn't go anywhere.

Explain why it's good for the game

Adds more detail to the game and allows the player to have more options regarding the diagnosis of their patients. Even though this PR is not meant to replace any type of current diagnosis methods, it is thought to allow the possibility of these items being used if the player wish, or if the situation they are in requires. It is also thought to actually give some purpose to both items, instead of only being decorative (basically).

About the "flash eyes with flashlight" mechanism, it just have been repaired because of its relation with the functionality of the penlight itself. (Remember, only the penlight can be used to do diagnosis, generic flashlights will only allow to temporarily blind the person you are interacting with, and will not give you any medical information).

Testing Photographs and Procedure

Screenshots & Videos

image

image

image

image

image

Changelog

🆑
add: Adds penlights and stethoscopes to nurses and corpsmen, they can use them to reliably check if someone have specific types of organ damage and how much, without the need of other apparatus. Adds a new organ.status called "LITTLE_BRUISED", used by the stethoscope and penlight to not give false positives when diagnosticating someone (saying that they are healthy, when they actually have 9 heart damage).
fix: Fixed an outdated check that made the entire "flash eyes with flashlight" mechanic don't work at all. Also updated it to check some other things for ease of logic.
spellcheck: Fixed typos on the abandoned "flash eyes with flashlight" code.
code: Added new functionalities for both the stethoscope and penlight: The stethoscopes can now be used to check the condition of both heart and lungs individually by aiming the chest, letting you be able to check if the organs are LITTLE_BRUISED (Have a damage equal or above 1), BRUISED (Have a damage equal or above 10), BROKEN (have a damage equal or above 30) or "HEALTHY" (any damage below 1). And the penlight, that can be used the same way to check the condition of brain and eyes by aiming the eyes of the person you are interacting with. Also with the fixing mentioned above, you can now flash people's eyes again! Everytime you check the condition of someone's eyes, you will also flash them. Replaced one letter vars in the flashlight code and on the stethoscope section of the ties code.
imageadd: Adds new "in_hand" icons for penlights and stethoscopes, both will now appear on your hands when used. Penlights have both "off" and "on" icons, fancy stuff!
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge Fix Fix one bug, make ten more Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors Code Improvement Make the code longer labels Jul 12, 2024
code/game/machinery/vending/vendor_types/crew/medical.dm Outdated Show resolved Hide resolved
code/game/objects/items/devices/flashlight.dm Outdated Show resolved Hide resolved
code/game/objects/items/devices/flashlight.dm Outdated Show resolved Hide resolved
code/game/objects/items/devices/flashlight.dm Outdated Show resolved Hide resolved
@LC4492 LC4492 requested a review from Zonespace27 July 12, 2024 21:02
@blackdragonTOW
Copy link
Contributor

Hello! Please remember to attach screenshots of your altered sprites in the PR description!!

@LC4492
Copy link
Contributor Author

LC4492 commented Jul 14, 2024

Hello! Please remember to attach screenshots of your altered sprites in the PR description!!

I did add the images, but it seems they are not showing up in github properly

@LC4492
Copy link
Contributor Author

LC4492 commented Jul 15, 2024

Hello! Please remember to attach screenshots of your altered sprites in the PR description!!

I did add the images, but it seems they are not showing up in github properly

All showing properly now

@cm13-github
Copy link
Contributor

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

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

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

@LC4492 LC4492 marked this pull request as ready for review August 6, 2024 01:35
@LC4492 LC4492 requested a review from kiVts August 6, 2024 02:10
@LC4492 LC4492 requested a review from kiVts August 6, 2024 02:17
Copy link
Contributor

@kiVts kiVts left a comment

Choose a reason for hiding this comment

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

one final thing I promise!!!

code/game/objects/items/devices/flashlight.dm Show resolved Hide resolved
code/modules/clothing/under/ties.dm Outdated Show resolved Hide resolved
@kiVts kiVts marked this pull request as draft August 6, 2024 03:32
@LC4492 LC4492 marked this pull request as ready for review August 6, 2024 04:11
@LC4492 LC4492 requested a review from kiVts August 6, 2024 04:11
Copy link
Contributor

@kiVts kiVts left a comment

Choose a reason for hiding this comment

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

looks good

@kiVts kiVts added this pull request to the merge queue Aug 6, 2024
Merged via the queue into cmss13-devs:master with commit 6bb886f Aug 6, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Aug 6, 2024
@Toastina
Copy link

Toastina commented Aug 8, 2024

Late to the party but. can you code so that penlight works inside the helmet. it's effect is similar to rail light

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Feature Feature coder badge Fix Fix one bug, make ten more Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants