From 1a79ffaf79be0ba3592fe23ac36beb56d10ce9f2 Mon Sep 17 00:00:00 2001 From: Artur Date: Mon, 7 Sep 2020 16:17:03 +0300 Subject: [PATCH] RE_Enter works properly now --- code/modules/mob/dead/observer/observer.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 6a3a167b38..c1d28c3d71 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -1,6 +1,9 @@ GLOBAL_LIST_EMPTY(ghost_images_default) //this is a list of the default (non-accessorized, non-dir) images of the ghosts themselves GLOBAL_LIST_EMPTY(ghost_images_simple) //this is a list of all ghost images as the simple white ghost - +GLOBAL_LIST_INIT(ghost_verbs, list( + /mob/dead/observer/proc/dead_tele, + /mob/dead/observer/proc/open_spawners_menu, + /mob/dead/observer/proc/view_gas)) GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) /mob/dead/observer @@ -60,10 +63,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) /mob/dead/observer/Initialize(mapload, mob/body) set_invisibility(GLOB.observer_default_invisibility) - add_verb(src, list( - /mob/dead/observer/proc/dead_tele, - /mob/dead/observer/proc/open_spawners_menu, - /mob/dead/observer/proc/view_gas)) + add_verb(src, GLOB.ghost_verbs) if(icon_state in GLOB.ghost_forms_with_directions_list) ghostimage_default = image(src.icon,src,src.icon_state + "_nodir") @@ -408,9 +408,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(usr, "Another consciousness is in your body...It is resisting you.") return client.change_view(CONFIG_GET(string/default_view)) + transfer_ckey(mind.current, FALSE) SStgui.on_transfer(src, mind.current) // Transfer NanoUIs. mind.current.client.init_verbs() - transfer_ckey(mind.current, FALSE) return TRUE /mob/dead/observer/verb/stay_dead()