From 5d6eb6f24bb50604e71040656937081120a49ec6 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Fri, 6 Mar 2020 14:56:49 +0100 Subject: [PATCH 1/2] Patches some awful integrated circuit examiner runtime errors. --- code/__DEFINES/misc.dm | 1 + code/modules/integrated_electronics/subtypes/input.dm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 881a02c38b..89cacc1c7b 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -407,6 +407,7 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S #define DUMMY_HUMAN_SLOT_ADMIN "admintools" #define DUMMY_HUMAN_SLOT_MANIFEST "dummy_manifest_generation" #define DUMMY_HUMAN_SLOT_HALLUCINATION "dummy_hallucination" +#define DUMMY_HUMAN_SLOT_EXAMINER "dummy_examiner" #define PR_ANNOUNCEMENTS_PER_ROUND 5 //The number of unique PR announcements allowed per round //This makes sure that a single person can only spam 3 reopens and 3 closes before being ignored diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index f1cf9dd950..789ebd2541 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -349,8 +349,8 @@ set_pin_data(IC_OUTPUT, 2, H.desc) if(istype(H, /mob/living)) - var/mob/living/M = H - var/msg = M.examine() + var/mob/living/carbon/human/D = generate_or_wait_for_human_dummy(DUMMY_HUMAN_SLOT_EXAMINER) + var/msg = H.examine(D) if(msg) set_pin_data(IC_OUTPUT, 2, msg) From a298a34ae9666209748bd93047164227c8baa795 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Fri, 6 Mar 2020 14:57:34 +0100 Subject: [PATCH 2/2] Oh yea. --- code/modules/integrated_electronics/subtypes/input.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index 789ebd2541..0be6fd8686 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -353,6 +353,7 @@ var/msg = H.examine(D) if(msg) set_pin_data(IC_OUTPUT, 2, msg) + unset_busy_human_dummy(DUMMY_HUMAN_SLOT_EXAMINER) set_pin_data(IC_OUTPUT, 3, H.x-T.x) set_pin_data(IC_OUTPUT, 4, H.y-T.y)