Merge pull request #771 from dwasint/small-fixes

Small fixes

code/datums/interactions/cyborg_combat_mode.dm

@@ -16,4 +16,4 @@
 		if (4)
 			combat_mode = !combat_mode
 	update_istate(owner.mob, null)
-	UI.update_icon_state()
+	UI?.update_icon_state()

html/admin/view_variables.css

@@ -1,37 +1,49 @@
 body {
-	font-family: Verdana, sans-serif;
-	font-size: 9pt;
+    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+    font-size: 12pt;
+    background-color: #1a1a1a;
+    color: #fff;
+    margin: 0;
+    padding: 0;
 }
+
 .value {
-	font-family: "Courier New", monospace;
-	font-size: 8pt;
-	display: inline-block;
+    font-family: "Courier New", monospace;
+    font-size: 10pt;
+    display: inline-block;
+    color: #a8a8a8;
 }
 
 table.matrix {
-	border-collapse: collapse; border-spacing: 0;
-	font-size: 7pt;
+    border-collapse: collapse;
+    border-spacing: 0;
+    font-size: 10pt;
+    width: 100%;
+    color: #fff;
 }
-.matrix td{
-	text-align: center;
-	padding: 0 1ex 0ex 1ex;
+
+.matrix td {
+    text-align: center;
+    padding: 8px;
 }
+
 table.matrixbrak {
-	border-collapse: collapse; border-spacing: 0;
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 100%;
 }
-table.matrixbrak td.lbrak {
-	width: 0.8ex;
-	font-size: 50%;
-	border-top: solid 0.25ex black;
-	border-bottom: solid 0.25ex black;
-	border-left: solid 0.5ex black;
-	border-right: none;
+
+table.matrixbrak td.lbrak,
+table.matrixbrak td.rbrak {
+    width: 20px;
+    font-size: 80%;
+    border-top: solid 1px #666;
+    border-bottom: solid 1px #666;
+    border-left: solid 1px #666;
+    border-right: solid 1px #666;
 }
+
 table.matrixbrak td.rbrak {
-		width: 0.8ex;
-		font-size: 50%;
-		border-top: solid 0.25ex black;
-		border-bottom: solid 0.25ex black;
-		border-right: solid 0.5ex black;
-		border-left: none;
+    border-left: none;
+    border-right: solid 1px #666;
 }

monkestation/code/modules/metrics/sql_logging_subsystem.dm

@@ -94,6 +94,9 @@ SUBSYSTEM_DEF(sql_logging)
 			else
 				target_name = target.name
 				target_ckey = "Non Client Target"
+		else if(IS_CLIENT_OR_MOCK(target))
+			var/client/target_client = target
+			target_name = target_client.ckey
 
 	if(source && !isnull(source))
 		if(ismob(source))
@@ -102,8 +105,12 @@ SUBSYSTEM_DEF(sql_logging)
 				source_ckey = mob.client.ckey
 			source_name = mob.real_name
 
+		else if(IS_CLIENT_OR_MOCK(source))
+			var/client/source_client = source
+			source_name = source_client.ckey
 		else
 			source_name = source.name
+
 		source_x = source.x
 		source_y = source.y
 		source_z = source.z

monkestation/code/modules/virology/machines/splicer.dm

@@ -139,12 +139,12 @@
 /obj/machinery/computer/diseasesplicer/update_overlays()
 	..()
 	if (dish)
-		var/mutable_appearance/dish_outline = mutable_appearance(icon,"smalldish2-outline")
+		var/mutable_appearance/dish_outline = mutable_appearance(icon,"smalldish2-outline", src)
 		dish_outline.alpha = 128
 		dish_outline.pixel_x = -1
 		dish_outline.pixel_y = -13
 		.+= dish_outline
-		var/mutable_appearance/dish_content = mutable_appearance(icon,"smalldish2-empty")
+		var/mutable_appearance/dish_content = mutable_appearance(icon,"smalldish2-empty", src)
 		dish_content.alpha = 128
 		dish_content.pixel_x = -1
 		dish_content.pixel_y = -13
@@ -158,7 +158,7 @@
 
 	if (dish && dish.contained_virus)
 		if (dish.analysed)
-			var/mutable_appearance/scan_pattern = mutable_appearance(icon,"pattern-[dish.contained_virus.pattern]b")
+			var/mutable_appearance/scan_pattern = mutable_appearance(icon,"pattern-[dish.contained_virus.pattern]b", src)
 			scan_pattern.color = "#00FF00"
 			scan_pattern.pixel_x = -2
 			scan_pattern.pixel_y = 4
@@ -167,12 +167,12 @@
 			.+= mutable_appearance(icon,"splicer_unknown")
 
 	if(scanning || splicing)
-		var/mutable_appearance/splicer_glass = emissive_appearance(icon,"splicer_glass")
+		var/mutable_appearance/splicer_glass = emissive_appearance(icon,"splicer_glass", src)
 		splicer_glass.blend_mode = BLEND_ADD
 		.+= splicer_glass
 
 	if (memorybank)
-		.+= emissive_appearance(icon,"splicer_buffer")
+		.+= emissive_appearance(icon,"splicer_buffer", src)
 
 /obj/machinery/computer/diseasesplicer/proc/buffer2dish()
 	if(!memorybank || !dish || !dish.contained_virus)
@@ -236,7 +236,7 @@
 	. = ..()
 	if(.)
 		return TRUE
-	
+
 	if(scanning || splicing || burning)
 		return FALSE