This repository has been archived by the owner on Sep 17, 2022. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 12
Health Scanners good:) #96
Open
xNightHowlx
wants to merge
1
commit into
SinguloStation13:master
Choose a base branch
from
xNightHowlx:patch-3
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Health scanners now show how intensely (minor,severe,extreme) someone is bleeding, instead of just saying they're bleeding or not bleeding. Health scanners also now say if someone is bandaged. Also shows organ status for monke.
KubeRoot
reviewed
Jul 12, 2021
@@ -148,7 +148,8 @@ GENE SCANNER | |||
mob_status = "<span class='alert'><b>Deceased</b></span>" | |||
oxy_loss = max(rand(1, 40), oxy_loss, (300 - (tox_loss + fire_loss + brute_loss))) // Random oxygen loss | |||
|
|||
if(ishuman(M)) | |||
// Singulostation edit | |||
if(ishuman(M) || istype(M,/mob/living/carbon/monkey)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
if(ishuman(M) || istype(M,/mob/living/carbon/monkey)) | |
if(ishuman(M) || ismonkey(M)) |
Urumasi
suggested changes
Jul 12, 2021
@@ -148,7 +148,8 @@ GENE SCANNER | |||
mob_status = "<span class='alert'><b>Deceased</b></span>" | |||
oxy_loss = max(rand(1, 40), oxy_loss, (300 - (tox_loss + fire_loss + brute_loss))) // Random oxygen loss | |||
|
|||
if(ishuman(M)) | |||
// Singulostation edit | |||
if(ishuman(M) || istype(M,/mob/living/carbon/monkey)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
if(ishuman(M) || istype(M,/mob/living/carbon/monkey)) | |
if(ishuman(M) || ismonkey(M)) |
if(H.bleed_rate) | ||
render_list += "<span class='alert ml-1'><b>Subject is bleeding!</b></span>\n" | ||
var/bleedtext = "" | ||
if(H.bleed_rate <= 5) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This whole if else chain could be done with a switch statement
Urumasi
added
Verified ✔️
Yeah, i'm a coder. What about it?
and removed
Verified ✔️
Yeah, i'm a coder. What about it?
labels
Jul 15, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Health scanners now show how intensely (minor,severe,extreme) someone is bleeding, instead of just saying they're bleeding or not bleeding. Health scanners also now say if someone is bandaged. Also shows organ status for monke.
Why It's Good For The Game
Makes health scanners more useful and reliable.
Changelog
🆑
add: Health scanners now show how intensely (minor,severe,extreme) someone is bleeding, instead of just saying they're bleeding or not bleeding.
add: Health scanners also now say if someone is bandaged.
add: Also shows organ status for monke.
/:cl: