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.

Sign up for GitHub

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

Jump to bottom

Mouth and Eyes Surgical Incisions Show on Scanner & Open Surgical Incisions Alone Show Up On Scanner - A Fix To Issue #5639 #5640

Merged
merged 2 commits into from
Feb 4, 2024
Merged

Mouth and Eyes Surgical Incisions Show on Scanner & Open Surgical Incisions Alone Show Up On Scanner - A Fix To Issue #5639 #5640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6746ec8
Fixed
Warfan1815 Feb 2, 2024
7c7271d
Second Fixed
Warfan1815 Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions code/modules/mob/living/living_healthscan.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant))
bleeding_check = TRUE
break

if((!limb.brute_dam && !limb.burn_dam && !(limb.status & LIMB_DESTROYED)) && !bleeding_check && !internal_bleeding_check && !(implant && detail_level >= DETAIL_LEVEL_BODYSCAN ) && !(limb.status & LIMB_UNCALIBRATED_PROSTHETIC) && !(limb.status & LIMB_BROKEN) && !(limb.status & LIMB_SPLINTED) && !(limb.status & LIMB_SPLINTED_INDESTRUCTIBLE))
if((!limb.brute_dam && !limb.burn_dam && !(limb.status & LIMB_DESTROYED)) && !bleeding_check && !internal_bleeding_check && !(implant && detail_level >= DETAIL_LEVEL_BODYSCAN ) && !(limb.status & LIMB_UNCALIBRATED_PROSTHETIC) && !(limb.status & LIMB_BROKEN) && !(limb.status & LIMB_SPLINTED) && !(limb.status & LIMB_SPLINTED_INDESTRUCTIBLE) && !(limb.get_incision_depth()))
continue
var/list/core_body_parts = list("head", "chest", "groin")
var/list/current_list = list(
Expand All @@ -190,7 +190,6 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant))
"missing" = (limb.status & LIMB_DESTROYED),
"limb_status" = null,
"bleeding" = bleeding_check,
"open_incision" = limb.get_incision_depth(),
"implant" = implant,
"internal_bleeding" = internal_bleeding_check
)
Expand Down Expand Up @@ -248,6 +247,24 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant))
if(limb_type)
current_list["limb_type"] = limb_type

//checking for open incisions, but since eyes and mouths incisions are "head incisions" but not "head surgeries" gotta do some snowflake
if(limb.name == "head")
if(human_target_mob.active_surgeries["head"])
current_list["open_incision"] = TRUE

var/zone
if(human_target_mob.active_surgeries["eyes"])
zone = "eyes"
if(human_target_mob.active_surgeries["mouth"])
if(zone)
zone = "eyes and mouth"
else
zone = "mouth"
current_list["open_zone_incision"] = capitalize(zone)

else
current_list["open_incision"] = limb.get_incision_depth()

limb_data_lists["[limb.name]"] = current_list

data["limb_data_lists"] = limb_data_lists
Expand Down
5 changes: 5 additions & 0 deletions tgui/packages/tgui/interfaces/HealthScan.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,11 @@ const ScannerLimbs = (props) => {
[Embedded Object]
</Box>
) : null}
{limb.open_zone_incision ? (
<Box inline color={'red'} bold={1}>
[Open Surgical Incision In {limb.open_zone_incision}]
</Box>
) : null}
</Flex.Item>
</>
)}
Expand Down
Loading