Merge pull request #10881 from Ghommie/Ghommie-cit552

This commit is contained in:
kevinz000
2020-10-02 02:14:44 -03:00
committed by Dip
parent 730307bc05
commit f318dbe1b2
25 changed files with 469 additions and 452 deletions
+3 -2
View File
@@ -315,9 +315,10 @@
/mob/proc/ShiftClickOn(atom/A)
A.ShiftClick(src)
return
/atom/proc/ShiftClick(mob/user)
SEND_SIGNAL(src, COMSIG_CLICK_SHIFT, user)
if(user.client && user.client.eye == user || user.client.eye == user.loc)
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