Merge pull request #10881 from Ghommie/Ghommie-cit552

Refactoring mob holders into an element.
2020-02-06 00:41:28 -07:00
parent b3fb11559e 89466de29e
commit 18910a23a2
23 changed files with 252 additions and 224 deletions
@@ -319,9 +319,11 @@
 /mob/proc/ShiftClickOn(atom/A)
 	A.ShiftClick(src)
 	return
+
 /atom/proc/ShiftClick(mob/user)
-	SEND_SIGNAL(src, COMSIG_CLICK_SHIFT, user)
-	user.examinate(src)
+	var/flags = SEND_SIGNAL(src, COMSIG_CLICK_SHIFT, user)
+	if(!(flags & COMPONENT_DENY_EXAMINATE) && user.client && (user.client.eye == user || user.client.eye == user.loc || flags & COMPONENT_ALLOW_EXAMINATE))
+		user.examinate(src)
 	return

 /*