From 244fb40de80d1561c44d0bda953f479bd76ef150 Mon Sep 17 00:00:00 2001 From: SinTwo Date: Mon, 20 Jun 2016 23:32:18 -0400 Subject: [PATCH] Fixes part 1 --- code/game/machinery/atmo_control.dm | 15 +- code/game/machinery/computer/arcade.dm | 12 +- code/game/machinery/computer/cloning.dm | 2 +- code/game/machinery/computer3/lapvend.dm | 5 +- code/modules/holodeck/HolodeckControl.dm | 4 +- code/modules/paperwork/faxmachine.dm | 2 +- code/modules/paperwork/photocopier.dm | 2 +- code/modules/reagents/Chemistry-Machinery.dm | 193 +++++------- nano/css/icons.css | 26 ++ nano/css/shared.css | 15 +- nano/images/pills32.png | Bin 0 -> 2317 bytes nano/templates/adv_med.tmpl | 8 +- nano/templates/arcade_battle.tmpl | 8 +- nano/templates/atmo_control.tmpl | 53 ++-- nano/templates/chem_master.tmpl | 313 +++++++------------ nano/templates/cloning.tmpl | 4 +- nano/templates/fax.tmpl | 55 +++- nano/templates/holodeck.tmpl | 25 +- nano/templates/laptop_vendor.tmpl | 8 +- nano/templates/operating.tmpl | 90 ++---- nano/templates/photocopier.tmpl | 4 +- 21 files changed, 388 insertions(+), 456 deletions(-) create mode 100644 nano/images/pills32.png diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 43b9bf5913..629d962f51 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -122,7 +122,7 @@ obj/machinery/computer/general_air_control/Destroy() ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) - ui = new(user, src, ui_key, "atmo_control.tmpl", src.name, 400, 500) + ui = new(user, src, ui_key, "atmo_control.tmpl", src.name, 525, 500) ui.set_initial_data(data) ui.open() ui.set_auto_update(5) @@ -169,6 +169,7 @@ obj/machinery/computer/general_air_control/Destroy() data["input_info"] = list("power" = input_info["power"], "volume_rate" = round(input_info["volume_rate"], 0.1)) else data["input_info"] = null + if(output_info) data["output_info"] = list("power" = output_info["power"], "output_pressure" = output_info["internal"]) else @@ -179,7 +180,7 @@ obj/machinery/computer/general_air_control/Destroy() ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) - ui = new(user, src, ui_key, "atmo_control.tmpl", src.name, 400, 500) + ui = new(user, src, ui_key, "atmo_control.tmpl", src.name, 525, 500) ui.set_initial_data(data) ui.open() ui.set_auto_update(5) @@ -201,12 +202,12 @@ obj/machinery/computer/general_air_control/Destroy() return 1 if(href_list["adj_pressure"]) - var/change = href_list["adj_pressure"] + var/change = text2num(href_list["adj_pressure"]) pressure_setting = between(0, pressure_setting + change, 50*ONE_ATMOSPHERE) return 1 if(href_list["adj_input_flow_rate"]) - var/change = href_list["adj_input_flow_rate"] + var/change = text2num(href_list["adj_input_flow_rate"]) input_flow_setting = between(0, input_flow_setting + change, ATMOS_DEFAULT_VOLUME_PUMP + 500) //default flow rate limit for air injectors return 1 @@ -292,7 +293,7 @@ obj/machinery/computer/general_air_control/Destroy() ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) - ui = new(user, src, ui_key, "atmo_control.tmpl", src.name, 400, 500) + ui = new(user, src, ui_key, "atmo_control.tmpl", src.name, 525, 500) ui.set_initial_data(data) ui.open() ui.set_auto_update(5) @@ -314,12 +315,12 @@ obj/machinery/computer/general_air_control/Destroy() return 1 if(href_list["adj_pressure"]) - var/change = href_list["adj_pressure"] + var/change = text2num(href_list["adj_pressure"]) pressure_setting = between(0, pressure_setting + change, 10*ONE_ATMOSPHERE) return 1 if(href_list["adj_input_flow_rate"]) - var/change = href_list["adj_input_flow_rate"] + var/change = text2num(href_list["adj_input_flow_rate"]) input_flow_setting = between(0, input_flow_setting + change, ATMOS_DEFAULT_VOLUME_PUMP + 500) //default flow rate limit for air injectors return 1 diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 68b62bd1ab..d338edacc1 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -84,6 +84,7 @@ circuit = /obj/item/weapon/circuitboard/arcade/battle var/enemy_name = "Space Villian" var/temp = "Winners don't use space drugs" //Temporary message, for attack messages, etc + var/enemy_action = "" var/player_hp = 30 //Player health/attack points var/player_mp = 10 var/enemy_hp = 45 //Enemy health/attack points @@ -123,6 +124,7 @@ var/list/data = list() data["temp"] = temp + data["enemyAction"] = enemy_action data["enemyName"] = enemy_name data["playerHP"] = player_hp data["playerMP"] = player_mp @@ -131,7 +133,7 @@ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) - ui = new(user, src, ui_key, "arcade_battle.tmpl", src.name, 400, 500) + ui = new(user, src, ui_key, "arcade_battle.tmpl", src.name, 400, 300) ui.set_initial_data(data) ui.open() //ui.set_auto_update(2) @@ -218,12 +220,12 @@ else if (emagged && (turtle >= 4)) var/boomamt = rand(5,10) - temp = "[enemy_name] throws a bomb, exploding you for [boomamt] damage!" + enemy_action = "[enemy_name] throws a bomb, exploding you for [boomamt] damage!" player_hp -= boomamt else if ((enemy_mp <= 5) && (prob(70))) var/stealamt = rand(2,3) - temp = "[enemy_name] steals [stealamt] of your power!" + enemy_action = "[enemy_name] steals [stealamt] of your power!" player_mp -= stealamt if (player_mp <= 0) @@ -237,13 +239,13 @@ feedback_inc("arcade_loss_mana_normal") else if ((enemy_hp <= 10) && (enemy_mp > 4)) - temp = "[enemy_name] heals for 4 health!" + enemy_action = "[enemy_name] heals for 4 health!" enemy_hp += 4 enemy_mp -= 4 else var/attackamt = rand(3,6) - temp = "[enemy_name] attacks for [attackamt] damage!" + enemy_action = "[enemy_name] attacks for [attackamt] damage!" player_hp -= attackamt if ((player_mp <= 0) || (player_hp <= 0)) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 37108a268b..b96d557b32 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -120,7 +120,7 @@ pods_list_ui[++pods_list_ui.len] = list("pod" = pod, "biomass" = pod.biomass) if(pods) - data["pods"] = pods + data["pods"] = pods_list_ui else data["pods"] = null diff --git a/code/game/machinery/computer3/lapvend.dm b/code/game/machinery/computer3/lapvend.dm index ceb66a68bd..6acb530acc 100644 --- a/code/game/machinery/computer3/lapvend.dm +++ b/code/game/machinery/computer3/lapvend.dm @@ -32,9 +32,11 @@ if(vendmode == 1 && I) scan_id(I, W) vendmode = 0 + nanomanager.update_uis(src) if(vendmode == 2 && I) if(reimburse_id(I, W)) vendmode = 0 + nanomanager.update_uis(src) if(vendmode == 0) if(istype(W, /obj/item/device/laptop)) var/obj/item/device/laptop/L = W @@ -44,6 +46,7 @@ L.loc = src vendmode = 2 usr << "You slot your [L.name] into \The [src.name]" + nanomanager.update_uis(src) else ..() @@ -74,7 +77,7 @@ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) - ui = new(user, src, ui_key, "laptop_vendor.tmpl", src.name, 480, 500) + ui = new(user, src, ui_key, "laptop_vendor.tmpl", src.name, 480, 425) ui.set_initial_data(data) ui.open() //ui.set_auto_update(5) diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm index fd887db55e..1bc0c721c7 100644 --- a/code/modules/holodeck/HolodeckControl.dm +++ b/code/modules/holodeck/HolodeckControl.dm @@ -80,10 +80,10 @@ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) - ui = new(user, src, ui_key, "holodeck.tmpl", src.name, 400, 500) + ui = new(user, src, ui_key, "holodeck.tmpl", src.name, 400, 550) ui.set_initial_data(data) ui.open() - //ui.set_auto_update(5) + ui.set_auto_update(20) /obj/machinery/computer/HolodeckControl/Topic(href, href_list) if(..()) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 00b34fb04b..8c30f1d486 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -59,7 +59,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) - ui = new(user, src, ui_key, "fax.tmpl", src.name, 400, 500) + ui = new(user, src, ui_key, "fax.tmpl", src.name, 500, 500) ui.set_initial_data(data) ui.open() ui.set_auto_update(10) //this machine is so unimportant let's not have it update that often. diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 924ed8334d..ec0d7acf19 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -52,7 +52,7 @@ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) - ui = new(user, src, ui_key, "photocopier.tmpl", src.name, 400, 500) + ui = new(user, src, ui_key, "photocopier.tmpl", src.name, 300, 250) ui.set_initial_data(data) ui.open() ui.set_auto_update(10) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 5c4dc8c169..c0bf6b4f33 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -2,7 +2,6 @@ #define LIQUID 2 #define GAS 3 -#define BOTTLE_SPRITES list("bottle-1", "bottle-2", "bottle-3", "bottle-4") //list of available bottle sprites #define REAGENTS_PER_SHEET 20 @@ -23,10 +22,11 @@ var/condi = 0 var/useramount = 15 // Last used amount var/pillamount = 10 - var/bottlesprite = "bottle-1" //yes, strings - var/pillsprite = "1" - var/client/has_sprites = list() + var/bottlesprite = 1 + var/pillsprite = 1 var/max_pill_count = 20 + var/tab = "home" + var/analyze_data[0] flags = OPENCONTAINER /obj/machinery/chem_master/New() @@ -56,7 +56,6 @@ user.drop_item() B.loc = src user << "You add the beaker to the machine!" - src.updateUsrDialog() icon_state = "mixer1" else if(istype(B, /obj/item/weapon/storage/pill_bottle)) @@ -69,9 +68,74 @@ user.drop_item() B.loc = src user << "You add the pill bottle into the dispenser slot!" - src.updateUsrDialog() return +/obj/machinery/chem_master/attack_hand(mob/user as mob) + if(stat & BROKEN) + return + user.set_machine(src) + ui_interact(user) + +/** + * Display the NanoUI window for the chem master. + * + * See NanoUI documentation for details. + */ +/obj/machinery/chem_master/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + user.set_machine(src) + + var/list/data = list() + data["tab"] = tab + data["condi"] = condi + + if(loaded_pill_bottle) + data["pillBottle"] = list("total" = loaded_pill_bottle.contents.len, "max" = loaded_pill_bottle.storage_slots) + else + data["pillBottle"] = null + + if(beaker) + var/datum/reagents/R = beaker:reagents + var/ui_reagent_beaker_list[0] + for(var/datum/reagent/G in R.reagent_list) + ui_reagent_beaker_list[++ui_reagent_beaker_list.len] = list("name" = G.name, "volume" = G.volume, "description" = G.description, "id" = G.id) + + data["beaker"] = list("total_volume" = R.total_volume, "reagent_list" = ui_reagent_beaker_list) + else + data["beaker"] = null + + if(reagents.total_volume) + var/ui_reagent_list[0] + for(var/datum/reagent/N in reagents.reagent_list) + ui_reagent_list[++ui_reagent_list.len] = list("name" = N.name, "volume" = N.volume, "description" = N.description, "id" = N.id) + + data["reagents"] = list("total_volume" = reagents.total_volume, "reagent_list" = ui_reagent_list) + else + data["reagents"] = null + + data["mode"] = mode + + if(analyze_data) + data["analyzeData"] = list("name" = analyze_data["name"], "desc" = analyze_data["desc"], "blood_type" = analyze_data["blood_type"], "blood_DNA" = analyze_data["blood_DNA"]) + else + data["analyzeData"] = null + + data["pillSprite"] = pillsprite + data["bottleSprite"] = bottlesprite + + var/P[20] //how many pill sprites there are. Sprites are taken from chemical.dmi and can be found in nano/images/pill.png + for(var/i = 1 to P.len) + P[i] = i + data["pillSpritesAmount"] = P + + data["bottleSpritesAmount"] = list(1, 2, 3, 4) //how many bottle sprites there are. Sprites are taken from chemical.dmi and can be found in nano/images/pill.png + + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) + if (!ui) + ui = new(user, src, ui_key, "chem_master.tmpl", src.name, 575, 400) + ui.set_initial_data(data) + ui.open() + ui.set_auto_update(5) + /obj/machinery/chem_master/Topic(href, href_list) if(stat & (BROKEN|NOPOWER)) return if(usr.stat || usr.restrained()) return @@ -80,20 +144,19 @@ src.add_fingerprint(usr) usr.set_machine(src) + if(href_list["tab_select"]) + tab = href_list["tab_select"] if (href_list["ejectp"]) if(loaded_pill_bottle) loaded_pill_bottle.loc = src.loc loaded_pill_bottle = null - else if(href_list["close"]) - usr << browse(null, "window=chemmaster") - usr.unset_machine() - return if(beaker) var/datum/reagents/R = beaker:reagents - if (href_list["analyze"]) - var/dat = "" + if (tab == "analyze") + analyze_data["name"] = href_list["name"] + analyze_data["desc"] = href_list["desc"] if(!condi) if(href_list["name"] == "Blood") var/datum/reagent/blood/G @@ -101,16 +164,9 @@ if(F.name == href_list["name"]) G = F break - var/A = G.name - var/B = G.data["blood_type"] - var/C = G.data["blood_DNA"] - dat += "Chemmaster 3000Chemical infos:

Name:
[A]

Description:
Blood Type: [B]
DNA: [C]


(Back)" - else - dat += "Chemmaster 3000Chemical infos:

Name:
[href_list["name"]]

Description:
[href_list["desc"]]


(Back)" - else - dat += "Condimaster 3000Condiment infos:

Name:
[href_list["name"]]

Description:
[href_list["desc"]]


(Back)" - usr << browse(dat, "window=chem_master;size=575x400") - return + analyze_data["name"] = G.name + analyze_data["blood_type"] = G.data["blood_type"] + analyze_data["blood_DNA"] = G.data["blood_DNA"] else if (href_list["add"]) @@ -147,9 +203,6 @@ else if (href_list["toggle"]) mode = !mode - else if (href_list["main"]) - attack_hand(usr) - return else if (href_list["eject"]) if(beaker) beaker:loc = src.loc @@ -187,7 +240,6 @@ if(src.loaded_pill_bottle) if(loaded_pill_bottle.contents.len < loaded_pill_bottle.storage_slots) P.loc = loaded_pill_bottle - src.updateUsrDialog() else if (href_list["createbottle"]) if(!condi) @@ -197,106 +249,23 @@ P.name = "[name] bottle" P.pixel_x = rand(-7, 7) //random position P.pixel_y = rand(-7, 7) - P.icon_state = bottlesprite + P.icon_state = "bottle"+bottlesprite reagents.trans_to_obj(P,60) P.update_icon() else var/obj/item/weapon/reagent_containers/food/condiment/P = new/obj/item/weapon/reagent_containers/food/condiment(src.loc) reagents.trans_to_obj(P,50) - else if(href_list["change_pill"]) - #define MAX_PILL_SPRITE 20 //max icon state of the pill sprites - var/dat = "" - for(var/i = 1 to MAX_PILL_SPRITE) - dat += "" - dat += "
" - usr << browse(dat, "window=chem_master") - return - else if(href_list["change_bottle"]) - var/dat = "" - for(var/sprite in BOTTLE_SPRITES) - dat += "" - dat += "
" - usr << browse(dat, "window=chem_master") - return + else if(href_list["pill_sprite"]) pillsprite = href_list["pill_sprite"] else if(href_list["bottle_sprite"]) bottlesprite = href_list["bottle_sprite"] - src.updateUsrDialog() - return + nanomanager.update_uis(src) /obj/machinery/chem_master/attack_ai(mob/user as mob) return src.attack_hand(user) -/obj/machinery/chem_master/attack_hand(mob/user as mob) - if(stat & BROKEN) - return - user.set_machine(src) - if(!(user.client in has_sprites)) - spawn() - has_sprites += user.client - for(var/i = 1 to MAX_PILL_SPRITE) - usr << browse_rsc(icon('icons/obj/chemical.dmi', "pill" + num2text(i)), "pill[i].png") - for(var/sprite in BOTTLE_SPRITES) - usr << browse_rsc(icon('icons/obj/chemical.dmi', sprite), "[sprite].png") - var/dat = "" - if(!beaker) - dat = "Please insert beaker.
" - if(src.loaded_pill_bottle) - dat += "Eject Pill Bottle \[[loaded_pill_bottle.contents.len]/[loaded_pill_bottle.storage_slots]\]

" - else - dat += "No pill bottle inserted.

" - dat += "Close" - else - var/datum/reagents/R = beaker:reagents - dat += "Eject beaker and Clear Buffer
" - if(src.loaded_pill_bottle) - dat += "Eject Pill Bottle \[[loaded_pill_bottle.contents.len]/[loaded_pill_bottle.storage_slots]\]

" - else - dat += "No pill bottle inserted.

" - if(!R.total_volume) - dat += "Beaker is empty." - else - dat += "Add to buffer:
" - for(var/datum/reagent/G in R.reagent_list) - dat += "[G.name] , [G.volume] Units - " - dat += "(Analyze) " - dat += "(1) " - dat += "(5) " - dat += "(10) " - dat += "(30) " - dat += "(60) " - dat += "(All) " - dat += "(Custom)
" - - dat += "
Transfer to [(!mode ? "disposal" : "beaker")]:
" - if(reagents.total_volume) - for(var/datum/reagent/N in reagents.reagent_list) - dat += "[N.name] , [N.volume] Units - " - dat += "(Analyze) " - dat += "(1) " - dat += "(5) " - dat += "(10) " - dat += "(30) " - dat += "(60) " - dat += "(All) " - dat += "(Custom)
" - else - dat += "Empty
" - if(!condi) - dat += "

Create pill (60 units max)
" - dat += "Create multiple pills
" - dat += "Create bottle (60 units max)" - else - dat += "Create bottle (50 units max)" - if(!condi) - user << browse("Chemmaster 3000Chemmaster menu:

[dat]", "window=chem_master;size=575x400") - else - user << browse("Condimaster 3000Condimaster menu:

[dat]", "window=chem_master;size=575x400") - onclose(user, "chem_master") - return - /obj/machinery/chem_master/condimaster name = "CondiMaster 3000" condi = 1 diff --git a/nano/css/icons.css b/nano/css/icons.css index a6bec0f0d0..b2eacc0ab8 100644 --- a/nano/css/icons.css +++ b/nano/css/icons.css @@ -245,6 +245,32 @@ .uiIcon16.icon-note64 { background-image: url(uiIcons64.png); background-position: -64px -64px; width: 64px; height: 64px; } .uiIcon16.icon-close64 { background-image: url(uiIcons64.png); background-position: -128px -64px; width: 64px; height: 64px; } +.uiIcon16.icon-pill { background-image: url(pills32.png); width: 32px; height: 32px;} +.uiIcon16.icon-pill.pill1 { background-position: 0 0; } +.uiIcon16.icon-pill.pill2 { background-position: -32px 0; } +.uiIcon16.icon-pill.pill3 { background-position: -64px 0; } +.uiIcon16.icon-pill.pill4 { background-position: -96px 0; } +.uiIcon16.icon-pill.pill5 { background-position: -128px 0; } +.uiIcon16.icon-pill.pill6 { background-position: 0 -32px; } +.uiIcon16.icon-pill.pill7 { background-position: -32px -32px; } +.uiIcon16.icon-pill.pill8 { background-position: -64px -32px; } +.uiIcon16.icon-pill.pill9 { background-position: -96px -32px; } +.uiIcon16.icon-pill.pill10 { background-position: -128px -32px; } +.uiIcon16.icon-pill.pill11 { background-position: 0 -64px; } +.uiIcon16.icon-pill.pill12 { background-position: -32px -64px; } +.uiIcon16.icon-pill.pill13 { background-position: -64px -64px; } +.uiIcon16.icon-pill.pill14 { background-position: -96px -64px; } +.uiIcon16.icon-pill.pill15 { background-position: -128px -64px; } +.uiIcon16.icon-pill.pill16 { background-position: 0 -96px; } +.uiIcon16.icon-pill.pill17 { background-position: -32px -96px; } +.uiIcon16.icon-pill.pill18 { background-position: -64px -96px; } +.uiIcon16.icon-pill.pill19 { background-position: -96px -96px; } +.uiIcon16.icon-pill.pill20 { background-position: -128px -96px; } +.uiIcon16.icon-pill.bottle1 { background-position: 0 -128px; } +.uiIcon16.icon-pill.bottle2 { background-position: -32px -128px; } +.uiIcon16.icon-pill.bottle3 { background-position: -64px -128px; } +.uiIcon16.icon-pill.bottle4 { background-position: -96px -128px; } + .mapIcon16 { position: absolute; width: 16px; diff --git a/nano/css/shared.css b/nano/css/shared.css index a50f96a3c7..16dfecc648 100644 --- a/nano/css/shared.css +++ b/nano/css/shared.css @@ -45,6 +45,19 @@ hr { white-space: nowrap; } +.link32 { + float: left; + min-width: 15px; + max-width: 31px; + height: 31px; + text-align: center; + text-decoration: none; + background: #40628a; + border: 1px solid #161616; + margin: 0 2px 2px 0; + cursor: default; +} + .hasIcon { padding: 0px 4px 4px 0px; } @@ -649,7 +662,7 @@ th.misc { } .oxyloss { - color: blue; + color: #0000A9; } /* 75px width used in power monitoring console buttons */ diff --git a/nano/images/pills32.png b/nano/images/pills32.png new file mode 100644 index 0000000000000000000000000000000000000000..61459093c1cac55e1f6309e08afa82bcb56e82dd GIT binary patch literal 2317 zcmZux2{@bS7XBlsgxGqOQln}{bwOLH7DHmYU8qtFS{kaFpwuPyEp5emRXe5&O$2Q% zkpxwP)ZPWRL|VJrTT2AdDk>St{HZ(lxik0v&-woIednC#d%ov=&w0}v9Zn$N>Tm!6 z5T{PsoCAHnc*#hE|BP;|KIkN|mS-#hpfXGLHyOhy(K}55gKBtN zcf9kpEBHvCP(L8V$3GZv5bTHFjWjr9U~<(c!2tkdGEUi8x4WX)D?H^6TH?+yb(1TyB7D6bw3Qt8;xa=MmtuTSEg7w=1nu#uWK)=fzSKn zYbLkd3)+@$89d%N8twh&-gQ3be3f8%tT0X0@Zzo#3gajR72lXz0B+h|k2%SGzQBvC zF+%>-cXlARJkgsb&X^a>QI)-oHt}@WE0^%gP#5oP-walE8wSSoZIhop(3Z7c7bT3N z1X;Vd`(___i23BacTE8w9L(q@5{VY?lS@KkGKee1iGmYsqjKR}e+*_Ldn@c4OBz^P zLd483JtwcNzA}&HU)3mV^-#lvPb-jX_VPDJtKGoF)R^nIaGpxH{vItc;t1&{x~t|_ z2ND8_IOwwoM1{diCP4Rs(qtls^+={0nzsQBPI2HF zy&|fP*6u%G{i{bGWc|2;R(hwfclLURk?lzoiNxV>_B_^dU`1L8?ZHHrMZwq8n<1fA zpYHM}KPF8bSbfm}d*wEt@}bgiye-`_VYzYLl$RLt9=(YtJK?T1ME`4J>PZ`^MikSZ zV`@WO+bpXgwk#c(Gducm}ie`s$QRWT?E44sg@0|>O6eYPD>z&KF>u2tL|JGdCZ=69q8 zIiTVLbEWmdq{QYd6~&pbV=;jrKty#F*l|(=r2qxB$;pQ=TWclU?>RfJu94rV@^1r4 z-PHvUt!QC%ijRe<@VjCP!^qf1s$_O>(&K6>+_AgzMb)69N`9Vi3bs;vzxX9*lM2gD z6C@uXn={j`sz5~bkY!p9xBj#JF8+Uj&fcD0-m3upD|O$_XmbH2mL|hV$u_DB!+zs2 zZ#zZrG-brRuNWjTtu!|MohO&#RmY_cXK6W{)oVNla_kuQB;mM;o5n@aSecNUQtqmS z_L|;asYk*IN8H5rGXVW`S9u~;N^jok7ZB-QqTUwH1TFKCu-C!~edCut<=3oT2tBAF zp8bxz-DrtU^?XO%PbktZ;uWxuol^PD&WX!A;@NfmZmFTT$+RtCwmM$sP#EF=f(|^q zPgcm&rzU*-SVIPJ!IIN&&QG;Y+2w#-+HA9T*eC`c*7;UQuQE&QLZhE#vI* zEEa0y)K8_Uu0R#%VoN*_EhU4-TGvC&)@7+FPkq8?CR}r%diwCZgvN0f-+|& zIcNxx2YHHI9(>j#{k6B;EziwfrLZ-oHnLOP<21$9mafjufaBEk=l;0nNx0r-I;V^t!{ z9yTQ;a|fhwK@E+tEq#(4{J99C=v^ePny!F8+uzJ~=P;qT+C~YPEiqb+Z7{clg^-a5 z0+8~z{0i;;&Cmu9?85TFZ^OWt^!U=!*U^0_Ct=(7&91PJb_krP=bVCd0-2C|BoC4J zGs?{;D+31@<%oAph}{TK!ud5V?V*d5Yw}1X_|@p>x{?6VzL?L7)>uZa8oAs-^sACC zp5wZ`KvuU|I6)Hz>7>@pRf&YWI%>p-$Q6li8InNG#;##r*|{#(ipp?vo_2P2w(a+^ zSaJu8q8ZjAd6E!ap&E21$-wvmVGn+Wn#QgJr%*ZHKFQ!70AqXM7u_5K+)+IKP)9t3 zMv2_KI!72Amc3p1X=ON^-qEjmRG`++d>RpN68ZotzbWxseS}xw(^cCpi{xqs%?oo& zPKaJ>4&1r8C$!v9eMx74**_;}|ND|`dqX3xHp`QH{t-_{V@6^}MnYMN0a?^dB^x%= z%upx{^6;uf@F>$&?i??pf#Jy&(#h+0G{ckvy#NTK(Qu6!N*B~bjGc(+v_&=$Slf2 z!6p3-_{Dh4Lij-7Z2aZoXvgX*-mjW>uh{s9Mniz_gaKf Brute: -
+
{{:data.occupant.bruteLoss}}

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

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

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

diff --git a/nano/templates/arcade_battle.tmpl b/nano/templates/arcade_battle.tmpl index 0455649404..7725698634 100644 --- a/nano/templates/arcade_battle.tmpl +++ b/nano/templates/arcade_battle.tmpl @@ -4,8 +4,12 @@ -->

{{:data.enemyName}}

- -
{{:data.temp}}
+{{if data.gameOver}} +
{{:data.temp}}
+{{else}} +
{{:data.temp}}
+
{{:data.enemyAction}}
+{{/if}}
Health:
{{:data.playerHP}}
diff --git a/nano/templates/atmo_control.tmpl b/nano/templates/atmo_control.tmpl index 503f15458f..d4033f41e0 100644 --- a/nano/templates/atmo_control.tmpl +++ b/nano/templates/atmo_control.tmpl @@ -5,30 +5,37 @@ {{if data.sensors}} {{for data.sensors}} {{if value.sensor_data}} -
- {{:value.long_name}} +
+
{{:value.long_name}}
{{if value.sensor_data.pressure}} -
Pressure:
- {{:value.sensor_data.pressure}} kPa +
+
Pressure:
+
{{:value.sensor_data.pressure}} kPa
+
{{/if}} {{if value.sensor_data.temperature}} -
Temperature:
- {{:value.sensor_data.temperature}} kPa +
+
Temperature:
+
{{:value.sensor_data.temperature}} kPa
+
{{/if}} {{if value.sensor_data.oxygen || value.sensor_data.nitrogen || value.sensor_data.carbon_dioxide || value.sensor_data.phoron}} -
Gas Composition:
- {{if value.sensor_data.oxygen}} - {{:value.sensor_data.pressure}} % O2 - {{/if}} - {{if value.sensor_data.nitrogen}} - {{:value.sensor_data.pressure}} % N - {{/if}} - {{if value.sensor_data.carbon_dioxide}} - {{:value.sensor_data.pressure}} % CO2 - {{/if}} - {{if value.sensor_data.phoron}} - {{:value.sensor_data.pressure}} % TX - {{/if}} +
+
Gas Composition:
+ {{if value.sensor_data.oxygen}} +
{{:value.sensor_data.pressure}} % O2
+ {{/if}} + {{if value.sensor_data.nitrogen}} +
{{:value.sensor_data.pressure}} % N
+ {{/if}} + {{if value.sensor_data.carbon_dioxide}} +
{{:value.sensor_data.pressure}} % CO2
+ {{/if}} + {{if value.sensor_data.phoron}} +
{{:value.sensor_data.pressure}} % TX
+ {{/if}} + +
{{/if}}
{{else}} @@ -68,7 +75,6 @@ On Hold {{/if}}
- {{:helper.link('Refresh', null, {'in_refresh_status' : 1})}}
Flow Rate Limit:
@@ -78,6 +84,7 @@
Command:
{{:helper.link('Toggle Power', null, {'in_toggle_injector' : 1})}} {{:helper.link('Set Flow Rate', null, {'in_set_flowrate' : 1})}} + {{:helper.link('Refresh', null, {'in_refresh_status' : 1})}}
{{else}}
@@ -112,13 +119,12 @@ {{/if}}
- {{if data.input_info.power}} + {{if data.output_info.power}} Open {{else}} On Hold {{/if}}
- {{:helper.link('Refresh', null, {'out_refresh_status' : 1})}}
{{if data.tanks}} @@ -133,6 +139,7 @@
Command:
{{:helper.link('Toggle Power', null, {'out_toggle_power' : 1})}} {{:helper.link('Set Pressure', null, {'out_set_pressure' : 1})}} + {{:helper.link('Refresh', null, {'out_refresh_status' : 1})}}
{{else}}
@@ -190,8 +197,8 @@ {{else}} On Hold {{/if}} +
{{:helper.link('Refresh', null, {'refresh_status' : 1})}}
- {{:helper.link('Refresh', null, {'refresh_status' : 1})}}
Rate:
diff --git a/nano/templates/chem_master.tmpl b/nano/templates/chem_master.tmpl index f163447dbf..1b8315154a 100644 --- a/nano/templates/chem_master.tmpl +++ b/nano/templates/chem_master.tmpl @@ -1,205 +1,116 @@ /obj/machinery/chem_master/attackby(var/obj/item/weapon/B as obj, var/mob/user as mob) + Interface for chem master + See: code/modules/reagents/Chemistry-Machinery.dm +--> +{{if data.tab == 'home'}} +
+
{{:helper.link(data.pillBottle ? 'Eject Pill Bottle' : 'No pill bottle inserted', 'eject', {'ejectp' : 1}, data.pillBottle ? null : 'linkOff')}}
- if(beaker) - var/datum/reagents/R = beaker:reagents - if (href_list["analyze"]) - var/dat = "" - if(!condi) - if(href_list["name"] == "Blood") - var/datum/reagent/blood/G - for(var/datum/reagent/F in R.reagent_list) - if(F.name == href_list["name"]) - G = F - break - var/A = G.name - var/B = G.data["blood_type"] - var/C = G.data["blood_DNA"] - dat += "Chemmaster 3000Chemical infos:

Name:
[A]

Description:
Blood Type: [B]
DNA: [C]


(Back)" - else - dat += "Chemmaster 3000Chemical infos:

Name:
[href_list["name"]]

Description:
[href_list["desc"]]


(Back)" - else - dat += "Condimaster 3000Condiment infos:

Name:
[href_list["name"]]

Description:
[href_list["desc"]]


(Back)" - usr << browse(dat, "window=chem_master;size=575x400") - return + {{if data.pillBottle}} +
{{:data.pillBottle.total}} / {{:data.pillBottle.max}}
+ {{/if}} +
+
{{:helper.link(data.beaker ? 'Eject Beaker and Clear Buffer' : 'Please insert beaker', 'eject', {'eject' : 1}, data.beaker ? null : 'linkOff')}}
+ + {{if data.beaker}} + {{if data.beaker.total_volume}} + Add to buffer: + {{for data.beaker.reagent_list}} +
+
{{:value.name}}
+
{{:value.volume}} Units
+
+
+ {{:helper.link('Analyze', 'signal-diag', {'tab_select' : 'analyze', 'desc' : value.description, 'name' : value.name})}} + {{:helper.link('1', 'plus', {'add' : value.id, 'amount' : 1})}} + {{:helper.link('5', 'plus', {'add' : value.id, 'amount' : 5})}} + {{:helper.link('10', 'plus', {'add' : value.id, 'amount' : 10})}} + {{:helper.link('30', 'plus', {'add' : value.id, 'amount' : 30})}} + {{:helper.link('60', 'plus', {'add' : value.id, 'amount' : 60})}} + {{:helper.link('All', 'plus', {'add' : value.id, 'amount' : value.volume})}} + {{:helper.link('Custom', 'plus', {'addcustom' : value.id})}} +
+ {{/for}} + {{else}} + Beaker is empty. + {{/if}} +
+
+
Transfer to
+ {{:helper.link(!data.mode ? 'disposal' : 'beaker', null, {'toggle' : 1})}} +
+ {{if data.reagents}} + {{if data.reagents.total_volume}} + {{for data.reagents.reagent_list}} +
+
{{:value.name}}
+
{{:value.volume}} Units
+
+
+ {{:helper.link('Analyze', 'signal-diag', {'tab_select' : 'analyze', 'desc' : value.description, 'name' : value.name})}} + {{:helper.link('1', 'minus', {'remove' : value.id, 'amount' : 1})}} + {{:helper.link('5', 'minus', {'remove' : value.id, 'amount' : 5})}} + {{:helper.link('10', 'minus', {'remove' : value.id, 'amount' : 10})}} + {{:helper.link('30', 'minus', {'remove' : value.id, 'amount' : 30})}} + {{:helper.link('60', 'minus', {'remove' : value.id, 'amount' : 60})}} + {{:helper.link('All', 'minus', {'remove' : value.id, 'amount' : value.volume})}} + {{:helper.link('Custom', 'minus', {'removecustom' : value.id})}} +
+ {{/for}} + {{/if}} + {{else}} + Empty + {{/if}} + {{if !data.condi}} +
+
+ {{:helper.link('Create pill (60 units max)', null, {'createpill' : 1})}} + {{:helper.link('Create multiple pills', null, {'createpill_multiple' : 1})}} + {{:helper.link('Create bottle (60 units max)', null, {'createbottle' : 1})}} +
+
+ {{:helper.link('', 'pill pill' + data.pillSprite, {'tab_select' : 'pill'}, null, 'link32')}} + {{:helper.link('', 'pill bottle' + data.bottleSprite, {'tab_select' : 'bottle'}, null, 'link32')}} +
+ {{/if}} + {{/if}} - else if (href_list["add"]) +{{else data.tab == 'analyze'}} + {{if !data.condi}} +

Chemical Info:

+ {{else}} +

Condiment Info:

+ {{/if}} +
+
Name:
+
{{:data.analyzeData.name}}
+
+ {{if data.analyzeData.name == 'Blood'}} +
+
Blood Type:
+
{{:data.analyzeData.blood_type}}
+
+
+
DNA:
+
{{:data.analyzeData.blood_DNA}}
+
+ {{else}} +
+
Description:
+
{{:data.analyzeData.desc}}
+
+ {{/if}} + {{:helper.link('Back', 'arrowreturn-1-w', {'tab_select' : 'home'})}} - if(href_list["amount"]) - var/id = href_list["add"] - var/amount = Clamp((text2num(href_list["amount"])), 0, 200) - R.trans_id_to(src, id, amount) - - else if (href_list["addcustom"]) - - var/id = href_list["addcustom"] - useramount = input("Select the amount to transfer.", 30, useramount) as num - useramount = Clamp(useramount, 0, 200) - src.Topic(null, list("amount" = "[useramount]", "add" = "[id]")) - - else if (href_list["remove"]) - - if(href_list["amount"]) - var/id = href_list["remove"] - var/amount = Clamp((text2num(href_list["amount"])), 0, 200) - if(mode) - reagents.trans_id_to(beaker, id, amount) - else - reagents.remove_reagent(id, amount) - - - else if (href_list["removecustom"]) - - var/id = href_list["removecustom"] - useramount = input("Select the amount to transfer.", 30, useramount) as num - useramount = Clamp(useramount, 0, 200) - src.Topic(null, list("amount" = "[useramount]", "remove" = "[id]")) - - else if (href_list["toggle"]) - mode = !mode - - else if (href_list["main"]) - attack_hand(usr) - return - else if (href_list["eject"]) - if(beaker) - beaker:loc = src.loc - beaker = null - reagents.clear_reagents() - icon_state = "mixer0" - else if (href_list["createpill"] || href_list["createpill_multiple"]) - var/count = 1 - - if(reagents.total_volume/count < 1) //Sanity checking. - return - - if (href_list["createpill_multiple"]) - count = input("Select the number of pills to make.", "Max [max_pill_count]", pillamount) as num - count = Clamp(count, 1, max_pill_count) - - if(reagents.total_volume/count < 1) //Sanity checking. - return - - var/amount_per_pill = reagents.total_volume/count - if (amount_per_pill > 60) amount_per_pill = 60 - - var/name = sanitizeSafe(input(usr,"Name:","Name your pill!","[reagents.get_master_reagent_name()] ([amount_per_pill] units)"), MAX_NAME_LEN) - - if(reagents.total_volume/count < 1) //Sanity checking. - return - while (count--) - var/obj/item/weapon/reagent_containers/pill/P = new/obj/item/weapon/reagent_containers/pill(src.loc) - if(!name) name = reagents.get_master_reagent_name() - P.name = "[name] pill" - P.pixel_x = rand(-7, 7) //random position - P.pixel_y = rand(-7, 7) - P.icon_state = "pill"+pillsprite - reagents.trans_to_obj(P,amount_per_pill) - if(src.loaded_pill_bottle) - if(loaded_pill_bottle.contents.len < loaded_pill_bottle.storage_slots) - P.loc = loaded_pill_bottle - src.updateUsrDialog() - - else if (href_list["createbottle"]) - if(!condi) - var/name = sanitizeSafe(input(usr,"Name:","Name your bottle!",reagents.get_master_reagent_name()), MAX_NAME_LEN) - var/obj/item/weapon/reagent_containers/glass/bottle/P = new/obj/item/weapon/reagent_containers/glass/bottle(src.loc) - if(!name) name = reagents.get_master_reagent_name() - P.name = "[name] bottle" - P.pixel_x = rand(-7, 7) //random position - P.pixel_y = rand(-7, 7) - P.icon_state = bottlesprite - reagents.trans_to_obj(P,60) - P.update_icon() - else - var/obj/item/weapon/reagent_containers/food/condiment/P = new/obj/item/weapon/reagent_containers/food/condiment(src.loc) - reagents.trans_to_obj(P,50) - else if(href_list["change_pill"]) - #define MAX_PILL_SPRITE 20 //max icon state of the pill sprites - var/dat = "" - for(var/i = 1 to MAX_PILL_SPRITE) - dat += "" - dat += "
" - usr << browse(dat, "window=chem_master") - return - else if(href_list["change_bottle"]) - var/dat = "" - for(var/sprite in BOTTLE_SPRITES) - dat += "" - dat += "
" - usr << browse(dat, "window=chem_master") - return - else if(href_list["pill_sprite"]) - pillsprite = href_list["pill_sprite"] - else if(href_list["bottle_sprite"]) - bottlesprite = href_list["bottle_sprite"] - - src.updateUsrDialog() - return - - -{{:helper.link(data.beaker ? 'Eject Beaker and Clear Buffer' : 'Please insert beaker', 'eject', {'eject' : 1}), data.beaker ? null : 'linkOff'}} -{{:helper.link(data.pillBottle ? 'Eject Pill Bottle' : 'Please insert beaker', 'eject', {'ejectp' : 1}), data.pillBottle ? null : 'linkOff'}} -{{:data.pillBottleTotal}} / {{:data.pillBottleMax}} - -{{if data.beakerReagent}} - Add to buffer: - {{for data.beakerReagent}} - {{:value.name}} , {{:value.volume}} Units - - {{:helper.link('Analyze', 'signal-diag', {'analyze' : 1, 'desc' : value.description, 'name' : value.name})}} - {{:helper.link('1', 'plus', {'add' : value.id, 'amount' : 1})}} - {{:helper.link('5', 'plus', {'add' : value.id, 'amount' : 5})}} - {{:helper.link('10', 'plus', {'add' : value.id, 'amount' : 10})}} - {{:helper.link('30', 'plus', {'add' : value.id, 'amount' : 30})}} - {{:helper.link('60', 'plus', {'add' : value.id, 'amount' : 60})}} - {{:helper.link('All', 'plus', {'add' : value.id, 'amount' : value.volume})}} - {{:helper.link('Custom', 'plus', {'addcustom' : value.id})}} - -if(!beaker) data.beaker -if(src.loaded_pill_bottle) data.pillBottle -[[loaded_pill_bottle.contents.len]/[loaded_pill_bottle.storage_slots]\] data.pillBottleTotal data.pillBottleMax - -var/datum/reagents/R = beaker:reagents -if(!R.total_volume) - dat += "Beaker is empty." - else - dat += "Add to buffer:
" - for(var/datum/reagent/G in R.reagent_list) - dat += "[G.name] , [G.volume] Units - " - dat += "(Analyze) " - dat += "(1) " - dat += "(5) " - dat += "(10) " - dat += "(30) " - dat += "(60) " - dat += "(All) " - dat += "(Custom)
" - - dat += "
Transfer to [(!mode ? "disposal" : "beaker")]:
" - if(reagents.total_volume) - for(var/datum/reagent/N in reagents.reagent_list) - dat += "[N.name] , [N.volume] Units - " - dat += "(Analyze) " - dat += "(1) " - dat += "(5) " - dat += "(10) " - dat += "(30) " - dat += "(60) " - dat += "(All) " - dat += "(Custom)
" - else - dat += "Empty
" - if(!condi) - dat += "

Create pill (60 units max)
" - dat += "Create multiple pills
" - dat += "Create bottle (60 units max)" - else - dat += "Create bottle (50 units max)" - if(!condi) - user << browse("Chemmaster 3000Chemmaster menu:

[dat]", "window=chem_master;size=575x400") - else - user << browse("Condimaster 3000Condimaster menu:

[dat]", "window=chem_master;size=575x400") - onclose(user, "chem_master") - return \ No newline at end of file +{{else data.tab == 'pill'}} + {{for data.pillSpritesAmount}} + {{:helper.link('', 'pill pill' + value, {'pill_sprite' : value}, null, data.pillSprite == value ? 'linkOn link32' : 'link32')}} + {{/for}} +

{{:helper.link('Return', 'arrowreturn-1-w', {'tab_select' : 'home'})}}
+ +{{else data.tab == 'bottle'}} + {{for data.bottleSpritesAmount}} + {{:helper.link('', 'pill bottle' + value, {'bottle_sprite' : value}, null, data.bottleSprite == value ? 'linkOn link32' : 'link32')}} + {{/for}} +

{{:helper.link('Return', 'arrowreturn-1-w', {'tab_select' : 'home'})}}
+{{/if}} \ No newline at end of file diff --git a/nano/templates/cloning.tmpl b/nano/templates/cloning.tmpl index d1ea7df3ad..a6e0a2544c 100644 --- a/nano/templates/cloning.tmpl +++ b/nano/templates/cloning.tmpl @@ -77,7 +77,7 @@ {{:helper.link('Delete Record', 'trash', {'del_rec' : 1}, null, 'redButton')}} Name: {{:data.activeRecord.real_name}} - + --> {{:helper.link('Load from disk', 'transfer-e-w', {'disk' : 'load'}, data.disk ? null : 'linkOff')}} diff --git a/nano/templates/fax.tmpl b/nano/templates/fax.tmpl index 5af31d6adc..4745a7aeb3 100644 --- a/nano/templates/fax.tmpl +++ b/nano/templates/fax.tmpl @@ -3,30 +3,53 @@ See: code/modules/paperwork/faxmachine.dm --> -Confirm Identity: {{:helper.link(data.scanName, 'check', {'scan' : 1})}} +
+
+ Confirm Identity: +
+ {{:helper.link(data.scanName ? data.scanName : 'Insert Card', 'check', {'scan' : 1})}} + {{if data.authenticated}} + {{:helper.link('Log Out', 'eject', {'logout' : 1}, null, 'redButton')}} + {{else}} + {{:helper.link('Log In', 'person', {'auth' : 1}, data.scanName ? null : 'linkOff')}} + {{/if}} +
{{if data.authenticated}} - {{:helper.link('Log Out', 'eject', {'logout' : 1}, null, 'linkDanger')}} +
- Logged in to: {{:data.bossName}} Quantum Entanglement Network + +
+
+ Logged in to: +
+
+ {{:data.bossName}} Quantum Entanglement Network +
+
{{if data.copyItem}} - {{:helper.link('Remove Item', 'eject', {'remove' : 1})}} {{if data.cooldown}} - Transmitter arrays realigning. Please stand by. +
Transmitter arrays realigning. Please stand by.
{{else}} - {{:helper.link('Send', 'signal-diag', {'send' : 1})}} - Currently sending: {{:data.copyItemName}} - Sending to: {{:helper.link(data.destination, 'tag', {'dept' : 1})}} +
+
Currently sending:
+
{{:data.copyItemName}}
+
+
+
Sending to:
+ {{:helper.link(data.destination, 'tag', {'dept' : 1})}} +
+
{{:helper.link('Send', 'signal-diag', {'send' : 1})}}
{{/if}} {{else}} - Please insert paper to send via secure connection. +
Please insert paper to send via secure connection.
{{if data.cooldown}} - Transmitter arrays realigning. Please stand by. +
Transmitter arrays realigning. Please stand by.
{{/if}} {{/if}} {{else}} - {{:helper.link('Log In', 'person', {'auth' : 1})}} - Proper authentication is required to use this device. - {{if data.copyItem}} - {{:helper.link('Remove Item', 'eject', {'remove' : 1})}} - {{/if}} -{{/if}} \ No newline at end of file +
Proper authentication is required to use this device.
+{{/if}} +{{if data.copyItem}} +
{{:helper.link('Remove Item', 'eject', {'remove' : 1})}}
+{{/if}} + diff --git a/nano/templates/holodeck.tmpl b/nano/templates/holodeck.tmpl index 6c813944dd..71d4ad5605 100644 --- a/nano/templates/holodeck.tmpl +++ b/nano/templates/holodeck.tmpl @@ -3,31 +3,34 @@ See: code/modules/holodeck/HolodeckControl.dm --> -Current Loaded Programs: +

Current Loaded Programs:

{{for data.supportedPrograms}} - {{:helper.link(value.name, data.currentProgram == value.program ? 'check' : 'clear', {'program' : value.program}, data.currentProgram == value.program ? 'linkOn' : null)}} +
{{:helper.link(value.name, data.currentProgram == value.program ? 'check' : 'close', {'program' : value.program}, null, data.currentProgram == value.program ? 'linkOn' : null)}}
{{/for}} -Please ensure that only holographic weapons are used in the holodeck if a combat simulation has been loaded. +
Please ensure that only holographic weapons are used in the holodeck if a combat simulation has been loaded.
{{if data.isSilicon}} {{if data.safetyDisabled}} {{if data.emagged}} - ERROR: Cannot re-enable Safety Protocols. +
ERROR: Cannot re-enable Safety Protocols.
{{else}} - {{:helper.link('Re-Enable Safety Protocols?', 'help', {'AIoverride' : 1}, null, 'linkOn')}} +
{{:helper.link('Re-Enable Safety Protocols?', 'help', {'AIoverride' : 1}, null, 'linkOn')}}
{{/if}} {{else}} - {{:helper.link('Re-Enable Safety Protocols?', 'help', {'AIoverride' : 1}, null, 'linkDanger')}} +
{{:helper.link('Re-Enable Safety Protocols?', 'help', {'AIoverride' : 1}, null, 'redButton')}}
{{/if}} {{/if}} {{if data.safetyDisabled}} {{for data.restrictedPrograms}} - {{:helper.link('Begin ' + value.name, data.currentProgram == value.program ? 'check' : 'clear', {'program' : value.program}, data.currentProgram == value.program ? 'linkOn' : null)}} - Ensure the holodeck is empty before testing. +
{{:helper.link('Begin ' + value.name, data.currentProgram == value.program ? 'check' : 'close', {'program' : value.program}, null, data.currentProgram == value.program ? 'linkOn' : null)}}
{{/for}} - Safety Protocols are DISABLED +
Ensure the holodeck is empty before testing.
+
Safety Protocols are DISABLED
{{else}} - Safety Protocols are ENABLED +
Safety Protocols are ENABLED
{{/if}} -{{:helper.link(data.gravity ? 'On ' : 'Off', data.gravity ? 'check' : 'clear', {'gravity' : 1}, null, data.gravity ? 'linkOn' : linkDanger')}} \ No newline at end of file +
+
Gravity:
+ {{:helper.link(data.gravity ? 'On ' : 'Off', data.gravity ? 'check' : 'close', {'gravity' : 1}, null, data.gravity ? 'linkOn' : 'redButton')}} +
\ No newline at end of file diff --git a/nano/templates/laptop_vendor.tmpl b/nano/templates/laptop_vendor.tmpl index 6854619b19..e0de4f7272 100644 --- a/nano/templates/laptop_vendor.tmpl +++ b/nano/templates/laptop_vendor.tmpl @@ -5,11 +5,9 @@ {{if data.mode == 0}}
-
- Please choose your laptop customization options.
- Your comptuer will automatically be loaded with any programs you can use after the transaction is complete.
- Some programs will require additional components to be installed! -
+ Please choose your laptop customization options.
+ Your comptuer will automatically be loaded with any programs you can use after the transaction is complete.
+ Some programs will require additional components to be installed!
diff --git a/nano/templates/operating.tmpl b/nano/templates/operating.tmpl index 3772639915..c53bd94c65 100644 --- a/nano/templates/operating.tmpl +++ b/nano/templates/operating.tmpl @@ -6,67 +6,39 @@ {{if data.table}}

Patient Information:

{{if data.victim}} -
-
- Name: +
+
Name:
+
{{:data.victim.real_name}}
+ +
Age:
+
{{:data.victim.age}}
+ +
Blood Type:
+
{{:data.victim.b_type}}
- {{:data.victim.real_name}} -
-
-
- Age: +
+
+
Health:
+
{{:data.victim.health}}
+ +
Brute Damage:
+
{{:data.victim.brute}}
+ +
Toxins Damage:
+
{{:data.victim.tox}}
+ +
Fire Damage:
+
{{:data.victim.burn}}
+ +
Suffocation Damage:
+
{{:data.victim.oxy}}
+ +
Patient Status:
+
{{:data.victim.stat}}
+ +
Heartbeat Rate:
+
{{:data.victim.pulse}}
- {{:data.victim.age}} -
-
-
- Blood Type: -
- {{:data.victim.b_type}} -
-
-
-
- Health: -
- {{:data.victim.health}} -
-
-
- Brute Damage: -
- {{:data.victim.brute}} -
-
-
- Toxins Damage: -
- {{:data.victim.tox}} -
-
-
- Fire Damage: -
- {{:data.victim.burn}} -
-
-
- Suffocation Damage: -
- {{:data.victim.oxy}} -
-
-
- Patient Status: -
- {{:data.victim.stat}} -
-
-
- Heartbeat Rate: -
- {{:data.victim.pulse}} -
{{else}} No Patient Detected {{/if}} diff --git a/nano/templates/photocopier.tmpl b/nano/templates/photocopier.tmpl index 9d1bcf7918..9c9910e969 100644 --- a/nano/templates/photocopier.tmpl +++ b/nano/templates/photocopier.tmpl @@ -10,7 +10,7 @@ {{:helper.link('Copy', 'copy', {'copy' : 1})}}
-
+
Printing:
@@ -23,7 +23,7 @@
-
Current toner level:
+
Current toner level:
{{:data.toner}}u
{{else}}