From dd94a30dbb7026245e4fb791e0b3db4e6a3722cd Mon Sep 17 00:00:00 2001
From: moxian <moxian@users.noreply.github.com>
Date: Mon, 30 Nov 2020 08:07:49 -0800
Subject: [PATCH] Allow ghosts to look inside containers (#14996)

* Allow ghosts to inspect storage via alt+clicking

Also streamlines orient2hud calls a bit.

* Normal click now also opens the storage for ghosts.
---
 code/_onclick/observer.dm                     |  2 +-
 .../objects/items/weapons/storage/bags.dm     |  2 --
 .../objects/items/weapons/storage/belt.dm     |  1 -
 .../objects/items/weapons/storage/storage.dm  | 29 ++++++++++---------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
index 3452400edbb..df0ed20f6b1 100644
--- a/code/_onclick/observer.dm
+++ b/code/_onclick/observer.dm
@@ -55,7 +55,7 @@
 /mob/dead/observer/ShiftClickOn(var/atom/A)
 	examinate(A)
 
-/atom/proc/attack_ghost(mob/user as mob)
+/atom/proc/attack_ghost(mob/user)
 	return
 
 // health + cyborg analyzer for ghosts
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 5370004a0a7..4a3072a6374 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -263,7 +263,6 @@
 		else
 			S.loc = src
 
-	orient2hud(usr)
 	if(usr.s_active)
 		usr.s_active.show_to(usr)
 	update_icon()
@@ -305,7 +304,6 @@
 			S.amount -= stacksize
 		if(!S.amount)
 			qdel(S) // todo: there's probably something missing here
-	orient2hud(usr)
 	if(usr.s_active)
 		usr.s_active.show_to(usr)
 	update_icon()
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 99ee47c74f5..2791ee28541 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -689,7 +689,6 @@
 				bolacount++
 		cooldown = world.time
 		update_icon()
-		orient2hud()
 		if(ishuman(loc))
 			var/mob/living/carbon/human/H = loc
 			if(H.belt && H.belt == src)
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 8609575652b..205c110215b 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -32,7 +32,6 @@
 			return
 
 		if(over_object == M && Adjacent(M)) // this must come before the screen objects only block
-			orient2hud(M)          // dunno why it wasn't before
 			if(M.s_active)
 				M.s_active.close(M)
 			show_to(M)
@@ -84,12 +83,11 @@
 
 /obj/item/storage/AltClick(mob/user)
 	if(ishuman(user) && Adjacent(user) && !user.incapacitated(FALSE, TRUE, TRUE))
-		orient2hud(user)
-		if(user.s_active)
-			user.s_active.close(user)
 		show_to(user)
 		playsound(loc, "rustle", 50, 1, -5)
 		add_fingerprint(user)
+	else if(isobserver(user))
+		show_to(user)
 	return ..()
 
 /obj/item/storage/proc/return_inv()
@@ -115,14 +113,15 @@
 		for(var/obj/item/I in src)
 			if(I.on_found(user))
 				return
+	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 -= src.boxes
-	user.client.screen -= src.closer
-	user.client.screen -= src.contents
-	user.client.screen += src.boxes
-	user.client.screen += src.closer
-	user.client.screen += src.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
 	return
 
@@ -141,7 +140,6 @@
 	if(src.use_sound)
 		playsound(src.loc, src.use_sound, 50, 1, -5)
 
-	orient2hud(user)
 	if(user.s_active)
 		user.s_active.close(user)
 	show_to(user)
@@ -317,7 +315,6 @@
 				else if(W && W.w_class >= WEIGHT_CLASS_NORMAL) //Otherwise they can only see large or normal items from a distance...
 					M.show_message("<span class='notice'>[usr] puts [W] into [src].</span>")
 
-		src.orient2hud(usr)
 		if(usr.s_active)
 			usr.s_active.show_to(usr)
 	W.mouse_opacity = MOUSE_OPACITY_OPAQUE //So you can click on the area around the item to equip it, instead of having to pixel hunt
@@ -352,7 +349,6 @@
 		W.forceMove(get_turf(src))
 
 	if(usr)
-		src.orient2hud(usr)
 		if(usr.s_active)
 			usr.s_active.show_to(usr)
 	if(W.maptext)
@@ -406,7 +402,6 @@
 			H.r_store = null
 			return
 
-	src.orient2hud(user)
 	if(src.loc == user)
 		if(user.s_active)
 			user.s_active.close(user)
@@ -419,6 +414,12 @@
 	src.add_fingerprint(user)
 	return
 
+/obj/item/storage/attack_ghost(mob/user)
+	if(isobserver(user))
+		// Revenants don't get to play with the toys.
+		show_to(user)
+	return ..()
+
 /obj/item/storage/verb/toggle_gathering_mode()
 	set name = "Switch Gathering Method"
 	set category = "Object"