initial port

code/modules/mob/mob.dm

@@ -875,13 +875,15 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 			L.alpha = lighting_alpha
 
 /mob/proc/update_mouse_pointer()
-	if (!client)
+	if(!client)
 		return
 	client.mouse_pointer_icon = initial(client.mouse_pointer_icon)
-	if (ismecha(loc))
+	if(istype(loc, /obj/vehicle/sealed))
 		var/obj/vehicle/sealed/mecha/M = loc
 		if(M.mouse_pointer)
 			client.mouse_pointer_icon = M.mouse_pointer
+	if(client.mouse_override_icon)
+		client.mouse_pointer_icon = client.mouse_override_icon
 
 /mob/proc/is_literate()
 	return 0