Merge pull request #404 from Uristqwerty/master

Three fixes for the Runtime Errors topic.
This commit is contained in:
Mloc
2012-02-12 12:01:06 -08:00
3 changed files with 3 additions and 3 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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]'")