refactor: AutoObserve (#6787) [testmerge][2facb5a]

Author: actions-user

code/__DEFINES/traits/declarations.dm

@@ -308,3 +308,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 
 /// A trait gained by leaning against a wall
 #define TRAIT_LEANING "leaning"
+
+/// used for dead mobs that are observing, but should not be afforded all the same platitudes as full ghosts.
+/// This is a mind trait because ghosts can be frequently deleted and we want to be sure this sticks.
+#define TRAIT_OBSERVING_INVENTORY "observe_inventory"

code/_onclick/hud/action_button.dm

@@ -7,7 +7,7 @@
 	var/datum/keybinding/mob/trigger_action_button/linked_keybind
 
 /atom/movable/screen/movable/action_button/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
-	if(!observer_check(usr))
+	if(HAS_TRAIT(usr, TRAIT_OBSERVING_INVENTORY))
 		return
 
 	if(locked && could_be_click_lag()) // in case something bad happend and game realised we dragged our ability instead of pressing it
@@ -37,7 +37,7 @@
 
 
 /atom/movable/screen/movable/action_button/Click(location,control,params)
-	if(!observer_check(usr))
+	if(HAS_TRAIT(usr, TRAIT_OBSERVING_INVENTORY))
 		return
 
 	var/list/modifiers = params2list(params)
@@ -73,7 +73,7 @@
 	return TRUE
 
 /atom/movable/screen/movable/action_button/proc/set_to_keybind(mob/user)
-	if(!observer_check(usr))
+	if(HAS_TRAIT(usr, TRAIT_OBSERVING_INVENTORY))
 		return
 
 	var/keybind_to_set_to = tgui_input_keycombo(user, "What keybind do you want to set this action button to?")
@@ -94,7 +94,7 @@
 
 
 /atom/movable/screen/movable/action_button/click_alt(mob/user)
-	if(!observer_check(usr))
+	if(HAS_TRAIT(usr, TRAIT_OBSERVING_INVENTORY))
 		return
 
 	linked_action.AltTrigger()
@@ -103,7 +103,7 @@
 
 /atom/movable/screen/movable/action_button/proc/clean_up_keybinds(mob/owner)
 	if(linked_keybind)
-		if(!observer_check(usr))
+		if(HAS_TRAIT(usr, TRAIT_OBSERVING_INVENTORY))
 			return
 
 		owner.client.active_keybindings[linked_keybind.binded_to] -= (linked_keybind)
@@ -133,10 +133,8 @@
 
 
 /atom/movable/screen/movable/action_button/hide_toggle/Click(location,control,params)
-	if(isobserver(usr))
-		var/mob/dead/observer/dead_mob = usr
-		if(dead_mob.orbiting)
-			return FALSE
+	if(HAS_TRAIT(usr, TRAIT_OBSERVING_INVENTORY))
+		return
 
 	if(usr.next_click > world.time)
 		return FALSE
@@ -158,7 +156,7 @@
 
 
 /atom/movable/screen/movable/action_button/hide_toggle/click_alt(mob/user)
-	if(!observer_check(usr))
+	if(HAS_TRAIT(usr, TRAIT_OBSERVING_INVENTORY))
 		return
 
 	for(var/datum/action/action as anything in user.actions)
@@ -197,9 +195,6 @@
 
 
 /atom/movable/screen/movable/action_button/MouseEntered(location, control, params)
-	if(!observer_check(usr))
-		return
-
 	if(!QDELETED(src))
 		if(!linked_keybind)
 			openToolTip(usr, src, params, title = name, content = desc, theme = actiontooltipstyle)
@@ -214,14 +209,6 @@
 /atom/movable/screen/movable/action_button/MouseExited()
 	closeToolTip(usr)
 
-// We don't want give permit to use buttons
-/atom/movable/screen/movable/action_button/proc/observer_check(mob/user)
-	if(isobserver(user))
-		var/mob/dead/observer/dead_mob = user
-		if(linked_action?.owner != user || dead_mob.orbiting)
-			return FALSE
-	return TRUE
-
 /mob/proc/update_action_buttons_icon()
 	for(var/datum/action/action as anything in actions)
 		action.UpdateButtonIcon()

code/_onclick/hud/alert.dm

@@ -91,6 +91,12 @@
 	if(client && hud_used)
 		hud_used.reorganize_alerts()
 		client.screen -= alert
+
+		for(var/mob/dead/observer/observe in inventory_observers)
+			if(!observe.client)
+				LAZYREMOVE(inventory_observers, observe)
+				continue
+			observe.client.screen -= alert
 	qdel(alert)
 
 /atom/movable/screen/alert
@@ -329,6 +335,8 @@ or something covering your eyes."
 	icon_state = "embeddedobject"
 
 /atom/movable/screen/alert/embeddedobject/Click()
+	if(!..())
+		return
 	if(isliving(usr))
 		var/mob/living/carbon/human/M = usr
 		return M.help_shake_act(M)
@@ -373,6 +381,9 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 
 
 /atom/movable/screen/alert/fire/Click()
+	if(!..())
+		return
+
 	if(!isliving(usr))
 		return FALSE
 
@@ -394,6 +405,9 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 	icon_state = "direction_lock"
 
 /atom/movable/screen/alert/direction_lock/Click()
+	if(!..())
+		return
+
 	if(isliving(usr))
 		var/mob/living/L = usr
 		return L.clear_forced_look()
@@ -452,7 +466,7 @@ Recharging stations are available in robotics, the dormitory bathrooms, and the
 	desc = "You have merged with a diona gestalt and are now part of it's biomass. You can still wiggle yourself free though."
 
 /atom/movable/screen/alert/nymph/Click()
-	if(!usr || !usr.client)
+	if(!usr || !usr.client || !..())
 		return
 	if(isnymph(usr))
 		var/mob/living/simple_animal/diona/D = usr
@@ -491,7 +505,7 @@ so as to remain in compliance with the most up-to-date laws."
 	return ..()
 
 /atom/movable/screen/alert/hackingapc/Click()
-	if(!usr || !usr.client)
+	if(!usr || !usr.client || !..())
 		return
 	if(!target)
 		return
@@ -517,7 +531,7 @@ so as to remain in compliance with the most up-to-date laws."
 	return ..()
 
 /atom/movable/screen/alert/mech_port_available/Click()
-	if(!usr || !usr.client)
+	if(!usr || !usr.client || !..())
 		return
 	if(!ismecha(usr.loc) || !target)
 		return
@@ -533,7 +547,7 @@ so as to remain in compliance with the most up-to-date laws."
 	icon_state = "mech_port_x"
 
 /atom/movable/screen/alert/mech_port_disconnect/Click()
-	if(!usr || !usr.client)
+	if(!usr || !usr.client || !..())
 		return
 	if(!ismecha(usr.loc))
 		return
@@ -823,11 +837,17 @@ so as to remain in compliance with the most up-to-date laws."
 	desc = "You're legcuffed, which slows you down considerably. Click the alert to free yourself."
 
 /atom/movable/screen/alert/restrained/Click()
+	if(!..())
+		return
+
 	if(isliving(usr))
 		var/mob/living/L = usr
 		return L.resist()
 
 /atom/movable/screen/alert/restrained/buckled/Click()
+	if(!..())
+		return
+
 	var/mob/living/L = usr
 	if(!istype(L) || !L.can_resist())
 		return
@@ -846,6 +866,11 @@ so as to remain in compliance with the most up-to-date laws."
 	if(!hud_shown)
 		for(var/i in 1 to alerts.len)
 			mymob.client.screen -= alerts[alerts[i]]
+			for(var/mob/dead/observer/observe in mymob.inventory_observers)
+				if(!observe.client)
+					LAZYREMOVE(mymob.inventory_observers, observe)
+					continue
+				observe.client.screen -= alerts[alerts[i]]
 		return TRUE
 	for(var/i in 1 to alerts.len)
 		var/atom/movable/screen/alert/alert = alerts[alerts[i]]
@@ -868,17 +893,22 @@ so as to remain in compliance with the most up-to-date laws."
 				. = ""
 		alert.screen_loc = .
 		mymob.client.screen |= alert
+		for(var/mob/dead/observer/observe in mymob.inventory_observers)
+			if(!observe.client)
+				LAZYREMOVE(mymob.inventory_observers, observe)
+				continue
+			observe.client.screen |= alert
 	return TRUE
 
 /atom/movable/screen/alert/Click(location, control, params)
-	if(!usr || !usr.client)
+	if(!usr || !usr.client || HAS_TRAIT(usr, TRAIT_OBSERVING_INVENTORY))
 		return FALSE
 
 	var/paramslist = params2list(params)
 	if(paramslist["shift"]) // screen objects don't do the normal Click() stuff so we'll cheat
 		to_chat(usr, "<span class='boldnotice'>[name]</span> - <span class='info'>[desc]</span>")
 		return FALSE
-		
+
 	if(master)
 		return usr.client.Click(master, location, control, params)
 
@@ -897,7 +927,7 @@ so as to remain in compliance with the most up-to-date laws."
 	icon_state = "succumb"
 
 /atom/movable/screen/alert/succumb/Click()
-	if(!usr || !usr.client)
+	if(!usr || !usr.client || !..())
 		return
 	var/mob/living/living_owner = usr
 	if(!istype(usr))

code/_onclick/hud/fullscreen.dm

@@ -16,9 +16,9 @@
 	if(client && screen.should_show_to(src))
 		screen.update_for_view(client.view)
 		client.screen += screen
-		for(var/mob/dead/observer/observe in orbiters)
-			if(!istype(observe) || !observe.client || !observe.orbit_menu?.auto_observe)
-				LAZYREMOVE(orbiters, observe)
+		for(var/mob/dead/observer/observe in inventory_observers)
+			if(!observe.client)
+				LAZYREMOVE(inventory_observers, observe)
 				continue
 			observe.client.screen += screen
 
@@ -34,8 +34,9 @@
 		return
 
 	screens -= category
-	for(var/mob/dead/observer/observe in orbiters)
-		if(!istype(observe) || !observe.client)
+	for(var/mob/dead/observer/observe in inventory_observers)
+		if(!observe.client)
+			LAZYREMOVE(inventory_observers, observe)
 			continue
 		observe.screens -= category
 
@@ -46,8 +47,9 @@
 		if(client)
 			client.screen -= screen
 
-			for(var/mob/dead/observer/observe in orbiters)
-				if(!istype(observe) || !observe.client)
+			for(var/mob/dead/observer/observe in inventory_observers)
+				if(!observe.client)
+					LAZYREMOVE(inventory_observers, observe)
 					continue
 				observe.client.screen -= screen
 		qdel(screen)
@@ -56,8 +58,9 @@
 /mob/proc/clear_fullscreen_after_animate(atom/movable/screen/fullscreen/screen)
 	if(client)
 		client.screen -= screen
-		for(var/mob/dead/observer/observe in orbiters)
-			if(!istype(observe) || !observe.client)
+		for(var/mob/dead/observer/observe in inventory_observers)
+			if(!observe.client)
+				LAZYREMOVE(inventory_observers, observe)
 				continue
 			observe.client.screen -= screen
 	qdel(screen)
@@ -78,15 +81,17 @@
 				screen.update_for_view(mymob.client.view)
 				mymob.client.screen |= screen
 
-				for(var/mob/dead/observer/observe in mymob.orbiters)
-					if(!istype(observe) || !observe.client)
+				for(var/mob/dead/observer/observe in mymob.inventory_observers)
+					if(!observe.client)
+						LAZYREMOVE(mymob.inventory_observers, observe)
 						continue
 					observe.client.screen |= screen
 			else
 				mymob.client.screen -= screen
 
-				for(var/mob/dead/observer/observe in mymob.orbiters)
-					if(!istype(observe) || !observe.client)
+				for(var/mob/dead/observer/observe in mymob.inventory_observers)
+					if(!observe.client)
+						LAZYREMOVE(mymob.inventory_observers, observe)
 						continue
 					observe.client.screen -= screen
 

code/datums/action.dm

@@ -46,9 +46,9 @@
 	if(owner.client)
 		owner.client.screen += button
 
-		for(var/mob/dead/observer/observe in user.orbiters)
-			if(!istype(observe) || !observe.client || !observe.orbit_menu?.auto_observe)
-				LAZYREMOVE(user.orbiters, observe)
+		for(var/mob/dead/observer/observe in user.inventory_observers)
+			if(!observe.client)
+				LAZYREMOVE(user.inventory_observers, observe)
 				continue
 			observe.client.screen += button
 
@@ -76,9 +76,9 @@
 	if(user.client)
 		user.client.screen -= button
 
-		for(var/mob/dead/observer/observe in user.orbiters)
-			if(!istype(observe) || !observe.client || !observe.orbit_menu?.auto_observe)
-				LAZYREMOVE(user.orbiters, observe)
+		for(var/mob/dead/observer/observe in user.inventory_observers)
+			if(!observe.client)
+				LAZYREMOVE(user.inventory_observers, observe)
 				continue
 			observe.client.screen -= button
 

code/datums/diseases/viruses/babylon_fever.dm

@@ -87,6 +87,8 @@
 		stored_languages ^= translator.given_languages // you can't forget it, because it's on the chip in translator
 
 	for(var/datum/language/lan as anything in stored_languages)
+		if(lan.flags & NOBABEL)
+			continue
 		affected_mob.remove_language(lan.name)
 
 

code/datums/progressbar.dm

@@ -57,8 +57,9 @@
 		user_client = user.client
 		add_prog_bar_image_to_client()
 		// Ghosts wants to see a do_afters too!
-		for(var/mob/dead/observer/observe in user.orbiters)
-			if(!istype(observe) || !observe.client)
+		for(var/mob/dead/observer/observe in user.inventory_observers)
+			if(!observe.client)
+				LAZYREMOVE(user.inventory_observers, observe)
 				continue
 			user_client = observe.client
 			add_prog_bar_image_to_client()

code/datums/spells/bloodcrawl.dm

@@ -252,7 +252,7 @@
 	var/turf/tele_loc = isturf(enter_point) ? enter_point : enter_point.loc
 	var/holder = user.loc
 	user.forceMove(tele_loc)
-	user.client.eye = user
+	user.client.set_eye(user)
 
 	rise_animation(tele_loc, user, enter_point)
 

code/datums/status_effects/debuffs.dm

@@ -944,9 +944,9 @@
 	game_plane_master_controller.remove_filter("eye_blur")
 
 	// Maybe this should be bad for server perfomance, but i dont test it on production server
-	for(var/mob/dead/observer/observe in owner.orbiters)
-		if(!istype(observe) || !observe.client || !observe.orbit_menu?.auto_observe)
-			LAZYREMOVE(owner.orbiters, observe)
+	for(var/mob/dead/observer/observe in owner.inventory_observers)
+		if(!observe.client)
+			LAZYREMOVE(owner.inventory_observers, observe)
 			continue
 		game_plane_master_controller = observe.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
 		game_plane_master_controller.remove_filter("eye_blur")
@@ -965,9 +965,9 @@
 	game_plane_master_controller.add_filter("eye_blur", 1, gauss_blur_filter(amount_of_blur))
 
 	// Maybe this should be bad for server perfomance, but i dont test it on production server
-	for(var/mob/dead/observer/observe in owner.orbiters)
-		if(!istype(observe) || !observe.client || !observe.orbit_menu?.auto_observe)
-			LAZYREMOVE(owner.orbiters, observe)
+	for(var/mob/dead/observer/observe in owner.inventory_observers)
+		if(!observe.client)
+			LAZYREMOVE(owner.inventory_observers, observe)
 			continue
 		game_plane_master_controller = observe.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
 		game_plane_master_controller.add_filter("eye_blur", 1, gauss_blur_filter(amount_of_blur))