From 621f32adc36b39b3a0c6410675d40ccc34631069 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Mon, 17 Aug 2020 03:43:32 -0700
Subject: [PATCH 1/2] Update output.dm

---
 .../integrated_electronics/subtypes/output.dm | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm
index efd98c4d50..1fc08c9aaa 100644
--- a/code/modules/integrated_electronics/subtypes/output.dm
+++ b/code/modules/integrated_electronics/subtypes/output.dm
@@ -44,18 +44,18 @@
 /obj/item/integrated_circuit/output/screen/large/do_work()
 	..()
 
-	if(isliving(assembly.loc))//this whole block just returns if the assembly is neither in a mobs hands or on the ground
-		var/mob/living/H = assembly.loc
-		if(H.get_active_held_item() != assembly && H.get_inactive_held_item() != assembly)
-			return
-	else
-		if(!isturf(assembly.loc))
-			return
-	
-	var/atom/host = assembly || src
 	var/list/mobs = list()
-	for(var/mob/M in range(0, get_turf(src)))
-		mobs += M
+	if(isliving(assembly.loc))
+		mobs += assembly.loc
+		var/mob/living/L = assembly.loc
+		if(L.is_holding(src))
+			for(var/mob/M in range(1, get_turf(src)))
+				mobs += M
+	else
+		for(var/mob/M in range(2, get_turf(src))
+			mobs += M
+
+	var/atom/host = assembly || src
 	to_chat(mobs, "<span class='notice'>[icon2html(host.icon, world, host.icon_state)] flashes a message: [stuff_to_display]</span>")
 	host.investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT)
 

From c5d5493cfc2f2cb87b1f984a879b230bbb01b261 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 4 Oct 2020 09:45:03 -0700
Subject: [PATCH 2/2] Update output.dm

---
 code/modules/integrated_electronics/subtypes/output.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm
index 1fc08c9aaa..833b2963ad 100644
--- a/code/modules/integrated_electronics/subtypes/output.dm
+++ b/code/modules/integrated_electronics/subtypes/output.dm
@@ -52,7 +52,7 @@
 			for(var/mob/M in range(1, get_turf(src)))
 				mobs += M
 	else
-		for(var/mob/M in range(2, get_turf(src))
+		for(var/mob/M in range(2, get_turf(src)))
 			mobs += M
 
 	var/atom/host = assembly || src