Skip to content
This repository has been archived by the owner on Sep 17, 2022. It is now read-only.

Health Scanners good:) #96

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

xNightHowlx
Copy link

@xNightHowlx xNightHowlx commented Jul 12, 2021

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:

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.
@@ -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))
Copy link
Contributor

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))

@@ -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))
Copy link
Contributor

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)
Copy link
Contributor

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 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.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants