Fixes maniquin caused runtimes (#6784)

This commit is contained in:
Karolis
2019-07-27 20:46:18 +03:00
committed by Erki
parent 661fd0a615
commit 6b8c808fcc
2 changed files with 5 additions and 3 deletions

View File

@@ -225,9 +225,9 @@
* Helping functions for everyone * Helping functions for everyone
*/ */
/proc/GetAssignment(var/mob/living/carbon/human/H) /proc/GetAssignment(var/mob/living/carbon/human/H)
if(H.mind.role_alt_title) if(H.mind?.role_alt_title)
return H.mind.role_alt_title return H.mind.role_alt_title
else if(H.mind.assigned_role) else if(H.mind?.assigned_role)
return H.mind.assigned_role return H.mind.assigned_role
else if(H.job) else if(H.job)
return H.job return H.job

View File

@@ -281,6 +281,8 @@ main ui datum.
* @return nothing * @return nothing
*/ */
/datum/vueui/proc/check_for_change(var/force = 0) /datum/vueui/proc/check_for_change(var/force = 0)
if(!user.client)
return
if(status > STATUS_DISABLED) if(status > STATUS_DISABLED)
var/ret = object.vueui_data_change(data, user, src) var/ret = object.vueui_data_change(data, user, src)
if(ret) if(ret)
@@ -323,7 +325,7 @@ main ui datum.
* @return nothing * @return nothing
*/ */
/datum/vueui/process() /datum/vueui/process()
if (!object || !user || status < 0) if (!object || !user || status < 0 || !user.client)
close() close()
return return
update_status() update_status()