diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 1ee30b6e9d0..2dfbbaebd52 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -189,17 +189,17 @@ new /obj/effect/gibspawner/generic(get_turf(loc)) //I REPLACE YOUR TECHNOLOGY WITH FLESH! qdel(src) -/obj/machinery/bodyscanner/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1) +/obj/machinery/bodyscanner/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = TRUE) ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "adv_med.tmpl", "Body Scanner", 690, 600) ui.open() - ui.set_auto_update(1) + ui.set_auto_update(TRUE) /obj/machinery/bodyscanner/ui_data(mob/user, datum/topic_state/state) var/data[0] - data["occupied"] = occupant ? 1 : 0 + data["occupied"] = occupant ? TRUE : FALSE var/occupantData[0] if(occupant) @@ -235,7 +235,7 @@ var/bloodData[0] bloodData["hasBlood"] = 0 if(!(NO_BLOOD in occupant.dna.species.species_traits)) - bloodData["hasBlood"] = 1 + bloodData["hasBlood"] = TRUE bloodData["volume"] = occupant.blood_volume bloodData["percent"] = round(((occupant.blood_volume / BLOOD_VOLUME_NORMAL)*100)) bloodData["pulse"] = occupant.get_pulse(GETPULSE_TOOL) @@ -279,19 +279,19 @@ if(E.status & ORGAN_BROKEN) organStatus["broken"] = E.broken_description if(E.is_robotic()) - organStatus["robotic"] = 1 + organStatus["robotic"] = TRUE if(E.status & ORGAN_SPLINTED) - organStatus["splinted"] = 1 + organStatus["splinted"] = TRUE if(E.status & ORGAN_DEAD) - organStatus["dead"] = 1 + organStatus["dead"] = TRUE organData["status"] = organStatus if(istype(E, /obj/item/organ/external/chest) && occupant.is_lung_ruptured()) - organData["lungRuptured"] = 1 + organData["lungRuptured"] = TRUE if(E.internal_bleeding) - organData["internalBleeding"] = 1 + organData["internalBleeding"] = TRUE extOrganData.Add(list(organData)) @@ -331,7 +331,7 @@ if(href_list["print_p"]) visible_message("[src] rattles and prints out a sheet of paper.") var/obj/item/paper/P = new /obj/item/paper(loc) - playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, TRUE) P.info = "
Body Scan - [href_list["name"]]

" P.info += "Time of scan: [station_time_timestamp()]

" P.info += "[generate_printing_text()]" @@ -404,7 +404,7 @@ dat += "Ether: [occupant.reagents.get_reagent_amount("ether")] units
" extra_font = (occupant.reagents.get_reagent_amount("silver_sulfadiazine") < 30 ? "" : "") - dat += "[extra_font]\tSilver Sulfadiazine: [occupant.reagents.get_reagent_amount("silver_sulfadiazine")]
" + dat += "[extra_font]\tSilver Sulfadiazine: [occupant.reagents.get_reagent_amount("silver_sulfadiazine")] units

" extra_font = (occupant.reagents.get_reagent_amount("styptic_powder") < 30 ? "" : "") dat += "[extra_font]\tStyptic Powder: [occupant.reagents.get_reagent_amount("styptic_powder")] units
" diff --git a/html/browser/marked-paradise.js b/html/browser/marked-paradise.js index 03519139409..a92cadb1cfe 100644 --- a/html/browser/marked-paradise.js +++ b/html/browser/marked-paradise.js @@ -4,24 +4,22 @@ var $ = document.querySelector.bind(document); function parse(node) { - for (var i = 0; i < node.childNodes.length; i++) { - parse(node.childNodes[i]); - } - - if (!node.innerHTML) { - return; - } - - node.innerHTML = marked(node.innerHTML.replace(/
/gi, '\n').replace(/\t/gi, ''), { breaks: false, gfm: false }) - // marked.js wraps content into

tags, which is looks atrocious when we call it recursively. - // The following line unwraps it. - if (node.children.length == 1) { - node.innerHTML = node.children[0].innerHTML; - } + for (var i = 0; i < node.childNodes.length; i++) + parse(node.childNodes[i]); + + if (!node.innerHTML) + return; + + if (node.children.length == 0) { + node.innerHTML = marked(node.innerHTML.replace(/
/gi, '\n').replace(/\t/gi, ''), { breaks: false, gfm: false }); + // marked.js wraps content into

tags, which is looks atrocious when we call it recursively. + // The following line unwraps it. + if (node.children.length == 1 && node.children[0].tagName == "P") + node.innerHTML = node.children[0].innerHTML; + } } - + window.onload = function() { - if ($('#markdown')) { - parse($('#markdown')); - } + if ($('#markdown')) + parse($('#markdown')); }