Fixes modular computer ui_interact runtime

This commit is contained in:
vuonojenmustaturska
2018-03-28 15:51:43 +03:00
committed by CitadelStationBot
parent 77f40b6be9
commit b53373dec0

View File

@@ -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)