From 8e84ff57df84a9dc1c86ab216582fef426f822d7 Mon Sep 17 00:00:00 2001 From: Uristqwerty Date: Sun, 12 Feb 2012 13:54:52 -0500 Subject: [PATCH] Three fixes for the Runtime Errors topic. - null.check_tile_graphic() in FEA_system - "Cancel".network in /proc/camera_network_sort - "d699999427062f612349cb4948a6eb...".len (Might not be fixed entirely, but I fixed one place that it was being set incorrectly) --- code/FEA/FEA_system.dm | 2 +- code/game/machinery/camera.dm | 2 +- code/game/objects/devices/scanners.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/FEA/FEA_system.dm b/code/FEA/FEA_system.dm index 576bed173e..c7504eb930 100644 --- a/code/FEA/FEA_system.dm +++ b/code/FEA/FEA_system.dm @@ -217,7 +217,7 @@ datum base.processing = 0 //singletons at startup are technically unconnected anyway base.parent = null - if(base.air.check_tile_graphic()) + if(base.air && base.air.check_tile_graphic()) base.update_visuals(base.air) return null diff --git a/code/game/machinery/camera.dm b/code/game/machinery/camera.dm index b0b08edced..fdb8fb7c23 100644 --- a/code/game/machinery/camera.dm +++ b/code/game/machinery/camera.dm @@ -214,11 +214,11 @@ camera_sort(L) var/list/D = list() - D["Cancel"] = "Cancel" for (var/obj/machinery/camera/C in L) if ( C.network in src.networks ) D[text("[]: [][]", C.network, C.c_tag, (C.status ? null : " (Deactivated)"))] = C D = camera_network_sort(D) + D["Cancel"] = "Cancel" var/t = input(user, "Which camera should you change to?") as null|anything in D diff --git a/code/game/objects/devices/scanners.dm b/code/game/objects/devices/scanners.dm index 2b6ccd576d..169059ad82 100644 --- a/code/game/objects/devices/scanners.dm +++ b/code/game/objects/devices/scanners.dm @@ -116,7 +116,7 @@ MASS SPECTROMETER src.amount-- var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card( user.loc ) F.amount = 1 - F.fingerprints = md5(M.dna.uni_identity) + F.fingerprints += md5(M.dna.uni_identity) F.icon_state = "fingerprint1" F.name = text("FPrintC- '[M.name]'")