From 929f25c18b8f55e69fb97594fdb1483582c24413 Mon Sep 17 00:00:00 2001 From: Certh Date: Sat, 26 Dec 2015 09:55:11 +0100 Subject: [PATCH 1/8] Overhauls BodyScanner NanoUI --- code/game/machinery/adv_med.dm | 10 +- nano/css/shared.css | 7 +- nano/templates/adv_med.tmpl | 545 ++++++++++++++++----------------- 3 files changed, 274 insertions(+), 288 deletions(-) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 53e49224c6c..f005384ade4 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -315,6 +315,7 @@ occupantData["name"] = H.name occupantData["stat"] = H.stat occupantData["health"] = H.health + occupantData["maxHealth"] = H.maxHealth occupantData["hasVirus"] = H.virus2.len @@ -338,7 +339,9 @@ var/blood_volume = round(H.vessel.get_reagent_amount("blood")) bloodData["volume"] = blood_volume bloodData["percent"] = round(((blood_volume / 560)*100)) - + bloodData["pulse"] = H.get_pulse(GETPULSE_TOOL) + bloodData["bloodLevel"] = round(H.vessel.get_reagent_amount("blood")) + bloodData["bloodMax"] = H.max_blood occupantData["blood"] = bloodData var/reagentData[0] @@ -427,6 +430,9 @@ if(..()) return 1 + if (href_list["ejectify"]) + src.connected.eject() + if (href_list["print_p"]) generate_printing_text() @@ -609,4 +615,4 @@ else dat = " Error: No Body Scanner connected." - printing_text = dat \ No newline at end of file + printing_text = dat diff --git a/nano/css/shared.css b/nano/css/shared.css index 8aaf9c4f257..0e6568abf07 100644 --- a/nano/css/shared.css +++ b/nano/css/shared.css @@ -560,6 +560,11 @@ th.misc { color: #ffffff; } +/* Table styling for Med Scanner */ +.striped tr:nth-child(even) { + background-color: #404040 +} + /* Damage colors for crew monitoring computer */ .burn { color: orange; @@ -637,4 +642,4 @@ th.misc { .hot3 { color: #FF6600; -} \ No newline at end of file +} diff --git a/nano/templates/adv_med.tmpl b/nano/templates/adv_med.tmpl index 6e0e0d98752..5c7f739d732 100644 --- a/nano/templates/adv_med.tmpl +++ b/nano/templates/adv_med.tmpl @@ -1,14 +1,15 @@ - + {{if !data.occupied}}

No occupant detected.

{{else}}

Occupant Data:

- Name: + Name:
{{:data.occupant.name}} @@ -22,324 +23,298 @@ Used In File(s): \code\game\machinery\adv_med.dm
{{:helper.round(data.occupant.health*10)/10}}%
+
Status:
{{if data.occupant.stat==0}} - Alive + Alive {{else data.occupant.stat==1}} - Critical + Critical {{else}} - Dead + Dead {{/if}}
- {{:helper.link('Print', 'document', {'print_p' : 1, 'name' : data.occupant.name})}} +
-

Damage:

-
- Brute: +
+ Temperature:
-
- {{:data.occupant.bruteLoss}} -

-
- Burn: -
-
- {{:data.occupant.fireLoss}} -

-
- Oxygen: -
-
- {{:data.occupant.oxyLoss}} -

-
- Toxins: -
-
- {{:data.occupant.toxLoss}} -

-
- Brain: -
-
- {{:data.occupant.brainLoss}} -

-
- Radiation Level: -
-
- {{:data.occupant.radLoss}} -

-
- Genetic: -
-
- {{:data.occupant.cloneLoss}} -

-
- Paralysis: -
-
- {{:data.occupant.paralysis}}% ({{:data.occupant.paralysisSeconds}} seconds left!) -

-
-
-
- Body Temperature: -
-
+
{{:data.occupant.bodyTempC}}°C, {{:data.occupant.bodyTempF}}°F
+ {{if data.occupant.hasVirus}} -
+ Viral pathogen detected in blood stream. -
+
{{/if}} {{if data.occupant.hasBorer}} -
- Large growth detected in frontal lobe, possibly cancerous. Surgical removal is recommended. -
+ + Large growth detected in frontal lobe, possibly cancerous. Surgical removal is recommended.
{{/if}} {{if data.occupant.blind}} - Pupils unresponsive.
+ Pupils unresponsive.
{{/if}} {{if data.occupant.nearsighted}} - Retinal Misalignment Detected + Retinal misalignment detected
{{/if}}
+ {{:helper.link('Print', 'document', {'print_p' : 1, 'name' : data.occupant.name})}} + {{:helper.link('Eject Occupant', 'arrowreturnthick-1-s', {'ejectify' : 1}, data.occupied ? null : 'disabled')}} +

-
-
Blood
-
-
- Volume -
-
- {{:data.occupant.blood.volume}} -
-
-
-
- Percent -
-
- {{:data.occupant.blood.percent}}% -
-
-
- + Damage: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Brute Damage: + + Brain Damage: +
+ {{:helper.displayBar(data.occupant.bruteLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.bruteLoss) }} + + {{:helper.displayBar(data.occupant.brainLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.brainLoss)}} +
+ Resp. Damage: + + Radiation Level: +
+ {{:helper.displayBar(data.occupant.oxyLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.oxyLoss)}} + + {{:helper.displayBar(data.occupant.radLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.radLoss)}} +
+ Toxin Damage: + + Genetic Damage: +
+ {{:helper.displayBar(data.occupant.toxLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.toxLoss)}} + + {{:helper.displayBar(data.occupant.cloneLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.cloneLoss)}} +
+ Burn Severity: + + Paralysis %: ({{:data.occupant.paralysisSeconds}} seconds left) +
+ {{:helper.displayBar(data.occupant.fireLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.fireLoss)}} + + {{:helper.displayBar(data.occupant.paralysis, 0, data.occupant.maxHealth, 'bad', data.occupant.paralysis)}} +

- -
-
Reagents
-
-
- Epinephrine -
-
- {{:data.occupant.reagents.epinephrine}} -
-
-
-
- Ether -
-
- {{:data.occupant.reagents.ether}} -
-
-
-
- - Silver Sulfadiazine - -
-
- - {{:data.occupant.reagents.silver_sulfadiazine}} - -
-
-
-
- - Styptic Powder - -
-
- - {{:data.occupant.reagents.styptic_powder}} - -
-
-
-
- - Salbutamol - -
-
- - {{:data.occupant.reagents.salbutamol}} - -
-
+ Blood: +
+
Pulse:
{{:data.occupant.blood.pulse}} bpm
+
+
Blood Level:
+ {{if data.occupant.blood.percent <= 60}} + {{:helper.displayBar(data.occupant.blood.bloodLevel, 0, data.occupant.blood.bloodMax, 'bad')}} +
+ {{:data.occupant.blood.percent}}%, {{:data.occupant.blood.bloodLevel}}cl +
+ {{else data.occupant.blood.percent <= 90}} + {{:helper.displayBar(data.occupant.blood.bloodLevel, 0, data.occupant.blood.bloodMax, 'average')}} +
+ {{:data.occupant.blood.percent}}%, {{:data.occupant.bloodLevel}}cl +
+ {{else}} + {{:helper.displayBar(data.occupant.blood.bloodLevel, 0, data.occupant.blood.bloodMax, 'good')}} +
+ {{:data.occupant.blood.percent}}%, {{:data.occupant.blood.bloodLevel}}cl +
+ {{/if}} +
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Epinephrine: + + Ether: +
+ {{:helper.displayBar(data.occupant.reagents.epinephrine, 0, data.occupant.maxHealth, 'bad', data.occupant.reagents.epinephrine )}} + + {{:helper.displayBar(data.occupant.reagents.ether, 0, data.occupant.maxHealth, 'bad', data.occupant.reagents.ether)}} +
+ Silver Sulfadiazine: + + Styptic Powder: +
+ {{:helper.displayBar(data.occupant.reagents.silver_sulfadiazine, 0, data.occupant.maxHealth, 'bad', data.occupant.reagents.silver_sulfadiazine)}} + + {{:helper.displayBar(data.occupant.reagents.styptic_powder, 0, data.occupant.maxHealth, 'bad', data.occupant.reagents.styptic_powder)}} +
+ Salbutamol: +
+ {{:helper.displayBar(data.occupant.reagents.salbutamol, 0, data.occupant.maxHealth, 'bad', data.occupant.reagents.salbutamol)}} + +
+
External Organs -
- {{for data.occupant.extOrgan}} - {{if value.status.destroyed}} -
-
- {{:value.name}} - DESTROYED -
-
- {{else}} -
-
- {{:value.name}} -
-
- {{if value.status.broken}} - {{:value.status.broken}} - {{else value.status.splinted}} - Splinted - {{else value.status.robotic}} - Robotic - {{/if}} -
-
-
-
-  Brute/Burn -
-
- {{:value.bruteLoss}}/{{:value.fireLoss}} -
-
-
-
-  Injuries -
-
- {{if !value.status.bleeding}} - {{if !value.status.internalBleeding}} - No Injuries Detected - {{else}} - Internal Bleeding Detected + + + + + + + + + + + {{for data.occupant.extOrgan}} + + + + + + + {{/for}} + +
Name Brute damage Burn damage Injuries
{{:value.name}} + {{if value.bruteLoss> 0}} {{else}} {{/if}} + {{:value.bruteLoss}} + + {{if value.fireLoss> 0}} {{else}} {{/if}} + {{:value.fireLoss}} + + + {{if value.status.destroyed}} DESTROYED
{{/if}} + {{if value.status.bleeding}} external bleeding
{{/if}} + {{if value.internalBleeding}} internal bleeding
{{/if}} + {{if value.lungRuptured}} lung ruptured
{{/if}} + {{if value.status.broken}} {{:value.status.broken}}
{{/if}} + {{if value.germ_level > 100}} + {{if value.germ_level < 300}} + mild infection
+ {{else value.germ_level < 400}} + mild infection+
+ {{else value.germ_level < 500}} + mild infection++
+ {{else value.germ_level < 700}} + acute infection
+ {{else value.germ_level < 800}} + acute infection+
+ {{else value.germ_level < 900}} + acute infection++
+ {{else value.germ_level >= 900}} + septic
+ {{/if}} {{/if}} - {{else}} - {{if value.status.internalBleeding}} -
Internal Bleeding Detected. External Bleeding Detected.
- {{else}} - External Bleeding Detected + {{if value.open}} open incision
{{/if}} + + {{if value.status.splinted}} splinted
{{/if}} + {{if value.status.robotic}} robotic
{{/if}} + {{if value.implants_len}} + {{for value.implants : impValue:impindex}} + {{:impValue.known ? impValue.name : "unknown object"}}
+ {{/for}} {{/if}} - {{/if}} - - - {{if value.germ_level > 100}} -
-
-  Infection -
-
- {{if value.germ_level < 300}} - Mild Infection - {{else value.germ_level < 400}} - Mild Infection+ - {{else value.germ_level < 500}} - Mild Infection++ - {{else value.germ_level < 700}} - Acute Infection - {{else value.germ_level < 800}} - Acute Infection+ - {{else value.germ_level < 900}} - Acute Infection++ - {{else value.germ_level >= 900}} - Septic - {{/if}} -
-
- {{/if}} - {{if value.open}} -
-
-  Operation Status -
-
- Open Incision -
-
- {{/if}} - {{if value.implants_len}} -
-
-  Implants -

- {{for value.implants :impValue:impindex}} -
-   {{:impValue.known ? impValue.name : "Unknown"}} -

- {{/for}} -
- {{/if}} - {{/if}} +

- {{/for}} -
Internal Organs -
- {{for data.occupant.intOrgan}} -
-
- {{:value.name}} -
-
- {{:value.desc != null ? value.desc : ""}} -
-
- {{if value.germ_level > 100}} -
-
-  Infection -
-
- {{if value.germ_level < 300}} - Mild Infection - {{else value.germ_level < 400}} - Mild Infection+ - {{else value.germ_level < 500}} - Mild Infection++ - {{else value.germ_level < 700}} - Acute Infection - {{else value.germ_level < 800}} - Acute Infection+ - {{else value.germ_level < 900}} - Acute Infection++ - {{else value.germ_level >= 900}} - Septic - {{/if}} -
-
- {{/if}} -
-
-  Damage -
-
- {{:value.damage}} -
-
- {{/for}} -
-{{/if}} \ No newline at end of file + + + + + + + + + + {{for data.occupant.intOrgan}} + + + + + + + {{/for}} + +
Name Brute damage Injuries
{{:value.name}}
{{:value.desc != null ? value.desc : ""}} 		+ {{if value.damage > 0}} {{else}} {{/if}} + {{:value.damage}} + {{if value.germ_level > 100}} + {{if value.germ_level < 300}} + mild infection
+ {{else value.germ_level < 400}} + mild infection+
+ {{else value.germ_level < 500}} + mild infection++
+ {{else value.germ_level < 700}} + acute Infection
+ {{else value.germ_level < 800}} + acute Infection+
+ {{else value.germ_level < 900}} + acute Infection++
+ {{else value.germ_level >= 900}} + septic
+ {{/if}} + {{/if}} +
+{{/if}} From fb22f8f34ca73c5d08707a12af74488457ff00ff Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 27 Dec 2015 00:28:40 -0500 Subject: [PATCH 2/8] Cardboard Box Fix --- code/controllers/Processes/shuttles/supply.dm | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/code/controllers/Processes/shuttles/supply.dm b/code/controllers/Processes/shuttles/supply.dm index e7f1ac90d04..6be3d442030 100644 --- a/code/controllers/Processes/shuttles/supply.dm +++ b/code/controllers/Processes/shuttles/supply.dm @@ -252,10 +252,10 @@ return 1 return 0 - + /******************** SUPPLY ORDER - ********************/ + ********************/ /datum/supply_order var/ordernum var/datum/supply_packs/object = null @@ -263,14 +263,14 @@ var/orderedbyRank var/comment = null var/crates - + /datum/controller/process/shuttle/proc/generateSupplyOrder(packId, _orderedby, _orderedbyRank, _comment, _crates) if(!packId) return var/datum/supply_packs/P = supply_packs["[packId]"] if(!P) return - + var/datum/supply_order/O = new() O.ordernum = ordernum++ O.object = P @@ -278,15 +278,15 @@ O.orderedbyRank = _orderedbyRank O.comment = _comment O.crates = _crates - + requestlist += O - return O - + return O + /datum/supply_order/proc/generateRequisition(atom/_loc) if(!object) return - + var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(_loc) reqform.name = "Requisition Form - [crates] '[object.name]' for [orderedby]" reqform.info += "

[station_name] Supply Requisition Form

" @@ -301,11 +301,11 @@ reqform.info += object.manifest reqform.info += "
" reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:
" - + reqform.update_icon() //Fix for appearing blank when printed. return reqform - + /datum/supply_order/proc/createObject(atom/_loc, errors=0) if(!object) return @@ -334,7 +334,7 @@ slip.info +="Reason: [comment]
" slip.info +="Supply Crate Type: [object.name]
" slip.info +="Access Restriction: [object.access ? get_access_desc(object.access) : "None"]
" - slip.info +="[packagesAmt] PACKAGES IN THIS SHIPMENT
" + slip.info +="[packagesAmt] PACKAGES IN THIS SHIPMENT
" slip.info +="CONTENTS: