Nano Is Dead

This commit is contained in:
AffectedArc07
2020-11-21 09:46:50 +00:00
parent 3613057b9d
commit 984ac231e0
121 changed files with 43 additions and 26087 deletions
+1 -1
View File
@@ -47,7 +47,7 @@
ui.open()
/obj/item/aicard/tgui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state)
/obj/item/aicard/tgui_data(mob/user)
var/data[0]
var/mob/living/silicon/ai/AI = locate() in src
+3 -4
View File
@@ -50,14 +50,14 @@
else if(!istype(armor, /datum/armor))
stack_trace("Invalid type [armor.type] found in .armor during /obj Initialize()")
/obj/Topic(href, href_list, nowindow = FALSE, datum/topic_state/state = GLOB.default_state)
/obj/Topic(href, href_list, nowindow = FALSE, datum/tgui_state/state = GLOB.tgui_default_state)
// Calling Topic without a corresponding window open causes runtime errors
if(!nowindow && ..())
return TRUE
// In the far future no checks are made in an overriding Topic() beyond if(..()) return
// Instead any such checks are made in CanUseTopic()
if(CanUseTopic(usr, state, href_list) == STATUS_INTERACTIVE)
if(tgui_status(usr, state, href_list) == STATUS_INTERACTIVE)
CouldUseTopic(usr)
return FALSE
@@ -65,7 +65,7 @@
return TRUE
/obj/proc/CouldUseTopic(mob/user)
var/atom/host = nano_host()
var/atom/host = tgui_host()
host.add_fingerprint(user)
/obj/proc/CouldNotUseTopic(mob/user)
@@ -77,7 +77,6 @@
STOP_PROCESSING(SSobj, src) // TODO: Have a processing bitflag to reduce on unnecessary loops through the processing lists
else
STOP_PROCESSING(SSfastprocess, src)
SSnanoui.close_uis(src)
SStgui.close_uis(src)
return ..()
+1 -1
View File
@@ -155,7 +155,7 @@
if(voice_choice)
curse(user)
/obj/structure/mirror/magic/on_ui_close(mob/user)
/obj/structure/mirror/magic/tgui_close(mob/user)
curse(user)
/obj/structure/mirror/magic/attackby(obj/item/I, mob/living/user, params)