Merge pull request #8372 from PsiOmegaDelta/Runtimes

Runtime fixes

code/defines/procs/statistics.dm

@@ -47,9 +47,8 @@ proc/sql_report_death(var/mob/living/carbon/human/H)
 	if(!H.key || !H.mind)
 		return
 
-	var/turf/T = H.loc
+	var/area/placeofdeath = get_area(H)
-	var/area/placeofdeath = get_area(T.loc)
+	var/podname = placeofdeath ? placeofdeath.name : "Unknown area"
-	var/podname = placeofdeath.name
 
 	var/sqlname = sanitizeSQL(H.real_name)
 	var/sqlkey = sanitizeSQL(H.key)
@@ -82,9 +81,8 @@ proc/sql_report_cyborg_death(var/mob/living/silicon/robot/H)
 	if(!H.key || !H.mind)
 		return
 
-	var/turf/T = H.loc
+	var/area/placeofdeath = get_area(H)
-	var/area/placeofdeath = get_area(T.loc)
+	var/podname = placeofdeath ? placeofdeath.name : "Unknown area"
-	var/podname = placeofdeath.name
 
 	var/sqlname = sanitizeSQL(H.real_name)
 	var/sqlkey = sanitizeSQL(H.key)

code/modules/events/event_manager.dm

@@ -32,7 +32,7 @@
 		EC.process()
 
 /datum/event_manager/proc/event_complete(var/datum/event/E)
-	if(!E.event_meta)	// datum/event is used here and there for random reasons, maintaining "backwards compatibility"
+	if(!E.event_meta || !E.severity)	// datum/event is used here and there for random reasons, maintaining "backwards compatibility"
 		log_debug("Event of '[E.type]' with missing meta-data has completed.")
 		return
 

code/modules/mob/mob.dm

@@ -859,7 +859,9 @@ note dizziness decrements automatically in the mob's Life() proc.
 			canmove = 1
 			pixel_y = V.mob_offset_y
 	else if(buckled)
-		if (!buckled.movable)
+		// var/movable is defined at /obj/structure/stool/bed level
+		// If we're buckled to something else, such as vines, assume it's stationary.
+		if (!istype(buckled) || !buckled.movable)
 			anchored = 1
 			canmove = 0
 			if(istype(buckled,/obj/structure/stool/bed/chair) )

code/modules/nano/nanoui.dm

@@ -410,6 +410,8 @@ nanoui is used to open and update nano browser uis
   * @return nothing
   */
 /datum/nanoui/proc/open()
+	if(!user.client)
+		return
 
 	var/window_size = ""
 	if (width && height)

code/modules/virus2/helpers.dm

@@ -11,16 +11,17 @@ proc/infection_check(var/mob/living/carbon/M, var/vector = "Airborne")
 			if(M.internal)
 				score = 6	//not breathing infected air helps greatly
 				var/obj/item/I = M.wear_mask
-				
+
 				//masks provide a small bonus and can replace overall bio protection
-				score = max(score, round(0.06*I.armor["bio"]))
+				if(I)
-				if (istype(I, /obj/item/clothing/mask))
+					score = max(score, round(0.06*I.armor["bio"]))
-					score += 1 //this should be added after
+					if (istype(I, /obj/item/clothing/mask))
-		
+						score += 1 //this should be added after
+
 		if("Contact")
 			if(istype(M, /mob/living/carbon/human))
 				var/mob/living/carbon/human/H = M
-				
+
 				//gloves provide a larger bonus
 				if (istype(H.gloves, /obj/item/clothing/gloves))
 					score += 2
@@ -45,12 +46,12 @@ proc/infection_check(var/mob/living/carbon/M, var/vector = "Airborne")
 		return 0
 
 	var/protection = M.getarmor(null, "bio")	//gets the full body bio armour value, weighted by body part coverage.
-	
+
 	if (vector == "Airborne")
 		var/obj/item/I = M.wear_mask
 		if (istype(I))
 			protection = max(protection, round(0.06*I.armor["bio"]))
-	
+
 	return prob(protection)
 
 //Checks if table-passing table can reach target (5 tile radius)
@@ -80,10 +81,10 @@ proc/airborne_can_reach(turf/source, turf/target)
 		return
 	if(M.reagents.has_reagent("spaceacillin"))
 		return
-	
+
 	if(!disease.affected_species.len)
 		return
-	
+
 	if (!(M.species.name in disease.affected_species))
 		if (forced)
 			disease.affected_species[1] = M.species.name
@@ -131,7 +132,7 @@ proc/airborne_can_reach(turf/source, turf/target)
 //			log_debug("Attempting virus [ID]")
 			var/datum/disease2/disease/V = virus2[ID]
 			if(V.spreadtype != vector) continue
-			
+
 			//It's hard to get other people sick if you're in an airtight suit.
 			if(!infection_spreading_check(src, V.spreadtype)) continue