12

timchigaming · timchigaming · commit c2b5146c8a06 · 2025-04-14T20:52:34.000+03:00
diff --git a/code/__DEFINES/traits/declarations.dm b/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"
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
@@ -846,6 +846,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,6 +873,11 @@ 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)
@@ -878,7 +888,7 @@ so as to remain in compliance with the most up-to-date laws."
 	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)
 
diff --git a/code/_onclick/hud/fullscreen.dm b/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
 
diff --git a/code/datums/action.dm b/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
 
diff --git a/code/datums/progressbar.dm b/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()
diff --git a/code/datums/status_effects/debuffs.dm b/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))
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
@@ -174,15 +174,18 @@
 	orient2hud(user)  // this only needs to happen to make .contents show properly as screen objects.
 	if(user.s_active)
 		user.s_active.hide_from(user)
-	user.client.screen |= boxes
-	user.client.screen |= closer
-	user.client.screen |= contents
+	user.client.screen -= boxes
+	user.client.screen -= closer
+	user.client.screen -= contents
+	user.client.screen += boxes
+	user.client.screen += closer
+	user.client.screen += contents
 	user.s_active = src
 	LAZYOR(mobs_viewing, user)
 
-	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
 		show_to(observe)
 
@@ -196,9 +199,9 @@
 	if(user.s_active == src)
 		user.s_active = null
 
-	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
 		hide_from(observe)
 
@@ -210,7 +213,7 @@
 
 
 /obj/item/storage/proc/update_viewers()
-	for(var/mob/M as anything in mobs_viewing)
+	for(var/mob/M in mobs_viewing)
 		if(!QDELETED(M) && M.s_active == src && (M in range(1, loc)))
 			continue
 		hide_from(M)
@@ -440,11 +443,11 @@
 		if(usr.client && usr.s_active != src)
 			usr.client.screen -= W
 
-		for(var/mob/dead/observer/observe in usr.orbiters)
-			if(!istype(observe))
+		for(var/mob/dead/observer/observe in usr.inventory_observers)
+			if(!observe.client)
+				LAZYREMOVE(usr.inventory_observers, observe)
 				continue
-			if(observe.client && observe.s_active != src)
-				observe.client.screen -= W
+			observe.client.screen -= W
 
 		add_fingerprint(usr)
 
diff --git a/code/modules/balloon_alert/balloon_alert.dm b/code/modules/balloon_alert/balloon_alert.dm
@@ -69,8 +69,9 @@
 
 	viewer_client?.images += balloon_alert
 
-	for(var/mob/dead/observer/observe in viewer.orbiters)
-		if(!istype(observe) || !observe.client)
+	for(var/mob/dead/observer/observe in viewer.inventory_observers)
+		if(!observe.client)
+			LAZYREMOVE(viewer, observe)
 			continue
 		observe.client.images += balloon_alert
 
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
@@ -1394,9 +1394,9 @@
 	var/atom/old_eye = eye
 	eye = new_eye
 
-	for(var/mob/dead/observer/observe in mob.orbiters)
-		if(!istype(observe) || !observe.client || !observe.orbit_menu?.auto_observe)
-			LAZYREMOVE(mob.orbiters, observe)
+	for(var/mob/dead/observer/observe in mob.inventory_observers)
+		if(!observe.client)
+			LAZYREMOVE(mob.inventory_observers, observe)
 			continue
 		observe.client.eye = new_eye
 
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
@@ -42,6 +42,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 	///does the ghost have plant scanner mode on? by default it should be off
 	var/plant_analyzer = FALSE
 	var/datum/orbit_menu/orbit_menu
+	var/mob/living/do_observe_target = null
 
 /mob/dead/observer/New(mob/body=null, flags=1)
 	set_invisibility(GLOB.observer_default_invisibility)
@@ -683,42 +684,42 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set_sight(mob_eye.sight)
 
 	client.clear_screen()
-	LAZYOR(mob_eye.orbiters, src)
+	LAZYOR(mob_eye.inventory_observers, src)
 	mob_eye.hud_used.show_hud(mob_eye.hud_used.hud_version, src)
 
+	do_observe_target = mob_eye
+
 	for(var/datum/action/act in mob_eye.actions)
 		if( istype(act.button, /atom/movable/screen/movable/action_button/hide_toggle) || \
-			(act in src.actions))
+			(act in src.actions)) //maybe last check is useless
 			continue
-		client.screen += act.button
-
-	//An ingenious way to block access to the button. Yes, it's on the screen, but you can't press it.
-//	for(var/atom/movable/screen/movable/action_button/button in client.screen)
-//		button.mosue_opacity = 0
+		client.screen |= act.button
+	for(var/atom/movable/screen/alert/alert in mob_eye.alerts)
+		client.screen |= alert
 
 /mob/dead/observer/proc/handle_when_autoobserve_move()
 	SIGNAL_HANDLER  // COMSIG_ORBITER_ORBIT_STOP
 
 	reset_perspective(null)
+	hud_used.reorganize_alerts()
 	cleanup_observe()
+	hud_used.plane_master_controllers[PLANE_MASTERS_GAME].remove_filter("eye_blur")
 	lighting_alpha = client?.prefs.ghost_darkness_level //Remembers ghost lighting pref
 	update_sight()
-	LAZYREMOVE(orbiting?.orbiters, src)
-
+	LAZYREMOVE(do_observe_target.inventory_observers, src)
 	clear_fullscreens()
-
 	if(src) // If player discconnected
 		UnregisterSignal(src, COMSIG_ORBITER_ORBIT_STOP)
-	if(orbiting != null)
-		UnregisterSignal(orbiting, COMSIG_MOB_UPDATE_SIGHT)
+		UnregisterSignal(do_observe_target, COMSIG_MOB_UPDATE_SIGHT)
+	do_observe_target = null
 
 /mob/dead/observer/proc/handle_when_autoobserve_sight_updated()
 	SIGNAL_HANDLER  // COMSIG_MOB_UPDATE_SIGHT
 
-	var/mob/mob_eye = orbiting
-	sight = mob_eye?.sight
-	lighting_alpha = mob_eye?.lighting_alpha
-	update_sight()
+	if(orbiting && client)
+		sight = do_observe_target.sight
+		lighting_alpha = do_observe_target.lighting_alpha
+		update_sight()
 
 /mob/dead/observer/verb/toggle_ghostsee()
 	set name = "Toggle Ghost Vision"
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
@@ -74,8 +74,7 @@
 
 	var/atom/movable/eye_mob = owner.orbiting
 	owner.orbiting = null
-	owner.reset_perspective(null)
-	owner.cleanup_observe()
+	owner.handle_when_autoobserve_move()
 	owner.orbiting = eye_mob
 
 /datum/orbit_menu/ui_data(mob/user)
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
@@ -317,9 +317,11 @@
 	if(client)
 		client.screen -= I
 
-	for(var/mob/dead/observer/observe in orbiters)
-		if(observe.client && istype(observe))
+	for(var/mob/dead/observer/observe in inventory_observers)
+		if(observe.client && observe.client.eye == src && observe.do_observe_target == src)
 			observe.client.screen -= I
+		else
+			LAZYREMOVE(inventory_observers, observe)
 
 	I.forceMove(src)
 	I.layer = ABOVE_HUD_LAYER
diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
