diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 53230d1f83d..307d3c20445 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -102,6 +102,7 @@ leave_all_huds() //leave all the huds in the old body, so it won't get huds if somebody else enters it SSnanoui.user_transferred(current, new_character) + SStgui.on_transfer(current, new_character) if(new_character.mind) //remove any mind currently in our new body's mind variable new_character.mind.current = null diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index f02e037e8c5..ad164fe720a 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -310,6 +310,12 @@ Class Procs: return ..() +/obj/machinery/tgui_status(mob/user, datum/tgui_state/state) + if(!interact_offline && (stat & (NOPOWER|BROKEN))) + return STATUS_CLOSE + + return ..() + /obj/machinery/CouldUseTopic(var/mob/user) ..() user.set_machine(src) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index ed6b0190502..b372727fef7 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -621,7 +621,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( /obj/item/radio/borg/syndicate keyslot = new /obj/item/encryptionkey/syndicate/nukeops -/obj/item/radio/borg/syndicate/CanUseTopic(mob/user, datum/topic_state/state) +/obj/item/radio/borg/syndicate/tgui_status(mob/user, datum/tgui_state/state) . = ..() if(. == STATUS_UPDATE && istype(user, /mob/living/silicon/robot/syndicate)) . = STATUS_INTERACTIVE diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 261b6ba109b..9035207018a 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -46,7 +46,7 @@ w_class = I.w_class update_icon() - SSnanoui.update_uis(src) // update all UIs attached to src + SStgui.update_uis(src) // update all UIs attached to src //TODO: Have this take an assemblyholder else if(isassembly(I)) var/obj/item/assembly/A = I @@ -69,7 +69,7 @@ add_attack_logs(user, src, "attached [A] to a transfer valve", ATKLOG_FEW) log_game("[key_name_admin(user)] attached [A] to a transfer valve.") attacher = user - SSnanoui.update_uis(src) // update all UIs attached to src + SStgui.update_uis(src) // update all UIs attached to src /obj/item/transfer_valve/HasProximity(atom/movable/AM) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 7a56c53f73a..45c2129fc9a 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -78,6 +78,7 @@ else STOP_PROCESSING(SSfastprocess, src) SSnanoui.close_uis(src) + SStgui.close_uis(src) return ..() //user: The mob that is suiciding diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 12203b8155f..cdc1a8341d0 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -1191,7 +1191,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts if(!tweak || !istype(gear) || !(tweak in gear.gear_tweaks)) return var/metadata = tweak.get_metadata(user, get_tweak_metadata(gear, tweak)) - if(!metadata || !CanUseTopic(user)) + if(!metadata) return set_tweak_metadata(gear, tweak, metadata) else if(href_list["select_category"]) diff --git a/code/modules/instruments/objs/structures/_musician.dm b/code/modules/instruments/objs/structures/_musician.dm index 542859b4aef..df7530a3313 100644 --- a/code/modules/instruments/objs/structures/_musician.dm +++ b/code/modules/instruments/objs/structures/_musician.dm @@ -44,4 +44,4 @@ return TRUE if(!user) return FALSE - return !CanUseTopic(user, GLOB.physical_state) + return !tgui_status(user, GLOB.tgui_physical_state)