From b53373dec050950d8697dd2df9e6c90d54981e58 Mon Sep 17 00:00:00 2001
From: vuonojenmustaturska <naksu@youzen.ext.b2.fi>
Date: Wed, 28 Mar 2018 15:51:43 +0300
Subject: [PATCH] Fixes modular computer ui_interact runtime

---
 .../modular_computers/computers/item/computer_ui.dm        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/modules/modular_computers/computers/item/computer_ui.dm b/code/modules/modular_computers/computers/item/computer_ui.dm
index c57bf5f4e3..c8ca119e89 100644
--- a/code/modules/modular_computers/computers/item/computer_ui.dm
+++ b/code/modules/modular_computers/computers/item/computer_ui.dm
@@ -1,3 +1,10 @@
+<<<<<<< HEAD
+=======
+/obj/item/device/modular_computer/attack_self(mob/user)
+	. = ..()
+	ui_interact(user)
+
+>>>>>>> ba5a78b... Merge pull request #36743 from ShizCalev/modular-comp-ui_interact-runtime
 // Operates TGUI
 /obj/item/device/modular_computer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	if(!enabled)