This commit is contained in:
fake_vm_user
2022-04-26 23:24:27 -07:00
parent 7cab6c0844
commit a4899d0395
3 changed files with 6 additions and 3 deletions

View File

@@ -2,8 +2,12 @@
* shakes the camera of any client watching from an atom's perspective * shakes the camera of any client watching from an atom's perspective
*/ */
/proc/shake_camera(atom/movable/AM, duration, strength = 1) /proc/shake_camera(atom/movable/AM, duration, strength = 1)
if(!M || !IS_CONSCIOUS(M) || isEye(M) || isAI(M)) if(!AM || isEye(AM) || isAI(AM))
return return
if(ismob(AM))
var/mob/M = AM
if(!IS_CONSCIOUS(M))
return
if(!M.self_perspective) if(!M.self_perspective)
return return
for(var/client/C in AM.self_perspective.GetClients()) for(var/client/C in AM.self_perspective.GetClients())

View File

@@ -46,7 +46,6 @@
return return
if(C.using_perspective) if(C.using_perspective)
CRASH("client already had perspective") CRASH("client already had perspective")
return
clients += C clients += C
C.using_perspective = src C.using_perspective = src
Apply(C) Apply(C)

View File

@@ -79,7 +79,7 @@
/obj/item/chameleon/proc/eject_all() /obj/item/chameleon/proc/eject_all()
for(var/atom/movable/A in active_dummy) for(var/atom/movable/A in active_dummy)
A.forceMove(active_dummy.loc)) A.forceMove(active_dummy.loc)
if(ismob(A)) if(ismob(A))
var/mob/M = A var/mob/M = A
M.update_perspective() M.update_perspective()