Merge pull request #8415 from mwerezak/runtimes

More runtime fixes

code/game/machinery/computer3/computers/medical.dm

@@ -86,12 +86,13 @@
 					if(3.0)
 						dat += text("<B>Records Maintenance</B><HR>\n<A href='?src=\ref[];back=1'>Backup To Disk</A><BR>\n<A href='?src=\ref[];u_load=1'>Upload From disk</A><BR>\n<A href='?src=\ref[];del_all=1'>Delete All Records</A><BR>\n<BR>\n<A href='?src=\ref[];screen=1'>Back</A>", src, src, src, src)
 					if(4.0)
+						dat += "<CENTER><B>Medical Record</B></CENTER><BR>"
+						if ((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
 							var/icon/front = active1.fields["photo_front"]
 							var/icon/side = active1.fields["photo_side"]
 							usr << browse_rsc(front, "front.png")
 							usr << browse_rsc(side, "side.png")
-						dat += "<CENTER><B>Medical Record</B></CENTER><BR>"
-						if ((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
+						
 							dat += "<table><tr><td>Name: [active1.fields["name"]] \
 									ID: [active1.fields["id"]]<BR>\n	\
 									Sex: <A href='?src=\ref[src];field=sex'>[active1.fields["sex"]]</A><BR>\n	\

code/game/machinery/doors/door.dm

@@ -126,9 +126,6 @@
 	if(user.last_airflow > world.time - vsc.airflow_delay) //Fakkit
 		return
 	src.add_fingerprint(user)
-	if(!src.requiresID())
-		user = null
-
 	if(density)
 		if(allowed(user))	open()
 		else				flick("door_deny", src)
@@ -193,10 +190,6 @@
 		return
 	if(src.operating > 0 || isrobot(user))	return //borgs can't attack doors open because it conflicts with their AI-like interaction with them.
 	src.add_fingerprint(user)
-	if(!Adjacent(user))
-		user = null
-	if(!src.requiresID())
-		user = null
 
 	if(istype(I, /obj/item/stack/sheet/metal))
 		if(stat & BROKEN)
@@ -423,6 +416,11 @@
 /obj/machinery/door/proc/requiresID()
 	return 1
 
+/obj/machinery/door/allowed(mob/M)
+	if(!requiresID())
+		return ..(null) //don't care who they are or what they have, act as if they're NOTHING
+	return ..(M)
+
 /obj/machinery/door/update_nearby_tiles(need_rebuild)
 	if(!air_master)
 		return 0

code/game/machinery/doors/windowdoor.dm

@@ -234,9 +234,6 @@
 
 
 	src.add_fingerprint(user)
-	if (!src.requiresID())
-		//don't care who they are or what they have, act as if they're NOTHING
-		user = null
 
 	if (src.allowed(user))
 		if (src.density)

code/modules/mob/living/silicon/ai/freelook/chunk.dm

@@ -75,8 +75,9 @@
 	for(var/camera in cameras)
 		var/obj/machinery/camera/c = camera
 
-		if(!c)
+		if(!istype(c))
 			cameras -= c
+			continue
 
 		if(!c.can_use())
 			continue

code/modules/paperwork/paper.dm

@@ -23,9 +23,9 @@
 	var/stamps		//The (text for the) stamps on the paper.
 	var/fields		//Amount of user created fields
 	var/list/stamped
-	var/ico[0]      //Icons and
-	var/offset_x[0] //offsets stored for later
-	var/offset_y[0] //usage by the photocopier
+	var/list/ico[0]      //Icons and
+	var/list/offset_x[0] //offsets stored for later
+	var/list/offset_y[0] //usage by the photocopier
 	var/rigged = 0
 	var/spam_flag = 0
 

code/modules/paperwork/photocopier.dm

@@ -175,7 +175,7 @@
 	c.offset_y = copy.offset_y
 	var/list/temp_overlays = copy.overlays       //Iterates through stamps
 	var/image/img                                //and puts a matching
-	for (var/j = 1, j <= temp_overlays.len, j++) //gray overlay onto the copy
+	for (var/j = 1, j <= min(temp_overlays.len, copy.ico.len), j++) //gray overlay onto the copy
 		if (findtext(copy.ico[j], "cap") || findtext(copy.ico[j], "cent"))
 			img = image('icons/obj/bureaucracy.dmi', "paper_stamp-circle")
 		else if (findtext(copy.ico[j], "deny"))

code/modules/research/xenoarchaeology/finds/finds.dm

@@ -545,13 +545,9 @@
 		new_item.desc = src.desc
 
 		if(talkative)
-			new_item.talking_atom = new()
-			talking_atom.holder_atom = new_item
-			talking_atom.init()
+			new_item.talking_atom = new(new_item)
 
 		del(src)
 
 	else if(talkative)
-		src.talking_atom = new()
-		talking_atom.holder_atom = src
-		talking_atom.init()
+		src.talking_atom = new(src)

code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm

@@ -14,6 +14,10 @@
 	var/talk_interval = 50
 	var/talk_chance = 10
 
+/datum/talking_atom/New(atom/holder)
+	holder_atom = holder
+	init()
+
 /datum/talking_atom/proc/init()
 	if(holder_atom)
 		processing_objects.Add(src)
@@ -55,7 +59,7 @@
 
 	if(prob(30))
 		var/list/options = list("[holder_atom] seems to be listening intently to [source]...",\
-			"[holder_atom] seems to be focussing on [source]...",\
+			"[holder_atom] seems to be focusing on [source]...",\
 			"[holder_atom] seems to turn it's attention to [source]...")
 		holder_atom.loc.visible_message("\blue \icon[holder_atom] [pick(options)]")