Merge pull request #8761 from VOREStation/upstream-merge-7487

[MIRROR] Adds shift-middle click pointing
This commit is contained in:
Novacat
2020-08-21 01:09:36 -04:00
committed by GitHub
4 changed files with 22 additions and 3 deletions
+2 -2
View File
@@ -48,7 +48,7 @@
//mob verbs are faster than object verbs. See above.
/mob/living/pointed(atom/A as mob|obj|turf in view())
if(src.stat || !src.canmove || src.restrained())
if(src.stat || src.restrained())
return 0
if(src.status_flags & FAKEDEATH)
return 0
@@ -248,7 +248,7 @@ default behaviour is:
/mob/living/Crossed(var/atom/movable/AM) // Transplanting this from /mob/living/carbon/human/Crossed()
if(AM == src || AM.is_incorporeal()) // We're not going to run over ourselves or ghosts
return
if(istype(AM, /mob/living/bot/mulebot))
var/mob/living/bot/mulebot/MB = AM
MB.runOver(src)