cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 20:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Advanced Scanner print-outs now show if an organ is dead. (#13138)

Browse Source 
* Diagnosis

* minor oopsie

* fixes the fix
This commit is contained in:
Mitchs98
2020-03-21 19:14:54 -05:00
committed by GitHub
parent 604daa05e1
commit bdafa40b40
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/adv_med.dm
+13 -5
View File
@@ -425,6 +425,7 @@
var/AN = ""
var/open = ""
var/infected = ""
var/dead = ""
var/robot = ""
var/imp = ""
var/bled = ""
@@ -439,6 +440,8 @@
splint = "Splinted:"
if(e.status & ORGAN_BROKEN)
AN = "[e.broken_description]:"
if(e.status & ORGAN_DEAD)
dead = "DEAD:"
if(e.is_robotic())
robot = "Robotic:"
if(e.open)
@@ -454,9 +457,9 @@
infected = "Acute Infection:"
if(INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
infected = "Acute Infection+:"
if(INFECTION_LEVEL_TWO + 300 to INFECTION_LEVEL_TWO + 400)
if(INFECTION_LEVEL_TWO + 300 to INFECTION_LEVEL_TWO + 399)
infected = "Acute Infection++:"
if(INFECTION_LEVEL_THREE to INFINITY)
if(INFECTION_LEVEL_TWO + 400 to INFINITY)
infected = "Septic:"
var/unknown_body = 0
@@ -467,11 +470,14 @@
imp += "Unknown body present:"
if(!AN && !open && !infected & !imp)
AN = "None:"
dat += "<td>[e.name]</td><td>[e.burn_dam]</td><td>[e.brute_dam]</td><td>[robot][bled][AN][splint][open][infected][imp][internal_bleeding][lung_ruptured]</td>"
dat += "<td>[e.name]</td><td>[e.burn_dam]</td><td>[e.brute_dam]</td><td>[robot][bled][AN][splint][open][infected][imp][internal_bleeding][lung_ruptured][dead]</td>"
dat += "</tr>"
for(var/obj/item/organ/internal/i in occupant.internal_organs)
var/mech = i.desc
var/infection = "None"
var/dead = ""
if(i.status & ORGAN_DEAD)
dead = "DEAD:"
switch(i.germ_level)
if(1 to INFECTION_LEVEL_ONE + 200)
infection = "Mild Infection:"
@@ -483,11 +489,13 @@
infection = "Acute Infection:"
if(INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
infection = "Acute Infection+:"
if(INFECTION_LEVEL_TWO + 300 to INFINITY)
if(INFECTION_LEVEL_TWO + 300 to INFECTION_LEVEL_TWO + 399)
infection = "Acute Infection++:"
if(INFECTION_LEVEL_TWO + 400 to INFINITY)
infection = "Septic:"
dat += "<tr>"
dat += "<td>[i.name]</td><td>N/A</td><td>[i.damage]</td><td>[infection]:[mech]</td><td></td>"
dat += "<td>[i.name]</td><td>N/A</td><td>[i.damage]</td><td>[infection]:[mech][dead]</td><td></td>"
dat += "</tr>"
dat += "</table>"
if(occupant.disabilities & BLIND)