071024

baystation12.dme

@@ -3304,6 +3304,7 @@
 #include "proxima\code\modules\mob\language\human\alain.dm"
 #include "proxima\code\modules\mob\language\human\german.dm"
 #include "proxima\code\modules\mob\language\human\lirris.dm"
+#include "proxima\code\modules\mob\observer\ghost\ghost.dm"
 #include "proxima\code\modules\nano\nanoexternal.dm"
 #include "proxima\code\modules\paperwork\paper.dm"
 #include "proxima\code\modules\projectiles\gun.dm"

code/_onclick/ghost.dm

@@ -40,7 +40,7 @@
 			AltClickOn(target_turf)
 		return
 	if(modifiers["shift"])
-		examinate(src, A)
+		examinate(A) //examinate(src, A)
 		return
 	A.attack_ghost(src)
 

code/modules/admin/admin_verbs.dm

@@ -583,12 +583,10 @@ var/list/admin_verbs_xeno = list(
 	if(!check_rights(R_ADMIN))
 		return
 
-	if(istype(CH, /datum/click_handler/build_mode))
-		CH.Exit()
-		QDEL_NULL(CH)
+	if(istype(mob.GetClickHandler(), /datum/click_handler/build_mode))
+		mob.RemoveClickHandler(/datum/click_handler/build_mode)
 	else
-		CH = new /datum/click_handler/build_mode(src)
-		CH.Enter()
+		mob.PushClickHandler(/datum/click_handler/build_mode)
 
 /client/proc/object_talk(var/msg as text) // -- TLE
 	set category = "Special Verbs"

code/modules/admin/buildmode/_click_handler.dm

@@ -51,11 +51,13 @@
 	user.client.show_popup_menus = FALSE
 	for(var/build_button in build_buttons)
 		user.client.screen += build_button
+	user.click_handlers.Insert(1, src)
 
 /datum/click_handler/build_mode/Exit()
 	user.my_client.show_popup_menus = TRUE
 	for(var/build_button in build_buttons)
 		user.my_client.screen -= build_button
+	user.click_handlers.Remove(src)
 
 /datum/click_handler/build_mode/OnDblClick(atom/A, params)
 	OnClick(A, params) // We treat double-clicks as normal clicks

proxima/code/modules/mob/observer/ghost/ghost.dm

@@ -0,0 +1,4 @@
+/mob/observer/ghost/verb/set_ghost_alpha()
+	set name = "Set Ghost Alpha"
+	set category = "Ghost"
+	alpha = alpha ? 0 : initial(alpha)