diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 0cc1cc07a60..6031cce4552 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -119,7 +119,7 @@ return var/data[0] data["menu"] = src.menu - data["scanner"] = src.scanner + data["scanner"] = sanitize("[src.scanner]") var/canpodautoprocess = 0 if(pods.len) @@ -130,7 +130,7 @@ if(pod.efficiency > 5) canpodautoprocess = 1 - tempods.Add(list(list("pod" = "\ref[pod]", "name" = capitalize(pod.name), "biomass" = pod.biomass))) + tempods.Add(list(list("pod" = "\ref[pod]", "name" = sanitize(capitalize(pod.name)), "biomass" = pod.biomass))) data["pods"] = tempods data["loading"] = loading @@ -150,7 +150,7 @@ var/list/temprecords[0] for(var/datum/dna2/record/R in records) var tempRealName = R.dna.real_name - temprecords.Add(list(list("record" = "\ref[R]", "realname" = tempRealName))) + temprecords.Add(list(list("record" = "\ref[R]", "realname" = sanitize(tempRealName)))) data["records"] = temprecords if(src.menu == 3) @@ -162,7 +162,7 @@ if ((H) && (istype(H))) data["health"] = H.sensehealth() - data["realname"] = src.active_record.dna.real_name + data["realname"] = sanitize(src.active_record.dna.real_name) data["unidentity"] = src.active_record.dna.uni_identity data["strucenzymes"] = src.active_record.dna.struc_enzymes if(selected_pod && (selected_pod in pods) && selected_pod.biomass >= CLONE_BIOMASS) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 7c5c7e4a09f..0db5724b527 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -233,7 +233,7 @@ return if(pai) - if(!in_range(src, U) || pai.canmove || pai.resting) + if(!in_range(src, U)) U << browse(null, "window=paicard") usr.unset_machine() return diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 4b657bb3181..ef36f5b94c9 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -92,8 +92,8 @@ var/global/list/default_pai_software = list() ui.set_auto_update(1) /mob/living/silicon/pai/Topic(href, href_list) - . = ..() - if(.) return + if(..()) + return 1 if(href_list["software"]) var/soft = href_list["software"] diff --git a/nano/templates/cloning_console.tmpl b/nano/templates/cloning_console.tmpl index 7f82878aaa1..a1c35f903ae 100644 --- a/nano/templates/cloning_console.tmpl +++ b/nano/templates/cloning_console.tmpl @@ -65,17 +65,21 @@ Used In File(s): \code\game\machinery\computer\cloning.dm {{if data.numberofpods}}