From b94c1ab709b4c6ecb27708648976ce3f9b84dcae Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 12 Jul 2020 06:10:26 -0700 Subject: [PATCH 1/3] Update output.dm --- .../integrated_electronics/subtypes/output.dm | 53 ++++++++----------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm index 47b6e151cb..3d3010c0c8 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -35,7 +35,7 @@ stuff_to_display = replacetext("[I.data]", eol , "
") /obj/item/integrated_circuit/output/screen/large - name = "large screen" + name = "medium screen" desc = "Takes any data type as an input and displays it to anybody near the device when pulsed. \ It can also be examined to see the last thing it displayed." icon_state = "screen_medium" @@ -51,15 +51,29 @@ 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))) + mob += M + to_chat(mobs, "[icon2html(host.icon, world, O.icon_state)] flashes a message: [stuff_to_display]") + host.investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT) - var/list/nearby_things = range(0, get_turf(src)) - for(var/mob/M in nearby_things) - var/obj/O = assembly ? assembly : src - to_chat(M, "[icon2html(O.icon, world, O.icon_state)] [stuff_to_display]") - if(assembly) - assembly.investigate_log("displayed \"[html_encode(stuff_to_display)]\" with [type].", INVESTIGATE_CIRCUIT) - else - investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT) +/obj/item/integrated_circuit/output/screen/extralarge // the subtype is called "extralarge" because tg brought back medium screens and they named the subtype /screen/large + name = "large screen" + desc = "Takes any data type as an input and displays it to the user upon examining, and to all nearby beings when pulsed." + icon_state = "screen_large" + power_draw_per_use = 40 + cooldown_per_use = 10 + +/obj/item/integrated_circuit/output/screen/extralarge/do_work() + ..() + var/atom/host = assembly || src + var/list/mobs = list() + for(var/mob/M in view(7, get_turf(src))) + mob += M + to_chat(mobs, "[icon2html(host.icon, world, O.icon_state)] flashes a message: [stuff_to_display]") + host.investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT) /obj/item/integrated_circuit/output/light name = "light" @@ -389,25 +403,4 @@ //Hippie Ported Code-------------------------------------------------------------------------------------------------------- - - /obj/item/radio/headset/integrated - -/obj/item/integrated_circuit/output/screen/large - name = "medium screen" - -/obj/item/integrated_circuit/output/screen/extralarge // the subtype is called "extralarge" because tg brought back medium screens and they named the subtype /screen/large - name = "large screen" - desc = "Takes any data type as an input and displays it to the user upon examining, and to all nearby beings when pulsed." - icon_state = "screen_large" - power_draw_per_use = 40 - cooldown_per_use = 10 - -/obj/item/integrated_circuit/output/screen/extralarge/do_work() - ..() - var/obj/O = assembly ? get_turf(assembly) : loc - O.visible_message("[icon2html(O.icon, world, O.icon_state)] [stuff_to_display]") - if(assembly) - assembly.investigate_log("displayed \"[html_encode(stuff_to_display)]\" with [type].", INVESTIGATE_CIRCUIT) - else - investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT) From d9a7e860dd4e3cd89eb66fa0a2edf135e65283f1 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 12 Jul 2020 06:13:19 -0700 Subject: [PATCH 2/3] 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 3d3010c0c8..ad4d1c3891 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -70,7 +70,7 @@ ..() var/atom/host = assembly || src var/list/mobs = list() - for(var/mob/M in view(7, get_turf(src))) + for(var/mob/M in viewers(7, get_turf(src))) mob += M to_chat(mobs, "[icon2html(host.icon, world, O.icon_state)] flashes a message: [stuff_to_display]") host.investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT) From 6bf209d9a5330cadd0c6808205d01ed6a9554fc1 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 12 Jul 2020 06:56:48 -0700 Subject: [PATCH 3/3] Update output.dm --- code/modules/integrated_electronics/subtypes/output.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm index ad4d1c3891..efd98c4d50 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -55,8 +55,8 @@ var/atom/host = assembly || src var/list/mobs = list() for(var/mob/M in range(0, get_turf(src))) - mob += M - to_chat(mobs, "[icon2html(host.icon, world, O.icon_state)] flashes a message: [stuff_to_display]") + mobs += M + to_chat(mobs, "[icon2html(host.icon, world, host.icon_state)] flashes a message: [stuff_to_display]") host.investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT) /obj/item/integrated_circuit/output/screen/extralarge // the subtype is called "extralarge" because tg brought back medium screens and they named the subtype /screen/large @@ -71,8 +71,8 @@ var/atom/host = assembly || src var/list/mobs = list() for(var/mob/M in viewers(7, get_turf(src))) - mob += M - to_chat(mobs, "[icon2html(host.icon, world, O.icon_state)] flashes a message: [stuff_to_display]") + mobs += M + to_chat(mobs, "[icon2html(host.icon, world, host.icon_state)] flashes a message: [stuff_to_display]") host.investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT) /obj/item/integrated_circuit/output/light