cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1525 from yogstation13/upstream-merge-38797

Browse Source 
[MIRROR] Fixes TGUI runtime
This commit is contained in:
Nich
2018-06-30 22:32:49 +02:00
committed by GitHub
parent 27a7762495 a8b17a852a
commit 2bc16b686c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/objects/objs.dm
View File

@@ -26,7 +26,7 @@
var/req_access_txt = "0"
var/list/req_one_access
var/req_one_access_txt = "0"
var/renamedByPlayer = FALSE //set when a player uses a pen on a renamable object
/obj/vv_edit_var(vname, vval)
@@ -111,16 +111,16 @@
/obj/proc/updateUsrDialog()
if((obj_flags & IN_USE) && !(obj_flags & USES_TGUI))
var/is_in_use = 0
var/is_in_use = FALSE
var/list/nearby = viewers(1, src)
for(var/mob/M in nearby)
if ((M.client && M.machine == src))
is_in_use = 1
ui_interact(usr)
is_in_use = TRUE
ui_interact(M)
if(isAI(usr) || iscyborg(usr) || IsAdminGhost(usr))
if (!(usr in nearby))
if (usr.client && usr.machine==src) // && M.machine == src is omitted because if we triggered this by using the dialog, it doesn't matter if our machine changed in between triggering it and this - the dialog is probably still supposed to refresh.
is_in_use = 1
is_in_use = TRUE
ui_interact(usr)
// check for TK users
@@ -130,7 +130,7 @@
if(!(usr in nearby))
if(usr.client && usr.machine==src)
if(H.dna.check_mutation(TK))
is_in_use = 1
is_in_use = TRUE
ui_interact(usr)
if (is_in_use)
obj_flags |= IN_USE